11 files changed, 70 insertions, 84 deletions
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A1.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A1.js
index 371d16848..3f69b007c 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A1.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A1.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.
 
-/**
- * Native ECMAScript objects have an internal property called [[Prototype]]. The value of this property is
- * either null or an object and is used for implementing inheritance
- *
- * @path ch08/8.6/8.6.2/S8.6.2_A1.js
- * @description Check [[Prototype]] property of object
- */
+/*---
+info: >
+    Native ECMAScript objects have an internal property called [[Prototype]]. The value of this property is
+    either null or an object and is used for implementing inheritance
+description: Check [[Prototype]] property of object
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -70,4 +69,3 @@ if (!protoObj.isPrototypeOf(__foo)){
 };
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A2.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A2.js
index 5d4ccbd3e..073388613 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A2.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A2.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.
 
-/**
- * Properties of the [[Prototype]] object
- * are visible as properties of the child object for the purposes of get access, but not for put access
- *
- * @path ch08/8.6/8.6.2/S8.6.2_A2.js
- * @description Check visibility properties of the child object for the purposes of get access, but not for put access
- */
+/*---
+info: >
+    Properties of the [[Prototype]] object
+    are visible as properties of the child object for the purposes of get access, but not for put access
+description: >
+    Check visibility properties of the child object for the purposes
+    of get access, but not for put access
+---*/
 
 //Establish foo object
 function FooObj(){};
@@ -34,4 +35,3 @@ if (foo__.prop !== "some"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A3.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A3.js
index 506471148..e41a47ea4 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A3.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A3.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.
 
-/**
- * The specification does not provide any means for a program to access [[class]] value except through Object.prototype.toString
- *
- * @path ch08/8.6/8.6.2/S8.6.2_A3.js
- * @description Get [[class]] value except through Object.prototype.toString
- */
+/*---
+info: >
+    The specification does not provide any means for a program to access
+    [[class]] value except through Object.prototype.toString
+description: Get [[class]] value except through Object.prototype.toString
+---*/
 
 var __obj={};
 //////////////////////////////////////////////////////////////////////////////
@@ -16,4 +16,3 @@ if (__obj.toString() !== "[object " + 'Object' + "]"){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A4.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A4.js
index f147e6aaa..731e7fd92 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A4.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A4.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.
 
-/**
- * [[HasInstance]] returns a boolean value indicating whether Value delegates behaviour to this object
- *
- * @path ch08/8.6/8.6.2/S8.6.2_A4.js
- * @description Check that the obj instance of Object, but not instance
- *  of Function, String, Number, Array
- */
+/*---
+info: >
+    [[HasInstance]] returns a boolean value indicating whether Value
+    delegates behaviour to this object
+description: >
+    Check that the obj instance of Object, but not instance  of
+    Function, String, Number, Array
+---*/
 
 var __obj={};
 
@@ -50,4 +51,3 @@ if (__obj instanceof Array) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T1.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T1.js
index 47fa0ef6f..a5a32e273 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T1.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_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.
 
-/**
- * [[Call]] executes code associated with the object
- *
- * @path ch08/8.6/8.6.2/S8.6.2_A5_T1.js
- * @description Call function-property of object, property defined
- *  as testScreen = {touch:function(){count++}}
- */
+/*---
+info: "[[Call]] executes code associated with the object"
+description: >
+    Call function-property of object, property defined  as testScreen
+    = {touch:function(){count++}}
+---*/
 
 this.count=0;
 
@@ -29,4 +28,3 @@ if (count !==2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T2.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T2.js
index 391122473..56b608e26 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T2.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_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.
 
-/**
- * [[Call]] executes code associated with the object
- *
- * @path ch08/8.6/8.6.2/S8.6.2_A5_T2.js
- * @description Call function-property of object, property defined
- *  as seat['move']=function(){position++}
- */
+/*---
+info: "[[Call]] executes code associated with the object"
+description: >
+    Call function-property of object, property defined  as
+    seat['move']=function(){position++}
+---*/
 
 this.position=0;
 var seat = {};
@@ -29,4 +28,3 @@ if (position !==2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T3.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T3.js
index bbd603e4c..1aa0c610b 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T3.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_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.
 
-/**
- * [[Call]] executes code associated with the object
- *
- * @path ch08/8.6/8.6.2/S8.6.2_A5_T3.js
- * @description Call function-property of global object, property defined
- *  as knock=function(){count++}
- */
+/*---
+info: "[[Call]] executes code associated with the object"
+description: >
+    Call function-property of global object, property defined  as
+    knock=function(){count++}
+---*/
 
 var count=0;
 var knock=function(){count++};
@@ -28,4 +27,3 @@ if (count !==2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T4.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T4.js
index 7f38b27a0..23d402995 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T4.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A5_T4.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.
 
-/**
- * [[Call]] executes code associated with the object
- *
- * @path ch08/8.6/8.6.2/S8.6.2_A5_T4.js
- * @description Call function-property of global object, property defined
- *  as this['beep']=function(){__count++}
- */
+/*---
+info: "[[Call]] executes code associated with the object"
+description: >
+    Call function-property of global object, property defined  as
+    this['beep']=function(){__count++}
+---*/
 
 var __count=0;
 
@@ -29,4 +28,3 @@ if (__count !==2) {
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A6.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A6.js
index d62d34b47..69c2fa9e2 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A6.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_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.
 
-/**
- * [[Construct]] constructs an object. Invoked via the new operator. Objects that implement this internal method are called constructors
- *
- * @path ch08/8.6/8.6.2/S8.6.2_A6.js
- * @description Create a few Objects via the new operator
- */
+/*---
+info: >
+    [[Construct]] constructs an object. Invoked via the new operator. Objects
+    that implement this internal method are called constructors
+description: Create a few Objects via the new operator
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
@@ -25,4 +25,3 @@ if (numInstance.constructor !== Number){
 }
 //
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A7.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A7.js
index 6e996d779..587665131 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A7.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A7.js
@@ -1,17 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Objects that implement internal method [[Construct]] are called constructors. Math object is NOT constructor
- *
- * @path ch08/8.6/8.6.2/S8.6.2_A7.js
- * @description Checking if execution of "var objMath=new Math" passes
- * @negative
- */
+/*---
+info: >
+    Objects that implement internal method [[Construct]] are called
+    constructors. Math object is NOT constructor
+description: Checking if execution of "var objMath=new Math" passes
+flags: [negative]
+---*/
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 var objMath=new Math;
 
 //////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/ch08/8.6/8.6.2/S8.6.2_A8.js b/test/suite/ch08/8.6/8.6.2/S8.6.2_A8.js
index d57a56132..28f8ae033 100644
--- a/test/suite/ch08/8.6/8.6.2/S8.6.2_A8.js
+++ b/test/suite/ch08/8.6/8.6.2/S8.6.2_A8.js
@@ -1,11 +1,11 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch08/8.6/8.6.2/S8.6.2_A8.js
- * @description It should not be possible to change the [[Prototype]]
- * of a non-extensible object
- */
+/*---
+description: >
+    It should not be possible to change the [[Prototype]]  of a
+    non-extensible object
+---*/
 
 var x = Object.preventExtensions({});
 var y = {};
@@ -19,4 +19,3 @@ try {
 if (Object.getPrototypeOf(x) !== Object.prototype) {
   $ERROR("Prototype of non-extensible object mutated");
 }
-