45 files changed, 591 insertions, 624 deletions
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T1.js
index 629d08712..e4f2eb58d 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Date is called as part of a new expression it is
- * a constructor: it initializes the newly created object
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A1_T1.js
- * @description 2 arguments, (year, month)
- */
+/*---
+info: >
+    When Date is called as part of a new expression it is
+    a constructor: it initializes the newly created object
+description: 2 arguments, (year, month)
+includes: [$FAIL.js]
+---*/
 
 if (typeof new Date(1899, 11) !== "object") {
   $FAIL("#1.1: typeof new Date(1899, 11) should be 'object'");
@@ -224,4 +224,3 @@ var x124 = new Date(2100, 0);
 if(x124 === undefined){
   $FAIL("#12.4: new Date(2100, 0) should not be undefined");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T2.js
index 36199a6ce..730d7caf6 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T2.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Date is called as part of a new expression it is
- * a constructor: it initializes the newly created object
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A1_T2.js
- * @description 3 arguments, (year, month, date)
- */
+/*---
+info: >
+    When Date is called as part of a new expression it is
+    a constructor: it initializes the newly created object
+description: 3 arguments, (year, month, date)
+includes: [$FAIL.js]
+---*/
 
 if (typeof new Date(1899, 11, 31) !== "object") {
   $FAIL("#1.1: typeof new Date(1899, 11, 31) should be 'object'");
@@ -224,4 +224,3 @@ var x124 = new Date(2100, 0, 1);
 if(x124 === undefined){
   $FAIL("#12.4: new Date(2100, 0, 1) should not be undefined");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T3.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T3.js
index da20c7b94..2c5f9f46d 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T3.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T3.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Date is called as part of a new expression it is
- * a constructor: it initializes the newly created object
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A1_T3.js
- * @description 4 arguments, (year, month, date, hours)
- */
+/*---
+info: >
+    When Date is called as part of a new expression it is
+    a constructor: it initializes the newly created object
+description: 4 arguments, (year, month, date, hours)
+includes: [$FAIL.js]
+---*/
 
 if (typeof new Date(1899, 11, 31, 23) !== "object") {
   $FAIL("#1.1: typeof new Date(1899, 11, 31, 23) should be 'object'");
@@ -224,4 +224,3 @@ var x124 = new Date(2100, 0, 1, 0);
 if(x124 === undefined){
   $FAIL("#12.4: new Date(2100, 0, 1, 0) should not be undefined");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T4.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T4.js
index 85c2753bb..ec28033a4 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T4.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T4.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Date is called as part of a new expression it is
- * a constructor: it initializes the newly created object
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A1_T4.js
- * @description 5 arguments, (year, month, date, hours, minutes)
- */
+/*---
+info: >
+    When Date is called as part of a new expression it is
+    a constructor: it initializes the newly created object
+description: 5 arguments, (year, month, date, hours, minutes)
+includes: [$FAIL.js]
+---*/
 
 if (typeof new Date(1899, 11, 31, 23, 59) !== "object") {
   $FAIL("#1.1: typeof new Date(1899, 11, 31, 23, 59) should be 'object'");
@@ -224,4 +224,3 @@ var x124 = new Date(2100, 0, 1, 0, 0);
 if(x124 === undefined){
   $FAIL("#12.4: new Date(2100, 0, 1, 0, 0) should not be undefined");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T5.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T5.js
index b3bc53242..174ea1356 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T5.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T5.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Date is called as part of a new expression it is
- * a constructor: it initializes the newly created object
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A1_T5.js
- * @description 6 arguments, (year, month, date, hours, minutes, seconds)
- */
+/*---
+info: >
+    When Date is called as part of a new expression it is
+    a constructor: it initializes the newly created object
+description: 6 arguments, (year, month, date, hours, minutes, seconds)
+includes: [$FAIL.js]
+---*/
 
 if (typeof new Date(1899, 11, 31, 23, 59, 59) !== "object") {
   $FAIL("#1.1: typeof new Date(1899, 11, 31, 23, 59, 59) should be 'object'");
@@ -224,4 +224,3 @@ var x124 = new Date(2100, 0, 1, 0, 0, 0);
 if(x124 === undefined){
   $FAIL("#12.4: new Date(2100, 0, 1, 0, 0, 0) should not be undefined");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T6.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T6.js
index a33cd7238..92e28bed0 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T6.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A1_T6.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Date is called as part of a new expression it is
- * a constructor: it initializes the newly created object
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A1_T6.js
- * @description 7 arguments, (year, month, date, hours, minutes, seconds, ms)
- */
+/*---
+info: >
+    When Date is called as part of a new expression it is
+    a constructor: it initializes the newly created object
+description: 7 arguments, (year, month, date, hours, minutes, seconds, ms)
+includes: [$FAIL.js]
+---*/
 
 if (typeof new Date(1899, 11, 31, 23, 59, 59, 999) !== "object") {
   $FAIL("#1.1: typeof new Date(1899, 11, 31, 23, 59, 59, 999) should be 'object'");
@@ -224,4 +224,3 @@ var x124 = new Date(2100, 0, 1, 0, 0, 0, 0);
 if(x124 === undefined){
   $FAIL("#12.4: new Date(2100, 0, 1, 0, 0, 0, 0) should not be undefined");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T1.js
index e9a37e7dc..d78b7c50a 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T1.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Date prototype object, the one that is the
- * initial value of Date.prototype
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A2_T1.js
- * @description 2 arguments, (year, month)
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Date prototype object, the one that is the
+    initial value of Date.prototype
+description: 2 arguments, (year, month)
+includes: [$FAIL.js]
+---*/
 
 var x11 = new Date(1899, 11);
 if (typeof x11.constructor.prototype !== "object") {
@@ -189,4 +189,3 @@ var x123 = new Date(2100, 0);
 if(Date.prototype !== x123.constructor.prototype){
   $FAIL("#12.3: Date.prototype === x123.constructor.prototype");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T2.js
index c9482d234..098fc7ef7 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T2.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Date prototype object, the one that is the
- * initial value of Date.prototype
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A2_T2.js
- * @description 3 arguments, (year, month, date)
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Date prototype object, the one that is the
+    initial value of Date.prototype
+description: 3 arguments, (year, month, date)
+includes: [$FAIL.js]
+---*/
 
 var x11 = new Date(1899, 11, 31);
 if (typeof x11.constructor.prototype !== "object") {
@@ -189,4 +189,3 @@ var x123 = new Date(2100, 0, 1);
 if(Date.prototype !== x123.constructor.prototype){
   $FAIL("#12.3: Date.prototype === x123.constructor.prototype");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T3.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T3.js
index 42dd6b78c..062da59d9 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T3.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T3.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Date prototype object, the one that is the
- * initial value of Date.prototype
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A2_T3.js
- * @description 4 arguments, (year, month, date, hours)
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Date prototype object, the one that is the
+    initial value of Date.prototype
+description: 4 arguments, (year, month, date, hours)
+includes: [$FAIL.js]
+---*/
 
 var x11 = new Date(1899, 11, 31, 23);
 if (typeof x11.constructor.prototype !== "object") {
@@ -189,4 +189,3 @@ var x123 = new Date(2100, 0, 1, 0);
 if(Date.prototype !== x123.constructor.prototype){
   $FAIL("#12.3: Date.prototype === x123.constructor.prototype");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T4.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T4.js
index 371830aa5..b55f4ac40 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T4.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T4.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Date prototype object, the one that is the
- * initial value of Date.prototype
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A2_T4.js
- * @description 5 arguments, (year, month, date, hours, minutes)
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Date prototype object, the one that is the
+    initial value of Date.prototype
+description: 5 arguments, (year, month, date, hours, minutes)
+includes: [$FAIL.js]
+---*/
 
 var x11 = new Date(1899, 11, 31, 23, 59);
 if (typeof x11.constructor.prototype !== "object") {
@@ -189,4 +189,3 @@ var x123 = new Date(2100, 0, 1, 0, 0);
 if(Date.prototype !== x123.constructor.prototype){
   $FAIL("#12.3: Date.prototype === x123.constructor.prototype");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T5.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T5.js
index ca8352d2a..0129dc05a 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T5.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T5.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Date prototype object, the one that is the
- * initial value of Date.prototype
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A2_T5.js
- * @description 6 arguments, (year, month, date, hours, minutes, seconds)
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Date prototype object, the one that is the
+    initial value of Date.prototype
+description: 6 arguments, (year, month, date, hours, minutes, seconds)
+includes: [$FAIL.js]
+---*/
 
 var x11 = new Date(1899, 11, 31, 23, 59, 59);
 if (typeof x11.constructor.prototype !== "object") {
@@ -189,4 +189,3 @@ var x123 = new Date(2100, 0, 1, 0, 0, 0);
 if(Date.prototype !== x123.constructor.prototype){
   $FAIL("#12.3: Date.prototype === x123.constructor.prototype");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T6.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T6.js
index 42cc29817..e1442dc93 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T6.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A2_T6.js
@@ -1,14 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Date prototype object, the one that is the
- * initial value of Date.prototype
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A2_T6.js
- * @description 7 arguments, (year, month, date, hours, minutes, seconds, ms)
- */
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Date prototype object, the one that is the
+    initial value of Date.prototype
+description: 7 arguments, (year, month, date, hours, minutes, seconds, ms)
+includes: [$FAIL.js]
+---*/
 
 var x11 = new Date(1899, 11, 31, 23, 59, 59, 999);
 if (typeof x11.constructor.prototype !== "object") {
@@ -189,4 +189,3 @@ var x123 = new Date(2100, 0, 1, 0, 0, 0, 0);
 if(Date.prototype !== x123.constructor.prototype){
   $FAIL("#12.3: Date.prototype === x123.constructor.prototype");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T1.1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T1.1.js
index 3b7c9cf85..4edc05341 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T1.1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T1.1.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T1.1.js
- * @description Test based on delete prototype.toString - 2 arguments, (year, month)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+description: >
+    Test based on delete prototype.toString - 2 arguments, (year,
+    month)
+includes: [$FAIL.js]
+---*/
 
 var x1 = new Date(1899, 11);
 if (Object.prototype.toString.call(x1) !== "[object Date]") {
@@ -68,4 +70,3 @@ var x12 = new Date(2100, 0);
 if (Object.prototype.toString.call(x12) !== "[object Date]") {
   $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T1.2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T1.2.js
index 16b9f1492..b99af24c1 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T1.2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T1.2.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T1.2.js
- * @description Test based on overwriting prototype.toString - 2 arguments, (year, month)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+description: >
+    Test based on overwriting prototype.toString - 2 arguments, (year,
+    month)
+includes: [$FAIL.js]
+---*/
 
 Date.prototype.toString = Object.prototype.toString;
 
@@ -70,5 +72,3 @@ var x12 = new Date(2100, 0);
 if (x12.toString() !== "[object Date]") {
   $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T2.1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T2.1.js
index 00e3030c7..e4278ea8c 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T2.1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T2.1.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T2.1.js
- * @description Test based on delete prototype.toString - 3 arguments, (year, month, date)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+description: >
+    Test based on delete prototype.toString - 3 arguments, (year,
+    month, date)
+includes: [$FAIL.js]
+---*/
 
 var x1 = new Date(1899, 11, 31);
 if (Object.prototype.toString.call(x1) !== "[object Date]") {
@@ -68,4 +70,3 @@ var x12 = new Date(2100, 0, 1);
 if (Object.prototype.toString.call(x12) !== "[object Date]") {
   $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T2.2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T2.2.js
index d9b53f87d..af8286ea9 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T2.2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T2.2.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T2.2.js
- * @description Test based on overwriting prototype.toString - 3 arguments, (year, month, date)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+description: >
+    Test based on overwriting prototype.toString - 3 arguments, (year,
+    month, date)
+includes: [$FAIL.js]
+---*/
 
 Date.prototype.toString = Object.prototype.toString;
 
@@ -70,5 +72,3 @@ var x12 = new Date(2100, 0, 1);
 if (x12.toString() !== "[object Date]") {
   $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
-
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T3.1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T3.1.js
index 8fa20093a..67248c7c4 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T3.1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T3.1.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T3.1.js
- * @description Test based on delete prototype.toString - 4 arguments, (year, month, date, hours)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+description: >
+    Test based on delete prototype.toString - 4 arguments, (year,
+    month, date, hours)
+includes: [$FAIL.js]
+---*/
 
 var x1 = new Date(1899, 11, 31, 23);
 if (Object.prototype.toString.call(x1) !== "[object Date]") {
@@ -68,4 +70,3 @@ var x12 = new Date(2100, 0, 1, 0);
 if (Object.prototype.toString.call(x12) !== "[object Date]") {
   $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T3.2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T3.2.js
index 1a11ac25a..d199d5d80 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T3.2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T3.2.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T3.2.js
- * @description Test based on overwriting prototype.toString - 4 arguments, (year, month, date, hours)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+description: >
+    Test based on overwriting prototype.toString - 4 arguments, (year,
+    month, date, hours)
+includes: [$FAIL.js]
+---*/
 
 Date.prototype.toString = Object.prototype.toString;
 
@@ -70,4 +72,3 @@ var x12 = new Date(2100, 0, 1, 0);
 if (x12.toString() !== "[object Date]") {
   $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T4.1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T4.1.js
index 42ab3dfda..018eec031 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T4.1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T4.1.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T4.1.js
- * @description Test based on delete prototype.toString - 5 arguments, (year, month, date, hours, minutes)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+description: >
+    Test based on delete prototype.toString - 5 arguments, (year,
+    month, date, hours, minutes)
+includes: [$FAIL.js]
+---*/
 
 var x1 = new Date(1899, 11, 31, 23, 59);
 if (Object.prototype.toString.call(x1) !== "[object Date]") {
@@ -68,4 +70,3 @@ var x12 = new Date(2100, 0, 1, 0, 0);
 if (Object.prototype.toString.call(x12) !== "[object Date]") {
   $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T4.2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T4.2.js
index b7e2710e9..514fc315b 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T4.2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T4.2.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T4.2.js
- * @description Test based on overwriting prototype.toString - 5 arguments, (year, month, date, hours, minutes)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+description: >
+    Test based on overwriting prototype.toString - 5 arguments, (year,
+    month, date, hours, minutes)
+includes: [$FAIL.js]
+---*/
 
 Date.prototype.toString = Object.prototype.toString;
 
@@ -70,4 +72,3 @@ var x12 = new Date(2100, 0, 1, 0, 0);
 if (x12.toString() !== "[object Date]") {
   $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T5.1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T5.1.js
index 7372fc8ee..62ff57be0 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T5.1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T5.1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T5.1.js
- * @description 6 arguments, (year, month, date, hours, minutes, seconds)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+description: 6 arguments, (year, month, date, hours, minutes, seconds)
+includes: [$FAIL.js]
+---*/
 
 var x1 = new Date(1899, 11, 31, 23, 59, 59);
 if (Object.prototype.toString.call(x1) !== "[object Date]") {
@@ -68,4 +68,3 @@ var x12 = new Date(2100, 0, 1, 0, 0, 0);
 if (Object.prototype.toString.call(x12) !== "[object Date]") {
   $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T5.2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T5.2.js
index d5d0d16f4..6382ea122 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T5.2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T5.2.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T5.2.js
- * @description Test based on overwriting prototype.toString - 6 arguments, (year, month, date, hours, minutes, seconds)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+description: >
+    Test based on overwriting prototype.toString - 6 arguments, (year,
+    month, date, hours, minutes, seconds)
+includes: [$FAIL.js]
+---*/
 
 Date.prototype.toString = Object.prototype.toString;
 
@@ -70,4 +72,3 @@ var x12 = new Date(2100, 0, 1, 0, 0, 0);
 if (x12.toString() !== "[object Date]") {
   $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T6.1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T6.1.js
index 16cf59479..ca2f56c3c 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T6.1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T6.1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T6.1.js
- * @description 7 arguments, (year, month, date, hours, minutes, seconds, ms)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+description: 7 arguments, (year, month, date, hours, minutes, seconds, ms)
+includes: [$FAIL.js]
+---*/
 
 var x1 = new Date(1899, 11, 31, 23, 59, 59, 999);
 if (Object.prototype.toString.call(x1) !== "[object Date]") {
@@ -68,4 +68,3 @@ var x12 = new Date(2100, 0, 1, 0, 0, 0, 0);
 if (Object.prototype.toString.call(x12) !== "[object Date]") {
   $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T6.2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T6.2.js
index 40b9dd5b7..4b2276d35 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T6.2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A3_T6.2.js
@@ -1,13 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A3_T6.2.js
- * @description Test based on overwriting prototype.toString - 7 arguments, (year, month, date, hours, minutes, seconds, ms)
- */
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+description: >
+    Test based on overwriting prototype.toString - 7 arguments, (year,
+    month, date, hours, minutes, seconds, ms)
+includes: [$FAIL.js]
+---*/
 
 Date.prototype.toString = Object.prototype.toString;
 
@@ -70,4 +72,3 @@ var x12 = new Date(2100, 0, 1, 0, 0, 0, 0);
 if (x12.toString() !== "[object Date]") {
   $FAIL("#12: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T1.js
index b99a99669..a0f72dbb8 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T1.js
@@ -1,20 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 1. Call ToNumber(year)
- * 2. Call ToNumber(month)
- * 3. If date is supplied use ToNumber(date)
- * 4. If hours is supplied use ToNumber(hours)
- * 5. If minutes is supplied use ToNumber(minutes)
- * 6. If seconds is supplied use ToNumber(seconds)
- * 7. If ms is supplied use ToNumber(ms)
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A4_T1.js
- * @description 2 arguments, (year, month)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    1. Call ToNumber(year)
+    2. Call ToNumber(month)
+    3. If date is supplied use ToNumber(date)
+    4. If hours is supplied use ToNumber(hours)
+    5. If minutes is supplied use ToNumber(minutes)
+    6. If seconds is supplied use ToNumber(seconds)
+    7. If ms is supplied use ToNumber(ms)
+description: 2 arguments, (year, month)
+---*/
 
 var myObj = function(val){
   this.value = val;
@@ -43,4 +42,3 @@ catch(e){
     $ERROR("#2: The 2nd step is calling ToNumber(month)");
   }
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T2.js
index c711b38f4..2b4ba9df6 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T2.js
@@ -1,20 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 1. Call ToNumber(year)
- * 2. Call ToNumber(month)
- * 3. If date is supplied use ToNumber(date)
- * 4. If hours is supplied use ToNumber(hours)
- * 5. If minutes is supplied use ToNumber(minutes)
- * 6. If seconds is supplied use ToNumber(seconds)
- * 7. If ms is supplied use ToNumber(ms)
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A4_T2.js
- * @description 3 arguments, (year, month, date)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    1. Call ToNumber(year)
+    2. Call ToNumber(month)
+    3. If date is supplied use ToNumber(date)
+    4. If hours is supplied use ToNumber(hours)
+    5. If minutes is supplied use ToNumber(minutes)
+    6. If seconds is supplied use ToNumber(seconds)
+    7. If ms is supplied use ToNumber(ms)
+description: 3 arguments, (year, month, date)
+---*/
 
 var myObj = function(val){
   this.value = val;
@@ -54,4 +53,3 @@ catch(e){
     $ERROR("#3: The 3rd step is calling ToNumber(date)");
   }
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T3.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T3.js
index 4665dd2a4..3759b039b 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T3.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T3.js
@@ -1,20 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 1. Call ToNumber(year)
- * 2. Call ToNumber(month)
- * 3. If date is supplied use ToNumber(date)
- * 4. If hours is supplied use ToNumber(hours)
- * 5. If minutes is supplied use ToNumber(minutes)
- * 6. If seconds is supplied use ToNumber(seconds)
- * 7. If ms is supplied use ToNumber(ms)
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A4_T3.js
- * @description 4 arguments, (year, month, date, hours)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    1. Call ToNumber(year)
+    2. Call ToNumber(month)
+    3. If date is supplied use ToNumber(date)
+    4. If hours is supplied use ToNumber(hours)
+    5. If minutes is supplied use ToNumber(minutes)
+    6. If seconds is supplied use ToNumber(seconds)
+    7. If ms is supplied use ToNumber(ms)
+description: 4 arguments, (year, month, date, hours)
+---*/
 
 var myObj = function(val){
   this.value = val;
@@ -65,4 +64,3 @@ catch(e){
     $ERROR("#4: The 4th step is calling ToNumber(hours)");
   }
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T4.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T4.js
index f27c87a71..8490af46a 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T4.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T4.js
@@ -1,20 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 1. Call ToNumber(year)
- * 2. Call ToNumber(month)
- * 3. If date is supplied use ToNumber(date)
- * 4. If hours is supplied use ToNumber(hours)
- * 5. If minutes is supplied use ToNumber(minutes)
- * 6. If seconds is supplied use ToNumber(seconds)
- * 7. If ms is supplied use ToNumber(ms)
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A4_T4.js
- * @description 5 arguments, (year, month, date, hours, minutes)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    1. Call ToNumber(year)
+    2. Call ToNumber(month)
+    3. If date is supplied use ToNumber(date)
+    4. If hours is supplied use ToNumber(hours)
+    5. If minutes is supplied use ToNumber(minutes)
+    6. If seconds is supplied use ToNumber(seconds)
+    7. If ms is supplied use ToNumber(ms)
+description: 5 arguments, (year, month, date, hours, minutes)
+---*/
 
 var myObj = function(val){
   this.value = val;
@@ -76,4 +75,3 @@ catch(e){
     $ERROR("#5: The 5th step is calling ToNumber(minutes)");
   }
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T5.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T5.js
index fb538ce52..cc79688e1 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T5.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T5.js
@@ -1,20 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 1. Call ToNumber(year)
- * 2. Call ToNumber(month)
- * 3. If date is supplied use ToNumber(date)
- * 4. If hours is supplied use ToNumber(hours)
- * 5. If minutes is supplied use ToNumber(minutes)
- * 6. If seconds is supplied use ToNumber(seconds)
- * 7. If ms is supplied use ToNumber(ms)
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A4_T5.js
- * @description 6 arguments, (year, month, date, hours, minutes, seconds)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    1. Call ToNumber(year)
+    2. Call ToNumber(month)
+    3. If date is supplied use ToNumber(date)
+    4. If hours is supplied use ToNumber(hours)
+    5. If minutes is supplied use ToNumber(minutes)
+    6. If seconds is supplied use ToNumber(seconds)
+    7. If ms is supplied use ToNumber(ms)
+description: 6 arguments, (year, month, date, hours, minutes, seconds)
+---*/
 
 var myObj = function(val){
   this.value = val;
@@ -87,4 +86,3 @@ catch(e){
     $ERROR("#6: The 6th step is calling ToNumber(seconds)");
   }
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T6.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T6.js
index 84586a1d1..54b619da5 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T6.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A4_T6.js
@@ -1,20 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 1. Call ToNumber(year)
- * 2. Call ToNumber(month)
- * 3. If date is supplied use ToNumber(date)
- * 4. If hours is supplied use ToNumber(hours)
- * 5. If minutes is supplied use ToNumber(minutes)
- * 6. If seconds is supplied use ToNumber(seconds)
- * 7. If ms is supplied use ToNumber(ms)
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A4_T6.js
- * @description 7 arguments, (year, month, date, hours, minutes, seconds, ms)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    1. Call ToNumber(year)
+    2. Call ToNumber(month)
+    3. If date is supplied use ToNumber(date)
+    4. If hours is supplied use ToNumber(hours)
+    5. If minutes is supplied use ToNumber(minutes)
+    6. If seconds is supplied use ToNumber(seconds)
+    7. If ms is supplied use ToNumber(ms)
+description: 7 arguments, (year, month, date, hours, minutes, seconds, ms)
+---*/
 
 var myObj = function(val){
   this.value = val;
@@ -98,4 +97,3 @@ catch(e){
     $ERROR("#7: The 7th step is calling ToNumber(ms)");
   }
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T1.js
index 6aafec22c..c5d5bd8b6 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T1.js
@@ -1,71 +1,70 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
- * 1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
- * 9. Compute MakeDay(Result(8), Result(2), Result(3))
- * 10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
- * 11. Compute MakeDate(Result(9), Result(10))
- * 12. Set the [[Value]] property of the newly constructed object to
- * TimeClip(UTC(Result(11)))
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A5_T1.js
- * @description 2 arguments, (year, month)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
+    1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
+    9. Compute MakeDay(Result(8), Result(2), Result(3))
+    10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
+    11. Compute MakeDate(Result(9), Result(10))
+    12. Set the [[Value]] property of the newly constructed object to
+    TimeClip(UTC(Result(11)))
+description: 2 arguments, (year, month)
+includes:
+    - $FAIL.js
+    - environment.js
+    - numeric_conversion.js
+    - Date_constants.js
+    - Date_library.js
+---*/
 
-$INCLUDE("environment.js");
-$INCLUDE("numeric_conversion.js");
-$INCLUDE("Date_constants.js");
-$INCLUDE("Date_library.js");
-
 if (-2211638400000 !== new Date(1899, 11).valueOf()) {
   $FAIL("#1: Incorrect value of Date");
-}
-
+}
+
 if (-2208960000000 !== new Date(1899, 12).valueOf()) {
   $FAIL("#2: Incorrect value of Date");
-}
-
+}
+
 if (-2208960000000 !== new Date(1900, 0).valueOf()) {
   $FAIL("#3: Incorrect value of Date");
-}
-
+}
+
 if (-2649600000 !== new Date(1969, 11).valueOf()) {
   $FAIL("#4: Incorrect value of Date");
-}
-
+}
+
 if (28800000 !== new Date(1969, 12).valueOf()) {
   $FAIL("#5: Incorrect value of Date");
-}
-
+}
+
 if (28800000 !== new Date(1970, 0).valueOf()) {
   $FAIL("#6: Incorrect value of Date");
-}
-
+}
+
 if (944035200000 !== new Date(1999, 11).valueOf()) {
   $FAIL("#7: Incorrect value of Date");
-}
-
+}
+
 if (946713600000 !== new Date(1999, 12).valueOf()) {
   $FAIL("#8: Incorrect value of Date");
-}
-
+}
+
 if (946713600000 !== new Date(2000, 0).valueOf()) {
   $FAIL("#9: Incorrect value of Date");
-}
-
+}
+
 if (4099795200000 !== new Date(2099, 11).valueOf()) {
   $FAIL("#10: Incorrect value of Date");
-}
-
+}
+
 if (4102473600000 !== new Date(2099, 12).valueOf()) {
   $FAIL("#11: Incorrect value of Date");
-}
-
+}
+
 if (4102473600000 !== new Date(2100, 0).valueOf()) {
   $FAIL("#12: Incorrect value of Date");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T2.js
index 34cf98bba..5eb7a3a3c 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T2.js
@@ -1,71 +1,70 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
- * 1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
- * 9. Compute MakeDay(Result(8), Result(2), Result(3))
- * 10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
- * 11. Compute MakeDate(Result(9), Result(10))
- * 12. Set the [[Value]] property of the newly constructed object to
- * TimeClip(UTC(Result(11)))
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A5_T2.js
- * @description 3 arguments, (year, month, date)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
+    1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
+    9. Compute MakeDay(Result(8), Result(2), Result(3))
+    10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
+    11. Compute MakeDate(Result(9), Result(10))
+    12. Set the [[Value]] property of the newly constructed object to
+    TimeClip(UTC(Result(11)))
+description: 3 arguments, (year, month, date)
+includes:
+    - $FAIL.js
+    - environment.js
+    - numeric_conversion.js
+    - Date_constants.js
+    - Date_library.js
+---*/
 
-$INCLUDE("environment.js");
-$INCLUDE("numeric_conversion.js");
-$INCLUDE("Date_constants.js");
-$INCLUDE("Date_library.js");
-
 if (-2209046400000 !== new Date(1899, 11, 31).valueOf()) {
   $FAIL("#1: Incorrect value of Date");
-}
-
+}
+
 if (-2208960000000 !== new Date(1899, 12, 1).valueOf()) {
   $FAIL("#2: Incorrect value of Date");
-}
-
+}
+
 if (-2208960000000 !== new Date(1900, 0, 1).valueOf()) {
   $FAIL("#3: Incorrect value of Date");
-}
-
+}
+
 if (-57600000 !== new Date(1969, 11, 31).valueOf()) {
   $FAIL("#4: Incorrect value of Date");
-}
-
+}
+
 if (28800000 !== new Date(1969, 12, 1).valueOf()) {
   $FAIL("#5: Incorrect value of Date");
-}
-
+}
+
 if (28800000 !== new Date(1970, 0, 1).valueOf()) {
   $FAIL("#6: Incorrect value of Date");
-}
-
+}
+
 if (946627200000 !== new Date(1999, 11, 31).valueOf()) {
   $FAIL("#7: Incorrect value of Date");
-}
-
+}
+
 if (946713600000 !== new Date(1999, 12, 1).valueOf()) {
   $FAIL("#8: Incorrect value of Date");
-}
-
+}
+
 if (946713600000 !== new Date(2000, 0, 1).valueOf()) {
   $FAIL("#9: Incorrect value of Date");
-}
-
+}
+
 if (4102387200000 !== new Date(2099, 11, 31).valueOf()) {
   $FAIL("#10: Incorrect value of Date");
-}
-
+}
+
 if (4102473600000 !== new Date(2099, 12, 1).valueOf()) {
   $FAIL("#11: Incorrect value of Date");
-}
-
+}
+
 if (4102473600000 !== new Date(2100, 0, 1).valueOf()) {
   $FAIL("#12: Incorrect value of Date");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T3.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T3.js
index fdb6387b4..4d69a652f 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T3.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T3.js
@@ -1,71 +1,70 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
- * 1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
- * 9. Compute MakeDay(Result(8), Result(2), Result(3))
- * 10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
- * 11. Compute MakeDate(Result(9), Result(10))
- * 12. Set the [[Value]] property of the newly constructed object to
- * TimeClip(UTC(Result(11)))
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A5_T3.js
- * @description 4 arguments, (year, month, date, hours)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
+    1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
+    9. Compute MakeDay(Result(8), Result(2), Result(3))
+    10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
+    11. Compute MakeDate(Result(9), Result(10))
+    12. Set the [[Value]] property of the newly constructed object to
+    TimeClip(UTC(Result(11)))
+description: 4 arguments, (year, month, date, hours)
+includes:
+    - $FAIL.js
+    - environment.js
+    - numeric_conversion.js
+    - Date_constants.js
+    - Date_library.js
+---*/
 
-$INCLUDE("environment.js");
-$INCLUDE("numeric_conversion.js");
-$INCLUDE("Date_constants.js");
-$INCLUDE("Date_library.js");
-
 if (-2208963600000 !== new Date(1899, 11, 31, 23).valueOf()) {
   $FAIL("#1: Incorrect value of Date");
-}
-
+}
+
 if (-2208960000000 !== new Date(1899, 12, 1, 0).valueOf()) {
   $FAIL("#2: Incorrect value of Date");
-}
-
+}
+
 if (-2208960000000 !== new Date(1900, 0, 1, 0).valueOf()) {
   $FAIL("#3: Incorrect value of Date");
-}
-
+}
+
 if (25200000 !== new Date(1969, 11, 31, 23).valueOf()) {
   $FAIL("#4: Incorrect value of Date");
-}
-
+}
+
 if (28800000 !== new Date(1969, 12, 1, 0).valueOf()) {
   $FAIL("#5: Incorrect value of Date");
-}
-
+}
+
 if (28800000 !== new Date(1970, 0, 1, 0).valueOf()) {
   $FAIL("#6: Incorrect value of Date");
-}
-
+}
+
 if (946710000000 !== new Date(1999, 11, 31, 23).valueOf()) {
   $FAIL("#7: Incorrect value of Date");
-}
-
+}
+
 if (946713600000 !== new Date(1999, 12, 1, 0).valueOf()) {
   $FAIL("#8: Incorrect value of Date");
-}
-
+}
+
 if (946713600000 !== new Date(2000, 0, 1, 0).valueOf()) {
   $FAIL("#9: Incorrect value of Date");
-}
-
+}
+
 if (4102470000000 !== new Date(2099, 11, 31, 23).valueOf()) {
   $FAIL("#10: Incorrect value of Date");
-}
-
+}
+
 if (4102473600000 !== new Date(2099, 12, 1, 0).valueOf()) {
   $FAIL("#11: Incorrect value of Date");
-}
-
+}
+
 if (4102473600000 !== new Date(2100, 0, 1, 0).valueOf()) {
   $FAIL("#12: Incorrect value of Date");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T4.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T4.js
index 296ec5d8a..061e6550e 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T4.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T4.js
@@ -1,71 +1,70 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
- * 1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
- * 9. Compute MakeDay(Result(8), Result(2), Result(3))
- * 10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
- * 11. Compute MakeDate(Result(9), Result(10))
- * 12. Set the [[Value]] property of the newly constructed object to
- * TimeClip(UTC(Result(11)))
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A5_T4.js
- * @description 5 arguments, (year, month, date, hours, minutes)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
+    1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
+    9. Compute MakeDay(Result(8), Result(2), Result(3))
+    10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
+    11. Compute MakeDate(Result(9), Result(10))
+    12. Set the [[Value]] property of the newly constructed object to
+    TimeClip(UTC(Result(11)))
+description: 5 arguments, (year, month, date, hours, minutes)
+includes:
+    - $FAIL.js
+    - environment.js
+    - numeric_conversion.js
+    - Date_constants.js
+    - Date_library.js
+---*/
 
-$INCLUDE("environment.js");
-$INCLUDE("numeric_conversion.js");
-$INCLUDE("Date_constants.js");
-$INCLUDE("Date_library.js");
-
 if (-2208960060000 !== new Date(1899, 11, 31, 23, 59).valueOf()) {
   $FAIL("#1: Incorrect value of Date");
-}
-
+}
+
 if (-2208960000000 !== new Date(1899, 12, 1, 0, 0).valueOf()) {
   $FAIL("#2: Incorrect value of Date");
-}
-
+}
+
 if (-2208960000000 !== new Date(1900, 0, 1, 0, 0).valueOf()) {
   $FAIL("#3: Incorrect value of Date");
-}
-
+}
+
 if (28740000 !== new Date(1969, 11, 31, 23, 59).valueOf()) {
   $FAIL("#4: Incorrect value of Date");
-}
-
+}
+
 if (28800000 !== new Date(1969, 12, 1, 0, 0).valueOf()) {
   $FAIL("#5: Incorrect value of Date");
-}
-
+}
+
 if (28800000 !== new Date(1970, 0, 1, 0, 0).valueOf()) {
   $FAIL("#6: Incorrect value of Date");
-}
-
+}
+
 if (946713540000 !== new Date(1999, 11, 31, 23, 59).valueOf()) {
   $FAIL("#7: Incorrect value of Date");
-}
-
+}
+
 if (946713600000 !== new Date(1999, 12, 1, 0, 0).valueOf()) {
   $FAIL("#8: Incorrect value of Date");
-}
-
+}
+
 if (946713600000 !== new Date(2000, 0, 1, 0, 0).valueOf()) {
   $FAIL("#9: Incorrect value of Date");
-}
-
+}
+
 if (4102473540000 !== new Date(2099, 11, 31, 23, 59).valueOf()) {
   $FAIL("#10: Incorrect value of Date");
-}
-
+}
+
 if (4102473600000 !== new Date(2099, 12, 1, 0, 0).valueOf()) {
   $FAIL("#11: Incorrect value of Date");
-}
-
+}
+
 if (4102473600000 !== new Date(2100, 0, 1, 0, 0).valueOf()) {
   $FAIL("#12: Incorrect value of Date");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T5.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T5.js
index b6f579459..05323c930 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T5.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T5.js
@@ -1,71 +1,70 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
- * 1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
- * 9. Compute MakeDay(Result(8), Result(2), Result(3))
- * 10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
- * 11. Compute MakeDate(Result(9), Result(10))
- * 12. Set the [[Value]] property of the newly constructed object to
- * TimeClip(UTC(Result(11)))
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A5_T5.js
- * @description 6 arguments, (year, month, date, hours, minutes, seconds)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
+    1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
+    9. Compute MakeDay(Result(8), Result(2), Result(3))
+    10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
+    11. Compute MakeDate(Result(9), Result(10))
+    12. Set the [[Value]] property of the newly constructed object to
+    TimeClip(UTC(Result(11)))
+description: 6 arguments, (year, month, date, hours, minutes, seconds)
+includes:
+    - $FAIL.js
+    - environment.js
+    - numeric_conversion.js
+    - Date_constants.js
+    - Date_library.js
+---*/
 
-$INCLUDE("environment.js");
-$INCLUDE("numeric_conversion.js");
-$INCLUDE("Date_constants.js");
-$INCLUDE("Date_library.js");
-
 if (-2208960001000 !== new Date(1899, 11, 31, 23, 59, 59).valueOf()) {
   $FAIL("#1: Incorrect value of Date");
-}
-
+}
+
 if (-2208960000000 !== new Date(1899, 12, 1, 0, 0, 0).valueOf()) {
   $FAIL("#2: Incorrect value of Date");
-}
-
+}
+
 if (-2208960000000 !== new Date(1900, 0, 1, 0, 0, 0).valueOf()) {
   $FAIL("#3: Incorrect value of Date");
-}
-
+}
+
 if (28799000 !== new Date(1969, 11, 31, 23, 59, 59).valueOf()) {
   $FAIL("#4: Incorrect value of Date");
-}
-
+}
+
 if (28800000 !== new Date(1969, 12, 1, 0, 0, 0).valueOf()) {
   $FAIL("#5: Incorrect value of Date");
-}
-
+}
+
 if (28800000 !== new Date(1970, 0, 1, 0, 0, 0).valueOf()) {
   $FAIL("#6: Incorrect value of Date");
-}
-
+}
+
 if (946713599000 !== new Date(1999, 11, 31, 23, 59, 59).valueOf()) {
   $FAIL("#7: Incorrect value of Date");
-}
-
+}
+
 if (946713600000 !== new Date(1999, 12, 1, 0, 0, 0).valueOf()) {
   $FAIL("#8: Incorrect value of Date");
-}
-
+}
+
 if (946713600000 !== new Date(2000, 0, 1, 0, 0, 0).valueOf()) {
   $FAIL("#9: Incorrect value of Date");
-}
-
+}
+
 if (4102473599000 !== new Date(2099, 11, 31, 23, 59, 59).valueOf()) {
   $FAIL("#10: Incorrect value of Date");
-}
-
+}
+
 if (4102473600000 !== new Date(2099, 12, 1, 0, 0, 0).valueOf()) {
   $FAIL("#11: Incorrect value of Date");
-}
-
+}
+
 if (4102473600000 !== new Date(2100, 0, 1, 0, 0, 0).valueOf()) {
   $FAIL("#12: Incorrect value of Date");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T6.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T6.js
index adfb0465c..b3b5317c5 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T6.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A5_T6.js
@@ -1,71 +1,70 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * is set by following steps:
- * 8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
- * 1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
- * 9. Compute MakeDay(Result(8), Result(2), Result(3))
- * 10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
- * 11. Compute MakeDate(Result(9), Result(10))
- * 12. Set the [[Value]] property of the newly constructed object to
- * TimeClip(UTC(Result(11)))
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A5_T6.js
- * @description 7 arguments, (year, month, date, hours, minutes, seconds, ms)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    is set by following steps:
+    8. If Result(1) is not NaN and 0 <= ToInteger(Result(1)) <= 99, Result(8) is
+    1900+ToInteger(Result(1)); otherwise, Result(8) is Result(1)
+    9. Compute MakeDay(Result(8), Result(2), Result(3))
+    10. Compute MakeTime(Result(4), Result(5), Result(6), Result(7))
+    11. Compute MakeDate(Result(9), Result(10))
+    12. Set the [[Value]] property of the newly constructed object to
+    TimeClip(UTC(Result(11)))
+description: 7 arguments, (year, month, date, hours, minutes, seconds, ms)
+includes:
+    - $FAIL.js
+    - environment.js
+    - numeric_conversion.js
+    - Date_constants.js
+    - Date_library.js
+---*/
 
-$INCLUDE("environment.js");
-$INCLUDE("numeric_conversion.js");
-$INCLUDE("Date_constants.js");
-$INCLUDE("Date_library.js");
-
 if (-2208960000001 !== new Date(1899, 11, 31, 23, 59, 59, 999).valueOf()) {
   $FAIL("#1: Incorrect value of Date");
-}
-
+}
+
 if (-2208960000000 !== new Date(1899, 12, 1, 0, 0, 0, 0).valueOf()) {
   $FAIL("#2: Incorrect value of Date");
-}
-
+}
+
 if (-2208960000000 !== new Date(1900, 0, 1, 0, 0, 0, 0).valueOf()) {
   $FAIL("#3: Incorrect value of Date");
-}
-
+}
+
 if (28799999 !== new Date(1969, 11, 31, 23, 59, 59, 999).valueOf()) {
   $FAIL("#4: Incorrect value of Date");
-}
-
+}
+
 if (28800000 !== new Date(1969, 12, 1, 0, 0, 0, 0).valueOf()) {
   $FAIL("#5: Incorrect value of Date");
-}
-
+}
+
 if (28800000 !== new Date(1970, 0, 1, 0, 0, 0, 0).valueOf()) {
   $FAIL("#6: Incorrect value of Date");
-}
-
+}
+
 if (946713599999 !== new Date(1999, 11, 31, 23, 59, 59, 999).valueOf()) {
   $FAIL("#7: Incorrect value of Date");
-}
-
+}
+
 if (946713600000 !== new Date(1999, 12, 1, 0, 0, 0, 0).valueOf()) {
   $FAIL("#8: Incorrect value of Date");
-}
-
+}
+
 if (946713600000 !== new Date(2000, 0, 1, 0, 0, 0, 0).valueOf()) {
   $FAIL("#9: Incorrect value of Date");
-}
-
+}
+
 if (4102473599999 !== new Date(2099, 11, 31, 23, 59, 59, 999).valueOf()) {
   $FAIL("#10: Incorrect value of Date");
-}
-
+}
+
 if (4102473600000 !== new Date(2099, 12, 1, 0, 0, 0, 0).valueOf()) {
   $FAIL("#11: Incorrect value of Date");
-}
-
+}
+
 if (4102473600000 !== new Date(2100, 0, 1, 0, 0, 0, 0).valueOf()) {
   $FAIL("#12: Incorrect value of Date");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T1.js
index 887cd4e89..84af065f5 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T1.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * with supplied "undefined" argument should be NaN
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A6_T1.js
- * @description 2 arguments, (year, month)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    with supplied "undefined" argument should be NaN
+description: 2 arguments, (year, month)
+includes: [$FAIL.js]
+---*/
 
 function DateValue(year, month, date, hours, minutes, seconds, ms){
   return new Date(year, month, date, hours, minutes, seconds, ms).valueOf();
@@ -60,4 +60,3 @@ if (!isNaN(DateValue(2099, 12))) {
 if (!isNaN(DateValue(2100, 0))) {
   $FAIL("#12: The value should be NaN");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T2.js
index 3c3ff0cd4..374a68833 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T2.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * with supplied "undefined" argument should be NaN
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A6_T2.js
- * @description 3 arguments, (year, month, date)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    with supplied "undefined" argument should be NaN
+description: 3 arguments, (year, month, date)
+includes: [$FAIL.js]
+---*/
 
 function DateValue(year, month, date, hours, minutes, seconds, ms){
   return new Date(year, month, date, hours, minutes, seconds, ms).valueOf();
@@ -60,4 +60,3 @@ if (!isNaN(DateValue(2099, 12, 1))) {
 if (!isNaN(DateValue(2100, 0, 1))) {
   $FAIL("#12: The value should be NaN");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T3.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T3.js
index 311fca2fc..5e19f40db 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T3.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T3.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * with supplied "undefined" argument should be NaN
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A6_T3.js
- * @description 4 arguments, (year, month, date, hours)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    with supplied "undefined" argument should be NaN
+description: 4 arguments, (year, month, date, hours)
+includes: [$FAIL.js]
+---*/
 
 function DateValue(year, month, date, hours, minutes, seconds, ms){
   return new Date(year, month, date, hours, minutes, seconds, ms).valueOf();
@@ -60,4 +60,3 @@ if (!isNaN(DateValue(2099, 12, 1, 0))) {
 if (!isNaN(DateValue(2100, 0, 1, 0))) {
   $FAIL("#12: The value should be NaN");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T4.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T4.js
index 44a235743..ce348dce1 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T4.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T4.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * with supplied "undefined" argument should be NaN
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A6_T4.js
- * @description 5 arguments, (year, month, date, hours, minutes)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    with supplied "undefined" argument should be NaN
+description: 5 arguments, (year, month, date, hours, minutes)
+includes: [$FAIL.js]
+---*/
 
 function DateValue(year, month, date, hours, minutes, seconds, ms){
   return new Date(year, month, date, hours, minutes, seconds, ms).valueOf();
@@ -60,4 +60,3 @@ if (!isNaN(DateValue(2099, 12, 1, 0, 0))) {
 if (!isNaN(DateValue(2100, 0, 1, 0, 0))) {
   $FAIL("#12: The value should be NaN");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T5.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T5.js
index d22d80aea..4a6367e40 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T5.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.1_A6_T5.js
@@ -1,13 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Value]] property of the newly constructed object
- * with supplied "undefined" argument should be NaN
- *
- * @path ch15/15.9/15.9.3/S15.9.3.1_A6_T5.js
- * @description 6 arguments, (year, month, date, hours, minutes, seconds)
- */
+/*---
+info: >
+    The [[Value]] property of the newly constructed object
+    with supplied "undefined" argument should be NaN
+description: 6 arguments, (year, month, date, hours, minutes, seconds)
+includes: [$FAIL.js]
+---*/
 
 function DateValue(year, month, date, hours, minutes, seconds, ms){
   return new Date(year, month, date, hours, minutes, seconds, ms).valueOf();
@@ -60,4 +60,3 @@ if (!isNaN(DateValue(2099, 12, 1, 0, 0, 0))) {
 if (!isNaN(DateValue(2100, 0, 1, 0, 0, 0))) {
   $FAIL("#12: The value should be NaN");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A1_T1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A1_T1.js
index b0d9d93f7..56d4aa9d5 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A1_T1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A1_T1.js
@@ -1,16 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When Date is called as part of a new expression it is
- * a constructor: it initialises the newly created object
- *
- * @path ch15/15.9/15.9.3/S15.9.3.2_A1_T1.js
- * @description Checking types of newly created objects and it values
- */
-
-$INCLUDE("Date_constants.js");
- 
+/*---
+info: >
+    When Date is called as part of a new expression it is
+    a constructor: it initialises the newly created object
+description: Checking types of newly created objects and it values
+includes:
+    - $FAIL.js
+    - Date_constants.js
+---*/
+
 if (typeof new Date(date_1899_end) !== "object") {
   $FAIL("#1.1: typeof new Date(date_1899_end) === 'object'");
 }
@@ -154,4 +154,3 @@ var x84 = new Date(date_2100_start);
 if(x84 === undefined){
   $FAIL("#8.4: new Date(date_2100_start) !== undefined");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A2_T1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A2_T1.js
index 588612961..019d6c453 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A2_T1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A2_T1.js
@@ -1,16 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Prototype]] property of the newly constructed object
- * is set to the original Date prototype object, the one that is the
- * initial value of Date.prototype
- *
- * @path ch15/15.9/15.9.3/S15.9.3.2_A2_T1.js
- * @description Checking Date.prototype property of newly constructed objects
- */
-
-$INCLUDE("Date_constants.js");
+/*---
+info: >
+    The [[Prototype]] property of the newly constructed object
+    is set to the original Date prototype object, the one that is the
+    initial value of Date.prototype
+description: Checking Date.prototype property of newly constructed objects
+includes:
+    - $FAIL.js
+    - Date_constants.js
+---*/
 
 var x11 = new Date(date_1899_end);
 if (typeof x11.constructor.prototype !== "object") {
@@ -131,4 +131,3 @@ var x83 = new Date(date_2100_start);
 if(Date.prototype !== x83.constructor.prototype){
   $FAIL("#8.3: Date.prototype !== x83.constructor.prototype");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A3_T1.1.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A3_T1.1.js
index d95df2702..da8b599e4 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A3_T1.1.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A3_T1.1.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.2_A3_T1.1.js
- * @description Test based on delete prototype.toString
- */
-
-$INCLUDE("Date_constants.js");
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+description: Test based on delete prototype.toString
+includes:
+    - $FAIL.js
+    - Date_constants.js
+---*/
 
 var x1 = new Date(date_1899_end);
 if (Object.prototype.toString.call(x1) !== "[object Date]") {
@@ -50,4 +50,3 @@ var x8 = new Date(date_2100_start);
 if (Object.prototype.toString.call(x8) !== "[object Date]") {
   $FAIL("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
-
diff --git a/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A3_T1.2.js b/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A3_T1.2.js
index 824bd006a..6b824c3c6 100644
--- a/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A3_T1.2.js
+++ b/test/suite/ch15/15.9/15.9.3/S15.9.3.2_A3_T1.2.js
@@ -1,15 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The [[Class]] property of the newly constructed object
- * is set to "Date"
- *
- * @path ch15/15.9/15.9.3/S15.9.3.2_A3_T1.2.js
- * @description Test based on overwriting prototype.toString
- */
-
-$INCLUDE("Date_constants.js");
+/*---
+info: >
+    The [[Class]] property of the newly constructed object
+    is set to "Date"
+description: Test based on overwriting prototype.toString
+includes:
+    - $FAIL.js
+    - Date_constants.js
+---*/
 
 Date.prototype.toString = Object.prototype.toString;
 
@@ -52,4 +52,3 @@ var x8 = new Date(date_2100_start);
 if (x8.toString() !== "[object Date]") {
   $FAIL("#8: The [[Class]] property of the newly constructed object is set to 'Date'");
 }
-