14 files changed, 68 insertions, 104 deletions
diff --git a/test/suite/ch07/7.4/S7.4_A1_T1.js b/test/suite/ch07/7.4/S7.4_A1_T1.js
index 87bb8ce1a..74040ccea 100644
--- a/test/suite/ch07/7.4/S7.4_A1_T1.js
+++ b/test/suite/ch07/7.4/S7.4_A1_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Correct interpretation of single line comments
- *
- * @path ch07/7.4/S7.4_A1_T1.js
- * @description Create comments with any code
- */
+/*---
+info: Correct interpretation of single line comments
+description: Create comments with any code
+---*/
 
 //CHECK#1
 // $ERROR('#1: Correct interpretation single line comments');
@@ -40,5 +38,3 @@ this.y++;
 if (isNaN(y) !== true) {
   $ERROR('#6: //var this.y = 1; \\n this.y++; y === Not-a-Number. Actual: ' + (y));
 }
-
-
diff --git a/test/suite/ch07/7.4/S7.4_A1_T2.js b/test/suite/ch07/7.4/S7.4_A1_T2.js
index 4d8d8af43..7c8355785 100644
--- a/test/suite/ch07/7.4/S7.4_A1_T2.js
+++ b/test/suite/ch07/7.4/S7.4_A1_T2.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Correct interpretation of single line comments
- *
- * @path ch07/7.4/S7.4_A1_T2.js
- * @description Simple test, create empty comment: ///
- */
+/*---
+info: Correct interpretation of single line comments
+description: "Simple test, create empty comment: ///"
+---*/
 
 //CHECK#1
 ///
-
diff --git a/test/suite/ch07/7.4/S7.4_A2_T1.js b/test/suite/ch07/7.4/S7.4_A2_T1.js
index 97b8e6268..58ca41360 100644
--- a/test/suite/ch07/7.4/S7.4_A2_T1.js
+++ b/test/suite/ch07/7.4/S7.4_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.
 
-/**
- * Correct interpretation of multi line comments
- *
- * @path ch07/7.4/S7.4_A2_T1.js
- * @description Create comments with any code
- */
+/*---
+info: Correct interpretation of multi line comments
+description: Create comments with any code
+---*/
 
 /*CHECK#1*/
 /* $ERROR('#1: Correct interpretation multi line comments');
@@ -74,5 +72,3 @@ $ERROR('#8: var string = "/*var y = 0" /* y = 1;*/ string === "//var y = 0"');
 
 **********
 **/
-
-
diff --git a/test/suite/ch07/7.4/S7.4_A2_T2.js b/test/suite/ch07/7.4/S7.4_A2_T2.js
index feb4c9c2b..ddd0bbe70 100644
--- a/test/suite/ch07/7.4/S7.4_A2_T2.js
+++ b/test/suite/ch07/7.4/S7.4_A2_T2.js
@@ -1,13 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Correct interpretation of multi line comments
- *
- * @path ch07/7.4/S7.4_A2_T2.js
- * @description Try use /*CHECK#1/. This is not closed multi line comment
- * @negative
- */
+/*---
+info: Correct interpretation of multi line comments
+description: Try use /*CHECK#1/. This is not closed multi line comment
+flags: [negative]
+---*/
 
 /*CHECK#1/
-
diff --git a/test/suite/ch07/7.4/S7.4_A3.js b/test/suite/ch07/7.4/S7.4_A3.js
index 2efc9fab1..4ba2bc391 100644
--- a/test/suite/ch07/7.4/S7.4_A3.js
+++ b/test/suite/ch07/7.4/S7.4_A3.js
@@ -1,13 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Multi line comments cannot nest
- *
- * @path ch07/7.4/S7.4_A3.js
- * @description Try use nested comments
- * @negative
- */
+/*---
+info: Multi line comments cannot nest
+description: Try use nested comments
+flags: [negative]
+---*/
 
 /*CHECK#1*/
 
@@ -17,4 +15,3 @@ var
 /* x */
 = 1;
 */
-
diff --git a/test/suite/ch07/7.4/S7.4_A4_T1.js b/test/suite/ch07/7.4/S7.4_A4_T1.js
index 87c6ace88..c99541c1e 100644
--- a/test/suite/ch07/7.4/S7.4_A4_T1.js
+++ b/test/suite/ch07/7.4/S7.4_A4_T1.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single and Multi line comments are used together
- *
- * @path ch07/7.4/S7.4_A4_T1.js
- * @description Try use 2 close comment tags
- * @negative
- */
+/*---
+info: Single and Multi line comments are used together
+description: Try use 2 close comment tags
+flags: [negative]
+---*/
 
 /*CHECK#1*/
 
 /* var*/
 x*/
-
diff --git a/test/suite/ch07/7.4/S7.4_A4_T2.js b/test/suite/ch07/7.4/S7.4_A4_T2.js
index b64b28e0e..656be9c18 100644
--- a/test/suite/ch07/7.4/S7.4_A4_T2.js
+++ b/test/suite/ch07/7.4/S7.4_A4_T2.js
@@ -1,15 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single and Multi line comments are used together
- *
- * @path ch07/7.4/S7.4_A4_T2.js
- * @description Fist Multi line comment, then Single line comment
- */
+/*---
+info: Single and Multi line comments are used together
+description: Fist Multi line comment, then Single line comment
+---*/
 
 /*CHECK#1*/
 
 /* var
 *///x*/
