30 files changed, 303 insertions, 347 deletions
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.1/15.10.7.1-1.js b/test/suite/ch15/15.10/15.10.7/15.10.7.1/15.10.7.1-1.js
index 6d5d532ac..c7bc914d8 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.1/15.10.7.1-1.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.1/15.10.7.1-1.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch15/15.10/15.10.7/15.10.7.1/15.10.7.1-1.js
- * @description RegExp.prototype.source is of type String
- */
-
-
-function testcase() {
-  return (typeof(RegExp.prototype.source)) === 'string';
- }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: RegExp.prototype.source is of type String
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return (typeof(RegExp.prototype.source)) === 'string';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.1/15.10.7.1-2.js b/test/suite/ch15/15.10/15.10.7/15.10.7.1/15.10.7.1-2.js
index c3203d3b4..de58f15cf 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.1/15.10.7.1-2.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.1/15.10.7.1-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch15/15.10/15.10.7/15.10.7.1/15.10.7.1-2.js
- * @description RegExp.prototype.source is a data property with default attribute values (false)
- */
-
-
-function testcase() {
-  var d = Object.getOwnPropertyDescriptor(RegExp.prototype, 'source');
-  
-  if (d.writable === false &&
-      d.enumerable === false &&
-      d.configurable === false) {
-    return true;
-  }
- }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    RegExp.prototype.source is a data property with default attribute
+    values (false)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var d = Object.getOwnPropertyDescriptor(RegExp.prototype, 'source');
+  
+  if (d.writable === false &&
+      d.enumerable === false &&
+      d.configurable === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A10.js b/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A10.js
index 346a6b7c7..fcd0035b9 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A10.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A10.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance source property has the attribute ReadOnly
- *
- * @path ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A10.js
- * @description Checking if varying the source property fails
- */
+/*---
+info: The RegExp instance source property has the attribute ReadOnly
+description: Checking if varying the source property fails
+includes: [$FAIL.js]
+---*/
 
 __re = /./;
 
@@ -23,5 +22,3 @@ __re.source = "shifted";
 if (__re.source !== __obj) {
   $ERROR('#2: __re = /./; __obj = __re.source; __re.source = "shifted"; __re.source === __obj. Actual: ' + (__re.source));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A8.js b/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A8.js
index 56a8b048d..5d738b682 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A8.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance source property has the attribute DontEnum
- *
- * @path ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A8.js
- * @description Checking if enumerating the source property of RegExp instance fails
- */
+/*---
+info: The RegExp instance source property has the attribute DontEnum
+description: >
+    Checking if enumerating the source property of RegExp instance
+    fails
+includes: [$FAIL.js]
+---*/
 
 __re = new RegExp("[1-2]","i");
 
@@ -28,6 +29,4 @@ for (p in __re){
 
 if (count !== 0) {
   $ERROR('#2: count = 0; __re = new RegExp("[1-2]","i"); for (p in __re){ if (p==="source") count++; } count === 0. Actual: ' + (count));
-}  
-
-
+}
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A9.js b/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A9.js
index 086a41336..27e303ef5 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A9.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A9.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance source property has the attribute DontDelete
- *
- * @path ch15/15.10/15.10.7/15.10.7.1/S15.10.7.1_A9.js
- * @description Checking if deleting the source property fails
- */
+/*---
+info: The RegExp instance source property has the attribute DontDelete
+description: Checking if deleting the source property fails
+includes: [$FAIL.js]
+---*/
 
 __re = new RegExp;
 
@@ -24,5 +23,3 @@ if ((delete __re.source) !== false) {
 if (__re.hasOwnProperty('source') !== true) {
 	$ERROR('#2: __re = new RegExp;delete __re.source === true; __re.hasOwnProperty(\'source\') === true');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.2/15.10.7.2-1.js b/test/suite/ch15/15.10/15.10.7/15.10.7.2/15.10.7.2-1.js
index 16051f71d..b37256dbc 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.2/15.10.7.2-1.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.2/15.10.7.2-1.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch15/15.10/15.10.7/15.10.7.2/15.10.7.2-1.js
- * @description RegExp.prototype.global is of type Boolean
- */
-
-
-function testcase() {
-  return (typeof(RegExp.prototype.global)) === 'boolean';
- }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: RegExp.prototype.global is of type Boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return (typeof(RegExp.prototype.global)) === 'boolean';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.2/15.10.7.2-2.js b/test/suite/ch15/15.10/15.10.7/15.10.7.2/15.10.7.2-2.js
index e0855df0d..f1b5a918b 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.2/15.10.7.2-2.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.2/15.10.7.2-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch15/15.10/15.10.7/15.10.7.2/15.10.7.2-2.js
- * @description RegExp.prototype.global is a data property with default attribute values (false)
- */
-
-
-function testcase() {
-  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, 'global');
-  
-  if (desc.writable === false &&
-      desc.enumerable === false &&
-      desc.configurable === false) {
-    return true;
-  }
- }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    RegExp.prototype.global is a data property with default attribute
+    values (false)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var desc = Object.getOwnPropertyDescriptor(RegExp.prototype, 'global');
+  
+  if (desc.writable === false &&
+      desc.enumerable === false &&
+      desc.configurable === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A10.js b/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A10.js
index 22ffb66ff..300e1d781 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A10.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A10.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance global property has the attribute ReadOnly
- *
- * @path ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A10.js
- * @description Checking if varying the global property fails
- */
+/*---
+info: The RegExp instance global property has the attribute ReadOnly
+description: Checking if varying the global property fails
+includes: [$FAIL.js]
+---*/
 
 __re = /^|^/;
 
@@ -23,5 +22,3 @@ __re.global = "shifted";
 if (__re.global !== __obj) {
   $ERROR('#2: __re = /^|^/; __obj = __re.global; __re.global = "shifted"; __re.global === __obj. Actual: ' + (__re.global));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A8.js b/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A8.js
index 0c08304aa..d3ad4cf34 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A8.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance global property has the attribute DontEnum
- *
- * @path ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A8.js
- * @description Checking if enumerating the global property of RegExp instance fails
- */
+/*---
+info: The RegExp instance global property has the attribute DontEnum
+description: >
+    Checking if enumerating the global property of RegExp instance
+    fails
+includes: [$FAIL.js]
+---*/
 
 __re = new RegExp("[o-o]","m");
 
@@ -28,6 +29,4 @@ for (p in __re){
 
 if (count !== 0) {
   $ERROR('#2: count = 0; __re = new RegExp("[o-o]","m"); for (p in __re){ if (p==="global") count++; } count === 0. Actual: ' + (count));
-} 
-
-
+}
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A9.js b/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A9.js
index 91ad471d6..c13b35b5c 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A9.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A9.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance global property has the attribute DontDelete
- *
- * @path ch15/15.10/15.10.7/15.10.7.2/S15.10.7.2_A9.js
- * @description Checking if deleting the global property fails
- */
+/*---
+info: The RegExp instance global property has the attribute DontDelete
+description: Checking if deleting the global property fails
+includes: [$FAIL.js]
+---*/
 
 __re = new RegExp;
 
@@ -24,5 +23,3 @@ if ((delete __re.global) !== false) {
 if (__re.hasOwnProperty('global') !== true) {
   $ERROR('#2: __re = new RegExp;delete __re.global === true; __re.hasOwnProperty(\'global\') === true');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.3/15.10.7.3-1.js b/test/suite/ch15/15.10/15.10.7/15.10.7.3/15.10.7.3-1.js
index daf56877d..ceec1b577 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.3/15.10.7.3-1.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.3/15.10.7.3-1.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch15/15.10/15.10.7/15.10.7.3/15.10.7.3-1.js
- * @description RegExp.prototype.ignoreCase is of type Boolean
- */
-
-
-function testcase() {
-  return (typeof(RegExp.prototype.ignoreCase)) === 'boolean';
- }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: RegExp.prototype.ignoreCase is of type Boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return (typeof(RegExp.prototype.ignoreCase)) === 'boolean';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.3/15.10.7.3-2.js b/test/suite/ch15/15.10/15.10.7/15.10.7.3/15.10.7.3-2.js
index 7bf678bfb..58698a971 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.3/15.10.7.3-2.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.3/15.10.7.3-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch15/15.10/15.10.7/15.10.7.3/15.10.7.3-2.js
- * @description RegExp.prototype.ignoreCase is a data property with default attribute values (false)
- */
-
-
-function testcase() {
-  var d = Object.getOwnPropertyDescriptor(RegExp.prototype, 'ignoreCase');
-  
-  if (d.writable === false &&
-      d.enumerable === false &&
-      d.configurable === false) {
-    return true;
-  }
- }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    RegExp.prototype.ignoreCase is a data property with default
+    attribute values (false)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var d = Object.getOwnPropertyDescriptor(RegExp.prototype, 'ignoreCase');
+  
+  if (d.writable === false &&
+      d.enumerable === false &&
+      d.configurable === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A10.js b/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A10.js
index da394d9ff..9938c0ac5 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A10.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A10.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance ignoreCase property has the attribute ReadOnly
- *
- * @path ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A10.js
- * @description Checking if varying the ignoreCase property fails
- */
+/*---
+info: The RegExp instance ignoreCase property has the attribute ReadOnly
+description: Checking if varying the ignoreCase property fails
+includes: [$FAIL.js]
+---*/
 
 __re = /a|b|c/;
 
@@ -23,5 +22,3 @@ __re.ignoreCase = "shifted";
 if (__re.ignoreCase !== __obj) {
   $ERROR('#2: __re = /a|b|c/; __obj = __re.ignoreCase; __re.ignoreCase = "shifted"; __re.ignoreCase === __obj. Actual: ' + (__re.ignoreCase));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A8.js b/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A8.js
index be28f3197..675cd4c4d 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A8.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance ignoreCase property has the attribute DontEnum
- *
- * @path ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A8.js
- * @description Checking if enumerating the ignoreCase property of RegExp instance fails
- */
+/*---
+info: The RegExp instance ignoreCase property has the attribute DontEnum
+description: >
+    Checking if enumerating the ignoreCase property of RegExp instance
+    fails
+includes: [$FAIL.js]
+---*/
 
 __re = new RegExp("[|||||||]","");
 
@@ -28,5 +29,4 @@ for (p in __re){
 
 if (count !== 0) {
   $ERROR('#2: count = 0; __re = new RegExp("[|||||||]",""); for (p in __re){ if (p==="ignoreCase") count++; } count === 0. Actual: ' + (count));
-} 
-
+}
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A9.js b/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A9.js
index 28f85198d..d6a14a432 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A9.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A9.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance ignoreCase property has the attribute DontDelete
- *
- * @path ch15/15.10/15.10.7/15.10.7.3/S15.10.7.3_A9.js
- * @description Checking if deleting the ignoreCase property fails
- */
+/*---
+info: The RegExp instance ignoreCase property has the attribute DontDelete
+description: Checking if deleting the ignoreCase property fails
+includes: [$FAIL.js]
+---*/
 
 __re = new RegExp;
 
@@ -24,7 +23,3 @@ if ((delete __re.ignoreCase) !== false) {
 if (__re.hasOwnProperty('ignoreCase') !== true) {
   $ERROR('#2: __re = new RegExp;delete __re.ignoreCase === true; __re.hasOwnProperty(\'ignoreCase\') === true');
 }
-
-
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.4/15.10.7.4-1.js b/test/suite/ch15/15.10/15.10.7/15.10.7.4/15.10.7.4-1.js
index b55fdc583..27f81b956 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.4/15.10.7.4-1.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.4/15.10.7.4-1.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch15/15.10/15.10.7/15.10.7.4/15.10.7.4-1.js
- * @description RegExp.prototype.multiline is of type Boolean
- */
-
-
-function testcase() {
-  return (typeof(RegExp.prototype.multiline)) === 'boolean';
- }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: RegExp.prototype.multiline is of type Boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return (typeof(RegExp.prototype.multiline)) === 'boolean';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.4/15.10.7.4-2.js b/test/suite/ch15/15.10/15.10.7/15.10.7.4/15.10.7.4-2.js
index 7c34aa1d7..67cafe728 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.4/15.10.7.4-2.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.4/15.10.7.4-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch15/15.10/15.10.7/15.10.7.4/15.10.7.4-2.js
- * @description RegExp.prototype.multiline is a data property with default attribute values (false)
- */
-
-
-function testcase() {
-  var d = Object.getOwnPropertyDescriptor(RegExp.prototype, 'multiline');
-  
-  if (d.writable === false &&
-      d.enumerable === false &&
-      d.configurable === false) {
-    return true;
-  }
- }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    RegExp.prototype.multiline is a data property with default
+    attribute values (false)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var d = Object.getOwnPropertyDescriptor(RegExp.prototype, 'multiline');
+  
+  if (d.writable === false &&
+      d.enumerable === false &&
+      d.configurable === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A10.js b/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A10.js
index 51b4435da..9d026df9e 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A10.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A10.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance multiline property has the attribute ReadOnly
- *
- * @path ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A10.js
- * @description Checking if varying the multiline property fails
- */
+/*---
+info: The RegExp instance multiline property has the attribute ReadOnly
+description: Checking if varying the multiline property fails
+includes: [$FAIL.js]
+---*/
 
 __re = /\n/;
 
@@ -23,5 +22,3 @@ __re.multiline = "shifted";
 if (__re.multiline !== __obj) {
   $ERROR('#2: __re = /\\n/; __obj = __re.multiline; __re.multiline = "shifted"; __re.multiline === __obj. Actual: ' + (__re.multiline));
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A8.js b/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A8.js
index f3301c89c..275fcc76f 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A8.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance multiline property has the attribute DontEnum
- *
- * @path ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A8.js
- * @description Checking if enumerating the multiline property of RegExp instance fails
- */
+/*---
+info: The RegExp instance multiline property has the attribute DontEnum
+description: >
+    Checking if enumerating the multiline property of RegExp instance
+    fails
+includes: [$FAIL.js]
+---*/
 
 __re = new RegExp("[\u0041-\u0049]");
 
@@ -28,5 +29,4 @@ for (p in __re){
 
 if (count !== 0) {
   $ERROR('#2: count = 0; __re = new RegExp("[\\u0041-\\u0049]"); for (p in __re){ if (p==="multiline") count++; } count === 0. Actual: ' + (count));
-} 
-
+}
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A9.js b/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A9.js
index 13a045a06..190883c76 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A9.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A9.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance multiline property has the attribute DontDelete
- *
- * @path ch15/15.10/15.10.7/15.10.7.4/S15.10.7.4_A9.js
- * @description Checking if deleting the multiline property fails
- */
+/*---
+info: The RegExp instance multiline property has the attribute DontDelete
+description: Checking if deleting the multiline property fails
+includes: [$FAIL.js]
+---*/
 
 __re = new RegExp;
 
@@ -24,5 +23,3 @@ if ((delete __re.multiline) !== false) {
 if (__re.hasOwnProperty('multiline') !== true) {
   $ERROR('#2: __re = new RegExp;delete __re.multiline === true; __re.hasOwnProperty(\'multiline\') === true');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.5/15.10.7.5-1.js b/test/suite/ch15/15.10/15.10.7/15.10.7.5/15.10.7.5-1.js
index 0d00243cc..a74dc090e 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.5/15.10.7.5-1.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.5/15.10.7.5-1.js
@@ -1,15 +1,15 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch15/15.10/15.10.7/15.10.7.5/15.10.7.5-1.js
- * @description RegExp.prototype.lastIndex is of type Number
- */
-
-
-function testcase() {
-  return (typeof(RegExp.prototype.lastIndex)) === 'number';
- }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: RegExp.prototype.lastIndex is of type Number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  return (typeof(RegExp.prototype.lastIndex)) === 'number';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.5/15.10.7.5-2.js b/test/suite/ch15/15.10/15.10.7/15.10.7.5/15.10.7.5-2.js
index e7c88868e..6ecb66bc2 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.5/15.10.7.5-2.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.5/15.10.7.5-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch15/15.10/15.10.7/15.10.7.5/15.10.7.5-2.js
- * @description RegExp.prototype.lastIndex is a data property with specified attribute values
- */
-
-
-function testcase() {
-  var d = Object.getOwnPropertyDescriptor(RegExp.prototype, 'lastIndex');
-  
-  if (d.writable === true &&
-      d.enumerable === false &&
-      d.configurable === false) {
-    return true;
-  }
- }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    RegExp.prototype.lastIndex is a data property with specified
+    attribute values
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var d = Object.getOwnPropertyDescriptor(RegExp.prototype, 'lastIndex');
+  
+  if (d.writable === true &&
+      d.enumerable === false &&
+      d.configurable === false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.5/S15.10.7.5_A8.js b/test/suite/ch15/15.10/15.10.7/15.10.7.5/S15.10.7.5_A8.js
index c2213511b..69a57cde2 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.5/S15.10.7.5_A8.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.5/S15.10.7.5_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance lastIndex property has the attribute DontEnum
- *
- * @path ch15/15.10/15.10.7/15.10.7.5/S15.10.7.5_A8.js
- * @description Checking if enumerating the lastIndex property of RegExp instance fails
- */
+/*---
+info: The RegExp instance lastIndex property has the attribute DontEnum
+description: >
+    Checking if enumerating the lastIndex property of RegExp instance
+    fails
+includes: [$FAIL.js]
+---*/
 
 __re = new RegExp("A?B");
 
@@ -28,5 +29,4 @@ for (p in __re){
 
 if (count !== 0) {
   $ERROR('#2: count = 0; __re = new RegExp("A?B"); for (p in __re){ if (p==="lastIndex") count++; } count === 0. Actual: ' + (count));
-} 
-
+}
diff --git a/test/suite/ch15/15.10/15.10.7/15.10.7.5/S15.10.7.5_A9.js b/test/suite/ch15/15.10/15.10.7/15.10.7.5/S15.10.7.5_A9.js
index 0150240ce..e0337ff60 100644
--- a/test/suite/ch15/15.10/15.10.7/15.10.7.5/S15.10.7.5_A9.js
+++ b/test/suite/ch15/15.10/15.10.7/15.10.7.5/S15.10.7.5_A9.js
@@ -1,12 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The RegExp instance lastIndex property has the attribute DontDelete
- *
- * @path ch15/15.10/15.10.7/15.10.7.5/S15.10.7.5_A9.js
- * @description Checking if deleting the lastIndex property fails
- */
+/*---
+info: The RegExp instance lastIndex property has the attribute DontDelete
+description: Checking if deleting the lastIndex property fails
+includes: [$FAIL.js]
+---*/
 
 __re = new RegExp;
 
@@ -24,5 +23,3 @@ if ((delete __re.lastIndex) !== false) {
 if (__re.hasOwnProperty('lastIndex') !== true) {
   $ERROR('#2: __re = new RegExp;delete __re.lastIndex === true; __re.hasOwnProperty(\'lastIndex\') === true');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/S15.10.7_A1_T1.js b/test/suite/ch15/15.10/15.10.7/S15.10.7_A1_T1.js
index 7153f569f..e936fcc1a 100644
--- a/test/suite/ch15/15.10/15.10.7/S15.10.7_A1_T1.js
+++ b/test/suite/ch15/15.10/15.10.7/S15.10.7_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp instance has not [[call]] property
- *
- * @path ch15/15.10/15.10.7/S15.10.7_A1_T1.js
- * @description Checking if call of RegExp instance fails
- */
+/*---
+info: RegExp instance has not [[call]] property
+description: Checking if call of RegExp instance fails
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
 		$ERROR('#1.2: /[^a]*/() throw TypeError. Actual: ' + (e));
 	}
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/S15.10.7_A1_T2.js b/test/suite/ch15/15.10/15.10.7/S15.10.7_A1_T2.js
index 29b687f5c..97c81d329 100644
--- a/test/suite/ch15/15.10/15.10.7/S15.10.7_A1_T2.js
+++ b/test/suite/ch15/15.10/15.10.7/S15.10.7_A1_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp instance has not [[call]] property
- *
- * @path ch15/15.10/15.10.7/S15.10.7_A1_T2.js
- * @description Checking if call of RegExp("a|b","g")() fails
- */
+/*---
+info: RegExp instance has not [[call]] property
+description: Checking if call of RegExp("a|b","g")() fails
+---*/
 
 //CHECK#1
 try {
@@ -16,6 +14,3 @@ try {
     $ERROR('#1.2: RegExp("a|b","g")() throw TypeError. Actual: ' + (e));
   }
 }
-
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/S15.10.7_A2_T1.js b/test/suite/ch15/15.10/15.10.7/S15.10.7_A2_T1.js
index 357fd953f..1144bf86e 100644
--- a/test/suite/ch15/15.10/15.10.7/S15.10.7_A2_T1.js
+++ b/test/suite/ch15/15.10/15.10.7/S15.10.7_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp instance has not [[construct]] property
- *
- * @path ch15/15.10/15.10.7/S15.10.7_A2_T1.js
- * @description Checking if creating new RegExp instance fails
- */
+/*---
+info: RegExp instance has not [[construct]] property
+description: Checking if creating new RegExp instance fails
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
     $ERROR('#1.2: new /z/() throw TypeError. Actual: ' + (e));
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/S15.10.7_A2_T2.js b/test/suite/ch15/15.10/15.10.7/S15.10.7_A2_T2.js
index fd7df6512..0bf9401ec 100644
--- a/test/suite/ch15/15.10/15.10.7/S15.10.7_A2_T2.js
+++ b/test/suite/ch15/15.10/15.10.7/S15.10.7_A2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp instance has not [[construct]] property
- *
- * @path ch15/15.10/15.10.7/S15.10.7_A2_T2.js
- * @description Checking if creating "new RegExp" instance fails
- */
+/*---
+info: RegExp instance has not [[construct]] property
+description: Checking if creating "new RegExp" instance fails
+---*/
 
 //CHECK#1
 try {
@@ -16,5 +14,3 @@ try {
     $ERROR('#1.2: new new RegExp throw TypeError. Actual: ' + (e));
   }
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/S15.10.7_A3_T1.js b/test/suite/ch15/15.10/15.10.7/S15.10.7_A3_T1.js
index 25ce3575f..47257c4cc 100644
--- a/test/suite/ch15/15.10/15.10.7/S15.10.7_A3_T1.js
+++ b/test/suite/ch15/15.10/15.10.7/S15.10.7_A3_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp instance type is RegExp
- *
- * @path ch15/15.10/15.10.7/S15.10.7_A3_T1.js
- * @description Checking type of RegExp instance with operators typeof, instanceof and check it constructor.
- * RegExp instance is /[^a]* /
- */
+/*---
+info: RegExp instance type is RegExp
+description: >
+    Checking type of RegExp instance with operators typeof, instanceof
+    and check it constructor.  RegExp instance is /[^a]* /
+---*/
 
 __re = /[^a]*/;
 
@@ -25,5 +24,3 @@ if (__re.constructor !== RegExp) {
 if ((__re instanceof RegExp) !== true) {
 	$ERROR('#3: __re = /[^a]*/; (__re instanceof RegExp) === true');
 }
-
-
diff --git a/test/suite/ch15/15.10/15.10.7/S15.10.7_A3_T2.js b/test/suite/ch15/15.10/15.10.7/S15.10.7_A3_T2.js
index 5b1d51d09..82e3473f9 100644
--- a/test/suite/ch15/15.10/15.10.7/S15.10.7_A3_T2.js
+++ b/test/suite/ch15/15.10/15.10.7/S15.10.7_A3_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * RegExp instance type is RegExp
- *
- * @path ch15/15.10/15.10.7/S15.10.7_A3_T2.js
- * @description Checking type of RegExp instance with operators typeof, instanceof and check it constructor.
- * RegExp instance is new RegExp
- */
+/*---
+info: RegExp instance type is RegExp
+description: >
+    Checking type of RegExp instance with operators typeof, instanceof
+    and check it constructor.  RegExp instance is new RegExp
+---*/
 
 __re = new RegExp;
 
@@ -25,5 +24,3 @@ if (__re.constructor !== RegExp) {
 if ((__re instanceof RegExp) !== true) {
 	$ERROR('#3: __re = new RegExp; (__re instanceof RegExp) === true');
 }
-
-