51 files changed, 372 insertions, 418 deletions
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-1-s.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-1-s.js
index c90d4942e..32530b16b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-1-s.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-1-s.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-1-s.js
- * @description Strict Mode - 'this' value is a string which cannot be converted to wrapper objects when the function is called with an array of arguments
- * @onlyStrict
- */
-
-
-function testcase() {
-        "use strict";
-
-        function fun() {
-            return (this instanceof String);
-        }
-        return !fun.apply("", Array);
-    }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - 'this' value is a string which cannot be converted
+    to wrapper objects when the function is called with an array of
+    arguments
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        function fun() {
+            return (this instanceof String);
+        }
+        return !fun.apply("", Array);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-2-s.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-2-s.js
index 7f03675a3..e6024ec7a 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-2-s.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-2-s.js
@@ -1,20 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-2-s.js
- * @description Strict Mode - 'this' value is a number which cannot be converted to wrapper objects when the function is called with an array of arguments
- * @onlyStrict
- */
-
-
-function testcase() {
-        "use strict";
-        function fun() {
-            return (this instanceof Number);
-        }
-        return !fun.apply(-12, Array);
-    }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - 'this' value is a number which cannot be converted
+    to wrapper objects when the function is called with an array of
+    arguments
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        function fun() {
+            return (this instanceof Number);
+        }
+        return !fun.apply(-12, Array);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-3-s.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-3-s.js
index 7ae40757d..e2f185b2d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-3-s.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-3-s.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 
-/// Ecma International makes this code available under the terms and conditions set
-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 
-/// "Use Terms").   Any redistribution of this code must retain the above 
-/// copyright and this notice and otherwise comply with the Use Terms.
-/**
- * @path ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-3-s.js
- * @description Strict Mode - 'this' value is a boolean which cannot be converted to wrapper objects when the function is called with an array of arguments
- * @onlyStrict
- */
-
-
-function testcase() {
-        "use strict";
-
-        function fun() {
-            return (this instanceof Boolean);
-        }
-        return !fun.apply(false, Array);
-    }
-runTestCase(testcase);
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - 'this' value is a boolean which cannot be converted
+    to wrapper objects when the function is called with an array of
+    arguments
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        function fun() {
+            return (this instanceof Boolean);
+        }
+        return !fun.apply(false, Array);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A10.js
index 71c3710fe..b4be64aee 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A10.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype.apply.length property has the attribute ReadOnly
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A10.js
- * @description Checking if varying the Function.prototype.apply.length property fails
- */
+/*---
+info: The Function.prototype.apply.length property has the attribute ReadOnly
+description: >
+    Checking if varying the Function.prototype.apply.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (!(Function.prototype.apply.hasOwnProperty('length'))) {
@@ -21,4 +22,3 @@ Function.prototype.apply.length = function(){return "shifted";};
 if (Function.prototype.apply.length !== obj) {
   $ERROR('#2: the Function.prototype.apply length property has the attributes ReadOnly.');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A11.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A11.js
index 8f088e62e..41ec3c7d7 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A11.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A11.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype.apply.length property has the attribute DontEnum
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A11.js
- * @description TChecking if enumerating the Function.prototype.apply.length property fails
- */
+/*---
+info: The Function.prototype.apply.length property has the attribute DontEnum
+description: >
+    TChecking if enumerating the Function.prototype.apply.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Function.prototype.apply.hasOwnProperty('length'))) {
@@ -24,4 +25,3 @@ for (var p in Function.prototype.apply){
   if (p==="length")
       $ERROR('#2: the Function.prototype.apply.length property has the attributes DontEnum');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A12.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A12.js
index 85455d5bb..dea36d9a2 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A12.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A12.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.apply has not prototype property
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A12.js
- * @description Checking if obtaining the prototype property of Function.prototype.apply fails
- */
+/*---
+info: Function.prototype.apply has not prototype property
+description: >
+    Checking if obtaining the prototype property of
+    Function.prototype.apply fails
+---*/
 
 //CHECK#1
 if (Function.prototype.apply.prototype !== undefined) {
   $ERROR('#1: Function.prototype.apply has not prototype property'+Function.prototype.apply.prototype);
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A13.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A13.js
index 0f1f087c3..bb5410f30 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A13.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A13.js
@@ -1,11 +1,9 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A13.js
- * @description If IsCallable(func) is false, then throw a TypeError exception.
- * @negative TypeError
- */
+/*---
+description: If IsCallable(func) is false, then throw a TypeError exception.
+negative: TypeError
+---*/
 
 Function.prototype.apply.call(undefined, {}, []);
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A14.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A14.js
index a87c26d43..47d7c0d7f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A14.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A14.js
@@ -1,11 +1,9 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A14.js
- * @description If IsCallable(func) is false, then throw a TypeError exception.
- * @negative TypeError
- */
+/*---
+description: If IsCallable(func) is false, then throw a TypeError exception.
+negative: TypeError
+---*/
 
 Function.prototype.apply.call(null, {}, []);
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A15.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A15.js
index d4c6c1c65..548570df4 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A15.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A15.js
@@ -1,11 +1,9 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A15.js
- * @description If IsCallable(func) is false, then throw a TypeError exception.
- * @negative TypeError
- */
+/*---
+description: If IsCallable(func) is false, then throw a TypeError exception.
+negative: TypeError
+---*/
 
 Function.prototype.apply.call({}, {}, []);
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A16.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A16.js
index 75b0af287..80a96a8a4 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A16.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A16.js
@@ -1,12 +1,14 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If IsCallable(func) is false, then throw a TypeError exception.
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A16.js
- * @description A RegExp is not a function, but it may be callable. Iff it is, it's typeof should be 'function', in which case apply should accept it as a valid this value.
- */
+/*---
+info: If IsCallable(func) is false, then throw a TypeError exception.
+description: >
+    A RegExp is not a function, but it may be callable. Iff it is,
+    it's typeof should be 'function', in which case apply should
+    accept it as a valid this value.
+includes: [$FAIL.js]
+---*/
 
 var re = (/x/);
 if (typeof re === 'function') {
@@ -22,4 +24,3 @@ if (typeof re === 'function') {
     }
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A1_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A1_T1.js
index 0a612b7d1..9922f695d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A1_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A1_T1.js
@@ -1,13 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The apply method performs a function call using the [[Call]] property of the object. If the object does not have a [[Call]] property, a TypeError exception is thrown
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A1_T1.js
- * @description Calling "apply" method of the object that does not have a [[Call]] property.
- * Prototype of the object is Function()
- */
+/*---
+info: >
+    The apply method performs a function call using the [[Call]] property of
+    the object. If the object does not have a [[Call]] property, a TypeError
+    exception is thrown
+description: >
+    Calling "apply" method of the object that does not have a [[Call]]
+    property.  Prototype of the object is Function()
+includes: [$FAIL.js]
+---*/
 
 var proto=Function();
 
@@ -31,4 +34,3 @@ try {
   	$ERROR('#2.1: If the object does not have a [[Call]] property, a TypeError exception is thrown');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A1_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A1_T2.js
index 406c5c578..7428ee9ab 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A1_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A1_T2.js
@@ -1,13 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The apply method performs a function call using the [[Call]] property of the object. If the object does not have a [[Call]] property, a TypeError exception is thrown
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A1_T2.js
- * @description Calling "apply" method of the object that does not have a [[Call]] property.
- * Prototype of the object is Function.prototype
- */
+/*---
+info: >
+    The apply method performs a function call using the [[Call]] property of
+    the object. If the object does not have a [[Call]] property, a TypeError
+    exception is thrown
+description: >
+    Calling "apply" method of the object that does not have a [[Call]]
+    property.  Prototype of the object is Function.prototype
+includes: [$FAIL.js]
+---*/
 
 function FACTORY(){};
 
@@ -29,4 +32,3 @@ try {
   	$ERROR('#2.1: If the object does not have a [[Call]] property, a TypeError exception is thrown');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A2_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A2_T1.js
index 9e771fc82..9489636fe 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A2_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A2_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the apply method is 2
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A2_T1.js
- * @description Checking Function.prototype.apply.length
- */
+/*---
+info: The length property of the apply method is 2
+description: Checking Function.prototype.apply.length
+---*/
 
 //CHECK#1
 if (typeof Function.prototype.apply !== "function") {
@@ -22,4 +20,3 @@ if (typeof Function.prototype.apply.length === "undefined") {
 if (Function.prototype.apply.length !== 2) {
   $ERROR('#3: The length property of the apply method is 2');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A2_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A2_T2.js
index f714a10c7..491fbc24f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A2_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the apply method is 2
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A2_T2.js
- * @description Checking f.apply.length, where f is new Function
- */
+/*---
+info: The length property of the apply method is 2
+description: Checking f.apply.length, where f is new Function
+---*/
 
 var f=new Function;
 
@@ -24,4 +22,3 @@ if (typeof f.apply.length === "undefined") {
 if (f.apply.length !== 2) {
   $ERROR('#3: The length property of the apply method is 2');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T1.js
index 0b5908aa4..1720def61 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T1.js
- * @description Not any arguments at apply function
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Not any arguments at apply function
+---*/
 
 Function("this.field=\"strawberry\"").apply();
 
@@ -14,4 +14,3 @@ Function("this.field=\"strawberry\"").apply();
 if (this["field"] !== "strawberry") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T10.js
index 4e7e7b2a9..3b166e327 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T10.js
- * @description Checking by using eval, no any arguments at apply function
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Checking by using eval, no any arguments at apply function
+---*/
 
 eval(" (function(){this.feat=1}).apply()");
 
@@ -14,4 +14,3 @@ eval(" (function(){this.feat=1}).apply()");
 if (this["feat"] !== 1) {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T2.js
index 9118b69eb..d00335d2d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T2.js
- * @description Argument at apply function is null
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Argument at apply function is null
+---*/
 
 Function("this.field=\"green\"").apply(null);
 
@@ -14,4 +14,3 @@ Function("this.field=\"green\"").apply(null);
 if (this["field"] !== "green") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T3.js
index 279a70ef7..adc4245e9 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T3.js
- * @description Argument at apply function is void 0
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Argument at apply function is void 0
+---*/
 
 Function("this.field=\"battle\"").apply(void 0);
 
@@ -14,4 +14,3 @@ Function("this.field=\"battle\"").apply(void 0);
 if (this["field"] !== "battle") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T4.js
index bba4b3d45..3f21ccb9d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T4.js
- * @description Argument at apply function is undefined
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Argument at apply function is undefined
+---*/
 
 Function("this.field=\"oil\"").apply(undefined);
 
@@ -14,4 +14,3 @@ Function("this.field=\"oil\"").apply(undefined);
 if (this["field"] !== "oil") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T5.js
index 608c81f63..dd419a1ec 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T5.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T5.js
- * @description No any arguments at apply function and it called inside function declaration
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: >
+    No any arguments at apply function and it called inside function
+    declaration
+---*/
 
 function FACTORY(){
   Function("this.feat=\"in da haus\"").apply();
@@ -23,4 +25,3 @@ if (this["feat"] !== "in da haus") {
 if (typeof obj.feat !== "undefined") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T6.js
index c02bcd81c..b6efc19f8 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T6.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T6.js
- * @description Argument at apply function is null and it called inside function declaration
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: >
+    Argument at apply function is null and it called inside function
+    declaration
+---*/
 
 function FACTORY(){
   (function(){this.feat="kamon beyba"}).apply(null);
@@ -23,4 +25,3 @@ if (this["feat"] !== "kamon beyba") {
 if (typeof obj.feat !== "undefined") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T7.js
index ca8b3248f..011b37555 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T7.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T7.js
- * @description Argument at apply function is void 0 and it called inside function declaration
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: >
+    Argument at apply function is void 0 and it called inside function
+    declaration
+---*/
 
 (function FACTORY(){
   Function("this.feat=\"in da haus\"").apply(void 0);
@@ -17,4 +19,3 @@
 if (this["feat"] !== "in da haus") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T8.js
index 07a731396..fd4a14cdb 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T8.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T8.js
- * @description Argument at apply function is undefined and it called inside function declaration
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: >
+    Argument at apply function is undefined and it called inside
+    function declaration
+---*/
 
 (function FACTORY(){
   (function(){this.feat="kamon beyba"}).apply(undefined);
@@ -16,4 +18,3 @@
 if (this["feat"] !== "kamon beyba") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T9.js
index 2c4d250ac..9e669b7a6 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A3_T9.js
- * @description Checking by using eval, argument at apply function is void 0
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Checking by using eval, argument at apply function is void 0
+---*/
 
 eval( " Function(\"this.feat=1\").apply(void 0) " );
 
@@ -14,4 +14,3 @@ eval( " Function(\"this.feat=1\").apply(void 0) " );
 if (this["feat"] !== 1) {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T1.js
index 0ac56c9e7..bb74dea66 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T1.js
- * @description thisArg is number
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is number
+---*/
 
 var obj=1;
 
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T2.js
index 32d22bd0f..50dc4fddd 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T2.js
- * @description thisArg is boolean true
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is boolean true
+---*/
 
 var obj=true;
 
@@ -21,5 +21,3 @@ if (typeof obj.touched !== "undefined") {
 if (!(retobj["touched"])) {
   $ERROR('#2: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T3.js
index a2b9ae601..b2b8fbb02 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T3.js
- * @description thisArg is string
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is string
+---*/
 
 var obj="soap";
 
@@ -21,5 +21,3 @@ if (typeof obj.touched !== "undefined") {
 if (!(retobj["touched"])) {
   $ERROR('#2: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T4.js
index 956f43e7e..0105c9384 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T4.js
- * @description thisArg is function variable that return this
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is function variable that return this
+---*/
 
 f = function(){this.touched= true; return this;};
 
@@ -23,4 +23,3 @@ if (!(retobj["touched"])) {
 }
 
 var obj;
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T5.js
index 871b74c45..cb1e1ed5c 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T5.js
- * @description thisArg is function variable
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is function variable
+---*/
 
 var f = function(){this.touched= true;};
 
@@ -18,4 +18,3 @@ f.apply(obj);
 if (!(obj.touched)) {
   $ERROR('#1: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T6.js
index 31f57cb3d..9bbcee14b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T6.js
- * @description thisArg is new String()
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is new String()
+---*/
 
 var obj=new String("soap");
 
@@ -16,4 +16,3 @@ var obj=new String("soap");
 if (!(obj.touched)) {
   $ERROR('#1: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T7.js
index 4c0e95e89..ad7a4c135 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T7.js
- * @description thisArg is new Number()
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is new Number()
+---*/
 
 var obj=new Number(1);
 
@@ -16,5 +16,3 @@ Function("this.touched= true;").apply(obj);
 if (!(obj.touched)) {
   $ERROR('#1: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T8.js
index c0dca08eb..32bd7dc9c 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A5_T8.js
- * @description thisArg is Function()
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is Function()
+---*/
 
 var obj=Function();
 
@@ -16,4 +16,3 @@ new Function("this.touched= true; return this;").apply(obj);
 if (!(obj.touched)) {
   $ERROR('#1: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A6_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A6_T2.js
index d9e7ee361..ee4784900 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A6_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A6_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * if argArray is neither an array nor an arguments object (see 10.1.8), a TypeError exception is thrown
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A6_T2.js
- * @description argArray is (null,1)
- */
+/*---
+info: >
+    if argArray is neither an array nor an arguments object (see 10.1.8), a
+    TypeError exception is thrown
+description: argArray is (null,1)
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -17,4 +18,3 @@ try {
   	$ERROR('#1.1: if argArray is neither an array nor an arguments object (see 10.1.8), a TypeError exception is thrown');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A6_T3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A6_T3.js
index c7b57c7c7..0626d1458 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A6_T3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A6_T3.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * if argArray is neither an array nor an arguments object (see 10.1.8), a TypeError exception is thrown
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A6_T3.js
- * @description argArray is (object,"1,3,4")
- */
+/*---
+info: >
+    if argArray is neither an array nor an arguments object (see 10.1.8), a
+    TypeError exception is thrown
+description: argArray is (object,"1,3,4")
+includes: [$FAIL.js]
+---*/
 
 obj={};
 
@@ -19,4 +20,3 @@ try {
   	$ERROR('#1.1: if argArray is neither an array nor an arguments object (see 10.1.8), a TypeError exception is thrown');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T1.js
index d888ffb4d..28d5aa4f4 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T1.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If argArray is either an array or an arguments object,
- * the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T1.js
- * @description argArray is (null,[1])
- */
+/*---
+info: >
+    If argArray is either an array or an arguments object,
+    the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
+description: argArray is (null,[1])
+---*/
 
 Function("a1,a2,a3","this.shifted=a1;").apply(null,[1]);
 
@@ -15,5 +14,3 @@ Function("a1,a2,a3","this.shifted=a1;").apply(null,[1]);
 if (this["shifted"] !== 1) {
   $ERROR('#1: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T10.js
index 254ccb5e5..9ad760bcd 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T10.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If argArray is either an array or an arguments object,
- * the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T10.js
- * @description argArray is (empty object, arguments), inside function call without declaration used
- */
+/*---
+info: >
+    If argArray is either an array or an arguments object,
+    the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
+description: >
+    argArray is (empty object, arguments), inside function call
+    without declaration used
+---*/
 
 var obj={};
 
@@ -24,5 +25,3 @@ if (obj["shifted"] !== "42") {
 if (typeof this["shifted"] !== "undefined") {
   $ERROR('#2: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T2.js
index ef8ee5f54..ef7131d81 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T2.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If argArray is either an array or an arguments object,
- * the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T2.js
- * @description argArray is (null,[1,2,3])
- */
+/*---
+info: >
+    If argArray is either an array or an arguments object,
+    the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
+description: argArray is (null,[1,2,3])
+---*/
 
 new Function("a1,a2","a3","this.shifted=a2;").apply(null,[1,2,3]);
 
@@ -15,5 +14,3 @@ new Function("a1,a2","a3","this.shifted=a2;").apply(null,[1,2,3]);
 if (this["shifted"] !== 2) {
   $ERROR('#1: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T3.js
index cf003fe4b..89fc4331d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T3.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If argArray is either an array or an arguments object,
- * the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T3.js
- * @description argArray is (empty object, new Array("nine","inch","nails"))
- */
+/*---
+info: >
+    If argArray is either an array or an arguments object,
+    the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
+description: argArray is (empty object, new Array("nine","inch","nails"))
+---*/
 
 i=0;
 
@@ -26,5 +25,3 @@ if (obj["shifted"] !== "nine") {
 if (typeof this["shifted"] !== "undefined") {
   $ERROR('#2: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T4.js
index 35db7b9c2..0fa633020 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T4.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If argArray is either an array or an arguments object,
- * the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T4.js
- * @description argArray is (empty object, ( function(){return arguments;}) ("a","b","c"))
- */
+/*---
+info: >
+    If argArray is either an array or an arguments object,
+    the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
+description: >
+    argArray is (empty object, ( function(){return arguments;})
+    ("a","b","c"))
+---*/
 
 i=0;
 
@@ -26,5 +27,3 @@ if (obj["shifted"] !== "c") {
 if (typeof this["shifted"] !== "undefined") {
   $ERROR('#2: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T5.js
index ee656e882..ceb41dc92 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T5.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If argArray is either an array or an arguments object,
- * the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T5.js
- * @description argArray is (null, arguments), inside function declaration used
- */
+/*---
+info: >
+    If argArray is either an array or an arguments object,
+    the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
+description: argArray is (null, arguments), inside function declaration used
+---*/
 
 function FACTORY(){
   Function("a1,a2,a3","this.shifted=a1+a2+a3;").apply(null,arguments);
@@ -24,5 +23,3 @@ if (this["shifted"] !== "12") {
 if (typeof obj.shifted !== "undefined") {
   $ERROR('#2: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T6.js
index 90ac74272..ae27c8bea 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T6.js
@@ -1,13 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If argArray is either an array or an arguments object,
- * the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T6.js
- * @description argArray is (this, arguments), inside function declaration used
- */
+/*---
+info: >
+    If argArray is either an array or an arguments object,
+    the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
+description: argArray is (this, arguments), inside function declaration used
+---*/
 
 function FACTORY(){
   Function("a1,a2,a3","this.shifted=a1+a2+a3;").apply(this,arguments);
@@ -24,5 +23,3 @@ if (obj["shifted"] !== "42") {
 if (typeof this["shifted"] !== "undefined") {
   $ERROR('#2: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T7.js
index ff85f3462..f2ec55255 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T7.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If argArray is either an array or an arguments object,
- * the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T7.js
- * @description argArray is (null, arguments), inside function call without declaration used
- */
+/*---
+info: >
+    If argArray is either an array or an arguments object,
+    the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
+description: >
+    argArray is (null, arguments), inside function call without
+    declaration used
+---*/
 
 (function (){
   Function("a1,a2,a3","this.shifted=a1+a2+a3;").apply(null,arguments);
@@ -17,4 +18,3 @@
 if (this["shifted"] !== "12") {
   $ERROR('#1: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T8.js
index 031b407f7..c5ca86b4f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T8.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If argArray is either an array or an arguments object,
- * the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T8.js
- * @description argArray is (this, arguments), inside function call without declaration used
- */
+/*---
+info: >
+    If argArray is either an array or an arguments object,
+    the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
+description: >
+    argArray is (this, arguments), inside function call without
+    declaration used
+---*/
 
 (function (){
   Function("a1,a2,a3","this.shifted=a1+a2+a3;").apply(this,arguments);
@@ -17,5 +18,3 @@
 if (this["shifted"] !== "42") {
   $ERROR('#2: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T9.js
index 39ee45645..ed68fd3ca 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T9.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If argArray is either an array or an arguments object,
- * the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A7_T9.js
- * @description argArray is (empty object, arguments), inside function declaration used
- */
+/*---
+info: >
+    If argArray is either an array or an arguments object,
+    the function is passed the (ToUint32(argArray.length)) arguments argArray[0], argArray[1],...,argArray[ToUint32(argArray.length)-1]
+description: >
+    argArray is (empty object, arguments), inside function declaration
+    used
+---*/
 
 function FACTORY(){
   var obj = {};
@@ -26,5 +27,3 @@ if (typeof this["shifted"] !== "undefined") {
 if (obj.shifted !== "12") {
   $ERROR('#2: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T1.js
index 6db73fc75..ea65e4557 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.apply can`t be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T1.js
- * @description Checking if creating "new Function.prototype.apply" fails
- */
+/*---
+info: Function.prototype.apply can`t be used as [[create]] caller
+description: Checking if creating "new Function.prototype.apply" fails
+---*/
 
 try {
   obj = new Function.prototype.apply;
@@ -16,4 +14,3 @@ try {
   	$ERROR('#1.1: Function.prototype.apply can\'t be used as [[create]] caller');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T2.js
index 05cab52c5..9c10c3fc6 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.apply can`t be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T2.js
- * @description Checking if creating "new Function.prototype.apply()" fails
- */
+/*---
+info: Function.prototype.apply can`t be used as [[create]] caller
+description: Checking if creating "new Function.prototype.apply()" fails
+---*/
 
 try {
   obj = new Function.prototype.apply();
@@ -16,4 +14,3 @@ try {
   	$ERROR('#1.1: Function.prototype.apply can\'t be used as [[create]] caller');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T3.js
index 123948135..e6296a849 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.apply can`t be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T3.js
- * @description Checking if creating "new Function.apply" fails
- */
+/*---
+info: Function.prototype.apply can`t be used as [[create]] caller
+description: Checking if creating "new Function.apply" fails
+---*/
 
 try {
   obj = new Function.apply;
@@ -16,4 +14,3 @@ try {
   	$ERROR('#1.1: Function.prototype.apply can\'t be used as [[create]] caller');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T4.js
index 751240920..ac56b759c 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.apply can`t be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T4.js
- * @description Checking if creating "new (Function("this.p1=1").apply)" fails
- */
+/*---
+info: Function.prototype.apply can`t be used as [[create]] caller
+description: Checking if creating "new (Function("this.p1=1").apply)" fails
+---*/
 
 try {
   obj = new (Function("this.p1=1").apply);
@@ -16,4 +14,3 @@ try {
   	$ERROR('#1.1: Function.prototype.apply can\'t be used as [[create]] caller');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T5.js
index a69cae1d3..6d1dcc1cb 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.apply can`t be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T5.js
- * @description Checking if creating "new Function("this.p1=1").apply" fails
- */
+/*---
+info: Function.prototype.apply can`t be used as [[create]] caller
+description: Checking if creating "new Function("this.p1=1").apply" fails
+---*/
 
 try {
   FACTORY = Function("this.p1=1").apply;
@@ -17,4 +15,3 @@ try {
   	$ERROR('#1.1: Function.prototype.apply can\'t be used as [[create]] caller');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T6.js
index 9e44a4ab5..2aaac1707 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.apply can`t be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A8_T6.js
- * @description Checking if creating "new (Function("function f(){this.p1=1;};return f").apply())" fails
- */
+/*---
+info: Function.prototype.apply can`t be used as [[create]] caller
+description: >
+    Checking if creating "new (Function("function
+    f(){this.p1=1;};return f").apply())" fails
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +19,3 @@ try {
 if (obj.p1!== 1) {
   $ERROR('#2: Function.prototype.apply can\'t be used as [[create]] caller');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A9.js
index 9ebf423aa..278fcdf12 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A9.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype.apply.length property has the attribute DontDelete
- *
- * @path ch15/15.3/15.3.4/15.3.4.3/S15.3.4.3_A9.js
- * @description Checking if deleting the Function.prototype.apply.length property fails
- */
+/*---
+info: The Function.prototype.apply.length property has the attribute DontDelete
+description: >
+    Checking if deleting the Function.prototype.apply.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Function.prototype.apply.hasOwnProperty('length'))) {
@@ -22,4 +23,3 @@ if (delete Function.prototype.apply.length) {
 if (!(Function.prototype.apply.hasOwnProperty('length'))) {
   $FAIL('#2: The Function.prototype.apply.length property has the attributes DontDelete');
 }
-