14 files changed, 71 insertions, 99 deletions
diff --git a/test/suite/ch12/12.13/S12.13_A1.js b/test/suite/ch12/12.13/S12.13_A1.js
index bc2463577..2a20bb833 100644
--- a/test/suite/ch12/12.13/S12.13_A1.js
+++ b/test/suite/ch12/12.13/S12.13_A1.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.
 
-/**
- * Sanity test for throw statement
- *
- * @path ch12/12.13/S12.13_A1.js
- * @description Trying to throw exception with "throw"
- * @negative
- */
+/*---
+info: Sanity test for throw statement
+description: Trying to throw exception with "throw"
+flags: [negative]
+---*/
 
 throw "error";
-
diff --git a/test/suite/ch12/12.13/S12.13_A2_T1.js b/test/suite/ch12/12.13/S12.13_A2_T1.js
index bca31ea80..9b11bf3b9 100644
--- a/test/suite/ch12/12.13/S12.13_A2_T1.js
+++ b/test/suite/ch12/12.13/S12.13_A2_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.
 
-/**
- * "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1 evaluates Expression
- *
- * @path ch12/12.13/S12.13_A2_T1.js
- * @description Throwing undefined
- */
+/*---
+info: >
+    "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1
+    evaluates Expression
+description: Throwing undefined
+---*/
 
 // CHECK#1
 try{
@@ -15,4 +15,3 @@ try{
 catch(e){
   if (e!==undefined) $ERROR('#1: Exception === undefined. Actual:  Exception ==='+ e  );
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A2_T2.js b/test/suite/ch12/12.13/S12.13_A2_T2.js
index e068f39f6..be92edfa3 100644
--- a/test/suite/ch12/12.13/S12.13_A2_T2.js
+++ b/test/suite/ch12/12.13/S12.13_A2_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.
 
-/**
- * "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1 evaluates Expression
- *
- * @path ch12/12.13/S12.13_A2_T2.js
- * @description Throwing null
- */
+/*---
+info: >
+    "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1
+    evaluates Expression
+description: Throwing null
+---*/
 
 // CHECK#1
 try{
@@ -15,4 +15,3 @@ try{
 catch(e){
   if (e!==null) $ERROR('#1: Exception === null. Actual:  Exception ==='+ e  );
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A2_T3.js b/test/suite/ch12/12.13/S12.13_A2_T3.js
index 37592ac19..fe5b3d2af 100644
--- a/test/suite/ch12/12.13/S12.13_A2_T3.js
+++ b/test/suite/ch12/12.13/S12.13_A2_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.
 
-/**
- * "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1 evaluates Expression
- *
- * @path ch12/12.13/S12.13_A2_T3.js
- * @description Throwing boolean
- */
+/*---
+info: >
+    "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1
+    evaluates Expression
+description: Throwing boolean
+---*/
 
 // CHECK#1
 try{
@@ -41,4 +41,3 @@ try{
 catch(e){
   if (e!==true) $ERROR('#4: Exception ===true. Actual:  Exception ==='+ e  );
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A2_T4.js b/test/suite/ch12/12.13/S12.13_A2_T4.js
index bddf2dac3..7ddce10b4 100644
--- a/test/suite/ch12/12.13/S12.13_A2_T4.js
+++ b/test/suite/ch12/12.13/S12.13_A2_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.
 
-/**
- * "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1 evaluates Expression
- *
- * @path ch12/12.13/S12.13_A2_T4.js
- * @description Throwing string
- */
+/*---
+info: >
+    "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1
+    evaluates Expression
+description: Throwing string
+---*/
 
 // CHECK#1
 try{
@@ -24,4 +24,3 @@ try{
 catch(e){
   if (e!=="exception #1") $ERROR('#2: Exception ==="exception #1". Actual:  Exception ==='+ e );
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A2_T5.js b/test/suite/ch12/12.13/S12.13_A2_T5.js
index 8d8084849..a1de7260f 100644
--- a/test/suite/ch12/12.13/S12.13_A2_T5.js
+++ b/test/suite/ch12/12.13/S12.13_A2_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.
 
-/**
- * "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1 evaluates Expression
- *
- * @path ch12/12.13/S12.13_A2_T5.js
- * @description Throwing number
- */
+/*---
+info: >
+    "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1
+    evaluates Expression
+description: Throwing number
+---*/
 
 // CHECK#1
 try{
@@ -72,4 +72,3 @@ try{
 catch(e){
   if (e!==-0) $ERROR('#8: Exception ===-0. Actual:  Exception ==='+ e );
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A2_T6.js b/test/suite/ch12/12.13/S12.13_A2_T6.js
index 39e799852..3f80207bb 100644
--- a/test/suite/ch12/12.13/S12.13_A2_T6.js
+++ b/test/suite/ch12/12.13/S12.13_A2_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.
 
-/**
- * "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1 evaluates Expression
- *
- * @path ch12/12.13/S12.13_A2_T6.js
- * @description Throwing object
- */
+/*---
+info: >
+    "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1
+    evaluates Expression
+description: Throwing object
+---*/
 
 var myObj = {p1: 'a', 
              p2: 'b', 
@@ -42,4 +42,3 @@ try{
 }
 catch(e){}
 if (myObj.i!==6) $ERROR('#4: Handling of catch must be correct');
-
diff --git a/test/suite/ch12/12.13/S12.13_A2_T7.js b/test/suite/ch12/12.13/S12.13_A2_T7.js
index bf633f868..2cf87716a 100644
--- a/test/suite/ch12/12.13/S12.13_A2_T7.js
+++ b/test/suite/ch12/12.13/S12.13_A2_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.
 
-/**
- * "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1 evaluates Expression
- *
- * @path ch12/12.13/S12.13_A2_T7.js
- * @description Throwing Array
- */
+/*---
+info: >
+    "throw Expression" returns (throw, GetValue(Result(1)), empty), where 1
+    evaluates Expression
+description: Throwing Array
+---*/
 
 var mycars = new Array();
 mycars[0] = "Saab";
@@ -27,4 +27,3 @@ catch(e){
     if (e[i]!==mycars[i]) $ERROR('#1.'+i+': Exception['+i+'] === mycars['+i+']. Actual:  Exception['+i+'] ==='+ e[i]  );
   }
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A3_T1.js b/test/suite/ch12/12.13/S12.13_A3_T1.js
index 7843a6459..8c0d8823d 100644
--- a/test/suite/ch12/12.13/S12.13_A3_T1.js
+++ b/test/suite/ch12/12.13/S12.13_A3_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.
 
-/**
- * 1. Evaluate Expression
- *
- * @path ch12/12.13/S12.13_A3_T1.js
- * @description Evaluating boolean expression
- */
+/*---
+info: 1. Evaluate Expression
+description: Evaluating boolean expression
+---*/
 
 // CHECK#1
 var b=true;
@@ -42,4 +40,3 @@ try{
 catch(e){
   if (e!==true) $ERROR('#4: Exception === true(operaton &&). Actual:  Exception ==='+ e );
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A3_T2.js b/test/suite/ch12/12.13/S12.13_A3_T2.js
index f8cb92203..86573b5f0 100644
--- a/test/suite/ch12/12.13/S12.13_A3_T2.js
+++ b/test/suite/ch12/12.13/S12.13_A3_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.
 
-/**
- * 1. Evaluate Expression
- *
- * @path ch12/12.13/S12.13_A3_T2.js
- * @description Evaluating string expression
- */
+/*---
+info: 1. Evaluate Expression
+description: Evaluating string expression
+---*/
 
 // CHECK#1
 try{
@@ -25,4 +23,3 @@ try{
 catch(e){
   if (e!=="exception #1") $ERROR('#2: Exception === "exception #1"(operaton +). Actual:  Exception ==='+ e );
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A3_T3.js b/test/suite/ch12/12.13/S12.13_A3_T3.js
index 44c9d075c..7699df82f 100644
--- a/test/suite/ch12/12.13/S12.13_A3_T3.js
+++ b/test/suite/ch12/12.13/S12.13_A3_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.
 
-/**
- * 1. Evaluate Expression
- *
- * @path ch12/12.13/S12.13_A3_T3.js
- * @description Evaluating number expression
- */
+/*---
+info: 1. Evaluate Expression
+description: Evaluating number expression
+---*/
 
 // CHECK#1
 try{
@@ -89,4 +87,3 @@ try{
 catch(e){
   if (e!==23) $ERROR('#10: Exception ===23(operaton %). Actual:  Exception ==='+ e);
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A3_T4.js b/test/suite/ch12/12.13/S12.13_A3_T4.js
index 9a6e010f0..69c0962f2 100644
--- a/test/suite/ch12/12.13/S12.13_A3_T4.js
+++ b/test/suite/ch12/12.13/S12.13_A3_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.
 
-/**
- * 1. Evaluate Expression
- *
- * @path ch12/12.13/S12.13_A3_T4.js
- * @description Evaluating array expression
- */
+/*---
+info: 1. Evaluate Expression
+description: Evaluating array expression
+---*/
 
 var mycars = new Array();
 mycars[0] = "Saab";
@@ -53,4 +51,3 @@ catch(e){
     if (e[i]!==mycars2[i-3]) $ERROR('#3.'+i+': Exception['+i+']===mycars2['+(i-3)+'](operation .concat(new)). Actual:  Exception['+i+']==='+ e[i] );
   }
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A3_T5.js b/test/suite/ch12/12.13/S12.13_A3_T5.js
index 69fb016d5..cbdfa83b0 100644
--- a/test/suite/ch12/12.13/S12.13_A3_T5.js
+++ b/test/suite/ch12/12.13/S12.13_A3_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.
 
-/**
- * 1. Evaluate Expression
- *
- * @path ch12/12.13/S12.13_A3_T5.js
- * @description Evaluating equation expression
- */
+/*---
+info: 1. Evaluate Expression
+description: Evaluating equation expression
+---*/
 
 // CHECK#1
 var a=true;
@@ -17,4 +15,3 @@ try{
 catch(e){
   if (e!=="exception") $ERROR('#1: Exception ==="exception"(operaton ? , ). Actual:  Exception ==='+e  );
 }
-
diff --git a/test/suite/ch12/12.13/S12.13_A3_T6.js b/test/suite/ch12/12.13/S12.13_A3_T6.js
index 7191c6bd6..a5ae8725d 100644
--- a/test/suite/ch12/12.13/S12.13_A3_T6.js
+++ b/test/suite/ch12/12.13/S12.13_A3_T6.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.
 
-/**
- * 1. Evaluate Expression
- *
- * @path ch12/12.13/S12.13_A3_T6.js
- * @description Evaluating functions
- */
+/*---
+info: 1. Evaluate Expression
+description: Evaluating functions
+---*/
 
 // CHECK#1
 var i=0;
@@ -55,4 +53,3 @@ try{
 catch(e){
   if (e!==2) $ERROR('#4: Exception ===2. Actual:  Exception ==='+ e);
 }
-