-
diff --git a/test/suite/ch07/7.4/S7.4_A4_T3.js b/test/suite/ch07/7.4/S7.4_A4_T3.js
index 3e39f693a..480c9c30d 100644
--- a/test/suite/ch07/7.4/S7.4_A4_T3.js
+++ b/test/suite/ch07/7.4/S7.4_A4_T3.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single and Multi line comments are used together
- *
- * @path ch07/7.4/S7.4_A4_T3.js
- * @description Insert Single line comment into Multi line comment
- */
+/*---
+info: Single and Multi line comments are used together
+description: Insert Single line comment into Multi line comment
+---*/
 
 /*CHECK#1*/
 
 /* var
 //x
 */
-
diff --git a/test/suite/ch07/7.4/S7.4_A4_T4.js b/test/suite/ch07/7.4/S7.4_A4_T4.js
index 1b5657663..efb62499f 100644
--- a/test/suite/ch07/7.4/S7.4_A4_T4.js
+++ b/test/suite/ch07/7.4/S7.4_A4_T4.js
@@ -1,16 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single and Multi line comments are used together
- *
- * @path ch07/7.4/S7.4_A4_T4.js
- * @description Try to open Multi line comment at the end of Single comment
- * @negative
- */
+/*---
+info: Single and Multi line comments are used together
+description: Try to open Multi line comment at the end of Single comment
+flags: [negative]
+---*/
 
 /*CHECK#1*/
 
 // var /* 
 x*/
-
diff --git a/test/suite/ch07/7.4/S7.4_A4_T5.js b/test/suite/ch07/7.4/S7.4_A4_T5.js
index 9a01060ee..796c1e29e 100644
--- a/test/suite/ch07/7.4/S7.4_A4_T5.js
+++ b/test/suite/ch07/7.4/S7.4_A4_T5.js
@@ -1,14 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single and Multi line comments are used together
- *
- * @path ch07/7.4/S7.4_A4_T5.js
- * @description Insert Multi line comment into Single line comment
- */
+/*---
+info: Single and Multi line comments are used together
+description: Insert Multi line comment into Single line comment
+---*/
 
 /*CHECK#1*/
 
 // var /* x */
-
diff --git a/test/suite/ch07/7.4/S7.4_A4_T6.js b/test/suite/ch07/7.4/S7.4_A4_T6.js
index 08c983d7b..cee9abe9f 100644
--- a/test/suite/ch07/7.4/S7.4_A4_T6.js
+++ b/test/suite/ch07/7.4/S7.4_A4_T6.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Single and Multi line comments are used together
- *
- * @path ch07/7.4/S7.4_A4_T6.js
- * @description Insert Multi line comment with two closed tags into Single line comment
- */
+/*---
+info: Single and Multi line comments are used together
+description: >
+    Insert Multi line comment with two closed tags into Single line
+    comment
+---*/
 
 /*CHECK#1*/
 
 // var /* x / = */ 1 */
-
diff --git a/test/suite/ch07/7.4/S7.4_A4_T7.js b/test/suite/ch07/7.4/S7.4_A4_T7.js
index a58aa7d5d..037b690b7 100644
--- a/test/suite/ch07/7.4/S7.4_A4_T7.js
+++ b/test/suite/ch07/7.4/S7.4_A4_T7.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.
 
-/**
- * Single and Multi line comments are used together
- *
- * @path ch07/7.4/S7.4_A4_T7.js
- * @description Insert Multi line comment into Single line comments
- */
+/*---
+info: Single and Multi line comments are used together
+description: Insert Multi line comment into Single line comments
+---*/
 
 /*CHECK#1*/
 
@@ -14,4 +12,3 @@
 // x 
 // =
 // 1*/
-
diff --git a/test/suite/ch07/7.4/S7.4_A5.js b/test/suite/ch07/7.4/S7.4_A5.js
index bbdba29de..01fc38db0 100644
--- a/test/suite/ch07/7.4/S7.4_A5.js
+++ b/test/suite/ch07/7.4/S7.4_A5.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.
 
-/**
- * Single line comments can contain any Unicode character without Line Terminators
- *
- * @path ch07/7.4/S7.4_A5.js
- * @description //var " + xx + "yy = -1", insert instead of xx all Unicode characters
- */
+/*---
+info: >
+    Single line comments can contain any Unicode character without Line
+    Terminators
+description: >
+    //var " + xx + "yy = -1", insert instead of xx all Unicode
+    characters
+---*/
 
 //CHECK
 var errorCount = 0;
@@ -46,4 +48,3 @@ for (var i1 = 0; i1 < 16; i1++) {
 if (errorCount > 0) {
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count);
 }
-
diff --git a/test/suite/ch07/7.4/S7.4_A6.js b/test/suite/ch07/7.4/S7.4_A6.js
index c51790aeb..39d2766fa 100644
--- a/test/suite/ch07/7.4/S7.4_A6.js
+++ b/test/suite/ch07/7.4/S7.4_A6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If multi line comments csn not nest, they can contain any Unicode character
- *
- * @path ch07/7.4/S7.4_A6.js
- * @description "var"+ yy+ "xx = 1", insert instead of yy all Unicode characters
- */
+/*---
+info: >
+    If multi line comments csn not nest, they can contain any Unicode
+    character
+description: "\"var\"+ yy+ \"xx = 1\", insert instead of yy all Unicode characters"
+---*/
 
 //CHECK
 var errorCount = 0;
@@ -54,4 +54,3 @@ function decimalToHexString(n) {
   }
   return h;
 }
-