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.
author: Brian Terlson <brian.terlson@microsoft.com> 2014-07-21 16:09:02 -0700
committer: Brian Terlson <brian.terlson@microsoft.com> 2014-07-30 15:38:26 -0700
commit: d4354d14d534abaf2bcb1f82b3daae0702f3b8ee (patch)
tree: c61fce41bac7da21f486f38b443d492ce751f80c /test/suite/ch08
parent: 07ccd199d9e6cde340d154f1c5bcb539f6e1406a (diff)
182 files changed, 2168 insertions, 2274 deletions
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"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
author	Brian Terlson <brian.terlson@microsoft.com>	2014-07-21 16:09:02 -0700
committer	Brian Terlson <brian.terlson@microsoft.com>	2014-07-30 15:38:26 -0700
commit	d4354d14d534abaf2bcb1f82b3daae0702f3b8ee (patch)
tree	c61fce41bac7da21f486f38b443d492ce751f80c /test/suite/ch08
parent	07ccd199d9e6cde340d154f1c5bcb539f6e1406a (diff)