45 files changed, 365 insertions, 439 deletions
diff --git a/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-16-s.js b/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-16-s.js
index bfc1f5ece..52e18362c 100644
--- a/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-16-s.js
+++ b/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-16-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-16-s.js
- * @description Strict Mode - TypeError is thrown when changing the value of a Value Property of the Global Object under strict mode (NaN)
- * @onlyStrict
- */
-
-
-function testcase() {
-        "use strict";
-
-        try {
-            NaN = 12;
-            return false;
-        } catch (e) {
-            return e instanceof TypeError;
-        }
-    }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown when changing the value of a
+    Value Property of the Global Object under strict mode (NaN)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        try {
+            NaN = 12;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-18-s.js b/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-18-s.js
index e60836978..d117d9f67 100644
--- a/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-18-s.js
+++ b/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-18-s.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-18-s.js
- * @description Strict Mode - TypeError is thrown when changing the value of a Value Property of the Global Object under strict mode (undefined)
- * @onlyStrict
- */
-
-
-function testcase() {
-        "use strict";
-        try {
-            undefined = 12;
-            return false;
-        } catch (e) {
-            return e instanceof TypeError;
-        }
-    }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is thrown when changing the value of a
+    Value Property of the Global Object under strict mode (undefined)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        try {
+            undefined = 12;
+            return false;
+        } catch (e) {
+            return e instanceof TypeError;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-22-s.js b/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-22-s.js
index 9303b79b5..d072356e6 100644
--- a/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-22-s.js
+++ b/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-22-s.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-22-s.js
- * @description Strict Mode - TypeError is not thrown when changing the value of the Constructor Properties of the Global Object under strict mode (Object)
- * @onlyStrict
- */
-
-
-function testcase() {
-        "use strict";
-        var objBak = Object;
-
-        try {
-            Object = 12;
-            return true;
-        } finally {
-            Object = objBak;
-        }
-    }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is not thrown when changing the value of
+    the Constructor Properties of the Global Object under strict mode
+    (Object)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        var objBak = Object;
+
+        try {
+            Object = 12;
+            return true;
+        } finally {
+            Object = objBak;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-27-s.js b/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-27-s.js
index 9ecdf64a5..cd36539a2 100644
--- a/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-27-s.js
+++ b/test/suite/ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-27-s.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch10/10.2/10.2.1/10.2.1.1/10.2.1.1.3/10.2.1.1.3-4-27-s.js
- * @description Strict Mode - TypeError is not thrown when changing the value of the Constructor Properties of the Global Object under strict mode (Number)
- * @onlyStrict
- */
-
-
-function testcase() {
-        "use strict";
-
-        var numBak = Number;
-        try {
-            Number = 12;
-            return true;
-        } finally {
-            Number = numBak;
-        }
-    }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - TypeError is not thrown when changing the value of
+    the Constructor Properties of the Global Object under strict mode
+    (Number)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        var numBak = Number;
+        try {
+            Number = 12;
+            return true;
+        } finally {
+            Number = numBak;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.2/10.2.1/S10.2.1_A1.js b/test/suite/ch10/10.2/10.2.1/S10.2.1_A1.js
index 6206633b2..e697a8afb 100644
--- a/test/suite/ch10/10.2/10.2.1/S10.2.1_A1.js
+++ b/test/suite/ch10/10.2/10.2.1/S10.2.1_A1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the caller supplies fewer parameter values than there are
- * formal parameters, the extra formal parameters have value undefined
- *
- * @path ch10/10.2/10.2.1/S10.2.1_A1.js
- * @description Calling function excluding a few parameters
- */
+/*---
+info: >
+    If the caller supplies fewer parameter values than there are
+    formal parameters, the extra formal parameters have value undefined
+description: Calling function excluding a few parameters
+---*/
 
 //CHECK#1
 function f1(a, b){
@@ -26,4 +25,3 @@ function f2(a, b, c){
 if(!(f2(1) === true)){
   $ERROR('#2: f2(1, 2) === true');
 }
-
diff --git a/test/suite/ch10/10.2/10.2.1/S10.2.1_A2.js b/test/suite/ch10/10.2/10.2.1/S10.2.1_A2.js
index e622c5462..3b8e89a2f 100644
--- a/test/suite/ch10/10.2/10.2.1/S10.2.1_A2.js
+++ b/test/suite/ch10/10.2/10.2.1/S10.2.1_A2.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If two or more formal parameters share the same name, hence
- * the same property, the corresponding property is given the value that was
- * supplied for the last parameter with this name
- *
- * @path ch10/10.2/10.2.1/S10.2.1_A2.js
- * @description Creating functions initialized with two or more formal parameters, which have the same name
- * @noStrict
- */
+/*---
+info: >
+    If two or more formal parameters share the same name, hence
+    the same property, the corresponding property is given the value that was
+    supplied for the last parameter with this name
+description: >
+    Creating functions initialized with two or more formal parameters,
+    which have the same name
+flags: [noStrict]
+---*/
 
 //CHECK#1
 function f1(x, x) {
@@ -34,4 +35,3 @@ function f3(x, x) {
 if(!(f3(1, 2) === 'a2')){
   $ERROR("#3: f3(1, 2) === 'a2'");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.1/S10.2.1_A3.js b/test/suite/ch10/10.2/10.2.1/S10.2.1_A3.js
index 1c15c0621..8da07b12f 100644
--- a/test/suite/ch10/10.2/10.2.1/S10.2.1_A3.js
+++ b/test/suite/ch10/10.2/10.2.1/S10.2.1_A3.js
@@ -1,15 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If the value of this last parameter (which has the same
- * name as some previous parameters do) was not supplied by the
- * caller, the value of the corresponding property is undefined
- *
- * @path ch10/10.2/10.2.1/S10.2.1_A3.js
- * @description Creating functions with two or more formal parameters,
- * that have the same name. Calling this function excluding a few last parameters
- */
+/*---
+info: >
+    If the value of this last parameter (which has the same
+    name as some previous parameters do) was not supplied by the
+    caller, the value of the corresponding property is undefined
+description: >
+    Creating functions with two or more formal parameters,  that have
+    the same name. Calling this function excluding a few last
+    parameters
+---*/
 
 //CHECK#1
 function f1(x, a, b, x){
@@ -18,4 +19,3 @@ function f1(x, a, b, x){
 if(!(f1(1, 2) === undefined)){
   $ERROR('#1: f1(1, 2) === undefined');
 }
-
diff --git a/test/suite/ch10/10.2/10.2.1/S10.2.1_A4_T1.js b/test/suite/ch10/10.2/10.2.1/S10.2.1_A4_T1.js
index a153af430..346f3a27f 100644
--- a/test/suite/ch10/10.2/10.2.1/S10.2.1_A4_T1.js
+++ b/test/suite/ch10/10.2/10.2.1/S10.2.1_A4_T1.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function declaration in function code - If the variable object
- * already has a property with the name of Function Identifier, replace its
- * value and attributes. Semantically, this step must follow the creation of
- * FormalParameterList properties
- *
- * @path ch10/10.2/10.2.1/S10.2.1_A4_T1.js
- * @description Checking existence of a function with passed parameter
- * @noStrict
- */
+/*---
+info: >
+    Function declaration in function code - If the variable object
+    already has a property with the name of Function Identifier, replace its
+    value and attributes. Semantically, this step must follow the creation of
+    FormalParameterList properties
+description: Checking existence of a function with passed parameter
+flags: [noStrict]
+---*/
 
 //CHECK#1
 function f1(x){
@@ -46,4 +45,3 @@ function f3() {
 if (!(f3() === "function")){
   $ERROR('#3: f3() === "function"');
 }
-
diff --git a/test/suite/ch10/10.2/10.2.1/S10.2.1_A4_T2.js b/test/suite/ch10/10.2/10.2.1/S10.2.1_A4_T2.js
index 16661df91..4c84ac9e3 100644
--- a/test/suite/ch10/10.2/10.2.1/S10.2.1_A4_T2.js
+++ b/test/suite/ch10/10.2/10.2.1/S10.2.1_A4_T2.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function declaration in function code - If the variable object
- * already has a property with the name of Function Identifier, replace its
- * value and attributes. Semantically, this step must follow the creation of
- * FormalParameterList properties
- *
- * @path ch10/10.2/10.2.1/S10.2.1_A4_T2.js
- * @description Checking existence of a function with declared variable
- */
+/*---
+info: >
+    Function declaration in function code - If the variable object
+    already has a property with the name of Function Identifier, replace its
+    value and attributes. Semantically, this step must follow the creation of
+    FormalParameterList properties
+description: Checking existence of a function with declared variable
+includes: [$PRINT.js]
+---*/
 
 //CHECK#1
 function f1(){
@@ -38,4 +38,3 @@ function f2(){
 if(!(f2() === "function")){
   $PRINT('#2: f2() === "function"');
 }
-
diff --git a/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.1_T1.js b/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.1_T1.js
index 824aedeee..e0b73a85a 100644
--- a/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.1_T1.js
+++ b/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.1_T1.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * For each VariableDeclaration or VariableDeclarationNoIn in the
- * code, create a property of the variable object whose name is the Identifier
- * in the VariableDeclaration or VariableDeclarationNoIn, whose value is
- * undefined and whose attributes are determined by the type of code
- *
- * @path ch10/10.2/10.2.1/S10.2.1_A5.1_T1.js
- * @description Checking variable existence only
- */
+/*---
+info: >
+    For each VariableDeclaration or VariableDeclarationNoIn in the
+    code, create a property of the variable object whose name is the Identifier
+    in the VariableDeclaration or VariableDeclarationNoIn, whose value is
+    undefined and whose attributes are determined by the type of code
+description: Checking variable existence only
+includes: [$PRINT.js]
+---*/
 
 //CHECK#1
 function f1(){
@@ -32,4 +32,3 @@ function f2(){
 if(!(f2() === undefined)){
   $PRINT('#1: f2() === undefined');
 }
-
diff --git a/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.1_T2.js b/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.1_T2.js
index adef8b5c5..8cca24147 100644
--- a/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.1_T2.js
+++ b/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.1_T2.js
@@ -1,15 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * For each VariableDeclaration or VariableDeclarationNoIn in the
- * code, create a property of the variable object whose name is the Identifier
- * in the VariableDeclaration or VariableDeclarationNoIn, whose value is
- * undefined and whose attributes are determined by the type of code
- *
- * @path ch10/10.2/10.2.1/S10.2.1_A5.1_T2.js
- * @description Checking existence of the variable object property with formal parameter
- */
+/*---
+info: >
+    For each VariableDeclaration or VariableDeclarationNoIn in the
+    code, create a property of the variable object whose name is the Identifier
+    in the VariableDeclaration or VariableDeclarationNoIn, whose value is
+    undefined and whose attributes are determined by the type of code
+description: >
+    Checking existence of the variable object property with formal
+    parameter
+includes: [$PRINT.js]
+---*/
 
 //CHECK#1
 function f1(x){
@@ -32,4 +34,3 @@ function f2(x){
 if(!(f2() === undefined)){
   $PRINT('#1: f2(1) === undefined');
 }
-
diff --git a/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.2_T1.js b/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.2_T1.js
index d5321c907..743e289e6 100644
--- a/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.2_T1.js
+++ b/test/suite/ch10/10.2/10.2.1/S10.2.1_A5.2_T1.js
@@ -1,14 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If there is already a property of the variable object with the
- * name of a declared variable, the value of the property and its attributes
- * are not changed
- *
- * @path ch10/10.2/10.2.1/S10.2.1_A5.2_T1.js
- * @description Checking existence of the variable object property with formal parameter
- */
+/*---
+info: >
+    If there is already a property of the variable object with the
+    name of a declared variable, the value of the property and its attributes
+    are not changed
+description: >
+    Checking existence of the variable object property with formal
+    parameter
+includes: [$PRINT.js]
+---*/
 
 //CHECK#1
 function f1(x){
@@ -31,4 +33,3 @@ function f2(x){
 if(!(f2(1) === 1)){
   $PRINT('#1: f2(1) === 1');
 }
-
diff --git a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T1.js b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T1.js
index 7aba918d1..1f03ee6ae 100644
--- a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T1.js
+++ b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T1.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every execution context has associated with it a scope chain.
- * A scope chain is a list of objects that are searched when evaluating an
- * Identifier
- *
- * @path ch10/10.2/10.2.2/S10.2.2_A1_T1.js
- * @description Checking scope chain containing function declarations
- */
+/*---
+info: >
+    Every execution context has associated with it a scope chain.
+    A scope chain is a list of objects that are searched when evaluating an
+    Identifier
+description: Checking scope chain containing function declarations
+---*/
 
 var x = 0;
 
@@ -23,4 +22,3 @@ function f1(){
 if(!(f1() === 1)){
   $ERROR("#1: Scope chain disturbed");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T2.js b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T2.js
index 33b472418..06ec5a4ac 100644
--- a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T2.js
+++ b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every execution context has associated with it a scope chain.
- * A scope chain is a list of objects that are searched when evaluating an
- * Identifier
- *
- * @path ch10/10.2/10.2.2/S10.2.2_A1_T2.js
- * @description Checking scope chain containing function declarations
- */
+/*---
+info: >
+    Every execution context has associated with it a scope chain.
+    A scope chain is a list of objects that are searched when evaluating an
+    Identifier
+description: Checking scope chain containing function declarations
+---*/
 
 var x = 0;
 
@@ -22,4 +21,3 @@ function f1(){
 if(!(f1() === 0)){
   $ERROR("#1: Scope chain disturbed");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T3.js b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T3.js
index a9a85deff..350f662dd 100644
--- a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T3.js
+++ b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T3.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every execution context has associated with it a scope chain.
- * A scope chain is a list of objects that are searched when evaluating an
- * Identifier
- *
- * @path ch10/10.2/10.2.2/S10.2.2_A1_T3.js
- * @description Checking scope chain containing function declarations
- */
+/*---
+info: >
+    Every execution context has associated with it a scope chain.
+    A scope chain is a list of objects that are searched when evaluating an
+    Identifier
+description: Checking scope chain containing function declarations
+---*/
 
 var x = 0;
 
@@ -24,5 +23,3 @@ function f1(){
 if(!(f1() === undefined)){
   $ERROR("#1: Scope chain disturbed");
 }
-
-
diff --git a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T4.js b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T4.js
index e32ffac35..fdd3a3de4 100644
--- a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T4.js
+++ b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T4.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every execution context has associated with it a scope chain.
- * A scope chain is a list of objects that are searched when evaluating an
- * Identifier
- *
- * @path ch10/10.2/10.2.2/S10.2.2_A1_T4.js
- * @description Checking scope chain containing function declarations
- */
+/*---
+info: >
+    Every execution context has associated with it a scope chain.
+    A scope chain is a list of objects that are searched when evaluating an
+    Identifier
+description: Checking scope chain containing function declarations
+---*/
 
 var x = 0;
 
@@ -24,4 +23,3 @@ function f1(){
 if(!(f1() === 1)){
   $ERROR("#1: Scope chain disturbed");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T5.js b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T5.js
index c71654f6f..c761ef6f6 100644
--- a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T5.js
+++ b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T5.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every execution context has associated with it a scope chain.
- * A scope chain is a list of objects that are searched when evaluating an
- * Identifier
- *
- * @path ch10/10.2/10.2.2/S10.2.2_A1_T5.js
- * @description Checking scope chain containing function declarations and "with"
- * @noStrict
- */
+/*---
+info: >
+    Every execution context has associated with it a scope chain.
+    A scope chain is a list of objects that are searched when evaluating an
+    Identifier
+description: Checking scope chain containing function declarations and "with"
+flags: [noStrict]
+---*/
 
 var x = 0;
 
@@ -28,4 +27,3 @@ function f1(){
 if(!(f1() === "obj")){
   $ERROR("#1: Scope chain disturbed");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T6.js b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T6.js
index 990c27ef3..4e55face7 100644
--- a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T6.js
+++ b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T6.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every execution context has associated with it a scope chain.
- * A scope chain is a list of objects that are searched when evaluating an
- * Identifier
- *
- * @path ch10/10.2/10.2.2/S10.2.2_A1_T6.js
- * @description Checking scope chain containing function declarations and "with"
- * @noStrict
- */
+/*---
+info: >
+    Every execution context has associated with it a scope chain.
+    A scope chain is a list of objects that are searched when evaluating an
+    Identifier
+description: Checking scope chain containing function declarations and "with"
+flags: [noStrict]
+---*/
 
 var x = 0;
 
@@ -27,4 +26,3 @@ function f1(){
 if(!(f1() === "obj")){
   $ERROR("#1: Scope chain disturbed");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T7.js b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T7.js
index cc719b504..4b6de1a67 100644
--- a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T7.js
+++ b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T7.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every execution context has associated with it a scope chain.
- * A scope chain is a list of objects that are searched when evaluating an
- * Identifier
- *
- * @path ch10/10.2/10.2.2/S10.2.2_A1_T7.js
- * @description Checking scope chain containing function declarations and "with"
- * @noStrict
- */
+/*---
+info: >
+    Every execution context has associated with it a scope chain.
+    A scope chain is a list of objects that are searched when evaluating an
+    Identifier
+description: Checking scope chain containing function declarations and "with"
+flags: [noStrict]
+---*/
 
 var x = 0;
 
@@ -29,4 +28,3 @@ function f1(){
 if(!(f1() === "obj")){
   $ERROR("#1: Scope chain disturbed");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T8.js b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T8.js
index 3aaefcf14..e13f22581 100644
--- a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T8.js
+++ b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T8.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every execution context has associated with it a scope chain.
- * A scope chain is a list of objects that are searched when evaluating an
- * Identifier
- *
- * @path ch10/10.2/10.2.2/S10.2.2_A1_T8.js
- * @description Checking scope chain containing function declarations and "with"
- * @noStrict
- */
+/*---
+info: >
+    Every execution context has associated with it a scope chain.
+    A scope chain is a list of objects that are searched when evaluating an
+    Identifier
+description: Checking scope chain containing function declarations and "with"
+flags: [noStrict]
+---*/
 
 var x = 0;
 
@@ -29,4 +28,3 @@ function f1(){
 if(!(f1() === "obj")){
   $ERROR("#1: Scope chain disturbed");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T9.js b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T9.js
index c03fdd1cf..bfb8fc5af 100644
--- a/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T9.js
+++ b/test/suite/ch10/10.2/10.2.2/S10.2.2_A1_T9.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Every execution context has associated with it a scope chain.
- * A scope chain is a list of objects that are searched when evaluating an
- * Identifier
- *
- * @path ch10/10.2/10.2.2/S10.2.2_A1_T9.js
- * @description Checking scope chain containing function declarations and "with"
- * @noStrict
- */
+/*---
+info: >
+    Every execution context has associated with it a scope chain.
+    A scope chain is a list of objects that are searched when evaluating an
+    Identifier
+description: Checking scope chain containing function declarations and "with"
+flags: [noStrict]
+---*/
 
 var x = 0;
 
@@ -24,4 +23,3 @@ function f1(){
 if(!(f1() === "obj")){
   $ERROR("#1: Scope chain disturbed");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T1.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T1.js
index 6a133d788..6acdb8c14 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T1.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.1_T1.js
- * @description Global execution context - Value Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Global execution context - Value Properties
+---*/
 
 //CHECK#1
 if ( NaN === null ) {
@@ -23,4 +22,3 @@ if ( Infinity === null ) {
 if ( undefined === null ) {
   $ERROR("#3: undefined === null");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T2.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T2.js
index 1fafadc99..49d6bfa17 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T2.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.1_T2.js
- * @description Global execution context - Function Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Global execution context - Function Properties
+---*/
 
 //CHECK#4
 if ( eval === null ) {
@@ -53,4 +52,3 @@ if ( encodeURI === null ) {
 if ( encodeURIComponent === null ) {
   $ERROR("#12: encodeURIComponent === null");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T3.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T3.js
index 3407039e8..f586fc681 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T3.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.1_T3.js
- * @description Global execution context - Constructor Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Global execution context - Constructor Properties
+---*/
 
 //CHECK#13
 if ( Object === null ) {
@@ -83,5 +82,3 @@ if ( TypeError === null ) {
 if ( URIError === null ) {
   $ERROR("#26: URIError === null");
 }
-
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T4.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T4.js
index f59cc646e..1173976df 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T4.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.1_T4.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.1_T4.js
- * @description Global execution context - Other Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Global execution context - Other Properties
+---*/
 
 //CHECK#27
 if ( Math === null ) {
   $ERROR("#27: Math === null");
 }
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T1.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T1.js
index a6b6c4bbf..d69865b32 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T1.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.2_T1.js
- * @description Function execution context - Value Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Function execution context - Value Properties
+---*/
 
 function test() {
   //CHECK#1
@@ -27,4 +26,3 @@ function test() {
 }
 
 test();
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T2.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T2.js
index 45ca89f36..211149fb7 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T2.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.2_T2.js
- * @description Function execution context - Function Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Function execution context - Function Properties
+---*/
 
 function test() {
   //CHECK#4
@@ -57,4 +56,3 @@ function test() {
 }
 
 test();
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T3.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T3.js
index 295943cb7..a49262bbc 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T3.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.2_T3.js
- * @description Function execution context - Constructor Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Function execution context - Constructor Properties
+---*/
 
 function test() {
   //CHECK#13
@@ -87,4 +86,3 @@ function test() {
 }
 
 test();
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T4.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T4.js
index 01d02fb39..a1d0451d0 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T4.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.2_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.2_T4.js
- * @description Function execution context - Other Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Function execution context - Other Properties
+---*/
 
 function test() {
   //CHECK#27
@@ -17,4 +16,3 @@ function test() {
 }
 
 test();
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T1.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T1.js
index 695f0acf5..d5fb931c8 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T1.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.3_T1.js
- * @description Eval execution context - Value Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Eval execution context - Value Properties
+---*/
 
 var evalStr = 
 '//CHECK#1\n'+
@@ -27,4 +26,3 @@ var evalStr =
 ';\n';
 
 eval(evalStr);
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T2.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T2.js
index 5afd0ef93..17ea0a4d6 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T2.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.3_T2.js
- * @description Eval execution context - Function Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Eval execution context - Function Properties
+---*/
 
 var evalStr = 
 '//CHECK#4\n'+
@@ -57,4 +56,3 @@ var evalStr =
 ';\n';
 
 eval(evalStr);
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T3.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T3.js
index b34b1e252..55280ae16 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T3.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.3_T3.js
- * @description Eval execution context - Constructor Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Eval execution context - Constructor Properties
+---*/
 
 var evalStr = 
 '//CHECK#13\n'+
@@ -87,4 +86,3 @@ var evalStr =
 ';\n';
 
 eval(evalStr);
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T4.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T4.js
index 054969ce2..73fb3c2f1 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T4.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A1.3_T4.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object has properties such as built-in objects such as
- * Math, String, Date, parseInt, etc
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A1.3_T4.js
- * @description Eval execution context - Other Properties
- */
+/*---
+info: >
+    Global object has properties such as built-in objects such as
+    Math, String, Date, parseInt, etc
+description: Eval execution context - Other Properties
+---*/
 
 var evalStr = 
 '//CHECK#27\n'+
@@ -17,4 +16,3 @@ var evalStr =
 ';\n';
 
 eval(evalStr);
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T1.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T1.js
index db57ad5ba..4d3f3f882 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T1.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.1_T1.js
- * @description Global execution context - Value Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Global execution context - Value Properties
+---*/
 
 //CHECK#1
 for (var x in this) {
@@ -18,4 +16,3 @@ for (var x in this) {
     $ERROR("#1: 'undefined' have attribute DontEnum");
   } 
 }
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T2.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T2.js
index 6a39d43a1..6c25317e6 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T2.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.1_T2.js
- * @description Global execution context - Function Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Global execution context - Function Properties
+---*/
 
 //CHECK#1
 for (var x in this) {
@@ -30,4 +28,3 @@ for (var x in this) {
     $ERROR("#1: 'encodeURIComponent' have attribute DontEnum");
   } 
 }
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T3.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T3.js
index c684a649a..56146684e 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T3.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.1_T3.js
- * @description Global execution context - Constructor Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Global execution context - Constructor Properties
+---*/
 
 //CHECK#1
 for (var x in this) {
@@ -42,4 +40,3 @@ for (var x in this) {
     $ERROR("#1: 'URIError' have attribute DontEnum");
   }
 }
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T4.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T4.js
index cb575c533..5ae5c15d7 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T4.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.1_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.1_T4.js
- * @description Global execution context - Other Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Global execution context - Other Properties
+---*/
 
 //CHECK#1
 for (var x in this) {
@@ -14,4 +12,3 @@ for (var x in this) {
     $ERROR("#1: 'Math' have attribute DontEnum");
   }
 }
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T1.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T1.js
index 808cc1b60..7e9482a05 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T1.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.2_T1.js
- * @description Function execution context - Value Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Function execution context - Value Properties
+---*/
 
 function test() {
   //CHECK#1
@@ -22,4 +20,3 @@ function test() {
 }
 
 test();
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T2.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T2.js
index ac87a58ef..4dfb563c9 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T2.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.2_T2.js
- * @description Function execution context - Function Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Function execution context - Function Properties
+---*/
 
 function test() {
   //CHECK#1
@@ -34,4 +32,3 @@ function test() {
 }
 
 test();
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T3.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T3.js
index e6f5f4ac7..65d7f29d7 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T3.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.2_T3.js
- * @description Function execution context - Constructor Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Function execution context - Constructor Properties
+---*/
 
 function test() {
   //CHECK#1
@@ -46,4 +44,3 @@ function test() {
 }
 
 test();
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T4.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T4.js
index 3a6afa5cc..695530429 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T4.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.2_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.2_T4.js
- * @description Function execution context - Other Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Function execution context - Other Properties
+---*/
 
 function test() {
   //CHECK#1
@@ -18,4 +16,3 @@ function test() {
 }
 
 test();
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T1.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T1.js
index f7f32c563..c6c90bdd4 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T1.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.3_T1.js
- * @description Global execution context - Value Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Global execution context - Value Properties
+---*/
 
 var evalStr = 
 '//CHECK#1\n'+
@@ -21,4 +19,3 @@ var evalStr =
 '}\n';
 
 eval(evalStr);
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T2.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T2.js
index 8d3cfe7ee..d4a3c5b36 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T2.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.3_T2.js
- * @description Global execution context - Function Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Global execution context - Function Properties
+---*/
 
 var evalStr = 
 '//CHECK#1\n'+
@@ -33,4 +31,3 @@ var evalStr =
 '}\n';
 
 eval(evalStr);
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T3.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T3.js
index 9ae75beb9..b70facd01 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T3.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.3_T3.js
- * @description Global execution context - Constructor Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Global execution context - Constructor Properties
+---*/
 
 var evalStr = 
 '//CHECK#1\n'+
@@ -45,4 +43,3 @@ var evalStr =
 '}\n';
 
 eval(evalStr);
-
diff --git a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T4.js b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T4.js
index ed60835c9..335f3852c 100644
--- a/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T4.js
+++ b/test/suite/ch10/10.2/10.2.3/S10.2.3_A2.3_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Global object properties have attributes { DontEnum }
- *
- * @path ch10/10.2/10.2.3/S10.2.3_A2.3_T4.js
- * @description Global execution context - Other Properties
- */
+/*---
+info: Global object properties have attributes { DontEnum }
+description: Global execution context - Other Properties
+---*/
 
 var evalStr = 
 '//CHECK#1\n'+
@@ -17,4 +15,3 @@ var evalStr =
 '}\n';
 
 eval(evalStr);
-