418 files changed, 6613 insertions, 6479 deletions

diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-4gs.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-4gs.js
index 442da6b2a..8320664b9 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-4gs.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-4gs.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-4gs.js

- * @description Strict Mode - SyntaxError is thrown if a function using the Function constructor has two identical parameters in (global) strict mode

- * @onlyStrict

- * @negative NotEarlyError

- */

-

-"use strict";

-throw NotEarlyError;

-var _15_3_2_1_10_4_fun = new Function('param_1', 'param_2', 'param_1', '"use strict"; return 0;');

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if a function using the
+    Function constructor has two identical parameters in (global)
+    strict mode
+negative: NotEarlyError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+throw NotEarlyError;
+var _15_3_2_1_10_4_fun = new Function('param_1', 'param_2', 'param_1', '"use strict"; return 0;');
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-6gs.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-6gs.js
index 950bd16a6..7fe85eaec 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-6gs.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-6gs.js
@@ -1,15 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-6gs.js

- * @description Strict Mode - SyntaxError is thrown if a function using the Function constructor has two identical parameters in (local) strict mode

- * @onlyStrict

- * @negative NotEarlyError

- */

-

-throw NotEarlyError;

-var _15_3_2_1_10_6_fun = new Function('param_1', 'param_2', 'param_1', '"use strict";return 0;');

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if a function using the
+    Function constructor has two identical parameters in (local)
+    strict mode
+negative: NotEarlyError
+flags: [onlyStrict]
+---*/
+
+throw NotEarlyError;
+var _15_3_2_1_10_6_fun = new Function('param_1', 'param_2', 'param_1', '"use strict";return 0;');
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-1-s.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-1-s.js
index 4d6c194b0..8aa68ed84 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-1-s.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-1-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-1-s.js

- * @description Duplicate seperate parameter name in Function constructor throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-function testcase() {   

-  try {

-    Function('a','a','"use strict";');

-    return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Duplicate seperate parameter name in Function constructor throws
+    SyntaxError in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {   
+  try {
+    Function('a','a','"use strict";');
+    return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-1.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-1.js
index f5a4f0176..5b9330b96 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-1.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-1.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-1.js

- * @description Duplicate separate parameter name in Function constructor allowed if body not strict

- */

-

-

-function testcase()

-{   

-    Function('a','a','return;');

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Duplicate separate parameter name in Function constructor allowed
+    if body not strict
+includes: [runTestCase.js]
+---*/
+
+function testcase()
+{   
+    Function('a','a','return;');
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-2-s.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-2-s.js
index 84d1f1385..ed7ed525c 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-2-s.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-2-s.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-2-s.js

- * @description Duplicate seperate parameter name in Function constructor called from strict mode allowed if body not strict

- * @onlyStrict

- */

-

-

-function testcase()

-{ 

-  "use strict"; 

-  try {

-    Function('a','a','return;');

-    return true;

-  } catch (e) {

-    return false;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Duplicate seperate parameter name in Function constructor called
+    from strict mode allowed if body not strict
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase()
+{ 
+  "use strict"; 
+  try {
+    Function('a','a','return;');
+    return true;
+  } catch (e) {
+    return false;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-3-s.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-3-s.js
index c01edad67..e92aa4902 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-3-s.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-3-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-3-s.js

- * @description Function constructor having a formal parameter named 'eval' throws SyntaxError if function body is strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-  

-

-  try {

-    Function('eval', '"use strict";');

-	return false;

-  }

-  catch (e) {

-    return (e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function constructor having a formal parameter named 'eval' throws
+    SyntaxError if function body is strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  
+
+  try {
+    Function('eval', '"use strict";');
+	return false;
+  }
+  catch (e) {
+    return (e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-3.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-3.js
index defc1c46e..fdce73fbc 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-3.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-3.js
@@ -1,16 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-3.js

- * @description Function constructor may have a formal parameter named 'eval' if body is not strict mode

- */

-

-

-function testcase() {

-  Function('eval', 'return;');

-  return true;

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function constructor may have a formal parameter named 'eval' if
+    body is not strict mode
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  Function('eval', 'return;');
+  return true;
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-4-s.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-4-s.js
index 9521c6f42..4f4c7c7d6 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-4-s.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-4-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-4-s.js

- * @description Function constructor call from strict code with formal parameter named 'eval' does not throws SyntaxError if function body is not strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-   "use strict";

-   try { 

-     Function('eval', 'return;');

-	 return true;

-   } catch (e) {

-     return false;

-   }

-   

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function constructor call from strict code with formal parameter
+    named 'eval' does not throws SyntaxError if function body is not
+    strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+   "use strict";
+   try { 
+     Function('eval', 'return;');
+	 return true;
+   } catch (e) {
+     return false;
+   }
+   
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-5-s.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-5-s.js
index 27d157f65..ab333f4e9 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-5-s.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-5-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-5-s.js

- * @description Duplicate combined parameter name in Function constructor throws SyntaxError in strict mode

- * @onlyStrict

- */

-

-

-function testcase()

-{   

-  try 

-  {

-    Function('a,a','"use strict";');

-	return false;

-  }

-  catch (e) {

-    return(e instanceof SyntaxError);

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Duplicate combined parameter name in Function constructor throws
+    SyntaxError in strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase()
+{   
+  try 
+  {
+    Function('a,a','"use strict";');
+	return false;
+  }
+  catch (e) {
+    return(e instanceof SyntaxError);
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-5.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-5.js
index e59b188d0..bf9fc4bc2 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-5.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-5.js
@@ -1,17 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-5.js

- * @description Duplicate combined parameter name in Function constructor allowed if body is not strict

- */

-

-

-function testcase()

-{   

-    Function('a,a','return;');

-    return true;

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Duplicate combined parameter name in Function constructor allowed
+    if body is not strict
+includes: [runTestCase.js]
+---*/
+
+function testcase()
+{   
+    Function('a,a','return;');
+    return true;
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-6-s.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-6-s.js
index 50ced1960..98a8357aa 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-6-s.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-6-s.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-6-s.js

- * @description Duplicate combined parameter name allowed in Function constructor called in strict mode if body not strict

- * @onlyStrict

- */

-

-

-function testcase()

-{ 

-  "use strict"; 

-  try {

-     Function('a,a','return a;');

-	 return true;

-  } catch (e) {

-     return false;

-  }

-  

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Duplicate combined parameter name allowed in Function constructor
+    called in strict mode if body not strict
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase()
+{ 
+  "use strict"; 
+  try {
+     Function('a,a','return a;');
+	 return true;
+  } catch (e) {
+     return false;
+  }
+  
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-7-s.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-7-s.js
index 7b01bccd2..b8ccd4499 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-7-s.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-7-s.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-7-s.js

- * @description Function constructor call from strict code with formal parameter named arguments does not throws SyntaxError if function body is not strict mode

- * @onlyStrict

- */

-

-

-function testcase() {

-   "use strict";

-   try {

-     Function('arguments', 'return;');

-     return true;

-	 

-   } catch (e) {

-     return false;

-   }

-  }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function constructor call from strict code with formal parameter
+    named arguments does not throws SyntaxError if function body is
+    not strict mode
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+   "use strict";
+   try {
+     Function('arguments', 'return;');
+     return true;
+	 
+   } catch (e) {
+     return false;
+   }
+  }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-8-s.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-8-s.js
index 5eac4dacb..b06d4cf69 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-8-s.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-8-s.js
@@ -1,20 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-8-s.js

- * @description Strict Mode - SyntaxError is not thrown if a function is created using a Function constructor that has two identical parameters, which are separated by a unique parameter name and there is no explicit 'use strict' in the function constructor's body

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        var foo = new Function("baz", "qux", "baz", "return 0;");

-        return true;

-

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is not thrown if a function is created
+    using a Function constructor that has two identical parameters,
+    which are separated by a unique parameter name and there is no
+    explicit 'use strict' in the function constructor's body
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        var foo = new Function("baz", "qux", "baz", "return 0;");
+        return true;
+
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-9-s.js b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-9-s.js
index bbdbb4435..b84d6e12e 100644
--- a/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-9-s.js
+++ b/test/suite/ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-9-s.js
@@ -1,19 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.2/15.3.2.1/15.3.2.1-11-9-s.js

- * @description Strict Mode - SyntaxError is thrown if a function is created using the Function constructor that has three identical parameters and there is no explicit 'use strict' in the function constructor's body

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        var foo = new Function("baz", "baz", "baz", "return 0;");

-        return true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - SyntaxError is thrown if a function is created using
+    the Function constructor that has three identical parameters and
+    there is no explicit 'use strict' in the function constructor's
+    body
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        var foo = new Function("baz", "baz", "baz", "return 0;");
+        return true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T1.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T1.js
index b555fa475..91b5319b4 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T1.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T1.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T1.js
- * @description The body of the function is "{toString:function(){throw 7;}}"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: "The body of the function is \"{toString:function(){throw 7;}}\""
+includes: [$FAIL.js]
+---*/
 
 var body = {toString:function(){throw 7;}}
 
@@ -25,4 +25,3 @@ try {
   	$ERROR('#1.1: When the Function constructor is called with one argument then body be that argument the following step are taken: call ToString(body)');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T10.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T10.js
index bebedfa7b..cd42f72d1 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T10.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T10.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T10.js
- * @description Value of the function constructor argument is "null"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: Value of the function constructor argument is "null"
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -30,4 +30,3 @@ if (f.constructor !== Function) {
 if (f() !== undefined) {
   $ERROR('#3: When the Function constructor is called with one argument then body be that argument the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T11.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T11.js
index 15c27010d..984a31263 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T11.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T11.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T11.js
- * @description Value of the function constructor argument is "undefined"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: Value of the function constructor argument is "undefined"
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -30,4 +30,3 @@ if (f.constructor !== Function) {
 if (f() !== undefined) {
   $ERROR('#3: When the Function constructor is called with one argument then body be that argument the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T12.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T12.js
index fd076fdd5..ee1610d46 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T12.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T12.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T12.js
- * @description Value of the function constructor argument is "void 0"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: Value of the function constructor argument is "void 0"
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -30,4 +30,3 @@ if (f.constructor !== Function) {
 if (f()!==undefined) {
   $ERROR('#3: When the Function constructor is called with one argument then body be that argument the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T13.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T13.js
index 4c29ed834..d86433103 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T13.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T13.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T13.js
- * @description Value of the function constructor argument is "{}"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: Value of the function constructor argument is "{}"
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -23,4 +23,3 @@ try {
   	$ERROR('#1.1: If body is not parsable as FunctionBody then throw a SyntaxError exception');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T2.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T2.js
index fe9bc5575..6ff6d8623 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T2.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T2.js
@@ -1,18 +1,20 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T2.js
- * @description The body of the function is "{toString:function(){return "return 1;";}}"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: >
+    The body of the function is "{toString:function(){return "return
+    1;";}}"
+includes: [$FAIL.js]
+---*/
 
 var body={toString:function(){return "return 1;";}};
 
@@ -32,4 +34,3 @@ if (f.constructor !== Function) {
 if (f()!==1) {
   $ERROR('#3: hen the Function constructor is called with one argument then body be that argument the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T3.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T3.js
index 16bbcb38b..9233c0b7a 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T3.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T3.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T3.js
- * @description Value of the function constructor argument is 1
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: Value of the function constructor argument is 1
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -30,4 +30,3 @@ if (f.constructor !== Function) {
 if (f()!==undefined) {
   $ERROR('#3: When the Function constructor is called with one argument then body be that argument the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T4.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T4.js
index 5747cf649..d366b9cce 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T4.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T4.js
@@ -1,18 +1,20 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T4.js
- * @description Value of the function constructor argument is x, where x is specified with "undefined"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: >
+    Value of the function constructor argument is x, where x is
+    specified with "undefined"
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -32,4 +34,3 @@ if (f()!==undefined) {
 }
 
 var x;
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T5.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T5.js
index 8465f24e2..30232040a 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T5.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T5.js
@@ -1,18 +1,20 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T5.js
- * @description Value of the function constructor argument is "Object("return \'A\'")"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: >
+    Value of the function constructor argument is "Object("return
+    \'A\'")"
+includes: [$FAIL.js]
+---*/
 
 var body = Object("return \'A\'");
 
@@ -32,4 +34,3 @@ if (f.constructor !== Function) {
 if (f()!=="\u0041") {
   $ERROR('#3: When the Function constructor is called with one argument then body be that argument the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T6.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T6.js
index 08893ef08..e6c882053 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T6.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T6.js
@@ -1,18 +1,20 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T6.js
- * @description Value of the function constructor argument is the string "return true;"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: >
+    Value of the function constructor argument is the string "return
+    true;"
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -30,4 +32,3 @@ if (f.constructor !== Function) {
 if (!(f())) {
   $ERROR('#3: When the Function constructor is called with one argument then body be that argument the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T7.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T7.js
index 072bb2dad..b79a6bf17 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T7.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T7.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T7.js
- * @description Value of the function constructor argument is "Object(1)"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: Value of the function constructor argument is "Object(1)"
+includes: [$FAIL.js]
+---*/
 
 var body = new Object(1);
 
@@ -32,4 +32,3 @@ if (f.constructor !== Function) {
 if (f()!==undefined) {
   $ERROR('#3: When the Function constructor is called with one argument then body be that argument the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T8.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T8.js
index 66c143da2..ec62aae15 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T8.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T8.js
@@ -1,18 +1,18 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T8.js
- * @description Value of the function constructor argument is "var 1=1;"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: Value of the function constructor argument is "var 1=1;"
+includes: [$FAIL.js]
+---*/
 
 var body = "var 1=1;";
 
@@ -25,4 +25,3 @@ try {
   	$ERROR('#1.1: If body is not parsable as FunctionBody then throw a SyntaxError exception');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T9.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T9.js
index c0db5a247..6ffb278cf 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T9.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A1_T9.js
@@ -1,18 +1,19 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with one argument then body be that argument and the following steps are taken:
- * i) Call ToString(body)
- * ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
- * iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * v) Return Result(iv)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A1_T9.js
- * @description Value of the function constructor argument is "return arguments[0];"
- */
+/*---
+info: >
+    When the Function constructor is called with one argument then body be that argument and the following steps are taken:
+    i) Call ToString(body)
+    ii) If P is not parsable as a FormalParameterListopt then throw a SyntaxError exception
+    iii) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    iv) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody.
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    v) Return Result(iv)
+description: >
+    Value of the function constructor argument is "return
+    arguments[0];"
+---*/
 
 var f = new Function("return arguments[0];");
 
@@ -25,4 +26,3 @@ if (!(f instanceof Function)) {
 if (f("A") !== "A") {
   $ERROR('#2: When the Function constructor is called with one argument then body be that argument and the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T1.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T1.js
index d55278080..8a1c832b9 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T1.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T1.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * It is permissible but not necessary to have one argument for each formal parameter to be specified
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A2_T1.js
- * @description Values of the function constructor arguments are "arg1", "arg2", "arg3", "return arg1+arg2+arg3;"
- */
+/*---
+info: >
+    It is permissible but not necessary to have one argument for each formal
+    parameter to be specified
+description: >
+    Values of the function constructor arguments are "arg1", "arg2",
+    "arg3", "return arg1+arg2+arg3;"
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -24,4 +27,3 @@ if (!(f instanceof Function)){
 if (f(1,2,3) !== 6) {
   $ERROR('#3: It is permissible but not necessary to have one argument for each formal parameter to be specified');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T2.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T2.js
index b9deb65a0..6223d69e8 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T2.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T2.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * It is permissible but not necessary to have one argument for each formal parameter to be specified
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A2_T2.js
- * @description Values of the function constructor arguments are "arg1, arg2", "arg3", "return arg1+arg2+arg3;"
- */
+/*---
+info: >
+    It is permissible but not necessary to have one argument for each formal
+    parameter to be specified
+description: >
+    Values of the function constructor arguments are "arg1, arg2",
+    "arg3", "return arg1+arg2+arg3;"
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -24,4 +27,3 @@ if (!(f instanceof Function)){
 if (f("AB","BA",1) !== "ABBA1") {
   $ERROR('#3: It is permissible but not necessary to have one argument for each formal parameter to be specified');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T3.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T3.js
index d46d16ac6..a71a19710 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T3.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T3.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * It is permissible but not necessary to have one argument for each formal parameter to be specified
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A2_T3.js
- * @description Values of the function constructor arguments are "arg1, arg2, arg3", "return arg1+arg2+arg3;"
- */
+/*---
+info: >
+    It is permissible but not necessary to have one argument for each formal
+    parameter to be specified
+description: >
+    Values of the function constructor arguments are "arg1, arg2,
+    arg3", "return arg1+arg2+arg3;"
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -24,4 +27,3 @@ if (!(f instanceof Function)){
 if (f(1,1,"ABBA") !== "2ABBA") {
   $ERROR('#3: It is permissible but not necessary to have one argument for each formal parameter to be specified');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T4.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T4.js
index 99dab211d..245d0e6ea 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T4.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T4.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * It is permissible but not necessary to have one argument for each formal parameter to be specified
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A2_T4.js
- * @description Values of the function constructor arguments are "return"-s of various results
- */
+/*---
+info: >
+    It is permissible but not necessary to have one argument for each formal
+    parameter to be specified
+description: >
+    Values of the function constructor arguments are "return"-s of
+    various results
+includes: [$FAIL.js]
+---*/
 
 var i=0;
 
@@ -28,4 +31,3 @@ if (!(f instanceof Function)){
 if (f(4,"2","QUESTION") !== "42QUESTION") {
   $ERROR('#3: It is permissible but not necessary to have one argument for each formal parameter to be specified');
 }
-  
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T5.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T5.js
index 2953c784e..da46e57e3 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T5.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T5.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * It is permissible but not necessary to have one argument for each formal parameter to be specified
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A2_T5.js
- * @description Values of the function constructor arguments are "return"-s of various results and a concotenation of strings
- */
+/*---
+info: >
+    It is permissible but not necessary to have one argument for each formal
+    parameter to be specified
+description: >
+    Values of the function constructor arguments are "return"-s of
+    various results and a concotenation of strings
+includes: [$FAIL.js]
+---*/
 
 var i=0;
 
@@ -28,4 +31,3 @@ if (!(f instanceof Function)){
 if (f("",1,2) !== "12") {
   $ERROR('#3: It is permissible but not necessary to have one argument for each formal parameter to be specified');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T6.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T6.js
index c9cdbbe25..bfc24e559 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T6.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A2_T6.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * It is permissible but not necessary to have one argument for each formal parameter to be specified
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A2_T6.js
- * @description Values of the function constructor arguments are "return"-s of various results and a concotenation of strings
- */
+/*---
+info: >
+    It is permissible but not necessary to have one argument for each formal
+    parameter to be specified
+description: >
+    Values of the function constructor arguments are "return"-s of
+    various results and a concotenation of strings
+includes: [$FAIL.js]
+---*/
 
 var i=0;
 
@@ -28,4 +31,3 @@ if (!(f instanceof Function)){
 if (f("",1,p) !== "1arg4") {
   $ERROR('#3: It is permissible but not necessary to have one argument for each formal parameter to be specified');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T1.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T1.js
index d88a7125b..0e93d2677 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T1.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T1.js
@@ -1,20 +1,23 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T1.js
- * @description Values of the function constructor arguments are "{toString:function(){throw 1;}}" and "{toString:function(){throw 'body';}}"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are
+    "{toString:function(){throw 1;}}" and "{toString:function(){throw
+    'body';}}"
+includes: [$FAIL.js]
+---*/
 
 var p = {toString:function(){throw 1;}};
 var body = {toString:function(){throw "body";}};
@@ -28,6 +31,3 @@ try {
   	$ERROR('#1.1: i) Let Result(i) be the first argument; ii) Let P be ToString(Result(i))');
   }
 }
-
-
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T10.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T10.js
index c51f90ac0..50254fb07 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T10.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T10.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T10.js
- * @description Values of the function constructor arguments are "{toString:function(){return "z;x"}}" and "return this;"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are
+    "{toString:function(){return "z;x"}}" and "return this;"
+includes: [$FAIL.js]
+---*/
 
 var body = "return this;";
 var p={toString:function(){return "z;x"}};
@@ -28,4 +30,3 @@ try {
   	$ERROR('#1.1: If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T11.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T11.js
index 9bebddcc9..3af814add 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T11.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T11.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T11.js
- * @description Values of the function constructor arguments are "a,b,c" and "void 0"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are "a,b,c" and "void
+    0"
+includes: [$FAIL.js]
+---*/
 
 var p = "a,b,c";
 
@@ -34,4 +36,3 @@ if (f.constructor !== Function) {
 if (f()!==undefined) {
   $ERROR('#3: When the Function constructor is called with arguments p, body the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T12.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T12.js
index 2ab0d4289..3933cf7a7 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T12.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T12.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T12.js
- * @description Values of the function constructor arguments are "a,b,c" and "undefined"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are "a,b,c" and
+    "undefined"
+includes: [$FAIL.js]
+---*/
 
 var p = "a,b,c";
 
@@ -34,4 +36,3 @@ if (f.constructor !== Function) {
 if (f()!==undefined) {
   $ERROR('#3: When the Function constructor is called with arguments p, body the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T13.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T13.js
index 120e8f857..0213fba8a 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T13.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T13.js
@@ -1,20 +1,20 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T13.js
- * @description Values of the function constructor arguments are "a,b,c" and "null"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: Values of the function constructor arguments are "a,b,c" and "null"
+includes: [$FAIL.js]
+---*/
 
 var p = "a,b,c";
 
@@ -34,4 +34,3 @@ if (f.constructor !== Function) {
 if (f()!==undefined) {
   $ERROR('#3: When the Function constructor is called with arguments p, body the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T14.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T14.js
index 6b936260d..c51f7f5d8 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T14.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T14.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T14.js
- * @description Values of the function constructor arguments are "a,b,c" and an undefined variable
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are "a,b,c" and an
+    undefined variable
+includes: [$FAIL.js]
+---*/
 
 var p = "a,b,c";
 
@@ -36,4 +38,3 @@ if (f()!==undefined) {
 }
 
 var body;
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T15.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T15.js
index b1c430d09..b67a7c580 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T15.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T15.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T15.js
- * @description Values of the function constructor arguments are are two empty strings
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are are two empty
+    strings
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 try {
@@ -32,4 +34,3 @@ if (f.constructor !== Function) {
 if (f()!==undefined) {
   $ERROR('#3: When the Function constructor is called with arguments p, body the following steps are taken...');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T2.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T2.js
index d6ba8f1e1..df99bb1e7 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T2.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T2.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T2.js
- * @description Values of the function constructor arguments are "{toString:function(){return 'a';}}" and "return a;"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are
+    "{toString:function(){return 'a';}}" and "return a;"
+includes: [$FAIL.js]
+---*/
 
 var p = {toString:function(){return "a";}};
 var body = "return a;";
@@ -35,6 +37,3 @@ if (f.constructor !== Function) {
 if (f(42)!==42) {
   $ERROR('#3: When the Function constructor is called with arguments p, body creates a new Function object as specified in 13.2');
 }
-
-
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T3.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T3.js
index 7e23616ac..ae74908ad 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T3.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T3.js
@@ -1,20 +1,23 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T3.js
- * @description Values of the function constructor arguments are "{toString:function(){p=1;return "a";}}" and "{toString:function(){throw "body";}}"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are
+    "{toString:function(){p=1;return "a";}}" and
+    "{toString:function(){throw "body";}}"
+includes: [$FAIL.js]
+---*/
 
 var p = {toString:function(){p=1;return "a";}};
 var body = {toString:function(){throw "body";}};
@@ -33,7 +36,3 @@ try {
 if (p !== 1) {
   $ERROR('#2: i) Let Result(i) be the first argument; ii) Let P be ToString(Result(i))');
 }
-
-
-
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T4.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T4.js
index 50ca1f4e8..b00fc0be4 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T4.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T4.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T4.js
- * @description Values of the function constructor arguments are an undefined variable and "return 1.1;"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are an undefined
+    variable and "return 1.1;"
+includes: [$FAIL.js]
+---*/
 
 var body = "return 1.1;";
 
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T5.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T5.js
index 4591d11a3..371a3918b 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T5.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T5.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T5.js
- * @description Values of the function constructor arguments are "void 0" and "return \"A\";"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are "void 0" and
+    "return \"A\";"
+includes: [$FAIL.js]
+---*/
 
 var body = "return \"A\";";
 
@@ -34,6 +36,3 @@ if (f.constructor !== Function) {
 if (f()!=='\u0041') {
   $ERROR('#3: When the Function constructor is called with one argument then body be that argument the following steps are taken...');
 }
-
-
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T6.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T6.js
index 1015e215e..5acf9b3ea 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T6.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T6.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T6.js
- * @description Values of the function constructor arguments are "null" and "return true;"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are "null" and
+    "return true;"
+includes: [$FAIL.js]
+---*/
 
 var body = "return true;";
 
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T7.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T7.js
index d78484373..573e8299b 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T7.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T7.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T7.js
- * @description Values of the function constructor arguments are "Object("a")" and "return a;"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are "Object("a")" and
+    "return a;"
+includes: [$FAIL.js]
+---*/
 
 var body = "return a;";
 
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T8.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T8.js
index 89464dcea..ececaaaee 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T8.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T8.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T8.js
- * @description Values of the function constructor arguments are "undefined" and "return this;"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are "undefined" and
+    "return this;"
+includes: [$FAIL.js]
+---*/
 
 var body = "return this;";
 
@@ -34,6 +36,3 @@ if (f.constructor !== Function) {
 if (f()!==this) {
   $ERROR('#3: When the Function constructor is called with one argument then body be that argument the following steps are taken...');
 }
-
-
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T9.js b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T9.js
index befbdd9d2..5d527b971 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T9.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2.1_A3_T9.js
@@ -1,20 +1,22 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * When the Function constructor is called with arguments p, body the following steps are taken:
- * i) Let Result(i) be the first argument
- * ii) Let P be ToString(Result(i))
- * iii) Call ToString(body)
- * iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
- * v) If body is not parsable as FunctionBody then throw a SyntaxError exception
- * vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
- * Pass in a scope chain consisting of the global object as the Scope parameter
- * vii) Return Result(vi)
- *
- * @path ch15/15.3/15.3.2/S15.3.2.1_A3_T9.js
- * @description Values of the function constructor arguments are "1,1" and "return this;"
- */
+/*---
+info: >
+    When the Function constructor is called with arguments p, body the following steps are taken:
+    i) Let Result(i) be the first argument
+    ii) Let P be ToString(Result(i))
+    iii) Call ToString(body)
+    iv) If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception
+    v) If body is not parsable as FunctionBody then throw a SyntaxError exception
+    vi) Create a new Function object as specified in 13.2 with parameters specified by parsing P as a FormalParameterListopt and body specified by parsing body as a FunctionBody
+    Pass in a scope chain consisting of the global object as the Scope parameter
+    vii) Return Result(vi)
+description: >
+    Values of the function constructor arguments are "1,1" and "return
+    this;"
+includes: [$FAIL.js]
+---*/
 
 var body = "return this;";
 var p="1,1";
@@ -28,4 +30,3 @@ try {
   	$ERROR('#1.1: If P is not parsable as a FormalParameterList_opt then throw a SyntaxError exception');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.2/S15.3.2_A1.js b/test/suite/ch15/15.3/15.3.2/S15.3.2_A1.js
index 0ad4336e8..af2f4bd26 100644
--- a/test/suite/ch15/15.3/15.3.2/S15.3.2_A1.js
+++ b/test/suite/ch15/15.3/15.3.2/S15.3.2_A1.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.
 
-/**
- * When Function is called as part of a new expression, it is a constructor: it initialises the newly created object
- *
- * @path ch15/15.3/15.3.2/S15.3.2_A1.js
- * @description Checking the constuctor of the object that is created as a new Function
- */
+/*---
+info: >
+    When Function is called as part of a new expression, it is a constructor:
+    it initialises the newly created object
+description: >
+    Checking the constuctor of the object that is created as a new
+    Function
+---*/
 
 var f = new Function;
 
@@ -19,4 +21,3 @@ if (f.constructor !== Function) {
 if (f === undefined) {
   $ERROR('#2: When Function is called as part of a new expression, it is a constructor: it initialises the newly created object');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A1.js b/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A1.js
index 0db8f44b3..8fbae5845 100644
--- a/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A1.js
+++ b/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype property has the attribute ReadOnly
- *
- * @path ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A1.js
- * @description Checking if varying the Function.prototype property fails
- */
+/*---
+info: The Function.prototype property has the attribute ReadOnly
+description: Checking if varying the Function.prototype property fails
+---*/
 
 var obj = Function.prototype;
 Function.prototype = function(){return "shifted";};
@@ -24,4 +22,3 @@ try {
 } catch (e) {
   $ERROR('#2.1: the Function.prototype property has the attributes ReadOnly: '+e);
 }
-
diff --git a/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A2.js b/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A2.js
index 7f4f9a04a..430a2c6f6 100644
--- a/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A2.js
+++ b/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype property has the attribute DontEnum
- *
- * @path ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A2.js
- * @description Checking if enumerating the Function.prototype property fails
- */
+/*---
+info: The Function.prototype property has the attribute DontEnum
+description: Checking if enumerating the Function.prototype property fails
+---*/
 
 // CHECK#1
 if (Function.propertyIsEnumerable('prototype')) {
@@ -23,4 +21,3 @@ for (p in Function){
 if (count !== 0) {
   $ERROR('#2: the Function.prototype property has the attributes DontEnum');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A3.js b/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A3.js
index a03351de8..bd708304a 100644
--- a/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A3.js
+++ b/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype property has the attribute DontDelete
- *
- * @path ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A3.js
- * @description Checking if deleting the Function.prototype property fails
- */
+/*---
+info: The Function.prototype property has the attribute DontDelete
+description: Checking if deleting the Function.prototype property fails
+---*/
 
 delete Function.prototype;
 
@@ -14,4 +12,3 @@ delete Function.prototype;
 if (!(Function.hasOwnProperty('prototype'))) {
   $ERROR('#1: the Function.prototype property has the attributes DontDelete.');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A4.js b/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A4.js
index edd70c32a..fb35f3a77 100644
--- a/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A4.js
+++ b/test/suite/ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A4.js
@@ -1,16 +1,16 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Detects whether the value of a function's "prototype" property
- * as seen by normal object operations might deviate from the value
- * as seem by Object.getOwnPropertyDescriptor
- *
- * @path ch15/15.3/15.3.3/15.3.3.1/S15.3.3.1_A4.js
- * @description Checks if reading a function's .prototype directly
- * agrees with reading it via Object.getOwnPropertyDescriptor, after
- * having set it by Object.defineProperty.
- */
+/*---
+info: >
+    Detects whether the value of a function's "prototype" property
+    as seen by normal object operations might deviate from the value
+    as seem by Object.getOwnPropertyDescriptor
+description: >
+    Checks if reading a function's .prototype directly  agrees with
+    reading it via Object.getOwnPropertyDescriptor, after  having set
+    it by Object.defineProperty.
+---*/
 
 function foo() {}
 
@@ -19,4 +19,3 @@ if (foo.prototype !==
     Object.getOwnPropertyDescriptor(foo, 'prototype').value) {
   $ERROR("A function.prototype's descriptor lies");
 }
-
diff --git a/test/suite/ch15/15.3/15.3.3/15.3.3.2/15.3.3.2-1.js b/test/suite/ch15/15.3/15.3.3/15.3.3.2/15.3.3.2-1.js
index d75389567..bcedcf4cc 100644
--- a/test/suite/ch15/15.3/15.3.3/15.3.3.2/15.3.3.2-1.js
+++ b/test/suite/ch15/15.3/15.3.3/15.3.3.2/15.3.3.2-1.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.3/15.3.3.2/15.3.3.2-1.js

- * @description Function.length - data property with value 1

- */

-

-

-function testcase() {

-

-  var desc = Object.getOwnPropertyDescriptor(Function,"length");

-  if(desc.value === 1 &&

-     desc.writable === false &&

-     desc.enumerable === false &&

-     desc.configurable === false)

-    return true; 

-

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.length - data property with value 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  var desc = Object.getOwnPropertyDescriptor(Function,"length");
+  if(desc.value === 1 &&
+     desc.writable === false &&
+     desc.enumerable === false &&
+     desc.configurable === false)
+    return true; 
+
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.3/S15.3.3_A1.js b/test/suite/ch15/15.3/15.3.3/S15.3.3_A1.js
index 668a9ab24..ed47c9ed1 100644
--- a/test/suite/ch15/15.3/15.3.3/S15.3.3_A1.js
+++ b/test/suite/ch15/15.3/15.3.3/S15.3.3_A1.js
@@ -1,15 +1,11 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function constructor has the property "prototype"
- *
- * @path ch15/15.3/15.3.3/S15.3.3_A1.js
- * @description Checking existence of the property "prototype"
- */
+/*---
+info: The Function constructor has the property "prototype"
+description: Checking existence of the property "prototype"
+---*/
 
 if(!Function.hasOwnProperty("prototype")){
   $ERROR('#1: The Function constructor has the property "prototype"');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.3/S15.3.3_A2_T1.js b/test/suite/ch15/15.3/15.3.3/S15.3.3_A2_T1.js
index 70a280e72..a0caf9f5a 100644
--- a/test/suite/ch15/15.3/15.3.3/S15.3.3_A2_T1.js
+++ b/test/suite/ch15/15.3/15.3.3/S15.3.3_A2_T1.js
@@ -1,16 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the Function constructor
- * is the Function prototype object
- *
- * @path ch15/15.3/15.3.3/S15.3.3_A2_T1.js
- * @description Checking prototype of Function
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the Function constructor
+    is the Function prototype object
+description: Checking prototype of Function
+---*/
 
 // CHECK#
 if (!(Function.prototype.isPrototypeOf(Function))) {
   $ERROR('#1: the value of the internal [[Prototype]] property of the Function constructor is the Function prototype object.');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.3/S15.3.3_A2_T2.js b/test/suite/ch15/15.3/15.3.3/S15.3.3_A2_T2.js
index a067cf202..32774bcaf 100644
--- a/test/suite/ch15/15.3/15.3.3/S15.3.3_A2_T2.js
+++ b/test/suite/ch15/15.3/15.3.3/S15.3.3_A2_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.
 
-/**
- * The value of the internal [[Prototype]] property of the Function constructor
- * is the Function prototype object
- *
- * @path ch15/15.3/15.3.3/S15.3.3_A2_T2.js
- * @description Add new property to Function.prototype and check it
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the Function constructor
+    is the Function prototype object
+description: Add new property to Function.prototype and check it
+---*/
 
 Function.prototype.indicator = 1;
 
@@ -15,4 +14,3 @@ Function.prototype.indicator = 1;
 if (Function.indicator != 1) {
   $ERROR('#1: the value of the internal [[Prototype]] property of the Function constructor is the Function prototype object.');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.3/S15.3.3_A3.js b/test/suite/ch15/15.3/15.3.3/S15.3.3_A3.js
index 5e2ae99f9..a5b059566 100644
--- a/test/suite/ch15/15.3/15.3.3/S15.3.3_A3.js
+++ b/test/suite/ch15/15.3/15.3.3/S15.3.3_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function constructor has length property whose value is 1
- *
- * @path ch15/15.3/15.3.3/S15.3.3_A3.js
- * @description Checking Function.length property
- */
+/*---
+info: Function constructor has length property whose value is 1
+description: Checking Function.length property
+---*/
 
 //CHECK#1
 if (!Function.hasOwnProperty("length")){
@@ -17,4 +15,3 @@ if (!Function.hasOwnProperty("length")){
 if (Function.length !== 1) {
   $ERROR('#2: Function constructor length property value is 1');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A10.js
index a48f8a86a..d0e3dd604 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A10.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype.toString.length property has the attribute ReadOnly
- *
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A10.js
- * @description Checking if varying the Function.prototype.toString.length property fails
- */
+/*---
+info: The Function.prototype.toString.length property has the attribute ReadOnly
+description: >
+    Checking if varying the Function.prototype.toString.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (!(Function.prototype.toString.hasOwnProperty('length'))) {
@@ -21,4 +22,3 @@ Function.prototype.toString.length = function(){return "shifted";};
 if (Function.prototype.toString.length !== obj) {
   $ERROR('#2: the Function.prototype.toString length property has the attributes ReadOnly.');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A11.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A11.js
index b5c98b131..79b93654d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A11.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A11.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the toString method is 0
- *
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A11.js
- * @description Checking Function.prototype.toString.length
- */
+/*---
+info: The length property of the toString method is 0
+description: Checking Function.prototype.toString.length
+---*/
 
 //CHECK#1
 if (!(Function.prototype.toString.hasOwnProperty("length"))) {
@@ -17,4 +15,3 @@ if (!(Function.prototype.toString.hasOwnProperty("length"))) {
 if (Function.prototype.toString.length !== 0) {
   $ERROR('#2: The length property of the toString method is 0');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A12.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A12.js
index 73f979d52..e8c826722 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A12.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A12.js
@@ -1,11 +1,11 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A12.js
- * @description The Function.prototype.toString function is not generic; it throws a TypeError exception if its this value is not a Function object.
- * @negative TypeError
- */
+/*---
+description: >
+    The Function.prototype.toString function is not generic; it throws
+    a TypeError exception if its this value is not a Function object.
+negative: TypeError
+---*/
 
 Function.prototype.toString.call(undefined);
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A13.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A13.js
index fe4e6a020..9a86be25f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A13.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A13.js
@@ -1,11 +1,11 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A13.js
- * @description The toString function is not generic; it throws a TypeError exception if its this value is not a Function object.
- * @negative TypeError
- */
+/*---
+description: >
+    The toString function is not generic; it throws a TypeError
+    exception if its this value is not a Function object.
+negative: TypeError
+---*/
 
 Function.prototype.toString.call(null);
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A14.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A14.js
index 4f7fe886d..fb9a87ece 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A14.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A14.js
@@ -1,11 +1,11 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A14.js
- * @description The toString function is not generic; it throws a TypeError exception if its this value is not a Function object.
- * @negative TypeError
- */
+/*---
+description: >
+    The toString function is not generic; it throws a TypeError
+    exception if its this value is not a Function object.
+negative: TypeError
+---*/
 
 Function.prototype.toString.call({});
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A15.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A15.js
index 20e2f4362..082cef2d9 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A15.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A15.js
@@ -1,13 +1,14 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toString function is not generic; it throws a TypeError exception if its this value is not a Function object.
- *
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A15.js
- * @description Whether or not they are callable, RegExp objects are not Function objects, so toString should throw a TypeError.
- * @negative TypeError
- */
+/*---
+info: >
+    The toString function is not generic; it throws a TypeError exception if
+    its this value is not a Function object.
+description: >
+    Whether or not they are callable, RegExp objects are not Function
+    objects, so toString should throw a TypeError.
+negative: TypeError
+---*/
 
 Function.prototype.toString.call(/x/);
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A16.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A16.js
index 141465ba3..d15d8f25e 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A16.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A16.js
@@ -1,15 +1,17 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The toString function is not generic; it throws a TypeError exception if its this value is not a Function object.
- *
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A16.js
- * @description The String constructor, given an object, should invoke that object's toString method as a method, i.e., with its this value bound to that object.
- * @negative TypeError
- */
+/*---
+info: >
+    The toString function is not generic; it throws a TypeError exception if
+    its this value is not a Function object.
+description: >
+    The String constructor, given an object, should invoke that
+    object's toString method as a method, i.e., with its this value
+    bound to that object.
+negative: TypeError
+---*/
 
 var obj = {toString: Function.prototype.toString};
 
 String(obj);
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A6.js
index fd3578e46..d35867c71 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A6.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.toString has not prototype property
- *
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A6.js
- * @description Checking if obtaining the prototype property of Function.prototype.toString fails
- */
+/*---
+info: Function.prototype.toString has not prototype property
+description: >
+    Checking if obtaining the prototype property of
+    Function.prototype.toString fails
+---*/
 
 //CHECK#1
 if (Function.prototype.toString.prototype !== undefined) {
   $ERROR('#1: Function.prototype.toString has not prototype property'+Function.prototype.toString.prototype);
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A7.js
index c7b2d4856..0d3cf17f3 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A7.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.toString can't be used as constructor
- *
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A7.js
- * @description Checking if creating "new Function.prototype.toString" fails
- */
+/*---
+info: Function.prototype.toString can't be used as constructor
+description: Checking if creating "new Function.prototype.toString" fails
+includes:
+    - $PRINT.js
+    - $FAIL.js
+---*/
 
 var FACTORY = Function.prototype.toString;
 
@@ -16,4 +17,3 @@ try {
 } catch (e) {
   $PRINT(e);
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A8.js
index 1b81b603b..776f0d8a1 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype.toString.length property has the attribute DontEnum
- *
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A8.js
- * @description Checking if enumerating the Function.prototype.toString.length property fails
- */
+/*---
+info: The Function.prototype.toString.length property has the attribute DontEnum
+description: >
+    Checking if enumerating the Function.prototype.toString.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Function.prototype.toString.hasOwnProperty('length'))) {
@@ -24,4 +25,3 @@ for (p in Function.prototype.toString){
   if (p==="length")
       $ERROR('#2: the Function.prototype.toString.length property has the attributes DontEnum');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A9.js
index 296ca7ca0..7ab734b22 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A9.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype.toString.length property has the attribute DontDelete
- *
- * @path ch15/15.3/15.3.4/15.3.4.2/S15.3.4.2_A9.js
- * @description Checking if deleting the Function.prototype.toString.length property fails
- */
+/*---
+info: >
+    The Function.prototype.toString.length property has the attribute
+    DontDelete
+description: >
+    Checking if deleting the Function.prototype.toString.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Function.prototype.toString.hasOwnProperty('length'))) {
@@ -22,4 +25,3 @@ if (delete Function.prototype.toString.length) {
 if (!(Function.prototype.toString.hasOwnProperty('length'))) {
   $FAIL('#2: The Function.prototype.toString.length property has the attributes DontDelete');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-1-s.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-1-s.js
index c90d4942e..32530b16b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-1-s.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-1-s.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-1-s.js

- * @description Strict Mode - 'this' value is a string which cannot be converted to wrapper objects when the function is called with an array of arguments

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        function fun() {

-            return (this instanceof String);

-        }

-        return !fun.apply("", Array);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - 'this' value is a string which cannot be converted
+    to wrapper objects when the function is called with an array of
+    arguments
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        function fun() {
+            return (this instanceof String);
+        }
+        return !fun.apply("", Array);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-2-s.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-2-s.js
index 7f03675a3..e6024ec7a 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-2-s.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-2-s.js
@@ -1,20 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-2-s.js

- * @description Strict Mode - 'this' value is a number which cannot be converted to wrapper objects when the function is called with an array of arguments

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        function fun() {

-            return (this instanceof Number);

-        }

-        return !fun.apply(-12, Array);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - 'this' value is a number which cannot be converted
+    to wrapper objects when the function is called with an array of
+    arguments
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        function fun() {
+            return (this instanceof Number);
+        }
+        return !fun.apply(-12, Array);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-3-s.js b/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-3-s.js
index 7ae40757d..e2f185b2d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-3-s.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-3-s.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.3/15.3.4.3-3-s.js

- * @description Strict Mode - 'this' value is a boolean which cannot be converted to wrapper objects when the function is called with an array of arguments

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        function fun() {

-            return (this instanceof Boolean);

-        }

-        return !fun.apply(false, Array);

-    }

-runTestCase(testcase);

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

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-1-s.js

- * @description Strict Mode - 'this' value is a string which cannot be converted to wrapper objects when the function is called without an array of arguments

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        function fun() {

-            return (this instanceof String);

-        }

-        return !fun.call("");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - 'this' value is a string which cannot be converted
+    to wrapper objects when the function is called without an array of
+    arguments
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        function fun() {
+            return (this instanceof String);
+        }
+        return !fun.call("");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-2-s.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-2-s.js
index 7848d3c7b..98d1e0a0e 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-2-s.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-2-s.js
@@ -1,20 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-2-s.js

- * @description Strict Mode - 'this' value is a number which cannot be converted to wrapper objects  when the function is called without an array argument

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        function fun() {

-            return (this instanceof Number);

-        }

-        return !fun.call(-12);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - 'this' value is a number which cannot be converted
+    to wrapper objects  when the function is called without an array
+    argument
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        function fun() {
+            return (this instanceof Number);
+        }
+        return !fun.call(-12);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-3-s.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-3-s.js
index 0d965fb67..497744771 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-3-s.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-3-s.js
@@ -1,20 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.4/15.3.4.4-3-s.js

- * @description Strict Mode - 'this' value is a boolean which cannot be converted to wrapper objects when the function is called without an array of arguments

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        function fun() {

-            return (this instanceof Boolean);

-        }

-        return !fun.call(false);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict Mode - 'this' value is a boolean which cannot be converted
+    to wrapper objects when the function is called without an array of
+    arguments
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        function fun() {
+            return (this instanceof Boolean);
+        }
+        return !fun.call(false);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A10.js
index ee76d447f..8b055543f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A10.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype.call.length property has the attribute ReadOnly
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A10.js
- * @description Checking if varying the Function.prototype.call.length property fails
- */
+/*---
+info: The Function.prototype.call.length property has the attribute ReadOnly
+description: >
+    Checking if varying the Function.prototype.call.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#1
 if (!(Function.prototype.call.hasOwnProperty('length'))) {
@@ -21,4 +22,3 @@ Function.prototype.call.length = function(){return "shifted";};
 if (Function.prototype.call.length !== obj) {
   $ERROR('#2: the Function.prototype.call length property has the attributes ReadOnly.');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A11.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A11.js
index 987f9ee3e..63399e6bb 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A11.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A11.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype.call.length property has the attribute DontEnum
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A11.js
- * @description Checking if enumerating the Function.prototype.call.length property fails
- */
+/*---
+info: The Function.prototype.call.length property has the attribute DontEnum
+description: >
+    Checking if enumerating the Function.prototype.call.length
+    property fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Function.prototype.call.hasOwnProperty('length'))) {
@@ -24,4 +25,3 @@ for (p in Function.prototype.call){
   if (p==="length")
     $ERROR('#2: the Function.prototype.call.length property has the attributes DontEnum');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A12.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A12.js
index c8fbff69a..547bd6f58 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A12.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A12.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.call has not prototype property
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A12.js
- * @description Checking if obtaining the prototype property of Function.prototype.call fails
- */
+/*---
+info: Function.prototype.call has not prototype property
+description: >
+    Checking if obtaining the prototype property of
+    Function.prototype.call fails
+---*/
 
 //CHECK#1
 if (Function.prototype.call.prototype !== undefined) {
   $ERROR('#1: Function.prototype.call has not prototype property'+Function.prototype.call.prototype);
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A13.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A13.js
index 5b08ca218..212c319ab 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A13.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A13.js
@@ -1,11 +1,9 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A13.js
- * @description If IsCallable(func) is false, then throw a TypeError exception.
- * @negative TypeError
- */
+/*---
+description: If IsCallable(func) is false, then throw a TypeError exception.
+negative: TypeError
+---*/
 
 Function.prototype.call.call(undefined, {});
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A14.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A14.js
index 9fde7ac60..f8b50978c 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A14.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A14.js
@@ -1,11 +1,9 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A14.js
- * @description If IsCallable(func) is false, then throw a TypeError exception.
- * @negative TypeError
- */
+/*---
+description: If IsCallable(func) is false, then throw a TypeError exception.
+negative: TypeError
+---*/
 
 Function.prototype.call.call(null, {});
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A15.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A15.js
index 56624d8fd..dced623d5 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A15.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A15.js
@@ -1,11 +1,9 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A15.js
- * @description If IsCallable(func) is false, then throw a TypeError exception.
- * @negative TypeError
- */
+/*---
+description: If IsCallable(func) is false, then throw a TypeError exception.
+negative: TypeError
+---*/
 
 Function.prototype.call.call({}, {});
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A16.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A16.js
index c32a02957..40a50e41b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A16.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A16.js
@@ -1,12 +1,14 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If IsCallable(func) is false, then throw a TypeError exception.
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A16.js
- * @description A RegExp is not a function, but it may be callable. Iff it is, it's typeof should be 'function', in which case call should accept it as a valid this value.
- */
+/*---
+info: If IsCallable(func) is false, then throw a TypeError exception.
+description: >
+    A RegExp is not a function, but it may be callable. Iff it is,
+    it's typeof should be 'function', in which case call should accept
+    it as a valid this value.
+includes: [$FAIL.js]
+---*/
 
 var re = (/x/);
 if (typeof re === 'function') {
@@ -22,4 +24,3 @@ if (typeof re === 'function') {
     }
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A1_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A1_T1.js
index e9bec0320..d40e6778f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A1_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A1_T1.js
@@ -1,13 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The call method performs a function call using the [[Call]] property of the object. If the object does not have a [[Call]] property, a TypeError exception is thrown
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A1_T1.js
- * @description Call "call" method of the object that does not have a [[Call]] property.
- * Prototype of the object is Function()
- */
+/*---
+info: >
+    The call method performs a function call using the [[Call]] property of
+    the object. If the object does not have a [[Call]] property, a TypeError
+    exception is thrown
+description: >
+    Call "call" method of the object that does not have a [[Call]]
+    property.  Prototype of the object is Function()
+includes: [$FAIL.js]
+---*/
 
 var proto=Function();
 
@@ -31,4 +34,3 @@ try {
   	$ERROR('#2.1: If the object does not have a [[Call]] property, a TypeError exception is thrown');
   }
 }
-    
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A1_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A1_T2.js
index 637cf20d1..5ff35e76c 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A1_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A1_T2.js
@@ -1,13 +1,16 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The call method performs a function call using the [[Call]] property of the object. If the object does not have a [[Call]] property, a TypeError exception is thrown
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A1_T2.js
- * @description Calling "call" method of the object that does not have a [[Call]] property.
- * Prototype of the object is Function.prototype
- */
+/*---
+info: >
+    The call method performs a function call using the [[Call]] property of
+    the object. If the object does not have a [[Call]] property, a TypeError
+    exception is thrown
+description: >
+    Calling "call" method of the object that does not have a [[Call]]
+    property.  Prototype of the object is Function.prototype
+includes: [$FAIL.js]
+---*/
 
 function FACTORY(){};
 
@@ -29,4 +32,3 @@ try {
   	$ERROR('#2.1: If the object does not have a [[Call]] property, a TypeError exception is thrown');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A2_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A2_T1.js
index c8282a269..214e1d498 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A2_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.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.
 
-/**
- * The length property of the call method is 1
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A2_T1.js
- * @description Checking Function.prototype.call.length
- */
+/*---
+info: The length property of the call method is 1
+description: Checking Function.prototype.call.length
+---*/
 
 //CHECK#1
 if (typeof Function.prototype.call !== "function") {
@@ -22,4 +20,3 @@ if (typeof Function.prototype.call.length === "undefined") {
 if (Function.prototype.call.length !== 1) {
   $ERROR('#3: The length property of the call method is 1');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A2_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A2_T2.js
index f76bdc230..ccceca809 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A2_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A2_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The length property of the call method is 1
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A2_T2.js
- * @description Checking f.call.length, where f is new Function
- */
+/*---
+info: The length property of the call method is 1
+description: Checking f.call.length, where f is new Function
+---*/
 
 var f=new Function;
 
@@ -24,4 +22,3 @@ if (typeof f.call.length === "undefined") {
 if (f.call.length !== 1) {
   $ERROR('#3: The length property of the call method is 1');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T1.js
index 6dcf5ccca..8fd063b2c 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T1.js
- * @description Not any arguments at call function
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Not any arguments at call function
+---*/
 
 Function("this.field=\"strawberry\"").call();
 
@@ -14,4 +14,3 @@ Function("this.field=\"strawberry\"").call();
 if (this["field"] !== "strawberry") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T10.js
index 1a8a62569..b07352b87 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T10.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T10.js
- * @description Checking by using eval, no any arguments at call function
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Checking by using eval, no any arguments at call function
+---*/
 
 eval(" (function(){this.feat=1}).call()");
 
@@ -14,4 +14,3 @@ eval(" (function(){this.feat=1}).call()");
 if (this["feat"] !== 1) {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T2.js
index c356ff4aa..2e5208876 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T2.js
- * @description Argument at call function is null
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Argument at call function is null
+---*/
 
 Function("this.field=\"green\"").call(null);
 
@@ -14,4 +14,3 @@ Function("this.field=\"green\"").call(null);
 if (this["field"] !== "green") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T3.js
index 5eb42018e..66b768ddb 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T3.js
- * @description Argument at call function is void 0
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Argument at call function is void 0
+---*/
 
 Function("this.field=\"battle\"").call(void 0);
 
@@ -14,4 +14,3 @@ Function("this.field=\"battle\"").call(void 0);
 if (this["field"] !== "battle") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T4.js
index f643ac429..e0774f76c 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T4.js
- * @description Argument at call function is undefined
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Argument at call function is undefined
+---*/
 
 Function("this.field=\"oil\"").call(undefined);
 
@@ -14,4 +14,3 @@ Function("this.field=\"oil\"").call(undefined);
 if (this["field"] !== "oil") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T5.js
index 47f35a67e..0e3473352 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T5.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T5.js
- * @description No any arguments at call function and it called inside function declaration
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: >
+    No any arguments at call function and it called inside function
+    declaration
+---*/
 
 function FACTORY(){
   Function("this.feat=\"in da haus\"").call();
@@ -23,4 +25,3 @@ if (this["feat"] !== "in da haus") {
 if (typeof obj.feat !== "undefined") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T6.js
index 25c8fa070..5cb79300c 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T6.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T6.js
- * @description Argument at call function is null and it called inside function declaration
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: >
+    Argument at call function is null and it called inside function
+    declaration
+---*/
 
 function FACTORY(){
   (function(){this.feat="kamon beyba"}).call(null);
@@ -23,4 +25,3 @@ if (this["feat"] !== "kamon beyba") {
 if (typeof obj.feat !== "undefined") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T7.js
index 6fa6551a7..d4325b359 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T7.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T7.js
- * @description Argument at call function is void 0 and it called inside function declaration
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: >
+    Argument at call function is void 0 and it called inside function
+    declaration
+---*/
 
 (function FACTORY(){
   Function("this.feat=\"in da haus\"").call(void 0);
@@ -17,4 +19,3 @@
 if (this["feat"] !== "in da haus") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T8.js
index 575230da8..f46e72cd0 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T8.js
@@ -1,12 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T8.js
- * @description Argument at call function is undefined and it called inside function declaration
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: >
+    Argument at call function is undefined and it called inside
+    function declaration
+---*/
 
 (function FACTORY(){
   (function(){this.feat="kamon beyba"}).call(undefined);
@@ -17,4 +19,3 @@
 if (this["feat"] !== "kamon beyba") {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T9.js
index 4efc2e771..773b8fec9 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T9.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is null or undefined, the called function is passed the global object as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A3_T9.js
- * @description Checking by using eval, argument at call function is void 0
- */
+/*---
+info: >
+    If thisArg is null or undefined, the called function is passed the global
+    object as the this value
+description: Checking by using eval, argument at call function is void 0
+---*/
 
 eval( " Function(\"this.feat=1\").call(void 0) " );
 
@@ -15,4 +15,3 @@ eval( " Function(\"this.feat=1\").call(void 0) " );
 if (this["feat"] !== 1) {
   $ERROR('#1: If thisArg is null or undefined, the called function is passed the global object as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T1.js
index f274db083..7dfc3cd20 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T1.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T1.js
- * @description thisArg is number
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is number
+---*/
 
 var obj=1;
 
@@ -21,5 +21,3 @@ if (typeof obj.touched !== "undefined") {
 if (!(retobj["touched"])) {
   $ERROR('#2: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T2.js
index 1e594dd96..e5a7411a8 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T2.js
- * @description thisArg is boolean true
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is boolean true
+---*/
 
 var obj=true;
 
@@ -21,5 +21,3 @@ if (typeof obj.touched !== "undefined") {
 if (!(retobj["touched"])) {
   $ERROR('#2: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T3.js
index 665bf1010..199e18435 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T3.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T3.js
- * @description thisArg is string
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is string
+---*/
 
 var obj="soap";
 
@@ -21,5 +21,3 @@ if (typeof obj.touched !== "undefined") {
 if (!(retobj["touched"])) {
   $ERROR('#2: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T4.js
index 05cff1df0..c15b7f9fc 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T4.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T4.js
- * @description thisArg is function variable that return this
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is function variable that return this
+---*/
 
 var f = function(){this.touched= true; return this;};
 
@@ -23,4 +23,3 @@ if (!(retobj["touched"])) {
 }
 
 var obj;
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T5.js
index 96795e150..1344686aa 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T5.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T5.js
- * @description thisArg is function variable
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is function variable
+---*/
 
 var f = function(){this.touched= true;};
 
@@ -18,4 +18,3 @@ f.call(obj);
 if (!(obj.touched)) {
   $ERROR('#1: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T6.js
index 127954e68..18ee613cb 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T6.js
- * @description thisArg is new String()
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is new String()
+---*/
 
 var obj=new String("soap");
 
@@ -16,4 +16,3 @@ var obj=new String("soap");
 if (!(obj.touched)) {
   $ERROR('#1: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T7.js
index f6166f31a..71c786c50 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T7.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T7.js
- * @description thisArg is new Number()
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is new Number()
+---*/
 
 var obj=new Number(1);
 
@@ -16,5 +16,3 @@ Function("this.touched= true;").call(obj);
 if (!(obj.touched)) {
   $ERROR('#1: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T8.js
index f3f6cf18b..246ab4be0 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T8.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A5_T8.js
- * @description thisArg is Function()
- */
+/*---
+info: >
+    If thisArg is not null(defined) the called function is passed
+    ToObject(thisArg) as the this value
+description: thisArg is Function()
+---*/
 
 var obj=Function();
 
@@ -16,4 +16,3 @@ new Function("this.touched= true; return this;").call(obj);
 if (!(obj.touched)) {
   $ERROR('#1: If thisArg is not null(defined) the called function is passed ToObject(thisArg) as the this value');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T1.js
index 04b21e57a..d8e00e68b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_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.
 
-/**
- * The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
- * a function call using the [[Call]] property of the object
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T1.js
- * @description Argunemts of call function is (null,[1])
- */
+/*---
+info: >
+    The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
+    a function call using the [[Call]] property of the object
+description: Argunemts of call function is (null,[1])
+---*/
 
 Function("a1,a2,a3","this.shifted=a1;").call(null,[1]);
 
@@ -25,5 +24,3 @@ if (this["shifted"].length !== 1) {
 if (this["shifted"][0] !== 1) {
   $ERROR('#3: The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs a function call using the [[Call]] property of the object');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T10.js
index b9b00d1c4..a67340241 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T10.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
- * a function call using the [[Call]] property of the object
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T10.js
- * @description Argunemts of call function is (empty object, "", arguments,2), inside function call without declaration used
- */
+/*---
+info: >
+    The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
+    a function call using the [[Call]] property of the object
+description: >
+    Argunemts of call function is (empty object, "", arguments,2),
+    inside function call without declaration used
+---*/
 
 var obj={};
 
@@ -24,5 +25,3 @@ if (obj["shifted"] !== "42") {
 if (typeof this["shifted"] !== "undefined") {
   $ERROR('#2: The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs a function call using the [[Call]] property of the object');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T2.js
index 27afbee73..848ecb4f4 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_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.
 
-/**
- * The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
- * a function call using the [[Call]] property of the object
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T2.js
- * @description Argunemts of call function is (null,[3,2,1])
- */
+/*---
+info: >
+    The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
+    a function call using the [[Call]] property of the object
+description: Argunemts of call function is (null,[3,2,1])
+---*/
 
 new Function("a1,a2","a3","this.shifted=a1;").call(null,[3,2,1]);
 
@@ -20,5 +19,3 @@ if (this["shifted"].length !== 3) {
 if ((this["shifted"][0] !== 3)||(this["shifted"][1] !== 2)||(this["shifted"][2] !== 1)) {
   $ERROR('#2: The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs a function call using the [[Call]] property of the object');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T3.js
index cc51c178d..b1990fed5 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T3.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.
 
-/**
- * The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
- * a function call using the [[Call]] property of the object
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T3.js
- * @description Argunemts of call function is (empty object, new Array("nine","inch","nails"))
- */
+/*---
+info: >
+    The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
+    a function call using the [[Call]] property of the object
+description: >
+    Argunemts of call function is (empty object, new
+    Array("nine","inch","nails"))
+---*/
 
 var i=0;
 
@@ -31,5 +32,3 @@ if ((obj["shifted"][0] !== "nine")||(obj["shifted"][1] !== "inch")||(obj["shifte
 if (typeof this["shifted"] !== "undefined") {
   $ERROR('#3: The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs a function call using the [[Call]] property of the object');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T4.js
index 90311787b..729ac7cba 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T4.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
- * a function call using the [[Call]] property of the object
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T4.js
- * @description Argunemts of call function is (empty object, ( function(){return arguments;})("a","b","c","d"),"",2)
- */
+/*---
+info: >
+    The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
+    a function call using the [[Call]] property of the object
+description: >
+    Argunemts of call function is (empty object, ( function(){return
+    arguments;})("a","b","c","d"),"",2)
+---*/
 
 var i=0;
 
@@ -26,5 +27,3 @@ if (obj["shifted"] !== "24") {
 if (typeof this["shifted"] !== "undefined") {
   $ERROR('#2: The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs a function call using the [[Call]] property of the object');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T5.js
index 35a6fd846..48d32af5d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T5.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.
 
-/**
- * The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
- * a function call using the [[Call]] property of the object
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T5.js
- * @description Argunemts of call function is (null, arguments,"",2), inside function declaration used
- */
+/*---
+info: >
+    The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
+    a function call using the [[Call]] property of the object
+description: >
+    Argunemts of call function is (null, arguments,"",2), inside
+    function declaration used
+---*/
 
 function FACTORY(){
   Function("a1,a2,a3","this.shifted=a1.length+a2+a3;").call(null,arguments,"",2);
@@ -24,5 +25,3 @@ if (this["shifted"] !== "42") {
 if (typeof obj.shifted !== "undefined") {
   $ERROR('#2: The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs a function call using the [[Call]] property of the object');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T6.js
index 609c8de87..2e6bc6f5e 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T6.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.
 
-/**
- * The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
- * a function call using the [[Call]] property of the object
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T6.js
- * @description Argunemts of call function is (this, arguments,"",2), inside function declaration used
- */
+/*---
+info: >
+    The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
+    a function call using the [[Call]] property of the object
+description: >
+    Argunemts of call function is (this, arguments,"",2), inside
+    function declaration used
+---*/
 
 function FACTORY(){
   Function("a1,a2,a3","this.shifted=a1.length+a2+a3;").call(this,arguments,"",2);
@@ -24,5 +25,3 @@ if (obj["shifted"] !== "42") {
 if (typeof this["shifted"] !== "undefined") {
   $ERROR('#2: The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs a function call using the [[Call]] property of the object');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T7.js
index 7738e09e0..d38e3a770 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T7.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
- * a function call using the [[Call]] property of the object
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T7.js
- * @description Argunemts of call function is (null, arguments,"",2), inside function call without declaration used
- */
+/*---
+info: >
+    The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
+    a function call using the [[Call]] property of the object
+description: >
+    Argunemts of call function is (null, arguments,"",2), inside
+    function call without declaration used
+---*/
 
 (function (){
   Function("a1,a2,a3","this.shifted=a1.length+a2+a3;").call(null,arguments,"",2);
@@ -17,4 +18,3 @@
 if (this["shifted"] !== "42") {
   $ERROR('#1: The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs a function call using the [[Call]] property of the object');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T8.js
index eb00e7f05..290e7c0ab 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T8.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
- * a function call using the [[Call]] property of the object
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T8.js
- * @description Argunemts of call function is (this, arguments,"",2), inside function call without declaration used
- */
+/*---
+info: >
+    The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
+    a function call using the [[Call]] property of the object
+description: >
+    Argunemts of call function is (this, arguments,"",2), inside
+    function call without declaration used
+---*/
 
 (function (){
   Function("a1,a2,a3","this.shifted=a1.length+a2+a3;").call(this,arguments,"",2);
@@ -17,5 +18,3 @@
 if (this["shifted"] !== "42") {
   $ERROR('#2: The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs a function call using the [[Call]] property of the object');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T9.js
index ae2abe1cc..3803a21e1 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T9.js
@@ -1,13 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
- * a function call using the [[Call]] property of the object
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A6_T9.js
- * @description Argunemts of call function is (empty object, "", arguments,2), inside function declaration used
- */
+/*---
+info: >
+    The call method takes one or more arguments, thisArg and (optionally) arg1, arg2 etc, and performs
+    a function call using the [[Call]] property of the object
+description: >
+    Argunemts of call function is (empty object, "", arguments,2),
+    inside function declaration used
+---*/
 
 function FACTORY(){
   var obj = {};
@@ -26,5 +27,3 @@ if (typeof this["shifted"] !== "undefined") {
 if (obj.shifted !== "42") {
   $ERROR('#2: If argArray is either an array or an arguments object, the function is passed the...');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T1.js
index 1c02dbea7..9c368a31e 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.call can't be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T1.js
- * @description Checking if creating "new Function.prototype.call" fails
- */
+/*---
+info: Function.prototype.call can't be used as [[create]] caller
+description: Checking if creating "new Function.prototype.call" fails
+---*/
 
 try {
   var obj = new Function.prototype.call;
@@ -16,4 +14,3 @@ try {
   	$ERROR('#1.1: Function.prototype.call can\'t be used as [[create]] caller');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T2.js
index 2e6266889..b065bc3e7 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T2.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.call can't be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T2.js
- * @description Checking if creating "new Function.prototype.call()" fails
- */
+/*---
+info: Function.prototype.call can't be used as [[create]] caller
+description: Checking if creating "new Function.prototype.call()" fails
+---*/
 
 try {
   var FACTORY = Function.prototype.call;
@@ -17,4 +15,3 @@ try {
   	$ERROR('#1.1: Function.prototype.call can\'t be used as [[create]] caller');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T3.js
index 003e84f1c..27f5873bf 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T3.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.call can't be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T3.js
- * @description Checking if creating "new Function.call" fails
- */
+/*---
+info: Function.prototype.call can't be used as [[create]] caller
+description: Checking if creating "new Function.call" fails
+---*/
 
 try {
   var obj = new Function.call;
@@ -16,4 +14,3 @@ try {
   	$ERROR('#1.1: Function.prototype.call can\'t be used as [[create]] caller');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T4.js
index 34b6a4363..60a62109f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T4.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.call can't be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T4.js
- * @description Checking if creating "new (Function("this.p1=1").call)" fails
- */
+/*---
+info: Function.prototype.call can't be used as [[create]] caller
+description: Checking if creating "new (Function("this.p1=1").call)" fails
+---*/
 
 try {
   var obj = new (Function("this.p1=1").call);
@@ -16,4 +14,3 @@ try {
   	$ERROR('#1.1: Function.prototype.call can\'t be used as [[create]] caller');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T5.js
index 316ac5815..0e27c361a 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T5.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.call can't be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T5.js
- * @description Checking if creating "new Function("this.p1=1").call" fails
- */
+/*---
+info: Function.prototype.call can't be used as [[create]] caller
+description: Checking if creating "new Function("this.p1=1").call" fails
+---*/
 
 try {
   var FACTORY = Function("this.p1=1").call;
@@ -17,4 +15,3 @@ try {
   	$ERROR('#1.1: Function.prototype.call can\'t be used as [[create]] caller');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T6.js
index 0911558c4..06270aa94 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T6.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function.prototype.call can't be used as [[create]] caller
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A7_T6.js
- * @description Checking if creating "new (Function("function f(){this.p1=1;};return f").call())" fails
- */
+/*---
+info: Function.prototype.call can't be used as [[create]] caller
+description: >
+    Checking if creating "new (Function("function
+    f(){this.p1=1;};return f").call())" fails
+---*/
 
 //CHECK#1
 try {
@@ -19,4 +19,3 @@ try {
 if (obj.p1!== 1) {
   $ERROR('#2: Function.prototype.call can\'t be used as [[create]] caller');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A9.js
index 8176bb2f8..6508e1b28 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A9.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function.prototype.call.length property has the attribute DontDelete
- *
- * @path ch15/15.3/15.3.4/15.3.4.4/S15.3.4.4_A9.js
- * @description Checking if deleting the Function.prototype.call.length property fails
- */
+/*---
+info: The Function.prototype.call.length property has the attribute DontDelete
+description: >
+    Checking if deleting the Function.prototype.call.length property
+    fails
+includes: [$FAIL.js]
+---*/
 
 //CHECK#0
 if (!(Function.prototype.call.hasOwnProperty('length'))) {
@@ -22,4 +23,3 @@ if (delete Function.prototype.call.length) {
 if (!(Function.prototype.call.hasOwnProperty('length'))) {
   $FAIL('#2: The Function.prototype.call.length property has the attributes DontDelete');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-1.js
index ba29c8188..8c6cb1050 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-1.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-1.js

- * @description [[Call]] - 'F''s [[BoundArgs]] is used as the former part of arguments of calling the [[Call]] internal method of 'F''s [[TargetFunction]] when 'F' is called

- */

-

-

-function testcase() {

-        var func = function (x, y, z) {

-            return x + y + z;

-        };

-

-        var newFunc = Function.prototype.bind.call(func, {}, "a", "b", "c");

-

-        return newFunc() === "abc";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - 'F''s [[BoundArgs]] is used as the former part of
+    arguments of calling the [[Call]] internal method of 'F''s
+    [[TargetFunction]] when 'F' is called
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (x, y, z) {
+            return x + y + z;
+        };
+
+        var newFunc = Function.prototype.bind.call(func, {}, "a", "b", "c");
+
+        return newFunc() === "abc";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-10.js
index 48e266cdc..f4969e23d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-10.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-10.js

- * @description [[Call]] - length of parameters of 'target' is 1, length of 'boundArgs' is 0, length of 'ExtraArgs' is 0, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        var func = function (x) {

-            return this === obj && typeof x === "undefined";

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj);

-

-        return newFunc();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 0, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        var func = function (x) {
+            return this === obj && typeof x === "undefined";
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj);
+
+        return newFunc();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-11.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-11.js
index 17f074e4c..3294400e6 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-11.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-11.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-11.js

- * @description [[Call]] - length of parameters of 'target' is 1, length of 'boundArgs' is 0, length of 'ExtraArgs' is 1, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        var func = function (x) {

-            return this === obj && x === 1 && arguments[0] === 1 && arguments.length === 1 && this.prop === "abc";

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj);

-

-        return newFunc(1);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 1, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        var func = function (x) {
+            return this === obj && x === 1 && arguments[0] === 1 && arguments.length === 1 && this.prop === "abc";
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj);
+
+        return newFunc(1);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-12.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-12.js
index 4a9b5956d..b0d58e6c3 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-12.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-12.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-12.js

- * @description [[Call]] - length of parameters of 'target' is 1, length of 'boundArgs' is 0, length of 'ExtraArgs' is 2, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        var func = function (x) {

-            return this === obj && x === 1 && arguments[1] === 2 &&

-                arguments[0] === 1 && arguments.length === 2 && this.prop === "abc";

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj);

-

-        return newFunc(1, 2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 2, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        var func = function (x) {
+            return this === obj && x === 1 && arguments[1] === 2 &&
+                arguments[0] === 1 && arguments.length === 2 && this.prop === "abc";
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj);
+
+        return newFunc(1, 2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-13.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-13.js
index 9757b867a..d1358dcf8 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-13.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-13.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-13.js

- * @description [[Call]] - length of parameters of 'target' is 1, length of 'boundArgs' is 1, length of 'ExtraArgs' is 0, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        var func = function (x) {

-            return this === obj && x === 1 &&

-                arguments[0] === 1 && arguments.length === 1 && this.prop === "abc";

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj, 1);

-

-        return newFunc();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 1, length of 'ExtraArgs' is 0, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        var func = function (x) {
+            return this === obj && x === 1 &&
+                arguments[0] === 1 && arguments.length === 1 && this.prop === "abc";
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj, 1);
+
+        return newFunc();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-14.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-14.js
index 8468ad1ef..6d1effcd6 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-14.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-14.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-14.js

- * @description [[Call]] - length of parameters of 'target' is 1, length of 'boundArgs' is 1, length of 'ExtraArgs' is 1, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        var func = function (x) {

-            return this === obj && x === 1 && arguments[1] === 2

-                arguments[0] === 1 && arguments.length === 2 && this.prop === "abc";

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj, 1);

-

-        return newFunc(2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 1, length of 'ExtraArgs' is 1, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        var func = function (x) {
+            return this === obj && x === 1 && arguments[1] === 2
+                arguments[0] === 1 && arguments.length === 2 && this.prop === "abc";
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj, 1);
+
+        return newFunc(2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-15.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-15.js
index c5e81944f..fd8ad5698 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-15.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-15.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-15.js

- * @description [[Call]] - length of parameters of 'target' is 1, length of 'boundArgs' is 2, length of 'ExtraArgs' is 0, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        var func = function (x) {

-            return this === obj && x === 1 && arguments[1] === 2 &&

-                arguments[0] === 1 && arguments.length === 2 && this.prop === "abc";

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj, 1, 2);

-

-        return newFunc();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 2, length of 'ExtraArgs' is 0, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        var func = function (x) {
+            return this === obj && x === 1 && arguments[1] === 2 &&
+                arguments[0] === 1 && arguments.length === 2 && this.prop === "abc";
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj, 1, 2);
+
+        return newFunc();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-2.js
index 1f2d6da24..c2d42bfb5 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-2.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-2.js

- * @description [[Call]] - 'F''s [[BoundThis]] is used as the 'this' value of calling the [[Call]] internal method of 'F''s [[TargetFunction]] when 'F' is called

- */

-

-

-function testcase() {

-        var obj = { "prop": "a" };

-

-        var func = function () {

-            return this;

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj);

-

-        return newFunc() === obj;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - 'F''s [[BoundThis]] is used as the 'this' value of
+    calling the [[Call]] internal method of 'F''s [[TargetFunction]]
+    when 'F' is called
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { "prop": "a" };
+
+        var func = function () {
+            return this;
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj);
+
+        return newFunc() === obj;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-3.js
index 41128642e..5e29c70a5 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-3.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-3.js

- * @description [[Call]] - the provided arguments is used as the latter part of arguments of calling the [[Call]] internal method of 'F''s [[TargetFunction]] when 'F' is called

- */

-

-

-function testcase() {

-        var func = function (x, y, z) {

-            return z;

-        };

-

-        var newFunc = Function.prototype.bind.call(func, {}, "a", "b");

-

-        return newFunc("c") === "c";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - the provided arguments is used as the latter part of
+    arguments of calling the [[Call]] internal method of 'F''s
+    [[TargetFunction]] when 'F' is called
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (x, y, z) {
+            return z;
+        };
+
+        var newFunc = Function.prototype.bind.call(func, {}, "a", "b");
+
+        return newFunc("c") === "c";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-4.js
index e1ef7406c..677ebe679 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-4.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-4.js

- * @description [[Call]] - length of parameters of 'target' is 0, length of 'boundArgs' is 0, length of 'ExtraArgs' is 0, and without 'boundThis'

- */

-

-

-function testcase() {

-        var func = function () {

-            return arguments.length === 0;

-        };

-

-        var newFunc = Function.prototype.bind.call(func);

-

-        return newFunc();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 0, and without
+    'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function () {
+            return arguments.length === 0;
+        };
+
+        var newFunc = Function.prototype.bind.call(func);
+
+        return newFunc();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-5.js
index 2f5e6b5d3..df07a1ea3 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-5.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-5.js

- * @description [[Call]] - length of parameters of 'target' is 0, length of 'boundArgs' is 0, length of 'ExtraArgs' is 1, and without 'boundThis'

- */

-

-

-function testcase() {

-        var func = function () {

-            return arguments[0] === 1;

-        };

-

-        var newFunc = Function.prototype.bind.call(func);

-

-        return newFunc(1);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 1, and without
+    'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function () {
+            return arguments[0] === 1;
+        };
+
+        var newFunc = Function.prototype.bind.call(func);
+
+        return newFunc(1);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-6.js
index b96fba085..33ee79dbb 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-6.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-6.js

- * @description [[Call]] - length of parameters of 'target' is 0, length of 'boundArgs' is 0, length of 'ExtraArgs' is 0, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        var func = function () {

-            return this === obj && arguments.length === 0;

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj);

-

-        return newFunc();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 0, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        var func = function () {
+            return this === obj && arguments.length === 0;
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj);
+
+        return newFunc();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-7.js
index bc9559ad3..4044f2ff0 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-7.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-7.js

- * @description [[Call]] - length of parameters of 'target' is 0, length of 'boundArgs' is 1, length of 'ExtraArgs' is 0, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        var func = function () {

-            return this === obj && arguments[0] === 1;

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj, 1);

-

-        return newFunc();

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 1, length of 'ExtraArgs' is 0, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        var func = function () {
+            return this === obj && arguments[0] === 1;
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj, 1);
+
+        return newFunc();
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-8.js
index f24aa0f4b..1369fe74a 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-8.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-8.js

- * @description [[Call]] - length of parameters of 'target' is 0, length of 'boundArgs' is 0, length of 'ExtraArgs' is 1, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        var func = function () {

-            return this === obj && arguments[0] === 1;

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj);

-

-        return newFunc(1);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 1, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        var func = function () {
+            return this === obj && arguments[0] === 1;
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj);
+
+        return newFunc(1);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-9.js
index e65169ec1..d9c276888 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-9.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.1/15.3.4.5.1-4-9.js

- * @description [[Call]] - length of parameters of 'target' is 0, length of 'boundArgs' is 1, length of 'ExtraArgs' is 1, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        var func = function () {

-            return this === obj && arguments[0] === 1 && arguments[1] === 2;

-        };

-

-        var newFunc = Function.prototype.bind.call(func, obj, 1);

-

-        return newFunc(2);

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Call]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 1, length of 'ExtraArgs' is 1, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        var func = function () {
+            return this === obj && arguments[0] === 1 && arguments[1] === 2;
+        };
+
+        var newFunc = Function.prototype.bind.call(func, obj, 1);
+
+        return newFunc(2);
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-1.js
index 4064793c0..d4288641d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-1.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-1.js

- * @description [[Construct]] - 'F''s [[BoundArgs]] is used as the former part of arguments of calling the [[Construct]] internal method of 'F''s [[TargetFunction]] when 'F' is called as constructor

- */

-

-

-function testcase() {

-        var func = function (x, y, z) {

-            var objResult = {};

-            objResult.returnValue = x + y + z;

-            objResult.returnVerifyResult = arguments[0] === "a" && arguments.length === 3;

-            return objResult;

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {}, "a", "b", "c");

-

-        var newInstance = new NewFunc();

-

-        return newInstance.hasOwnProperty("returnValue") && newInstance.returnValue === "abc" &&

-            newInstance.hasOwnProperty("returnVerifyResult") && newInstance.returnVerifyResult === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - 'F''s [[BoundArgs]] is used as the former part of
+    arguments of calling the [[Construct]] internal method of 'F''s
+    [[TargetFunction]] when 'F' is called as constructor
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (x, y, z) {
+            var objResult = {};
+            objResult.returnValue = x + y + z;
+            objResult.returnVerifyResult = arguments[0] === "a" && arguments.length === 3;
+            return objResult;
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {}, "a", "b", "c");
+
+        var newInstance = new NewFunc();
+
+        return newInstance.hasOwnProperty("returnValue") && newInstance.returnValue === "abc" &&
+            newInstance.hasOwnProperty("returnVerifyResult") && newInstance.returnVerifyResult === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-10.js
index 1e797a3a2..11c6c987b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-10.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-10.js

- * @description [[Construct]] - length of parameters of 'target' is 1, length of 'boundArgs' is 0, length of 'ExtraArgs' is 1

- */

-

-

-function testcase() {

-        var func = function (x) {

-            return new Boolean(arguments.length === 1 && x === 1 && arguments[0] === 1);

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {});

-

-        var newInstance = new NewFunc(1);

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (x) {
+            return new Boolean(arguments.length === 1 && x === 1 && arguments[0] === 1);
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {});
+
+        var newInstance = new NewFunc(1);
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-11.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-11.js
index 7df435744..12ea9bec2 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-11.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-11.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-11.js

- * @description [[Construct]] - length of parameters of 'target' is 1, length of 'boundArgs' is 0, length of 'ExtraArgs' is 2

- */

-

-

-function testcase() {

-        var func = function (x) {

-            return new Boolean(arguments.length === 2 && x === 1 && arguments[1] === 2 && arguments[0] === 1);

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {});

-

-        var newInstance = new NewFunc(1, 2);

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 2
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (x) {
+            return new Boolean(arguments.length === 2 && x === 1 && arguments[1] === 2 && arguments[0] === 1);
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {});
+
+        var newInstance = new NewFunc(1, 2);
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-12.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-12.js
index 5003a213f..e1d83dbc4 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-12.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-12.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-12.js

- * @description [[Construct]] - length of parameters of 'target' is 1, length of 'boundArgs' is 1, length of 'ExtraArgs' is 0

- */

-

-

-function testcase() {

-        var func = function (x) {

-            return new Boolean(arguments.length === 1 && x === 1 && arguments[0] === 1);

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {}, 1);

-

-        var newInstance = new NewFunc();

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 1, length of 'ExtraArgs' is 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (x) {
+            return new Boolean(arguments.length === 1 && x === 1 && arguments[0] === 1);
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {}, 1);
+
+        var newInstance = new NewFunc();
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-13.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-13.js
index 24ca939c6..4b1e1e738 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-13.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-13.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-13.js

- * @description [[Construct]] - length of parameters of 'target' is 1, length of 'boundArgs' is 1, length of 'ExtraArgs' is 1

- */

-

-

-function testcase() {

-        var func = function (x) {

-            return new Boolean(arguments.length === 2 && x === 1 && arguments[1] === 2 && arguments[0] === 1);

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {}, 1);

-

-        var newInstance = new NewFunc(2);

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 1, length of 'ExtraArgs' is 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (x) {
+            return new Boolean(arguments.length === 2 && x === 1 && arguments[1] === 2 && arguments[0] === 1);
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {}, 1);
+
+        var newInstance = new NewFunc(2);
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-14.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-14.js
index 9489475f3..7cbfd10dc 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-14.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-14.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-14.js

- * @description [[Construct]] - length of parameters of 'target' is 1, length of 'boundArgs' is 2, length of 'ExtraArgs' is 0

- */

-

-

-function testcase() {

-        var func = function (x) {

-            return new Boolean(arguments.length === 2 && x === 1 && arguments[1] === 2 && arguments[0] === 1);

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {}, 1, 2);

-

-        var newInstance = new NewFunc();

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 2, length of 'ExtraArgs' is 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (x) {
+            return new Boolean(arguments.length === 2 && x === 1 && arguments[1] === 2 && arguments[0] === 1);
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {}, 1, 2);
+
+        var newInstance = new NewFunc();
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-2.js
index 44d424561..2109152d0 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-2.js
@@ -1,27 +1,30 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-2.js

- * @description [[Construct]] - the provided arguments is used as the latter part of arguments of calling the [[Construct]] internal method of 'F''s [[TargetFunction]] when 'F' is called as constructor

- */

-

-

-function testcase() {

-        var func = function (x, y, z) {

-            var objResult = {};

-            objResult.returnValue = x + y + z;

-            objResult.returnVerifyResult = arguments[0] === "a" && arguments.length === 3;

-            return objResult;

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {});

-

-        var newInstance = new NewFunc("a", "b", "c");

-

-        return newInstance.hasOwnProperty("returnValue") && newInstance.returnValue === "abc" &&

-            newInstance.hasOwnProperty("returnVerifyResult") && newInstance.returnVerifyResult === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - the provided arguments is used as the latter part
+    of arguments of calling the [[Construct]] internal method of 'F''s
+    [[TargetFunction]] when 'F' is called as constructor
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (x, y, z) {
+            var objResult = {};
+            objResult.returnValue = x + y + z;
+            objResult.returnVerifyResult = arguments[0] === "a" && arguments.length === 3;
+            return objResult;
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {});
+
+        var newInstance = new NewFunc("a", "b", "c");
+
+        return newInstance.hasOwnProperty("returnValue") && newInstance.returnValue === "abc" &&
+            newInstance.hasOwnProperty("returnVerifyResult") && newInstance.returnVerifyResult === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-3.js
index b355e499e..b4c697a5f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-3.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-3.js

- * @description [[Construct]] - length of parameters of 'target' is 0, length of 'boundArgs' is 0, length of 'ExtraArgs' is 0, and without 'boundThis'

- */

-

-

-function testcase() {

-        var func = function () {

-            return new Boolean(arguments.length === 0);

-        };

-

-        var NewFunc = Function.prototype.bind.call(func);

-

-        var newInstance = new NewFunc();

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 0, and without
+    'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function () {
+            return new Boolean(arguments.length === 0);
+        };
+
+        var NewFunc = Function.prototype.bind.call(func);
+
+        var newInstance = new NewFunc();
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-4.js
index 64c97830e..8d82312a8 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-4.js
@@ -1,23 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-4.js

- * @description [[Construct]] - length of parameters of 'target' is 0, length of 'boundArgs' is 0, length of 'ExtraArgs' is 1, and without 'boundThis'

- */

-

-

-function testcase() {

-        var func = function () {

-            return new Boolean(arguments[0] === 1 && arguments.length === 1);

-        };

-

-        var NewFunc = Function.prototype.bind.call(func);

-

-        var newInstance = new NewFunc(1);

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 1, and without
+    'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function () {
+            return new Boolean(arguments[0] === 1 && arguments.length === 1);
+        };
+
+        var NewFunc = Function.prototype.bind.call(func);
+
+        var newInstance = new NewFunc(1);
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-5.js
index 338256f0a..18ddd600d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-5.js
@@ -1,31 +1,33 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-5.js

- * @description [[Construct]] - length of parameters of 'target' is 0, length of 'boundArgs' is 0, length of 'ExtraArgs' is 0, and with 'boundThis'

- */

-

-

-function testcase() {

-        var obj = { prop: "abc" };

-

-        try {

-            Object.prototype.verifyThis = "verifyThis";

-            var func = function () {

-                return new Boolean(arguments.length === 0 && Object.prototype.toString.call(this) === "[object Object]" &&

-                    this.verifyThis === "verifyThis");

-            };

-

-            var NewFunc = Function.prototype.bind.call(func, obj);

-

-            var newInstance = new NewFunc();

-

-            return newInstance.valueOf();

-        } finally {

-            delete Object.prototype.verifyThis;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 0, and with 'boundThis'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var obj = { prop: "abc" };
+
+        try {
+            Object.prototype.verifyThis = "verifyThis";
+            var func = function () {
+                return new Boolean(arguments.length === 0 && Object.prototype.toString.call(this) === "[object Object]" &&
+                    this.verifyThis === "verifyThis");
+            };
+
+            var NewFunc = Function.prototype.bind.call(func, obj);
+
+            var newInstance = new NewFunc();
+
+            return newInstance.valueOf();
+        } finally {
+            delete Object.prototype.verifyThis;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-6.js
index a2e0fcd77..9dc06c92f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-6.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-6.js

- * @description [[Construct]] - length of parameters of 'target' is 0, length of 'boundArgs' is 1, length of 'ExtraArgs' is 0

- */

-

-

-function testcase() {

-        var func = function () {

-            return new Boolean(arguments.length === 1 && arguments[0] === 1);

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {}, 1);

-

-        var newInstance = new NewFunc();

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 1, length of 'ExtraArgs' is 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function () {
+            return new Boolean(arguments.length === 1 && arguments[0] === 1);
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {}, 1);
+
+        var newInstance = new NewFunc();
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-7.js
index 867308baa..979b7bb40 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-7.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-7.js

- * @description [[Construct]] - length of parameters of 'target' is 0, length of 'boundArgs' is 0, length of 'ExtraArgs' is 1

- */

-

-

-function testcase() {

-        var func = function () {

-            return new Boolean(arguments.length === 1 && arguments[0] === 1);

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {});

-

-        var newInstance = new NewFunc(1);

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function () {
+            return new Boolean(arguments.length === 1 && arguments[0] === 1);
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {});
+
+        var newInstance = new NewFunc(1);
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-8.js
index a0ec6fc0c..f7a06cd75 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-8.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-8.js

- * @description [[Construct]] - length of parameters of 'target' is 0, length of 'boundArgs' is 1, length of 'ExtraArgs' is 1

- */

-

-

-function testcase() {

-        var func = function () {

-            return new Boolean(arguments.length === 2 && arguments[0] === 1 && arguments[1] === 2);

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {}, 1);

-

-        var newInstance = new NewFunc(2);

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 0, length of
+    'boundArgs' is 1, length of 'ExtraArgs' is 1
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function () {
+            return new Boolean(arguments.length === 2 && arguments[0] === 1 && arguments[1] === 2);
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {}, 1);
+
+        var newInstance = new NewFunc(2);
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-9.js
index 89b443923..14501aa2a 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-9.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5.2/15.3.4.5.2-4-9.js

- * @description [[Construct]] - length of parameters of 'target' is 1, length of 'boundArgs' is 0, length of 'ExtraArgs' is 0

- */

-

-

-function testcase() {

-        var func = function (x) {

-            return new Boolean(arguments.length === 0 && typeof x === "undefined");

-        };

-

-        var NewFunc = Function.prototype.bind.call(func, {});

-

-        var newInstance = new NewFunc();

-

-        return newInstance.valueOf() === true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    [[Construct]] - length of parameters of 'target' is 1, length of
+    'boundArgs' is 0, length of 'ExtraArgs' is 0
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var func = function (x) {
+            return new Boolean(arguments.length === 0 && typeof x === "undefined");
+        };
+
+        var NewFunc = Function.prototype.bind.call(func, {});
+
+        var newInstance = new NewFunc();
+
+        return newInstance.valueOf() === true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-0-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-0-1.js
index 5dba58d7e..0768a5181 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-0-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-0-1.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-0-1.js

- * @description Function.prototype.bind must exist as a function

- */

-

-

-function testcase() {

-  var f = Function.prototype.bind;

-

-  if (typeof(f) === "function") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind must exist as a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var f = Function.prototype.bind;
+
+  if (typeof(f) === "function") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-0-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-0-2.js
index bef4b7b1b..e4d571c0e 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-0-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-0-2.js
@@ -1,17 +1,17 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-0-2.js

- * @description Function.prototype.bind must exist as a function taking 1 parameter

- */

-

-

-function testcase() {

-  if (Function.prototype.bind.length === 1) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind must exist as a function taking 1 parameter
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  if (Function.prototype.bind.length === 1) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-10-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-10-1.js
index d440104df..2b8068e2d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-10-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-10-1.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-10-1.js

- * @description Function.prototype.bind - internal property [[Class]] of 'F' is set as Function

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        return Object.prototype.toString.call(obj) === "[object Function]";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - internal property [[Class]] of 'F' is
+    set as Function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        return Object.prototype.toString.call(obj) === "[object Function]";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-11-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-11-1.js
index cb2777e7a..771472192 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-11-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-11-1.js
@@ -1,24 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-11-1.js

- * @description Function.prototype.bind - internal property [[Prototype]] of 'F' is set as Function.prototype

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-        try {

-            Function.prototype.property = 12;

-            var obj = foo.bind({});

-

-            return obj.property === 12;

-        } finally {

-            delete Function.prototype.property;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - internal property [[Prototype]] of 'F'
+    is set as Function.prototype
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+        try {
+            Function.prototype.property = 12;
+            var obj = foo.bind({});
+
+            return obj.property === 12;
+        } finally {
+            delete Function.prototype.property;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-1.js
index 63a59b19f..a413ace90 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-1.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-1.js

- * @description Function.prototype.bind, bound fn has a 'length' own property

- */

-

-

-function testcase() {

-  function foo() { }

-  var o = {};

-  

-  var bf = foo.bind(o);

-  if (bf.hasOwnProperty('length')) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind, bound fn has a 'length' own property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() { }
+  var o = {};
+  
+  var bf = foo.bind(o);
+  if (bf.hasOwnProperty('length')) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-2.js
index f2291dac3..2f6cf8561 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-2.js

- * @description Function.prototype.bind, 'length' set to remaining number of expected args

- */

-

-

-function testcase() {

-  function foo(x, y) { }

-  var o = {};

-  

-  var bf = foo.bind(o);

-  if (bf.length === 2) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind, 'length' set to remaining number of
+    expected args
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo(x, y) { }
+  var o = {};
+  
+  var bf = foo.bind(o);
+  if (bf.length === 2) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-3.js
index 8a1925dec..131cc650f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-3.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-3.js

- * @description Function.prototype.bind, 'length' set to remaining number of expected args (all args prefilled)

- */

-

-

-function testcase() {

-  function foo(x, y) { }

-  var o = {};

-  

-  var bf = foo.bind(o, 42, 101);

-  if (bf.length === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind, 'length' set to remaining number of
+    expected args (all args prefilled)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo(x, y) { }
+  var o = {};
+  
+  var bf = foo.bind(o, 42, 101);
+  if (bf.length === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-4.js
index 3fe65667e..7442c2155 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-4.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-4.js

- * @description Function.prototype.bind, 'length' set to remaining number of expected args (target takes 0 args)

- */

-

-

-function testcase() {

-  function foo() { }

-  var o = {};

-  

-  var bf = foo.bind(o);

-  if (bf.length === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind, 'length' set to remaining number of
+    expected args (target takes 0 args)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() { }
+  var o = {};
+  
+  var bf = foo.bind(o);
+  if (bf.length === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-5.js
index 2269348f3..76cd3cffe 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-5.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-5.js

- * @description Function.prototype.bind, 'length' set to remaining number of expected args (target provided extra args)

- */

-

-

-function testcase() {

-  function foo() { }

-  var o = {};

-  

-  var bf = foo.bind(o, 42);

-  if (bf.length === 0) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind, 'length' set to remaining number of
+    expected args (target provided extra args)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() { }
+  var o = {};
+  
+  var bf = foo.bind(o, 42);
+  if (bf.length === 0) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-6.js
index bf61a2d46..738e2d6f9 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-6.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-13.b-6.js

- * @description Function.prototype.bind, 'length' set to remaining number of expected args

- */

-

-

-function testcase() {

-    function foo(x, y) { }

-    var o = {};

-

-    var bf = foo.bind(o, 42);

-    if (bf.length === 1) {

-        return true;

-    }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind, 'length' set to remaining number of
+    expected args
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+    function foo(x, y) { }
+    var o = {};
+
+    var bf = foo.bind(o, 42);
+    if (bf.length === 1) {
+        return true;
+    }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-1.js
index 34e4eef14..97414a9f5 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-1.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-1.js

- * @description Function.prototype.bind, 'length' is a data valued own property

- */

-

-

-function testcase() {

-  function foo() { }

-  var o = {};

-  

-  var bf = foo.bind(o);

-  var desc = Object.getOwnPropertyDescriptor(bf, 'length');

-  if (desc.hasOwnProperty('value') === true &&

-      desc.hasOwnProperty('get') === false &&

-      desc.hasOwnProperty('set') === false) {

-    return true;

-  }    

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind, 'length' is a data valued own property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() { }
+  var o = {};
+  
+  var bf = foo.bind(o);
+  var desc = Object.getOwnPropertyDescriptor(bf, 'length');
+  if (desc.hasOwnProperty('value') === true &&
+      desc.hasOwnProperty('get') === false &&
+      desc.hasOwnProperty('set') === false) {
+    return true;
+  }    
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-2.js
index 2297286a7..20433efc4 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-2.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-2.js

- * @description Function.prototype.bind, 'length' is a data valued own property with default attributes (false)

- */

-

-

-function testcase() {

-  function foo() { }

-  var o = {};

-  

-  var bf = foo.bind(o);

-  var desc = Object.getOwnPropertyDescriptor(bf, 'length');

-  if (desc.value === 0 &&

-      desc.enumerable === false &&

-      desc.writable === false &&

-      desc.configurable == false) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind, 'length' is a data valued own property
+    with default attributes (false)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() { }
+  var o = {};
+  
+  var bf = foo.bind(o);
+  var desc = Object.getOwnPropertyDescriptor(bf, 'length');
+  if (desc.value === 0 &&
+      desc.enumerable === false &&
+      desc.writable === false &&
+      desc.configurable == false) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-3.js
index e5e332c7f..d62f34d3b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-3.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-3.js

- * @description Function.prototype.bind - The [[Writable]] attribute of length property in F set as false

- */

-

-

-function testcase() {

-

-        var canWritable = false;

-        var hasProperty = false;

-        function foo() { }

-        var obj = foo.bind({});

-        hasProperty = obj.hasOwnProperty("length");

-        obj.length = 100;

-        canWritable = (obj.length === 100);

-        return hasProperty && !canWritable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - The [[Writable]] attribute of length
+    property in F set as false
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var canWritable = false;
+        var hasProperty = false;
+        function foo() { }
+        var obj = foo.bind({});
+        hasProperty = obj.hasOwnProperty("length");
+        obj.length = 100;
+        canWritable = (obj.length === 100);
+        return hasProperty && !canWritable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-4.js
index 954e03c68..1d08c65be 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-4.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-4.js

- * @description Function.prototype.bind - The [[Enumerable]] attribute of length property in F set as false

- */

-

-

-function testcase() {

-

-        var canEnumerable = false;

-        var hasProperty = false;

-        function foo() { }

-        var obj = foo.bind({});

-        hasProperty = obj.hasOwnProperty("length");

-        for (var prop in obj) {

-            if (prop === "length") {

-                canEnumerable = true;

-            }

-        }

-        return hasProperty && !canEnumerable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - The [[Enumerable]] attribute of length
+    property in F set as false
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var canEnumerable = false;
+        var hasProperty = false;
+        function foo() { }
+        var obj = foo.bind({});
+        hasProperty = obj.hasOwnProperty("length");
+        for (var prop in obj) {
+            if (prop === "length") {
+                canEnumerable = true;
+            }
+        }
+        return hasProperty && !canEnumerable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-5.js
index ba9d7d5ab..a6957cd5c 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-5.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-15-5.js

- * @description Function.prototype.bind - The [[Configurable]] attribute of length property in F set as false

- */

-

-

-function testcase() {

-

-        var canConfigurable = false;

-        var hasProperty = false;

-        function foo() { }

-        var obj = foo.bind({});

-        hasProperty = obj.hasOwnProperty("length");

-        delete obj.caller;

-        canConfigurable = !obj.hasOwnProperty("length");

-        return hasProperty && !canConfigurable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - The [[Configurable]] attribute of length
+    property in F set as false
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var canConfigurable = false;
+        var hasProperty = false;
+        function foo() { }
+        var obj = foo.bind({});
+        hasProperty = obj.hasOwnProperty("length");
+        delete obj.caller;
+        canConfigurable = !obj.hasOwnProperty("length");
+        return hasProperty && !canConfigurable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-16-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-16-1.js
index db2db9513..5b4dcb9c8 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-16-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-16-1.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-16-1.js

- * @description Function.prototype.bind, [[Extensible]] of the bound fn is true

- */

-

-

-function testcase() {

-  function foo() { }

-  var o = {};

-  

-  var bf = foo.bind(o);

-  var ex = Object.isExtensible(bf);

-  if (ex === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind, [[Extensible]] of the bound fn is true
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() { }
+  var o = {};
+  
+  var bf = foo.bind(o);
+  var ex = Object.isExtensible(bf);
+  if (ex === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-16-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-16-2.js
index b7412d54f..fa2ab259a 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-16-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-16-2.js
@@ -1,19 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-16-2.js

- * @description Function.prototype.bind - The [[Extensible]] attribute of internal property in F set as true

- */

-

-

-function testcase() {

-

-        function foo() { }

-        var obj = foo.bind({});

-        obj.property = 12;

-        return obj.hasOwnProperty("property");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - The [[Extensible]] attribute of internal
+    property in F set as true
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function foo() { }
+        var obj = foo.bind({});
+        obj.property = 12;
+        return obj.hasOwnProperty("property");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-1.js
index 3c6157285..6402d6377 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-1.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target is not callable.

- *

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-1.js

- * @description Function.prototype.bind throws TypeError if the Target is not callable (but an instance of Function)

- */

-

-

-function testcase() {

-  foo.prototype = Function.prototype;

-  // dummy function

-  function foo() {}

-  var f = new foo();

-

-  try {

-    f.bind();

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target
+    is not callable.
+description: >
+    Function.prototype.bind throws TypeError if the Target is not
+    callable (but an instance of Function)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  foo.prototype = Function.prototype;
+  // dummy function
+  function foo() {}
+  var f = new foo();
+
+  try {
+    f.bind();
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-10.js
index 33ccf9e8c..6cf785d51 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-10.js
@@ -1,19 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-10.js

- * @description Function.prototype.bind throws TypeError if 'Target' is undefined

- */

-function testcase() {

-        try {

-            Function.prototype.bind.call(undefined);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        } 

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind throws TypeError if 'Target' is undefined
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Function.prototype.bind.call(undefined);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        } 
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-11.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-11.js
index 84425babe..ca3e196f9 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-11.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-11.js
@@ -1,19 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-11.js

- * @description Function.prototype.bind throws TypeError if 'Target' is NULL

- */

-function testcase() {

-        try {

-            Function.prototype.bind.call(null);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind throws TypeError if 'Target' is NULL
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Function.prototype.bind.call(null);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-12.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-12.js
index 64be86e10..0eed7c207 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-12.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-12.js
@@ -1,19 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-12.js

- * @description Function.prototype.bind throws TypeError if 'Target' is a boolean

- */

-function testcase() {

-        try {

-            Function.prototype.bind.call(true);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        } 

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind throws TypeError if 'Target' is a boolean
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Function.prototype.bind.call(true);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        } 
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-13.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-13.js
index c0dabe21f..ac297f53e 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-13.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-13.js
@@ -1,22 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the

-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-13.js

- * @description Function.prototype.bind throws TypeError if 'Target' is a number

- */

-function testcase() {

-        try {

-            Function.prototype.bind.call(5);

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind throws TypeError if 'Target' is a number
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Function.prototype.bind.call(5);
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-14.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-14.js
index 51ac5f943..d56026562 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-14.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-14.js
@@ -1,19 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-14.js

- * @description Function.prototype.bind throws TypeError if 'Target' is a string

- */

-function testcase() {

-        try {

-            Function.prototype.bind.call("abc");

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind throws TypeError if 'Target' is a string
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Function.prototype.bind.call("abc");
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-15.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-15.js
index 486e77a3f..664f49d6b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-15.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-15.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-15.js

- * @description Function.prototype.bind throws TypeError if 'Target' is Object without Call internal method

- */

-

-

-function testcase() {

-        try {

-            Function.prototype.bind.call({});

-            return false;

-        } catch (e) {

-            return (e instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind throws TypeError if 'Target' is Object
+    without Call internal method
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        try {
+            Function.prototype.bind.call({});
+            return false;
+        } catch (e) {
+            return (e instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-16.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-16.js
index 9af267814..cfadb95ec 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-16.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-16.js
@@ -1,22 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-16.js

- * @description Function.prototype.bind - 'Target' is a function

- */

-

-

-function testcase() {

-        function testFunc() {}

-        try {

-            testFunc.bind();

-            return true;

-        } catch (e) {

-            return false;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind - 'Target' is a function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        function testFunc() {}
+        try {
+            testFunc.bind();
+            return true;
+        } catch (e) {
+            return false;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-2.js
index cadeefde8..769c7f343 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-2.js
@@ -1,29 +1,32 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target is not callable.

- *

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-2.js

- * @description Function.prototype.bind throws TypeError if the Target is not callable (bind attached to object)

- */

-

-

-function testcase() {

-  // dummy function 

-  function foo() {}

-  var f = new foo();

-  f.bind = Function.prototype.bind;

-

-  try {

-    f.bind();

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target
+    is not callable.
+description: >
+    Function.prototype.bind throws TypeError if the Target is not
+    callable (bind attached to object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  // dummy function 
+  function foo() {}
+  var f = new foo();
+  f.bind = Function.prototype.bind;
+
+  try {
+    f.bind();
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-3.js
index a59b76a22..6b36cb39b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-3.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target is not callable.

- *

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-3.js

- * @description Function.prototype.bind allows Target to be a constructor (Number)

- */

-

-

-function testcase() {

-  var bnc = Number.bind(null);

-  var n = bnc(42);

-  if (n === 42) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target
+    is not callable.
+description: Function.prototype.bind allows Target to be a constructor (Number)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var bnc = Number.bind(null);
+  var n = bnc(42);
+  if (n === 42) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-4.js
index 9595be580..86a5c3fd7 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-4.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target is not callable.

- *

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-4.js

- * @description Function.prototype.bind allows Target to be a constructor (String)

- */

-

-

-function testcase() {

-  var bsc = String.bind(null);

-  var s = bsc("hello world");

-  if (s === "hello world") {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target
+    is not callable.
+description: Function.prototype.bind allows Target to be a constructor (String)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var bsc = String.bind(null);
+  var s = bsc("hello world");
+  if (s === "hello world") {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-5.js
index 760b7bad3..ca030b8f5 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-5.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target is not callable.

- *

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-5.js

- * @description Function.prototype.bind allows Target to be a constructor (Boolean)

- */

-

-

-function testcase() {

-  var bbc = Boolean.bind(null);

-  var b = bbc(true);

-  if (b === true) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target
+    is not callable.
+description: Function.prototype.bind allows Target to be a constructor (Boolean)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var bbc = Boolean.bind(null);
+  var b = bbc(true);
+  if (b === true) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-6.js
index c58f76684..44b6e0f21 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-6.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target is not callable.

- *

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-6.js

- * @description Function.prototype.bind allows Target to be a constructor (Object)

- */

-

-

-function testcase() {

-  var boc = Object.bind(null);

-  var o = boc(42);

-  if (o == 42) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target
+    is not callable.
+description: Function.prototype.bind allows Target to be a constructor (Object)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var boc = Object.bind(null);
+  var o = boc(42);
+  if (o == 42) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-7.js
index f40385247..69846ed01 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-7.js
@@ -1,24 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target is not callable.

- *

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-7.js

- * @description Function.prototype.bind throws TypeError if the Target is not callable (JSON)

- */

-

-

-function testcase() {

-  try {

-    JSON.bind();

-  }

-  catch (e) {

-    if (e instanceof TypeError) {

-      return true;

-    }

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target
+    is not callable.
+description: >
+    Function.prototype.bind throws TypeError if the Target is not
+    callable (JSON)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  try {
+    JSON.bind();
+  }
+  catch (e) {
+    if (e instanceof TypeError) {
+      return true;
+    }
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-8.js
index 96b3d395f..fbe540042 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-8.js
@@ -1,22 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * 15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target is not callable.

- *

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-8.js

- * @description Function.prototype.bind allows Target to be a constructor (Array)

- */

-

-

-function testcase() {

-        var bac = Array.bind(null);

-        var a = bac(42);

-        a.prop = "verifyPropertyExist";

-        a[41] = 41;

-

-        return a.prop === "verifyPropertyExist" && a[41] === 41 && a.length === 42;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+info: >
+    15.3.4.5 step 2 specifies that a TypeError must be thrown if the Target
+    is not callable.
+description: Function.prototype.bind allows Target to be a constructor (Array)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        var bac = Array.bind(null);
+        var a = bac(42);
+        a.prop = "verifyPropertyExist";
+        a[41] = 41;
+
+        return a.prop === "verifyPropertyExist" && a[41] === 41 && a.length === 42;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-9.js
index 35994e613..96740bea0 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-9.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-2-9.js

- * @description Function.prototype.bind allows Target to be a constructor (Date)

- */

-

-

-function testcase() {

-  var bdc = Date.bind(null);

-  var s = bdc(0, 0, 0);

-  if (typeof(s) === 'string') {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind allows Target to be a constructor (Date)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var bdc = Date.bind(null);
+  var s = bdc(0, 0, 0);
+  if (typeof(s) === 'string') {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-1.js
index 6baa890d9..b69e287cc 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-1.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-1.js

- * @description Function.prototype.bind - 'caller' is defined as one property of 'F'

- */

-

-

-function testcase() {

-

-        function foo() { }

-        var obj = foo.bind({});

-        return obj.hasOwnProperty("caller");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - 'caller' is defined as one property of
+    'F'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function foo() { }
+        var obj = foo.bind({});
+        return obj.hasOwnProperty("caller");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-2.js
index 97352a8ac..9077d78a7 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-2.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-2.js

- * @description Function.prototype.bind - [[Get]] attribute of 'caller' property in 'F' is thrower

- */

-

-

-function testcase() {

-

-        function foo() { }

-        var obj = foo.bind({});

-        try {

-            return obj.caller && false;

-        } catch (ex) {

-            return (ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - [[Get]] attribute of 'caller' property
+    in 'F' is thrower
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function foo() { }
+        var obj = foo.bind({});
+        try {
+            return obj.caller && false;
+        } catch (ex) {
+            return (ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-3.js
index d627779a3..868be1f04 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-3.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-3.js

- * @description Function.prototype.bind - [[Set]] attribute of 'caller' property in  'F' is thrower

- */

-

-

-function testcase() {

-

-        function foo() { }

-        var obj = foo.bind({});

-        try {

-            obj.caller = 12;

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - [[Set]] attribute of 'caller' property
+    in  'F' is thrower
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function foo() { }
+        var obj = foo.bind({});
+        try {
+            obj.caller = 12;
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-4.js
index df5c63681..0b695b452 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-4.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-4.js

- * @description Function.prototype.bind - The [[Enumerable]] attribute of 'caller' property in  'F' is false

- */

-

-

-function testcase() {

-

-        var canEnumerable = false;

-        var hasProperty = false;

-        function foo() { }

-        var obj = foo.bind({});

-        hasProperty = obj.hasOwnProperty("caller");

-        for (var prop in obj) {

-            if (prop === "caller") {

-                canEnumerable = true;

-            }

-        }

-        return hasProperty && !canEnumerable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - The [[Enumerable]] attribute of 'caller'
+    property in  'F' is false
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var canEnumerable = false;
+        var hasProperty = false;
+        function foo() { }
+        var obj = foo.bind({});
+        hasProperty = obj.hasOwnProperty("caller");
+        for (var prop in obj) {
+            if (prop === "caller") {
+                canEnumerable = true;
+            }
+        }
+        return hasProperty && !canEnumerable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-5.js
index e5ff88537..1377dbcd4 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-5.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-20-5.js

- * @description Function.prototype.bind - The [[Configurable]] attribute of 'caller' property in  'F' is false

- */

-

-

-function testcase() {

-

-        var canConfigurable = false;

-        var hasProperty = false;

-        function foo() { }

-        var obj = foo.bind({});

-        hasProperty = obj.hasOwnProperty("caller");

-        delete obj.caller;

-        canConfigurable = obj.hasOwnProperty("caller");

-        return hasProperty && canConfigurable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - The [[Configurable]] attribute of
+    'caller' property in  'F' is false
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var canConfigurable = false;
+        var hasProperty = false;
+        function foo() { }
+        var obj = foo.bind({});
+        hasProperty = obj.hasOwnProperty("caller");
+        delete obj.caller;
+        canConfigurable = obj.hasOwnProperty("caller");
+        return hasProperty && canConfigurable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-1.js
index 2f4f76dff..a44f29d9e 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-1.js
@@ -1,18 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-1.js

- * @description Function.prototype.bind - 'arguments' is defined as one property of 'F'

- */

-

-

-function testcase() {

-

-        function foo() { }

-        var obj = foo.bind({});

-        return obj.hasOwnProperty("arguments");

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - 'arguments' is defined as one property
+    of 'F'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function foo() { }
+        var obj = foo.bind({});
+        return obj.hasOwnProperty("arguments");
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-2.js
index 79b87cd9e..fde9b0460 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-2.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-2.js

- * @description Function.prototype.bind - [[Get]] attribute of 'arguments' property in  'F' is thrower

- */

-

-

-function testcase() {

-

-        function foo() { }

-        var obj = foo.bind({});

-        try {

-            return obj.arguments && false;

-        } catch (ex) {

-            return (ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - [[Get]] attribute of 'arguments'
+    property in  'F' is thrower
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function foo() { }
+        var obj = foo.bind({});
+        try {
+            return obj.arguments && false;
+        } catch (ex) {
+            return (ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-3.js
index 859b996fc..0b3a7948e 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-3.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-3.js

- * @description Function.prototype.bind - [[Set]] attribute of 'arguments' property in  'F' is thrower

- */

-

-

-function testcase() {

-

-        function foo() { }

-        var obj = foo.bind({});

-        try {

-            obj.arguments = 12;

-            return false;

-        } catch (ex) {

-            return (ex instanceof TypeError);

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - [[Set]] attribute of 'arguments'
+    property in  'F' is thrower
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        function foo() { }
+        var obj = foo.bind({});
+        try {
+            obj.arguments = 12;
+            return false;
+        } catch (ex) {
+            return (ex instanceof TypeError);
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-4.js
index 1f2b9b5af..ad0b1a23e 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-4.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-4.js

- * @description Function.prototype.bind - The [[Enumerable]] attribute of 'arguments' property in  'F' is false

- */

-

-

-function testcase() {

-

-        var canEnumerable = false;

-        var hasProperty = false;

-        function foo() { }

-        var obj = foo.bind({});

-        hasProperty = obj.hasOwnProperty("arguments");

-        for (var prop in obj) {

-            if (prop === "arguments") {

-                canEnumerable = true;

-            }

-        }

-        return hasProperty && !canEnumerable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - The [[Enumerable]] attribute of
+    'arguments' property in  'F' is false
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var canEnumerable = false;
+        var hasProperty = false;
+        function foo() { }
+        var obj = foo.bind({});
+        hasProperty = obj.hasOwnProperty("arguments");
+        for (var prop in obj) {
+            if (prop === "arguments") {
+                canEnumerable = true;
+            }
+        }
+        return hasProperty && !canEnumerable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-5.js
index fb5772d60..b8c4d86cb 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-5.js
@@ -1,23 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-21-5.js

- * @description Function.prototype.bind - The [[Configurable]] attribute of 'arguments' property in  'F' is false

- */

-

-

-function testcase() {

-

-        var canConfigurable = false;

-        var hasProperty = false;

-        function foo() { }

-        var obj = foo.bind({});

-        hasProperty = obj.hasOwnProperty("arguments");

-        delete obj.caller;

-        canConfigurable = !obj.hasOwnProperty("arguments");

-        return hasProperty && !canConfigurable;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - The [[Configurable]] attribute of
+    'arguments' property in  'F' is false
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var canConfigurable = false;
+        var hasProperty = false;
+        function foo() { }
+        var obj = foo.bind({});
+        hasProperty = obj.hasOwnProperty("arguments");
+        delete obj.caller;
+        canConfigurable = !obj.hasOwnProperty("arguments");
+        return hasProperty && !canConfigurable;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-3-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-3-1.js
index 919b1a01f..6ba9305b8 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-3-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-3-1.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-3-1.js

- * @description Function.prototype.bind - each arg is defined in A in list order

- */

-

-

-function testcase() {

-

-        var foo = function (x, y) {

-            return new Boolean((x + y) === "ab" && arguments[0] === "a" &&

-                arguments[1] === "b" && arguments.length === 2);

-        };

-

-        var obj = foo.bind({}, "a", "b");

-        return obj()==true;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind - each arg is defined in A in list order
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function (x, y) {
+            return new Boolean((x + y) === "ab" && arguments[0] === "a" &&
+                arguments[1] === "b" && arguments.length === 2);
+        };
+
+        var obj = foo.bind({}, "a", "b");
+        return obj()==true;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-1.js
index acc864358..db3e6de19 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-1.js
@@ -1,20 +1,20 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-1.js

- * @description Function.prototype.bind - F can get own data property

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        obj.property = 12;

-        return obj.property === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind - F can get own data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        obj.property = 12;
+        return obj.property === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-10.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-10.js
index 32f349895..2d984ed8d 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-10.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-10.js
@@ -1,33 +1,35 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-10.js

- * @description Function.prototype.bind - F can get own accessor property without a get function that overrides an inherited accessor property

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        try {

-            Object.defineProperty(Function.prototype, "property", {

-                get: function () {

-                    return 3;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(obj, "property", {

-                set: function () { }

-            });

-            return typeof (obj.property) === "undefined";

-        } finally {

-            delete Function.prototype.property;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - F can get own accessor property without
+    a get function that overrides an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        try {
+            Object.defineProperty(Function.prototype, "property", {
+                get: function () {
+                    return 3;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(obj, "property", {
+                set: function () { }
+            });
+            return typeof (obj.property) === "undefined";
+        } finally {
+            delete Function.prototype.property;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-11.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-11.js
index ec08f1129..c5041152b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-11.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-11.js
@@ -1,27 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-11.js

- * @description Function.prototype.bind - F can get inherited accessor property without a get function

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        try {

-            Object.defineProperty(Function.prototype, "property", {

-                set: function () { },

-                configurable: true

-            });

-            return typeof (obj.property) === "undefined";

-        } finally {

-            delete Function.prototype.property;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - F can get inherited accessor property
+    without a get function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        try {
+            Object.defineProperty(Function.prototype, "property", {
+                set: function () { },
+                configurable: true
+            });
+            return typeof (obj.property) === "undefined";
+        } finally {
+            delete Function.prototype.property;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-12.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-12.js
index 1071f6462..60eca15fa 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-12.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-12.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-12.js

- * @description Function.prototype.bind - F cannot get property which doesn't exist

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        return typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind - F cannot get property which doesn't exist
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        return typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-2.js
index 465322918..7d6f87b67 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-2.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-2.js

- * @description Function.prototype.bind - F can get inherited data property

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        try {

-            Function.prototype.property = 12;

-            return obj.property === 12;

-        } finally {

-            delete Function.prototype.property;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind - F can get inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        try {
+            Function.prototype.property = 12;
+            return obj.property === 12;
+        } finally {
+            delete Function.prototype.property;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-3.js
index 18570e273..b106908c0 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-3.js
@@ -1,26 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-3.js

- * @description Function.prototype.bind - F can get own data property that overrides an inherited data property

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-

-        try {

-            Function.prototype.property = 3;

-            obj.property = 12;

-            return obj.property === 12;

-        } finally {

-            delete Function.prototype.property;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - F can get own data property that
+    overrides an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+
+        try {
+            Function.prototype.property = 3;
+            obj.property = 12;
+            return obj.property === 12;
+        } finally {
+            delete Function.prototype.property;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-4.js
index ef687d6fd..357c005fe 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-4.js
@@ -1,34 +1,36 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-4.js

- * @description Function.prototype.bind - F can get own data property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        try {

-            Object.defineProperty(Function.prototype, "property", {

-                get: function () {

-                    return 3;

-                },

-                configurable: true

-            });

-           

-            Object.defineProperty(obj, "property", {

-                value: 12

-            });

-

-            return obj.property === 12;

-        } finally {

-            delete Function.prototype.property;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - F can get own data property that
+    overrides an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        try {
+            Object.defineProperty(Function.prototype, "property", {
+                get: function () {
+                    return 3;
+                },
+                configurable: true
+            });
+           
+            Object.defineProperty(obj, "property", {
+                value: 12
+            });
+
+            return obj.property === 12;
+        } finally {
+            delete Function.prototype.property;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-5.js
index c98325793..b51137416 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-5.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-5.js

- * @description Function.prototype.bind - F can get own accessor property

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        Object.defineProperty(obj, "property", {

-            get: function () {

-                return 12;

-            }

-        });

-        return obj.property === 12;

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind - F can get own accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        Object.defineProperty(obj, "property", {
+            get: function () {
+                return 12;
+            }
+        });
+        return obj.property === 12;
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-6.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-6.js
index 3cff59da8..3240abd31 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-6.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-6.js
@@ -1,29 +1,29 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-6.js

- * @description Function.prototype.bind - F can get inherited accessor property

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        try {

-            Object.defineProperty(Function.prototype, "property", {

-                get: function () {

-                    return 12;

-                },

-                configurable: true

-            });

-            return obj.property === 12;

-        } finally {

-            delete Function.prototype.property;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind - F can get inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        try {
+            Object.defineProperty(Function.prototype, "property", {
+                get: function () {
+                    return 12;
+                },
+                configurable: true
+            });
+            return obj.property === 12;
+        } finally {
+            delete Function.prototype.property;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-7.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-7.js
index f41fe83a2..b428c3e21 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-7.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-7.js
@@ -1,29 +1,31 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-7.js

- * @description Function.prototype.bind - F can get own accessor property that overrides an inherited data property

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        try {

-            Function.prototype.property = 3;

-            Object.defineProperty(obj, "property", {

-                get: function () {

-                    return 12;

-                }

-            });

-            return obj.property === 12;

-        } finally {

-            delete Function.prototype.property;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - F can get own accessor property that
+    overrides an inherited data property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        try {
+            Function.prototype.property = 3;
+            Object.defineProperty(obj, "property", {
+                get: function () {
+                    return 12;
+                }
+            });
+            return obj.property === 12;
+        } finally {
+            delete Function.prototype.property;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-8.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-8.js
index 2165355cc..3e4647a15 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-8.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-8.js
@@ -1,35 +1,37 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-8.js

- * @description Function.prototype.bind - F can get own accessor property that overrides an inherited accessor property

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        try {

-            Object.defineProperty(Function.prototype, "property", {

-                get: function () {

-                    return 3;

-                },

-                configurable: true

-            });

-

-            Object.defineProperty(obj, "property", {

-                get: function () {

-                    return 12;

-                }

-            });

-            return obj.property === 12;

-        } finally {

-            delete Function.prototype.property;

-        }

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - F can get own accessor property that
+    overrides an inherited accessor property
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        try {
+            Object.defineProperty(Function.prototype, "property", {
+                get: function () {
+                    return 3;
+                },
+                configurable: true
+            });
+
+            Object.defineProperty(obj, "property", {
+                get: function () {
+                    return 12;
+                }
+            });
+            return obj.property === 12;
+        } finally {
+            delete Function.prototype.property;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-9.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-9.js
index 8c2d6fd24..b1895009b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-9.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-9.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-6-9.js

- * @description Function.prototype.bind - F can get own accessor property without a get function

- */

-

-

-function testcase() {

-

-        var foo = function () { };

-

-        var obj = foo.bind({});

-        Object.defineProperty(obj, "property", {

-            set: function () {}

-        });

-        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";

-    }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind - F can get own accessor property without
+    a get function
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        var foo = function () { };
+
+        var obj = foo.bind({});
+        Object.defineProperty(obj, "property", {
+            set: function () {}
+        });
+        return obj.hasOwnProperty("property") && typeof (obj.property) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-8-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-8-1.js
index 4b6b7ded4..f8641bc43 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-8-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-8-1.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-8-1.js

- * @description Function.prototype.bind, type of bound function must be 'function'

- */

-

-

-function testcase() {

-  function foo() { }

-  var o = {};

-  

-  var bf = foo.bind(o);

-  if (typeof(bf) === 'function') {

-    return  true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind, type of bound function must be 'function'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() { }
+  var o = {};
+  
+  var bf = foo.bind(o);
+  if (typeof(bf) === 'function') {
+    return  true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-8-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-8-2.js
index 65db6d625..c7704a9e7 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-8-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-8-2.js
@@ -1,22 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-8-2.js

- * @description Function.prototype.bind, [[Class]] of bound function must be 'Function'

- */

-

-

-function testcase() {

-  function foo() { }

-  var o = {};

-  

-  var bf = foo.bind(o);

-  var s = Object.prototype.toString.call(bf);

-  if (s === '[object Function]') {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind, [[Class]] of bound function must be
+    'Function'
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() { }
+  var o = {};
+  
+  var bf = foo.bind(o);
+  var s = Object.prototype.toString.call(bf);
+  if (s === '[object Function]') {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-9-1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-9-1.js
index b0fa31606..ac2b0c8da 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-9-1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-9-1.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-9-1.js

- * @description Function.prototype.bind, [[Prototype]] is Function.prototype

- */

-

-

-function testcase() {

-  function foo() { }

-  var o = {};

-  

-  var bf = foo.bind(o);

-  if (Function.prototype.isPrototypeOf(bf)) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: Function.prototype.bind, [[Prototype]] is Function.prototype
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() { }
+  var o = {};
+  
+  var bf = foo.bind(o);
+  if (Function.prototype.isPrototypeOf(bf)) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-9-2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-9-2.js
index 8cff9369a..a15848d8b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-9-2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-9-2.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.4/15.3.4.5/15.3.4.5-9-2.js

- * @description Function.prototype.bind, [[Prototype]] is Function.prototype (using getPrototypeOf)

- */

-

-

-function testcase() {

-  function foo() { }

-  var o = {};

-  

-  var bf = foo.bind(o);

-  if (Object.getPrototypeOf(bf) === Function.prototype) {

-    return true;

-  }

- }

-runTestCase(testcase);

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Function.prototype.bind, [[Prototype]] is Function.prototype
+    (using getPrototypeOf)
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  function foo() { }
+  var o = {};
+  
+  var bf = foo.bind(o);
+  if (Object.getPrototypeOf(bf) === Function.prototype) {
+    return true;
+  }
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A1.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A1.js
index 65af32d2b..d4d1d582f 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A1.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A1.js
@@ -1,16 +1,13 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "caller" of bound function is poisoned (step 20)
- *
- * @path ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A1.js
- * @description A bound function should fail to find its "caller"
- * @negative TypeError
- */
+/*---
+info: "\"caller\" of bound function is poisoned (step 20)"
+description: A bound function should fail to find its "caller"
+negative: TypeError
+---*/
 
 function foo() { return bar.caller; }
 var bar = foo.bind({});
 function baz() { return bar(); }
 baz();
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A13.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A13.js
index 93892e868..791529e46 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A13.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A13.js
@@ -1,12 +1,9 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A13.js
- * @description If IsCallable(func) is false, then throw a TypeError exception.
- * @negative TypeError
- */
+/*---
+description: If IsCallable(func) is false, then throw a TypeError exception.
+negative: TypeError
+---*/
 
 Function.prototype.bind.call(undefined, {});
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A14.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A14.js
index 3fae6b26b..4bc49284b 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A14.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A14.js
@@ -1,12 +1,9 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A14.js
- * @description If IsCallable(func) is false, then throw a TypeError exception.
- * @negative TypeError
- */
+/*---
+description: If IsCallable(func) is false, then throw a TypeError exception.
+negative: TypeError
+---*/
 
 Function.prototype.bind.call(null, {});
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A15.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A15.js
index 25ac3d72a..03ba2d6be 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A15.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A15.js
@@ -1,12 +1,9 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A15.js
- * @description If IsCallable(func) is false, then throw a TypeError exception.
- * @negative TypeError
- */
+/*---
+description: If IsCallable(func) is false, then throw a TypeError exception.
+negative: TypeError
+---*/
 
 Function.prototype.bind.call({}, {});
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A16.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A16.js
index d3336de71..4dc1a7ae2 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A16.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A16.js
@@ -1,12 +1,14 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * If IsCallable(func) is false, then throw a TypeError exception.
- *
- * @path ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A16.js
- * @description A RegExp is not a function, but it may be callable. Iff it is, it's typeof should be 'function', in which case bind should accept it as a valid this value.
- */
+/*---
+info: If IsCallable(func) is false, then throw a TypeError exception.
+description: >
+    A RegExp is not a function, but it may be callable. Iff it is,
+    it's typeof should be 'function', in which case bind should accept
+    it as a valid this value.
+includes: [$FAIL.js]
+---*/
 
 var re = (/x/);
 if (typeof re === 'function') {
@@ -22,4 +24,3 @@ if (typeof re === 'function') {
     }
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A2.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A2.js
index 7d94c7755..15defb8f8 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A2.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A2.js
@@ -1,16 +1,13 @@
 // Copyright 2011 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * "arguments" of bound function is poisoned (step 21)
- *
- * @path ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A2.js
- * @description a bound function should fail to find the bound function "arguments"
- * @negative TypeError
- */
+/*---
+info: "\"arguments\" of bound function is poisoned (step 21)"
+description: a bound function should fail to find the bound function "arguments"
+negative: TypeError
+---*/
 
 function foo() { return bar.arguments; }
 var bar = foo.bind({});
 function baz() { return bar(); }
 baz();
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A3.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A3.js
index d0cd6bbaf..216eb0c63 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A3.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A3.js
@@ -1,12 +1,10 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A3.js
- * @description Function.prototype.bind must exist
- */
+/*---
+description: Function.prototype.bind must exist
+---*/
 
 if (!('bind' in Function.prototype)) {
   $ERROR('Function.prototype.bind is missing');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A4.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A4.js
index 719fdb531..f38eab829 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A4.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A4.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 ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A4.js
- * @description Function.prototype.bind call the original's internal
- * [[Call]] method rather than its .apply method.
- */
+/*---
+description: >
+    Function.prototype.bind call the original's internal  [[Call]]
+    method rather than its .apply method.
+---*/
 
 function foo() {}
 
@@ -14,4 +14,3 @@ foo.apply = function() {
   $ERROR("Function.prototype.bind called original's .apply method");
 };
 b(55, 66);
-
diff --git a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A5.js b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A5.js
index c80624e16..b09950015 100644
--- a/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A5.js
+++ b/test/suite/ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A5.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 ch15/15.3/15.3.4/15.3.4.5/S15.3.4.5_A5.js
- * @description Function.prototype.bind must curry [[Construct]] as
- * well as [[Call]].
- */
+/*---
+description: >
+    Function.prototype.bind must curry [[Construct]] as  well as
+    [[Call]].
+---*/
 
 function construct(f, args) {
   var bound = Function.prototype.bind.apply(f, [null].concat(args));
diff --git a/test/suite/ch15/15.3/15.3.4/S15.3.4.1_A1_T1.js b/test/suite/ch15/15.3/15.3.4/S15.3.4.1_A1_T1.js
index f41d2d94a..53063d157 100644
--- a/test/suite/ch15/15.3/15.3.4/S15.3.4.1_A1_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/S15.3.4.1_A1_T1.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The initial value of Function.prototype.constructor is the built-in Function constructor
- *
- * @path ch15/15.3/15.3.4/S15.3.4.1_A1_T1.js
- * @description Checking Function.prototype.constructor
- */
+/*---
+info: >
+    The initial value of Function.prototype.constructor is the built-in
+    Function constructor
+description: Checking Function.prototype.constructor
+---*/
 
 //CHECK#1
 if (Function.prototype.constructor !== Function) {
   $ERROR('#1: The initial value of Function.prototype.constructor is the built-in Function constructor');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/S15.3.4_A1.js b/test/suite/ch15/15.3/15.3.4/S15.3.4_A1.js
index f73e867b7..27576ea16 100644
--- a/test/suite/ch15/15.3/15.3.4/S15.3.4_A1.js
+++ b/test/suite/ch15/15.3/15.3.4/S15.3.4_A1.js
@@ -1,15 +1,14 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function prototype object is itself a Function object (its [[Class]] is "Function")
- *
- * @path ch15/15.3/15.3.4/S15.3.4_A1.js
- * @description Object.prototype.toString returns [object+[[Class]]+]
- */
+/*---
+info: >
+    The Function prototype object is itself a Function object (its [[Class]]
+    is "Function")
+description: Object.prototype.toString returns [object+[[Class]]+]
+---*/
 
 if (Object.prototype.toString.call(Function.prototype) !== "[object Function]") {
   $ERROR('#2: The Function prototype object is itself a Function ' +
          'object (its [[Class]] is "Function") (15.3.4)');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T1.js b/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T1.js
index 8a9e9cf66..30f64d762 100644
--- a/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/S15.3.4_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.
 
-/**
- * The Function prototype object is itself a Function object that, when invoked, accepts any arguments and returns undefined
- *
- * @path ch15/15.3/15.3.4/S15.3.4_A2_T1.js
- * @description Call Function.prototype()
- */
+/*---
+info: >
+    The Function prototype object is itself a Function object that, when
+    invoked, accepts any arguments and returns undefined
+description: Call Function.prototype()
+---*/
 
 //CHECK#1
 try {
@@ -16,4 +16,3 @@ try {
 } catch (e) {
   $ERROR('#1.1: The Function prototype object is itself a Function object that, when invoked, accepts any arguments and returns undefined: '+e);
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T2.js b/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T2.js
index bbf5ac5ef..7a9a11258 100644
--- a/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/S15.3.4_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.
 
-/**
- * The Function prototype object is itself a Function object that, when invoked, accepts any arguments and returns undefined
- *
- * @path ch15/15.3/15.3.4/S15.3.4_A2_T2.js
- * @description Call Function.prototype(null,void 0)
- */
+/*---
+info: >
+    The Function prototype object is itself a Function object that, when
+    invoked, accepts any arguments and returns undefined
+description: Call Function.prototype(null,void 0)
+---*/
 
 //CHECK#1
 try {
@@ -16,4 +16,3 @@ try {
 } catch (e) {
   $ERROR('#1.1: The Function prototype object is itself a Function object that, when invoked, accepts any arguments and returns undefined: '+e);
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T3.js b/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T3.js
index d01ed8e37..48e5b5838 100644
--- a/test/suite/ch15/15.3/15.3.4/S15.3.4_A2_T3.js
+++ b/test/suite/ch15/15.3/15.3.4/S15.3.4_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.
 
-/**
- * The Function prototype object is itself a Function object that, when invoked, accepts any arguments and returns undefined
- *
- * @path ch15/15.3/15.3.4/S15.3.4_A2_T3.js
- * @description Call Function.prototype(x), where x is undefined variable
- */
+/*---
+info: >
+    The Function prototype object is itself a Function object that, when
+    invoked, accepts any arguments and returns undefined
+description: Call Function.prototype(x), where x is undefined variable
+---*/
 
 //CHECK#1
 try {
@@ -17,5 +17,3 @@ try {
 } catch (e) {
   $ERROR('#1.1: The Function prototype object is itself a Function object that, when invoked, accepts any arguments and returns undefined: '+e);
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.4/S15.3.4_A3_T1.js b/test/suite/ch15/15.3/15.3.4/S15.3.4_A3_T1.js
index 0c0dd8bf4..2dd037682 100644
--- a/test/suite/ch15/15.3/15.3.4/S15.3.4_A3_T1.js
+++ b/test/suite/ch15/15.3/15.3.4/S15.3.4_A3_T1.js
@@ -1,16 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the internal [[Prototype]] property of the Function prototype object is the Object prototype object (15.3.4)
- *
- * @path ch15/15.3/15.3.4/S15.3.4_A3_T1.js
- * @description Checking prototype of Function.prototype
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the Function
+    prototype object is the Object prototype object (15.3.4)
+description: Checking prototype of Function.prototype
+---*/
 
 if (Object.getPrototypeOf(Function.prototype) !== Object.prototype) {
   $ERROR('#1: The value of the internal [[Prototype]] property of ' +
          'the Function prototype object is the Object prototype ' +
          'object (15.3.4)');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/S15.3.4_A3_T2.js b/test/suite/ch15/15.3/15.3.4/S15.3.4_A3_T2.js
index c76ebc759..1f250812a 100644
--- a/test/suite/ch15/15.3/15.3.4/S15.3.4_A3_T2.js
+++ b/test/suite/ch15/15.3/15.3.4/S15.3.4_A3_T2.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.
 
-/**
- * The value of the internal [[Prototype]] property of the Function prototype object is the Object prototype object (15.3.2.1)
- *
- * @path ch15/15.3/15.3.4/S15.3.4_A3_T2.js
- * @description Add new property to Object.prototype and check it at Function.prototype
- */
+/*---
+info: >
+    The value of the internal [[Prototype]] property of the Function
+    prototype object is the Object prototype object (15.3.2.1)
+description: >
+    Add new property to Object.prototype and check it at
+    Function.prototype
+---*/
 
 Object.prototype.indicator = 1;
 
@@ -14,4 +16,3 @@ Object.prototype.indicator = 1;
 if (Function.prototype.indicator!==1) {
   $ERROR('#1: The value of the internal [[Prototype]] property of the Function prototype object is the Object prototype object (15.3.2.1)');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/S15.3.4_A4.js b/test/suite/ch15/15.3/15.3.4/S15.3.4_A4.js
index 39b96039a..b314dd8a2 100644
--- a/test/suite/ch15/15.3/15.3.4/S15.3.4_A4.js
+++ b/test/suite/ch15/15.3/15.3.4/S15.3.4_A4.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function prototype object does not have a valueOf property of its own. however, it inherits the valueOf property from the Object prototype Object
- *
- * @path ch15/15.3/15.3.4/S15.3.4_A4.js
- * @description Checking valueOf property at Function.prototype
- */
+/*---
+info: >
+    The Function prototype object does not have a valueOf property of its
+    own. however, it inherits the valueOf property from the Object prototype
+    Object
+description: Checking valueOf property at Function.prototype
+---*/
 
 //CHECK#1
 if (Function.prototype.hasOwnProperty("valueOf") !== false) {
@@ -22,4 +23,3 @@ if (typeof Function.prototype.valueOf === "undefined") {
 if (Function.prototype.valueOf !== Object.prototype.valueOf) {
   $ERROR('#3: however, it inherits the valueOf property from the Object prototype Object');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.4/S15.3.4_A5.js b/test/suite/ch15/15.3/15.3.4/S15.3.4_A5.js
index d26add206..81f62eb3b 100644
--- a/test/suite/ch15/15.3/15.3.4/S15.3.4_A5.js
+++ b/test/suite/ch15/15.3/15.3.4/S15.3.4_A5.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The Function prototype object is itself a Function object without [[create]] property
- *
- * @path ch15/15.3/15.3.4/S15.3.4_A5.js
- * @description Checking if creating "new Function.prototype object" fails
- */
+/*---
+info: >
+    The Function prototype object is itself a Function object without
+    [[create]] property
+description: Checking if creating "new Function.prototype object" fails
+includes:
+    - $PRINT.js
+    - $FAIL.js
+---*/
 
 //CHECK#
 try {
@@ -16,4 +19,3 @@ try {
   $PRINT("#1.1: The Function prototype object is itself a Function object without [[create]] property "+e);
 
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5-1gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5-1gs.js
index 87e1cf11d..d9b4ca9de 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5-1gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5-1gs.js
@@ -1,18 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.5/15.3.5-1gs.js

- * @description StrictMode - error is thrown when reading the 'caller' property of a function object

- * @onlyStrict

- * @negative NotEarlyError

- */

-

-"use strict";

-function _15_3_5_1_gs() {}

-throw NotEarlyError;

-_15_3_5_1_gs.caller;

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - error is thrown when reading the 'caller' property of
+    a function object
+negative: NotEarlyError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function _15_3_5_1_gs() {}
+throw NotEarlyError;
+_15_3_5_1_gs.caller;
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5-2gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5-2gs.js
index c173e4413..41de01f99 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5-2gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5-2gs.js
@@ -1,17 +1,18 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-

-/**

- * @path ch15/15.3/15.3.5/15.3.5-2gs.js

- * @description StrictMode - error is thrown when reading the 'caller' property of a function object

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-

-"use strict";

-function _15_3_5_1_gs() {}

-_15_3_5_1_gs.caller;

-throw NotEarlyError;

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    StrictMode - error is thrown when reading the 'caller' property of
+    a function object
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function _15_3_5_1_gs() {}
+_15_3_5_1_gs.caller;
+throw NotEarlyError;
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-10gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-10gs.js
index e4709e980..c7d301c62 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-10gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-10gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-10gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (New'ed Function constructor includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var f = new Function("\"use strict\";\nreturn gNonStrict();");

-f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (New'ed Function constructor includes strict
+    directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var f = new Function("\"use strict\";\nreturn gNonStrict();");
+f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-11gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-11gs.js
index e36af1df9..634f7dcd3 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-11gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-11gs.js
@@ -1,21 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-11gs.js

- * @description Strict mode - checking access to strict function caller from strict function (eval used within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-eval("gNonStrict();");

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (eval used within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+eval("gNonStrict();");
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-12gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-12gs.js
index 9d72fbbe4..f571e2346 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-12gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-12gs.js
@@ -1,19 +1,19 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-12gs.js

- * @description Strict mode - checking access to non-strict function caller from non-strict function (eval includes strict directive prologue)

- * @noStrict

- */

-

-

-eval("\"use strict\";\ngNonStrict();");

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to non-strict function caller from
+    non-strict function (eval includes strict directive prologue)
+flags: [noStrict]
+---*/
+
+eval("\"use strict\";\ngNonStrict();");
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-13gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-13gs.js
index 65b6ea64a..b725b4035 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-13gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-13gs.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-13gs.js

- * @description Strict mode - checking access to non-strict function caller from strict function (indirect eval used within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var my_eval = eval;

-my_eval("gNonStrict();");

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to non-strict function caller from
+    strict function (indirect eval used within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var my_eval = eval;
+my_eval("gNonStrict();");
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-14gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-14gs.js
index d7dcf1c4d..0a30f58b7 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-14gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-14gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-14gs.js

- * @description Strict mode - checking access to non-strict function caller from non-strict function (indirect eval includes strict directive prologue)

- * @noStrict

- */

-

-

-var my_eval = eval;

-my_eval("\"use strict\";\ngNonStrict();");

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to non-strict function caller from
+    non-strict function (indirect eval includes strict directive
+    prologue)
+flags: [noStrict]
+---*/
+
+var my_eval = eval;
+my_eval("\"use strict\";\ngNonStrict();");
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-15gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-15gs.js
index f98fef128..708bfd6f0 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-15gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-15gs.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-15gs.js

- * @description Strict mode - checking access to strict function caller from strict function (New'ed object from FunctionDeclaration defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-function f() {

-    return gNonStrict();

-}

-new f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (New'ed object from FunctionDeclaration defined
+    within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function f() {
+    return gNonStrict();
+}
+new f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-16gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-16gs.js
index 7e2bddb40..cbcf6a952 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-16gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-16gs.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-16gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (New'ed object from FunctionDeclaration includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() {

-    "use strict";

-    return gNonStrict();

-}

-new f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (New'ed object from FunctionDeclaration
+    includes strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() {
+    "use strict";
+    return gNonStrict();
+}
+new f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-17gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-17gs.js
index 4052e0aef..0fc4ec341 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-17gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-17gs.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-17gs.js

- * @description Strict mode - checking access to strict function caller from strict function (New'ed object from FunctionExpression defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var f = function () {

-    return gNonStrict();

-}

-new f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (New'ed object from FunctionExpression defined
+    within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f = function () {
+    return gNonStrict();
+}
+new f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-18gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-18gs.js
index 9282dfb62..d5d471b77 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-18gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-18gs.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-18gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (New'ed object from FunctionExpression includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var f = function () {

-    "use strict";

-    return gNonStrict();

-}

-new f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (New'ed object from FunctionExpression
+    includes strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var f = function () {
+    "use strict";
+    return gNonStrict();
+}
+new f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-19gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-19gs.js
index 79adcf1ba..3e86ac856 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-19gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-19gs.js
@@ -1,23 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-19gs.js

- * @description Strict mode - checking access to strict function caller from strict function (New'ed object from Anonymous FunctionExpression defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var obj = new (function () {

-    return gNonStrict();

-});

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (New'ed object from Anonymous FunctionExpression
+    defined within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var obj = new (function () {
+    return gNonStrict();
+});
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-1gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-1gs.js
index 4bb11ea8e..9de4ca680 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-1gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-1gs.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-1gs.js

- * @description Strict mode - checking access to strict function caller from strict function (FunctionDeclaration defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-function f() {

-    return gNonStrict();

-}

-f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (FunctionDeclaration defined within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function f() {
+    return gNonStrict();
+}
+f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-20gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-20gs.js
index 654b3ead7..5e4d42d1d 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-20gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-20gs.js
@@ -1,23 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-20gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (New'ed object from Anonymous FunctionExpression includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var obj = new (function () {

-    "use strict";

-    return gNonStrict();

-});

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (New'ed object from Anonymous
+    FunctionExpression includes strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var obj = new (function () {
+    "use strict";
+    return gNonStrict();
+});
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-21gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-21gs.js
index a62912ede..1b0474c36 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-21gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-21gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-21gs.js

- * @description Strict mode - checking access to strict function caller from strict function (FunctionDeclaration defined within a FunctionDeclaration inside strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-function f1() {

-    function f() {

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (FunctionDeclaration defined within a
+    FunctionDeclaration inside strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function f1() {
+    function f() {
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-22gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-22gs.js
index d710c5ef7..76506c02b 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-22gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-22gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-22gs.js

- * @description Strict mode - checking access to strict function caller from strict function (FunctionExpression defined within a FunctionDeclaration inside strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-function f1() {

-    var f = function () {

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (FunctionExpression defined within a
+    FunctionDeclaration inside strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function f1() {
+    var f = function () {
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-23gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-23gs.js
index 8497d91fc..aab1f45b0 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-23gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-23gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-23gs.js

- * @description Strict mode - checking access to strict function caller from strict function (Anonymous FunctionExpression defined within a FunctionDeclaration inside strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-function f1() {

-    return (function () {

-        return gNonStrict();

-    })();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (Anonymous FunctionExpression defined within a
+    FunctionDeclaration inside strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function f1() {
+    return (function () {
+        return gNonStrict();
+    })();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-24gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-24gs.js
index 4d0c4f658..f3daa54f1 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-24gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-24gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-24gs.js

- * @description Strict mode - checking access to strict function caller from strict function (FunctionDeclaration defined within a FunctionExpression inside strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var f1 = function () {

-    function f() {

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (FunctionDeclaration defined within a
+    FunctionExpression inside strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f1 = function () {
+    function f() {
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-25gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-25gs.js
index 85e6f5b24..f0af53442 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-25gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-25gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-25gs.js

- * @description Strict mode - checking access to strict function caller from strict function (FunctionExpression defined within a FunctionExpression inside strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var f1 = function () {

-    var f = function () {

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (FunctionExpression defined within a
+    FunctionExpression inside strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f1 = function () {
+    var f = function () {
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-26gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-26gs.js
index b1f23423b..c604338ee 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-26gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-26gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-26gs.js

- * @description Strict mode - checking access to strict function caller from strict function (Anonymous FunctionExpression defined within a FunctionExpression inside strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var f1 = function () {

-    return (function () {

-        return gNonStrict();

-    })();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (Anonymous FunctionExpression defined within a
+    FunctionExpression inside strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f1 = function () {
+    return (function () {
+        return gNonStrict();
+    })();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-27gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-27gs.js
index 451a69965..00b7b87b1 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-27gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-27gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-27gs.js

- * @description Strict mode - checking access to strict function caller from strict function (FunctionDeclaration defined within an Anonymous FunctionExpression inside strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-(function () {

-    function f() {

-        return gNonStrict();

-    }

-    return f();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (FunctionDeclaration defined within an Anonymous
+    FunctionExpression inside strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+(function () {
+    function f() {
+        return gNonStrict();
+    }
+    return f();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-28gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-28gs.js
index 12abaf581..e714ff193 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-28gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-28gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-28gs.js

- * @description Strict mode - checking access to strict function caller from strict function (FunctionExpression defined within an Anonymous FunctionExpression inside strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-(function () {

-    var f = function () {

-        return gNonStrict();

-    }

-    return f();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (FunctionExpression defined within an Anonymous
+    FunctionExpression inside strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+(function () {
+    var f = function () {
+        return gNonStrict();
+    }
+    return f();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-29gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-29gs.js
index 47a3091e1..98cc9832c 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-29gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-29gs.js
@@ -1,25 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-29gs.js

- * @description Strict mode - checking access to strict function caller from strict function (Anonymous FunctionExpression defined within an Anonymous FunctionExpression inside strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-(function () {

-    return (function () {

-        return gNonStrict();

-    })();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (Anonymous FunctionExpression defined within an
+    Anonymous FunctionExpression inside strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+(function () {
+    return (function () {
+        return gNonStrict();
+    })();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-2gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-2gs.js
index ac0a73919..44cb36c84 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-2gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-2gs.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-2gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionDeclaration includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() {

-    "use strict";

-    return gNonStrict();

-}

-f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionDeclaration includes strict directive
+    prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() {
+    "use strict";
+    return gNonStrict();
+}
+f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-30gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-30gs.js
index 8928186ac..3c431e798 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-30gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-30gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-30gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionDeclaration defined within a FunctionDeclaration with a strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f1() {

-    "use strict";

-    function f() {

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionDeclaration defined within a
+    FunctionDeclaration with a strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f1() {
+    "use strict";
+    function f() {
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-31gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-31gs.js
index eae058954..66f97f752 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-31gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-31gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-31gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionExpression defined within a FunctionDeclaration with a strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f1() {

-    "use strict";

-    var f = function () {

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionExpression defined within a
+    FunctionDeclaration with a strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f1() {
+    "use strict";
+    var f = function () {
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-32gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-32gs.js
index 68e6e8e5f..a9ad3c88b 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-32gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-32gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-32gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Anonymous FunctionExpression defined within a FunctionDeclaration with a strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f1() {

-    "use strict";

-    return (function () {

-        return gNonStrict();

-    })();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Anonymous FunctionExpression defined within a
+    FunctionDeclaration with a strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f1() {
+    "use strict";
+    return (function () {
+        return gNonStrict();
+    })();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-33gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-33gs.js
index 5186ef4a3..bf4541754 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-33gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-33gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-33gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionDeclaration defined within a FunctionExpression with a strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var f1 = function () {

-    "use strict";

-    function f() {

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionDeclaration defined within a
+    FunctionExpression with a strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var f1 = function () {
+    "use strict";
+    function f() {
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-34gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-34gs.js
index 728330d49..9e8dbcd21 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-34gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-34gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-34gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionExpression defined within a FunctionExpression with a strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var f1 = function () {

-    "use strict";

-    var f = function () {

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionExpression defined within a
+    FunctionExpression with a strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var f1 = function () {
+    "use strict";
+    var f = function () {
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-35gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-35gs.js
index f78ae96e9..731beaf19 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-35gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-35gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-35gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Anonymous FunctionExpression defined within a FunctionExpression with a strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var f1 = function () {

-    "use strict";

-    return (function () {

-        return gNonStrict();

-    })();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Anonymous FunctionExpression defined within a
+    FunctionExpression with a strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var f1 = function () {
+    "use strict";
+    return (function () {
+        return gNonStrict();
+    })();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-36gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-36gs.js
index 4dca56c3b..7b69b993a 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-36gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-36gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-36gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionDeclaration defined within an Anonymous FunctionExpression with a strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-(function () {

-    "use strict";

-    function f() {

-        return gNonStrict();

-    }

-    return f();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionDeclaration defined within an
+    Anonymous FunctionExpression with a strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+(function () {
+    "use strict";
+    function f() {
+        return gNonStrict();
+    }
+    return f();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-37gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-37gs.js
index 866802a24..e8a37dee9 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-37gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-37gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-37gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionExpression defined within an Anonymous FunctionExpression with a strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-(function () {

-    "use strict";

-    var f = function () {

-        return gNonStrict();

-    }

-    return f();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionExpression defined within an
+    Anonymous FunctionExpression with a strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+(function () {
+    "use strict";
+    var f = function () {
+        return gNonStrict();
+    }
+    return f();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-38gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-38gs.js
index aa9734eb5..90faa0510 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-38gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-38gs.js
@@ -1,25 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-38gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Anonymous FunctionExpression defined within an Anonymous FunctionExpression with a strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-(function () {

-    "use strict";

-    return (function () {

-        return gNonStrict();

-    })();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Anonymous FunctionExpression defined within
+    an Anonymous FunctionExpression with a strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+(function () {
+    "use strict";
+    return (function () {
+        return gNonStrict();
+    })();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-39gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-39gs.js
index a60706623..495d355ce 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-39gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-39gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-39gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionDeclaration with a strict directive prologue defined within a FunctionDeclaration)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f1() {

-    function f() {

-        "use strict";

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionDeclaration with a strict directive
+    prologue defined within a FunctionDeclaration)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f1() {
+    function f() {
+        "use strict";
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-3gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-3gs.js
index 4f89d3727..e3d01d163 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-3gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-3gs.js
@@ -1,24 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-3gs.js

- * @description Strict mode - checking access to strict function caller from strict function (FunctionExpression defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var f = function () {

-    return gNonStrict();

-}

-f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (FunctionExpression defined within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f = function () {
+    return gNonStrict();
+}
+f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-40gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-40gs.js
index e96e2440e..f1e9c4092 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-40gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-40gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-40gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionExpression with a strict directive prologue defined within a FunctionDeclaration)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f1() {

-    var f = function () {

-        "use strict";

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionExpression with a strict directive
+    prologue defined within a FunctionDeclaration)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f1() {
+    var f = function () {
+        "use strict";
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-41gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-41gs.js
index f6c72bea7..26c2ddfe0 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-41gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-41gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-41gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Anonymous FunctionExpression with a strict directive prologue defined within a FunctionDeclaration)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f1() {

-    return (function () {

-        "use strict";

-        return gNonStrict();

-    })();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Anonymous FunctionExpression with a strict
+    directive prologue defined within a FunctionDeclaration)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f1() {
+    return (function () {
+        "use strict";
+        return gNonStrict();
+    })();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-42gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-42gs.js
index 32efa2793..a498ce942 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-42gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-42gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-42gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionDeclaration with a strict directive prologue defined within a FunctionExpression)

- * @noStrict

- * @negative TypeError

- */

-

-

-var f1 = function () {

-    function f() {

-        "use strict";

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionDeclaration with a strict directive
+    prologue defined within a FunctionExpression)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var f1 = function () {
+    function f() {
+        "use strict";
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-43gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-43gs.js
index 3dd7ff941..d63748ea0 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-43gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-43gs.js
@@ -1,27 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-43gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionExpression with a strict directive prologue defined within a FunctionExpression)

- * @noStrict

- * @negative TypeError

- */

-

-

-var f1 = function () {

-    var f = function () {

-        "use strict";

-        return gNonStrict();

-    }

-    return f();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionExpression with a strict directive
+    prologue defined within a FunctionExpression)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var f1 = function () {
+    var f = function () {
+        "use strict";
+        return gNonStrict();
+    }
+    return f();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-44gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-44gs.js
index 354c354e0..2c35a708d 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-44gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-44gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-44gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Anonymous FunctionExpression with a strict directive prologue defined within a FunctionExpression)

- * @noStrict

- * @negative TypeError

- */

-

-

-var f1 = function () {

-    return (function () {

-        "use strict";

-        return gNonStrict();

-    })();

-}

-f1();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Anonymous FunctionExpression with a strict
+    directive prologue defined within a FunctionExpression)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var f1 = function () {
+    return (function () {
+        "use strict";
+        return gNonStrict();
+    })();
+}
+f1();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-45gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-45gs.js
index 16b05ee24..27c0a5cd4 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-45gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-45gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-45gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionDeclaration with a strict directive prologue defined within an Anonymous FunctionExpression)

- * @noStrict

- * @negative TypeError

- */

-

-

-(function () {

-    function f() {

-        "use strict";

-        return gNonStrict();

-    }

-    return f();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionDeclaration with a strict directive
+    prologue defined within an Anonymous FunctionExpression)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+(function () {
+    function f() {
+        "use strict";
+        return gNonStrict();
+    }
+    return f();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-46gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-46gs.js
index 93e0beda4..e3beb585a 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-46gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-46gs.js
@@ -1,26 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-46gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionExpression with a strict directive prologue defined within an Anonymous FunctionExpression)

- * @noStrict

- * @negative TypeError

- */

-

-

-(function () {

-    var f = function () {

-        "use strict";

-        return gNonStrict();

-    }

-    return f();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionExpression with a strict directive
+    prologue defined within an Anonymous FunctionExpression)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+(function () {
+    var f = function () {
+        "use strict";
+        return gNonStrict();
+    }
+    return f();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-47gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-47gs.js
index b68de18d7..6c4b2c3c4 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-47gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-47gs.js
@@ -1,25 +1,26 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-47gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Anonymous FunctionExpression with a strict directive prologue defined within an Anonymous FunctionExpression)

- * @noStrict

- * @negative TypeError

- */

-

-

-(function () {

-    return (function () {

-        "use strict";

-        return gNonStrict();

-    })();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Anonymous FunctionExpression with a strict
+    directive prologue defined within an Anonymous FunctionExpression)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+(function () {
+    return (function () {
+        "use strict";
+        return gNonStrict();
+    })();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-48gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-48gs.js
index 0fb987cd2..197656b09 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-48gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-48gs.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-48gs.js

- * @description Strict mode - checking access to strict function caller from strict function (Literal getter defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var o = { get foo() { return gNonStrict(); } }

-o.foo;

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (Literal getter defined within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var o = { get foo() { return gNonStrict(); } }
+o.foo;
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-49gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-49gs.js
index 3eae7b11d..2fc6d0f19 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-49gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-49gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-49gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Literal getter includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var o = { get foo() { "use strict"; return gNonStrict(); } }

-o.foo;

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Literal getter includes strict directive
+    prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var o = { get foo() { "use strict"; return gNonStrict(); } }
+o.foo;
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-4gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-4gs.js
index f6fd1036d..2b0cea156 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-4gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-4gs.js
@@ -1,24 +1,25 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-4gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (FunctionExpression includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var f = function () {

-    "use strict";

-    return gNonStrict();

-}

-f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (FunctionExpression includes strict directive
+    prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var f = function () {
+    "use strict";
+    return gNonStrict();
+}
+f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-50gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-50gs.js
index 433bceb56..eb9a11ab7 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-50gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-50gs.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-50gs.js

- * @description Strict mode - checking access to strict function caller from strict function (Literal setter defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var o = { set foo(stuff) { return gNonStrict(); } }

-o.foo = 7; 

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (Literal setter defined within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var o = { set foo(stuff) { return gNonStrict(); } }
+o.foo = 7; 
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-51gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-51gs.js
index 49b69f4b9..bd27b5240 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-51gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-51gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-51gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Literal setter includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var o = { set foo(stuff) { "use strict"; return gNonStrict(); } }

-o.foo = 8;

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Literal setter includes strict directive
+    prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var o = { set foo(stuff) { "use strict"; return gNonStrict(); } }
+o.foo = 8;
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-52gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-52gs.js
index 6f49e6cdd..8294ed907 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-52gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-52gs.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-52gs.js

- * @description Strict mode - checking access to strict function caller from strict function (Injected getter defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var o = {};

-Object.defineProperty(o, "foo",  { get: function() { return gNonStrict(); } });

-o.foo;

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (Injected getter defined within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var o = {};
+Object.defineProperty(o, "foo",  { get: function() { return gNonStrict(); } });
+o.foo;
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-53gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-53gs.js
index 6c6bd48a8..20b919bce 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-53gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-53gs.js
@@ -1,22 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-53gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Injected getter includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var o = {};

-Object.defineProperty(o, "foo", { get: function() { "use strict"; return gNonStrict(); } });

-o.foo;

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Injected getter includes strict directive
+    prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var o = {};
+Object.defineProperty(o, "foo", { get: function() { "use strict"; return gNonStrict(); } });
+o.foo;
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-54gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-54gs.js
index 9e7b792d8..218bf85a2 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-54gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-54gs.js
@@ -1,23 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-54gs.js

- * @description Strict mode - checking access to strict function caller from strict function (Injected setter defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var o = {};

-Object.defineProperty(o, "foo", { set: function(stuff) { return gNonStrict(); } });

-o.foo = 9; 

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (Injected setter defined within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var o = {};
+Object.defineProperty(o, "foo", { set: function(stuff) { return gNonStrict(); } });
+o.foo = 9; 
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-55gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-55gs.js
index 2739fa9e0..345e46d42 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-55gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-55gs.js
@@ -1,22 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-55gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Injected setter includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var o = {};

-Object.defineProperty(o, "foo", { set: function(stuff) { "use strict"; return gNonStrict(); } });

-o.foo = 10;

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Injected setter includes strict directive
+    prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var o = {};
+Object.defineProperty(o, "foo", { set: function(stuff) { "use strict"; return gNonStrict(); } });
+o.foo = 10;
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-56gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-56gs.js
index 0b58b9453..caa546d01 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-56gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-56gs.js
@@ -1,22 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-56gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by non-strict function declaration)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-function foo() { return f();}

-foo();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    non-strict function declaration)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+function foo() { return f();}
+foo();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-57gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-57gs.js
index b13890cd3..931b17dfa 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-57gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-57gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-57gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by non-strict eval)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-eval("f();"); 

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    non-strict eval)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+eval("f();"); 
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-58gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-58gs.js
index e418493a1..770d95b2f 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-58gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-58gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-58gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by non-strict Function constructor)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-Function("return f();")();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    non-strict Function constructor)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+Function("return f();")();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-59gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-59gs.js
index a66ea00ca..98a1cdc8f 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-59gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-59gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-59gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by non-strict new'ed Function constructor)

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-new Function("return f();")();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    non-strict new'ed Function constructor)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+new Function("return f();")();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-5gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-5gs.js
index ce651dd22..5b078931e 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-5gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-5gs.js
@@ -1,23 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-5gs.js

- * @description Strict mode - checking access to strict function caller from strict function (Anonymous FunctionExpression defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-(function () {

-    return gNonStrict();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    strict function (Anonymous FunctionExpression defined within
+    strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+(function () {
+    return gNonStrict();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-60gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-60gs.js
index aaf42d98a..b425fe4d6 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-60gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-60gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-60gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.apply())

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.apply();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.apply())
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.apply();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-61gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-61gs.js
index 9c100aef0..6e1ff29cb 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-61gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-61gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-61gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.apply(null))

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.apply(null);

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.apply(null))
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.apply(null);
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-62gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-62gs.js
index fe4cfd658..96f2713d0 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-62gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-62gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-62gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.apply(undefined))

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.apply(undefined);

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.apply(undefined))
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.apply(undefined);
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-63gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-63gs.js
index 6a77440dd..40b728c71 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-63gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-63gs.js
@@ -1,22 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-63gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.apply(someObject))

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-var o = {};

-f.apply(o);

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.apply(someObject))
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+var o = {};
+f.apply(o);
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-64gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-64gs.js
index 5d630796e..771eb77d2 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-64gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-64gs.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-64gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.apply(globalObject))

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.apply(fnGlobalObject());

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.apply(globalObject))
+negative: TypeError
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.apply(fnGlobalObject());
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-65gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-65gs.js
index 5447227df..b0e016220 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-65gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-65gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-65gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.call())

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.call();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.call())
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.call();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-66gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-66gs.js
index b6a287d97..91a864d84 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-66gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-66gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-66gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.call(null))

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.call(null);

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.call(null))
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.call(null);
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-67gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-67gs.js
index 27bf71a06..4fcd16038 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-67gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-67gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-67gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.call(undefined))

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.call(undefined);

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.call(undefined))
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.call(undefined);
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-68gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-68gs.js
index a6f6d9e62..63a51a60b 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-68gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-68gs.js
@@ -1,22 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-68gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.call(someObject))

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-var o = {};

-f.call(o); 

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.call(someObject))
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+var o = {};
+f.call(o); 
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-69gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-69gs.js
index 124c0d09a..12acd1c74 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-69gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-69gs.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-69gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.call(globalObject))

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.call(fnGlobalObject());

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.call(globalObject))
+negative: TypeError
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.call(fnGlobalObject());
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-6gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-6gs.js
index 7a46ca1a7..2a684aa6b 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-6gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-6gs.js
@@ -1,23 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-6gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Anonymous FunctionExpression includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-(function () {

-    "use strict";

-    return gNonStrict();

-})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Anonymous FunctionExpression includes strict
+    directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+(function () {
+    "use strict";
+    return gNonStrict();
+})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-70gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-70gs.js
index 587cd4d3d..6e8f838ff 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-70gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-70gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-70gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.bind()())

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.bind()();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.bind()())
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.bind()();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-71gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-71gs.js
index 6a931da77..6b4cf92dc 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-71gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-71gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-71gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.bind(null)())

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.bind(null)();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.bind(null)())
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.bind(null)();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-72gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-72gs.js
index 03c60ba4f..1881e66f4 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-72gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-72gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-72gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.bind(undefined)())

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.bind(undefined)();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.bind(undefined)())
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.bind(undefined)();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-73gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-73gs.js
index 9ba366171..eb9d51c29 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-73gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-73gs.js
@@ -1,22 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-73gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.bind(someObject)())

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-var o = {};

-f.bind(o)();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.bind(someObject)())
+negative: TypeError
+flags: [noStrict]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+var o = {};
+f.bind(o)();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-74gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-74gs.js
index dcd3a636d..a7f13e783 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-74gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-74gs.js
@@ -1,21 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-74gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (strict function declaration called by Function.prototype.bind(globalObject)())

- * @noStrict

- * @negative TypeError

- */

-

-

-function f() { "use strict"; return gNonStrict();};

-f.bind(fnGlobalObject())(); 

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (strict function declaration called by
+    Function.prototype.bind(globalObject)())
+negative: TypeError
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { "use strict"; return gNonStrict();};
+f.bind(fnGlobalObject())(); 
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-75gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-75gs.js
index cda7c0324..d81a0f0a3 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-75gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-75gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-75gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict function declaration)

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-function foo() { "use strict"; return f();}

-foo(); 

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict function declaration)
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+function foo() { "use strict"; return f();}
+foo(); 
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-76gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-76gs.js
index 89c794699..454cceac4 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-76gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-76gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-76gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict eval)

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return eval("f();"); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict eval)
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return eval("f();"); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-77gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-77gs.js
index 572122575..444b6aa0e 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-77gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-77gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-77gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function constructor)

- * @noStrict

- */

-

-

-function f() {return gNonStrict();};

-(function () {"use strict"; return Function("return f();")(); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function constructor)
+flags: [noStrict]
+---*/
+
+function f() {return gNonStrict();};
+(function () {"use strict"; return Function("return f();")(); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-78gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-78gs.js
index 56e51c18d..252b872bd 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-78gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-78gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-78gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict new'ed Function constructor)

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return new Function("return f();")(); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict new'ed Function constructor)
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return new Function("return f();")(); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-79gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-79gs.js
index 845d4a0dc..b391119cd 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-79gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-79gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-79gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.apply())

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.apply();})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.apply())
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.apply();})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-7gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-7gs.js
index a75e3f030..9fb25f89f 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-7gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-7gs.js
@@ -1,22 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-7gs.js

- * @description Strict mode - checking access to non-strict function caller from strict function (Function constructor defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var f = Function("return gNonStrict();");

-f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to non-strict function caller from
+    strict function (Function constructor defined within strict mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f = Function("return gNonStrict();");
+f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-80gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-80gs.js
index 839c4ec6c..d9c12cc98 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-80gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-80gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-80gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.apply(null))

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.apply(null); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.apply(null))
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.apply(null); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-81gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-81gs.js
index 0425bd056..fa08289f2 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-81gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-81gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-81gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.apply(undefined))

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.apply(undefined); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.apply(undefined))
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.apply(undefined); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-82gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-82gs.js
index 43d35835a..82b1daf86 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-82gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-82gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-82gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.apply(someObject))

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-var o = {};

-(function () {"use strict"; return f.apply(o); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.apply(someObject))
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+var o = {};
+(function () {"use strict"; return f.apply(o); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-83gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-83gs.js
index 0428553b7..7c49e6c27 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-83gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-83gs.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-83gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.apply(globalObject))

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.apply(fnGlobalObject()); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.apply(globalObject))
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.apply(fnGlobalObject()); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-84gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-84gs.js
index 9984ceec7..a3ccc57eb 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-84gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-84gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-84gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.call())

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.call();})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.call())
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.call();})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-85gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-85gs.js
index 0eb29a573..8a1ddd4fa 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-85gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-85gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-85gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.call(null))

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.call(null);})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.call(null))
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.call(null);})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-86gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-86gs.js
index 87c216ae2..6370cd2ac 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-86gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-86gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-86gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.call(undefined))

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.call(undefined); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.call(undefined))
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.call(undefined); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-87gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-87gs.js
index 7936c1be2..f5144df3b 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-87gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-87gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-87gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.call(someObject))

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-var o = {};

-(function () {"use strict"; return f.call(o); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.call(someObject))
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+var o = {};
+(function () {"use strict"; return f.call(o); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-88gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-88gs.js
index 30b8bc4b5..48682c757 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-88gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-88gs.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-88gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.call(globalObject))

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.call(fnGlobalObject()); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.call(globalObject))
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.call(fnGlobalObject()); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-89gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-89gs.js
index 459cc0c23..664608f3e 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-89gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-89gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-89gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.bind()())

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.bind()();})();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.bind()())
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.bind()();})();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-8gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-8gs.js
index ccaa39bc9..68562726e 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-8gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-8gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-8gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (Function constructor includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-

-var f = Function("\"use strict\";\nreturn gNonStrict();");

-f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (Function constructor includes strict
+    directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var f = Function("\"use strict\";\nreturn gNonStrict();");
+f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-90gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-90gs.js
index ba624e0c2..c37a2124c 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-90gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-90gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-90gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.bind(null)())

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.bind(null)(); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.bind(null)())
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.bind(null)(); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-91gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-91gs.js
index cbb93f37f..ba676f097 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-91gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-91gs.js
@@ -1,20 +1,21 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-91gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.bind(undefined)())

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.bind(undefined)(); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.bind(undefined)())
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.bind(undefined)(); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-92gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-92gs.js
index 96b7b1a28..91720f2be 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-92gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-92gs.js
@@ -1,21 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-92gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.bind(someObject)())

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-var o = {};

-(function () {"use strict"; return f.bind(o)(); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.bind(someObject)())
+flags: [noStrict]
+---*/
+
+function f() { return gNonStrict();};
+var o = {};
+(function () {"use strict"; return f.bind(o)(); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-93gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-93gs.js
index 76fd8610c..6adb789bc 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-93gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-93gs.js
@@ -1,20 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-93gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function (non-strict function declaration called by strict Function.prototype.bind(globalObject)())

- * @noStrict

- */

-

-

-function f() { return gNonStrict();};

-(function () {"use strict"; return f.bind(fnGlobalObject())(); })();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function (non-strict function declaration called by
+    strict Function.prototype.bind(globalObject)())
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return gNonStrict();};
+(function () {"use strict"; return f.bind(fnGlobalObject())(); })();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-94gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-94gs.js
index 1bfe4693f..37186cb19 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-94gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-94gs.js
@@ -1,21 +1,24 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-94gs.js

- * @description Strict mode - checking access to strict function caller from non-strict function expression (FunctionDeclaration includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-var gNonStrict = function () {

-    return gNonStrict.caller || gNonStrict.caller.throwTypeError;

-}

-

-function f() {

-    "use strict";

-    return gNonStrict();

-}

-f();

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict function expression (FunctionDeclaration includes
+    strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var gNonStrict = function () {
+    return gNonStrict.caller || gNonStrict.caller.throwTypeError;
+}
+
+function f() {
+    "use strict";
+    return gNonStrict();
+}
+f();
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-95gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-95gs.js
index 52c3a2e8a..2294b72dd 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-95gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-95gs.js
@@ -1,19 +1,22 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-95gs.js

- * @description Strict mode - checking access to strict function caller from non-strict, constructor-based function (FunctionDeclaration includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-var gNonStrict = Function("return gNonStrict.caller || gNonStrict.caller.throwTypeError;");

-

-function f() {

-    "use strict";

-    return gNonStrict();

-}

-f();

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict, constructor-based function (FunctionDeclaration
+    includes strict directive prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var gNonStrict = Function("return gNonStrict.caller || gNonStrict.caller.throwTypeError;");
+
+function f() {
+    "use strict";
+    return gNonStrict();
+}
+f();
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-96gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-96gs.js
index 27562fada..07a223dc1 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-96gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-96gs.js
@@ -1,25 +1,28 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-96gs.js

- * @description Strict mode - checking access to strict function caller from non-strict property (FunctionDeclaration includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-var o = { 

-    get gNonStrict() {

-        var tmp = Object.getOwnPropertyDescriptor(o, "gNonStrict").get;

-        return tmp.caller || tmp.caller.throwTypeError;

-    }

-};

-

-

-function f() {

-    "use strict";

-    return o.gNonStrict;

-}

-f();

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from
+    non-strict property (FunctionDeclaration includes strict directive
+    prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var o = { 
+    get gNonStrict() {
+        var tmp = Object.getOwnPropertyDescriptor(o, "gNonStrict").get;
+        return tmp.caller || tmp.caller.throwTypeError;
+    }
+};
+
+
+function f() {
+    "use strict";
+    return o.gNonStrict;
+}
+f();
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-97gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-97gs.js
index 30b57a589..6468dc22f 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-97gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-97gs.js
@@ -1,25 +1,27 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-97gs.js

- * @description Strict mode - checking access to strict function caller from bound non-strict function (FunctionDeclaration includes strict directive prologue)

- * @noStrict

- * @negative TypeError

- */

-

-var gNonStrict = gNonStrictBindee.bind(null);

-

-function f() {

-    "use strict";

-    return gNonStrict();

-}

-f();

-

-

-function gNonStrictBindee() {

-    return gNonStrictBindee.caller || gNonStrictBindee.caller.throwTypeError;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to strict function caller from bound
+    non-strict function (FunctionDeclaration includes strict directive
+    prologue)
+negative: TypeError
+flags: [noStrict]
+---*/
+
+var gNonStrict = gNonStrictBindee.bind(null);
+
+function f() {
+    "use strict";
+    return gNonStrict();
+}
+f();
+
+
+function gNonStrictBindee() {
+    return gNonStrictBindee.caller || gNonStrictBindee.caller.throwTypeError;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-9gs.js b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-9gs.js
index b41bb2ef4..304dc7d57 100644
--- a/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-9gs.js
+++ b/test/suite/ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-9gs.js
@@ -1,22 +1,23 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

-/// Ecma International makes this code available under the terms and conditions set

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the 

-/// "Use Terms").   Any redistribution of this code must retain the above 

-/// copyright and this notice and otherwise comply with the Use Terms.

-/**

- * @path ch15/15.3/15.3.5/15.3.5.4/15.3.5.4_2-9gs.js

- * @description Strict mode - checking access to non-strict function caller from strict function (New'ed Function constructor defined within strict mode)

- * @onlyStrict

- * @negative TypeError

- */

-

-

-"use strict";

-var f = new Function("return gNonStrict();");

-f();

-

-

-function gNonStrict() {

-    return gNonStrict.caller;

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/LICENSE (the
+// "Use Terms").   Any redistribution of this code must retain the above
+// copyright and this notice and otherwise comply with the Use Terms.
+
+/*---
+description: >
+    Strict mode - checking access to non-strict function caller from
+    strict function (New'ed Function constructor defined within strict
+    mode)
+negative: TypeError
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f = new Function("return gNonStrict();");
+f();
+
+
+function gNonStrict() {
+    return gNonStrict.caller;
+}
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T1.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T1.js
index dba019d99..4ac1846a9 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T1.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the length property is usually an integer that indicates the 'typical' number of arguments expected by the function
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A1_T1.js
- * @description Checking length property of Function("arg1,arg2,arg3", null)
- */
+/*---
+info: >
+    The value of the length property is usually an integer that indicates the
+    'typical' number of arguments expected by the function
+description: Checking length property of Function("arg1,arg2,arg3", null)
+includes: [$FAIL.js]
+---*/
 
 f = new Function("arg1,arg2,arg3", null);
 
@@ -19,4 +20,3 @@ if (!(f.hasOwnProperty('length'))) {
 if (f.length !== 3) {
   $ERROR('#2: The value of the length property is usually an integer that indicates the "typical" number of arguments expected by the function');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T2.js
index e7ee6c2d1..8853eaa21 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T2.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the length property is usually an integer that indicates the 'typical' number of arguments expected by the function
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A1_T2.js
- * @description Checking length property of Function("arg1,arg2,arg3","arg4,arg5", null)
- */
+/*---
+info: >
+    The value of the length property is usually an integer that indicates the
+    'typical' number of arguments expected by the function
+description: >
+    Checking length property of Function("arg1,arg2,arg3","arg4,arg5",
+    null)
+includes: [$FAIL.js]
+---*/
 
 f = Function("arg1,arg2,arg3","arg4,arg5", null);
 
@@ -19,4 +22,3 @@ if (!(f.hasOwnProperty('length'))) {
 if (f.length !== 5) {
   $ERROR('#2: The value of the length property is usually an integer that indicates the "typical" number of arguments expected by the function');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T3.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T3.js
index ebabb31a0..58dd8596d 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T3.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A1_T3.js
@@ -1,12 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The value of the length property is usually an integer that indicates the 'typical' number of arguments expected by the function
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A1_T3.js
- * @description Checking length property of Function("arg1,arg2,arg3","arg1,arg2","arg3", null)
- */
+/*---
+info: >
+    The value of the length property is usually an integer that indicates the
+    'typical' number of arguments expected by the function
+description: >
+    Checking length property of
+    Function("arg1,arg2,arg3","arg1,arg2","arg3", null)
+includes: [$FAIL.js]
+---*/
 
 f = new Function("arg1,arg2,arg3","arg1,arg2","arg3", null);
 
@@ -19,4 +22,3 @@ if (!(f.hasOwnProperty('length'))) {
 if (f.length !== 6) {
   $ERROR('#2: The value of the length property is usually an integer that indicates the "typical" number of arguments expected by the function');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T1.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T1.js
index 2029841db..b3283b20a 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T1.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the length property has the attributes { DontDelete }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A2_T1.js
- * @description Checking if deleting the length property of Function("arg1,arg2,arg3", null) fails
- */
+/*---
+info: the length property has the attributes { DontDelete }
+description: >
+    Checking if deleting the length property of
+    Function("arg1,arg2,arg3", null) fails
+includes: [$FAIL.js]
+---*/
 
 f = new Function("arg1,arg2,arg3", null);
 
@@ -29,4 +30,3 @@ if (!(f.hasOwnProperty('length'))) {
 if (f.length !== 3) {
   $ERROR('#4: the length property has the attributes { DontDelete }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T2.js
index a430c4d0f..6b91eb17c 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the length property has the attributes { DontDelete }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A2_T2.js
- * @description Checking if deleting the length property of Function("arg1,arg2,arg3","arg4,arg5", null) fails
- */
+/*---
+info: the length property has the attributes { DontDelete }
+description: >
+    Checking if deleting the length property of
+    Function("arg1,arg2,arg3","arg4,arg5", null) fails
+includes: [$FAIL.js]
+---*/
 
 f =  Function("arg1,arg2,arg3","arg4,arg5", null);
 
@@ -26,4 +27,3 @@ if (!(f.hasOwnProperty('length'))) {
 if (f.length !== 5) {
   $ERROR('#3: the length property has the attributes { DontDelete }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T3.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T3.js
index 7c769946d..06957ee7a 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T3.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A2_T3.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the length property has the attributes { DontDelete }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A2_T3.js
- * @description Checking if deleting the length property of Function("arg1,arg2,arg3","arg1,arg2","arg3", null) fails
- */
+/*---
+info: the length property has the attributes { DontDelete }
+description: >
+    Checking if deleting the length property of
+    Function("arg1,arg2,arg3","arg1,arg2","arg3", null) fails
+includes: [$FAIL.js]
+---*/
 
 f = new Function("arg1,arg2,arg3","arg1,arg2","arg3", null);
 
@@ -26,4 +27,3 @@ if (!(f.hasOwnProperty('length'))) {
 if (f.length !== 6) {
   $ERROR('#3: the length property has the attributes { DontDelete }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T1.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T1.js
index c11f1e620..6244fb64f 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T1.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the length property has the attributes { ReadOnly }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A3_T1.js
- * @description Checking if varying the length property of Function("arg1,arg2,arg3","arg4,arg5", null) fails
- */
+/*---
+info: the length property has the attributes { ReadOnly }
+description: >
+    Checking if varying the length property of
+    Function("arg1,arg2,arg3","arg4,arg5", null) fails
+includes: [$FAIL.js]
+---*/
 
 f = new Function("arg1,arg2,arg3","arg4,arg5", null);
 
@@ -36,4 +37,3 @@ try {
 if (f.length !== 5) {
   $ERROR('#4: the length property has the attributes { ReadOnly }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T2.js
index 36e16ada4..02feaa396 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the length property has the attributes { ReadOnly }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A3_T2.js
- * @description Checking if varying the length property of Function("arg1,arg2,arg3", null) fails
- */
+/*---
+info: the length property has the attributes { ReadOnly }
+description: >
+    Checking if varying the length property of
+    Function("arg1,arg2,arg3", null) fails
+includes: [$FAIL.js]
+---*/
 
 f =  Function("arg1,arg2,arg3", null);
 
@@ -36,4 +37,3 @@ try {
 if (f.length !== 3) {
   $ERROR('#4: the length property has the attributes { ReadOnly }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T3.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T3.js
index 3eb47a8b1..bd3e9d80e 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T3.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A3_T3.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the length property has the attributes { ReadOnly }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A3_T3.js
- * @description Checking if varying the length property of Function("arg1,arg2,arg3","arg1,arg2","arg3", null) fails
- */
+/*---
+info: the length property has the attributes { ReadOnly }
+description: >
+    Checking if varying the length property of
+    Function("arg1,arg2,arg3","arg1,arg2","arg3", null) fails
+includes: [$FAIL.js]
+---*/
 
 f = new Function("arg1,arg2,arg3","arg1,arg2","arg3", null);
 
@@ -36,4 +37,3 @@ try {
 if (f.length !== 6) {
   $ERROR('#4: the length property has the attributes { ReadOnly }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T1.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T1.js
index 6ac1f63dc..96ccc51cc 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T1.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the length property has the attributes { DontEnum }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A4_T1.js
- * @description Checking if enumerating the length property of Function("arg1,arg2,arg3", null) fails
- */
+/*---
+info: the length property has the attributes { DontEnum }
+description: >
+    Checking if enumerating the length property of
+    Function("arg1,arg2,arg3", null) fails
+includes: [$FAIL.js]
+---*/
 
 f = new Function("arg1,arg2,arg3", null);
 
@@ -23,4 +24,3 @@ for(key in f)
 if (lengthenumed) {
   $ERROR('#2: the length property has the attributes { DontEnum }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T2.js
index ae7d5f551..e2a51b636 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the length property has the attributes { DontEnum }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A4_T2.js
- * @description Checking if enumerating the length property of Function("arg1,arg2,arg3","arg4,arg5", null) fails
- */
+/*---
+info: the length property has the attributes { DontEnum }
+description: >
+    Checking if enumerating the length property of
+    Function("arg1,arg2,arg3","arg4,arg5", null) fails
+includes: [$FAIL.js]
+---*/
 
 f =  Function("arg1,arg2,arg3","arg5,arg4", null);
 
@@ -23,4 +24,3 @@ for(key in f)
 if (lengthenumed) {
   $ERROR('#2: the length property has the attributes { DontEnum }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T3.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T3.js
index a5287e541..be60b88fd 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T3.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.1_A4_T3.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the length property has the attributes { DontEnum }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.1_A4_T3.js
- * @description Checking if enumerating the length property of Function("arg1,arg2,arg3","arg1,arg2","arg3", null) fails
- */
+/*---
+info: the length property has the attributes { DontEnum }
+description: >
+    Checking if enumerating the length property of
+    Function("arg1,arg2,arg3","arg1,arg2","arg3", null) fails
+includes: [$FAIL.js]
+---*/
 
 f = new Function("arg1,arg2,arg3","arg1,arg2","arg3", null);
 
@@ -23,4 +24,3 @@ for(key in f)
 if (lengthenumed) {
   $ERROR('#2: the length property has the attributes { DontEnum }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.2_A1_T1.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.2_A1_T1.js
index d58f7c76c..061fb5ead 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.2_A1_T1.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.2_A1_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the prototype property has the attributes { DontDelete }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.2_A1_T1.js
- * @description Checking if deleting the prototype property of Function("", null) fails
- */
+/*---
+info: the prototype property has the attributes { DontDelete }
+description: >
+    Checking if deleting the prototype property of Function("", null)
+    fails
+includes: [$FAIL.js]
+---*/
 
 f = new Function("", null);
 
@@ -26,4 +27,3 @@ if (delete f.prototype) {
 if (f.prototype !== fproto) {
   $ERROR('#3: the prototype property has the attributes { DontDelete }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.2_A1_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.2_A1_T2.js
index cd8e1e4bd..fe7de3a42 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.2_A1_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.2_A1_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * the prototype property has the attributes { DontDelete }
- *
- * @path ch15/15.3/15.3.5/S15.3.5.2_A1_T2.js
- * @description Checking if deleting the prototype property of Function(void 0, "") fails
- */
+/*---
+info: the prototype property has the attributes { DontDelete }
+description: >
+    Checking if deleting the prototype property of Function(void 0,
+    "") fails
+includes: [$FAIL.js]
+---*/
 
 f = Function(void 0, "");
 
@@ -26,4 +27,3 @@ if (delete f.prototype) {
 if (f.prototype !== fproto) {
   $ERROR('#3: the prototype property has the attributes { DontDelete }');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T1.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T1.js
index b90326eec..a139bd308 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T1.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A1_T1.js
- * @description V is number
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is
+    called with value V, the following steps are taken: i) If V is not an
+    object, return false
+description: V is number
+---*/
 
 FACTORY = Function("name","this.name=name;");
 
@@ -14,4 +15,3 @@ FACTORY = Function("name","this.name=name;");
 if ((1 instanceof  FACTORY)!==false) {
   $ERROR('#1: Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T2.js
index 79454b8fe..6bcde17a8 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A1_T2.js
- * @description V is string
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is
+    called with value V, the following steps are taken: i) If V is not an
+    object, return false
+description: V is string
+---*/
 
 FACTORY = Function("name","this.name=name;");
 
@@ -14,4 +15,3 @@ FACTORY = Function("name","this.name=name;");
 if (("1" instanceof  FACTORY)!==false) {
   $ERROR('#1: Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T3.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T3.js
index 9b7ebad28..e690608e7 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T3.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T3.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A1_T3.js
- * @description V is boolean true
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is
+    called with value V, the following steps are taken: i) If V is not an
+    object, return false
+description: V is boolean true
+---*/
 
 FACTORY = Function("name","this.name=name;");
 
@@ -14,4 +15,3 @@ FACTORY = Function("name","this.name=name;");
 if ((true instanceof  FACTORY)!==false) {
   $ERROR('#1: Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T4.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T4.js
index 364294e17..9c0476fb4 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T4.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T4.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A1_T4.js
- * @description V is boolean false
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is
+    called with value V, the following steps are taken: i) If V is not an
+    object, return false
+description: V is boolean false
+---*/
 
 FACTORY = Function("name","this.name=name;");
 
@@ -14,4 +15,3 @@ FACTORY = Function("name","this.name=name;");
 if ((false instanceof  FACTORY)!==false) {
   $ERROR('#1: Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T5.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T5.js
index ab5221bdf..012d82306 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T5.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T5.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A1_T5.js
- * @description V is void 0
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is
+    called with value V, the following steps are taken: i) If V is not an
+    object, return false
+description: V is void 0
+---*/
 
 FACTORY = Function("name","this.name=name;");
 
@@ -14,4 +15,3 @@ FACTORY = Function("name","this.name=name;");
 if ((void 0 instanceof  FACTORY)!==false) {
   $ERROR('#1: Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T6.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T6.js
index ac62538d8..9a83d745e 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T6.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T6.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A1_T6.js
- * @description V is null
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is
+    called with value V, the following steps are taken: i) If V is not an
+    object, return false
+description: V is null
+---*/
 
 FACTORY = Function("name","this.name=name;");
 
@@ -14,4 +15,3 @@ FACTORY = Function("name","this.name=name;");
 if ((null instanceof  FACTORY)!==false) {
   $ERROR('#1: Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T7.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T7.js
index 2ddb306eb..0acaef638 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T7.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T7.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A1_T7.js
- * @description V is undefined
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is
+    called with value V, the following steps are taken: i) If V is not an
+    object, return false
+description: V is undefined
+---*/
 
 FACTORY = Function("name","this.name=name;");
 
@@ -14,4 +15,3 @@ FACTORY = Function("name","this.name=name;");
 if ((undefined instanceof  FACTORY)!==false) {
   $ERROR('#1: Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T8.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T8.js
index 72cd6e7ac..3b56bf15a 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T8.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A1_T8.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V, the following steps are taken: i) If V is not an object, return false
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A1_T8.js
- * @description V is undefined variable
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is
+    called with value V, the following steps are taken: i) If V is not an
+    object, return false
+description: V is undefined variable
+---*/
 
 FACTORY = Function("name","this.name=name;");
 
@@ -16,4 +17,3 @@ if ((x instanceof  FACTORY)!==false) {
 }
 
 var x;
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T2.js
index 1a76931b9..9d18b0e21 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T2.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.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V and V is an object, the following steps are taken:
- * i) Call the [[Get]] method of F with property name "prototype".
- * ii) Let O be Result(i).
- * iii) O is not an object, throw a TypeError exception
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A2_T2.js
- * @description F.prototype is undefined, and V is empty object
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is called with value V and V is an object, the following steps are taken:
+    i) Call the [[Get]] method of F with property name "prototype".
+    ii) Let O be Result(i).
+    iii) O is not an object, throw a TypeError exception
+description: F.prototype is undefined, and V is empty object
+includes: [$FAIL.js]
+---*/
 
 FACTORY = new Function;
 
@@ -26,6 +26,3 @@ try {
   	$ERROR('#1.1: O is not an object, throw a TypeError exception');
   }
 }
-
-
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T5.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T5.js
index c84ed748e..0be5c506f 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T5.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T5.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.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of
- *             F is called with value V and V is an object, the following steps
- *             are taken: i) Call the [[Get]] method of F with property name
- *             "prototype". ii) Let O be Result(i). iii) O is not an object,
- *             throw a TypeError exception
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A2_T5.js
- * @description F.prototype is void 0, and V is new F
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of
+    F is called with value V and V is an object, the following steps
+    are taken: i) Call the [[Get]] method of F with property name
+    "prototype". ii) Let O be Result(i). iii) O is not an object,
+    throw a TypeError exception
+description: F.prototype is void 0, and V is new F
+includes: [$FAIL.js]
+---*/
 
 FACTORY = Function("this.prop=1;");
 
@@ -34,4 +34,3 @@ try {
 if ((instance.constructor !== FACTORY) || (instance.name !== "fairy")) {
   $ERROR('#2: instance.constructor === FACTORY');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T6.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T6.js
index 1ec347709..0cf183a50 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T6.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A2_T6.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.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of
- *             F is called with value V and V is an object, the following steps
- *             are taken: i) Call the [[Get]] method of F with property name
- *             "prototype". ii) Let O be Result(i). iii) O is not an object,
- *             throw a TypeError exception
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A2_T6.js
- * @description F.prototype is string, and V is function
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of
+    F is called with value V and V is an object, the following steps
+    are taken: i) Call the [[Get]] method of F with property name
+    "prototype". ii) Let O be Result(i). iii) O is not an object,
+    throw a TypeError exception
+description: F.prototype is string, and V is function
+includes: [$FAIL.js]
+---*/
 
 FACTORY = new Function;
 
@@ -26,4 +26,3 @@ try {
     $ERROR('#1.1: O is not an object, throw a TypeError exception');
   }
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A3_T1.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A3_T1.js
index 93779f8ff..8d6236fa0 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A3_T1.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A3_T1.js
@@ -1,18 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V and V is an object, the following steps are taken:
- * i) Call the [[Get]] method of F with property name "prototype".
- * ii) Let O be Result(i) and O is an object.
- * iii) Let V be the value of the [[Prototype]] property of V.
- * iv) If V is null, return false.
- * v)  If O and V refer to the same object or if they refer to objects joined to each other (13.1.2), return true.
- * vi) Go to step iii)
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A3_T1.js
- * @description F.prototype.type is 1, and V is new F
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is called with value V and V is an object, the following steps are taken:
+    i) Call the [[Get]] method of F with property name "prototype".
+    ii) Let O be Result(i) and O is an object.
+    iii) Let V be the value of the [[Prototype]] property of V.
+    iv) If V is null, return false.
+    v)  If O and V refer to the same object or if they refer to objects joined to each other (13.1.2), return true.
+    vi) Go to step iii)
+description: F.prototype.type is 1, and V is new F
+---*/
 
 FACTORY = Function("this.name=\"root\"");
 
@@ -24,4 +23,3 @@ instance = new FACTORY;
 if (!(instance instanceof FACTORY)) {
   $ERROR('#1: If O and V refer to the same object or if they refer to objects joined to each other (13.1.2), return true');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A3_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A3_T2.js
index d3f2cc7e3..5a28fb74f 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A3_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5.3_A3_T2.js
@@ -1,18 +1,17 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Assume F is a Function object. When the [[HasInstance]] method of F is called with value V and V is an object, the following steps are taken:
- * i) Call the [[Get]] method of F with property name "prototype".
- * ii) Let O be Result(i) and O is an object.
- * iii) Let V be the value of the [[Prototype]] property of V.
- * iv) If V is null, return false.
- * v)  If O and V refer to the same object or if they refer to objects joined to each other (13.1.2), return true.
- * vi) Go to step iii)
- *
- * @path ch15/15.3/15.3.5/S15.3.5.3_A3_T2.js
- * @description F.prototype is Object.prototype, and V is empty object
- */
+/*---
+info: >
+    Assume F is a Function object. When the [[HasInstance]] method of F is called with value V and V is an object, the following steps are taken:
+    i) Call the [[Get]] method of F with property name "prototype".
+    ii) Let O be Result(i) and O is an object.
+    iii) Let V be the value of the [[Prototype]] property of V.
+    iv) If V is null, return false.
+    v)  If O and V refer to the same object or if they refer to objects joined to each other (13.1.2), return true.
+    vi) Go to step iii)
+description: F.prototype is Object.prototype, and V is empty object
+---*/
 
 FAKEFACTORY = Function();
 
@@ -29,4 +28,3 @@ FAKEFACTORY.prototype=Object.prototype;
 if (!(fakeinstance instanceof FAKEFACTORY)) {
   $ERROR('#2: If O and V refer to the same object or if they refer to objects joined to each other (13.1.2), return true');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5_A1_T1.js b/test/suite/ch15/15.3/15.3.5/S15.3.5_A1_T1.js
index 792eb4920..fa2839f9c 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5_A1_T1.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5_A1_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.
 
-/**
- * The value of the [[Class]] property is "Function"
- *
- * @path ch15/15.3/15.3.5/S15.3.5_A1_T1.js
- * @description For testing use variable f = new Function
- */
+/*---
+info: The value of the [[Class]] property is "Function"
+description: For testing use variable f = new Function
+---*/
 
 var f = new Function;
 
 if (Object.prototype.toString.call(f) !== "[object Function]") {
   $ERROR('#1: The value of the [[Class]] property is "Function"');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5_A1_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5_A1_T2.js
index 1d33ccc16..03e786e0a 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5_A1_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5_A1_T2.js
@@ -1,17 +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 of the [[Class]] property is "Function"
- *
- * @path ch15/15.3/15.3.5/S15.3.5_A1_T2.js
- * @description For testing use variable f = Function()
- */
+/*---
+info: The value of the [[Class]] property is "Function"
+description: For testing use variable f = Function()
+---*/
 
 var f = Function();
 
 if (Object.prototype.toString.call(f) !== "[object Function]") {
   $ERROR('#1: The value of the [[Class]] property is "Function"');
 }
-
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5_A2_T1.js b/test/suite/ch15/15.3/15.3.5/S15.3.5_A2_T1.js
index a4c5c74f0..f623cedce 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5_A2_T1.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5_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.
 
-/**
- * Every function instance has a [[Call]] property
- *
- * @path ch15/15.3/15.3.5/S15.3.5_A2_T1.js
- * @description For testing call Function("var x =1; this.y=2;return \"OK\";")()
- */
+/*---
+info: Every function instance has a [[Call]] property
+description: For testing call Function("var x =1; this.y=2;return \"OK\";")()
+---*/
 
 //CHECK#1
 if (Function("var x =1; this.y=2;return \"OK\";")() !== "OK") {
@@ -22,4 +20,3 @@ if (typeof x !== "undefined") {
 if (y !== 2) {
   $ERROR('#3: Every function instance has a [[Call]] property');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5_A2_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5_A2_T2.js
index 86d2ea801..b3b6426eb 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5_A2_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5_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.
 
-/**
- * Every function instance has a [[Call]] property
- *
- * @path ch15/15.3/15.3.5/S15.3.5_A2_T2.js
- * @description For testing call (new Function("arg1,arg2","var x =arg1; this.y=arg2;return arg1+arg2;"))("1",2)
- */
+/*---
+info: Every function instance has a [[Call]] property
+description: >
+    For testing call (new Function("arg1,arg2","var x =arg1;
+    this.y=arg2;return arg1+arg2;"))("1",2)
+---*/
 
 //CHECK#1
 if ((new Function("arg1,arg2","var x =arg1; this.y=arg2;return arg1+arg2;"))("1",2) !== "12") {
@@ -22,4 +22,3 @@ if (typeof x !== "undefined") {
 if (y !== 2) {
   $ERROR('#3: Every function instance has a [[Call]] property');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5_A3_T1.js b/test/suite/ch15/15.3/15.3.5/S15.3.5_A3_T1.js
index 357eb0c15..ea74492ba 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5_A3_T1.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5_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.
 
-/**
- * every function instance has a [[Construct]] property
- *
- * @path ch15/15.3/15.3.5/S15.3.5_A3_T1.js
- * @description As constructor use Function("var x =1; this.y=2;return \"OK\";")
- */
+/*---
+info: every function instance has a [[Construct]] property
+description: As constructor use Function("var x =1; this.y=2;return \"OK\";")
+---*/
 
 FACTORY = Function("var x =1; this.y=2;return \"OK\";");
 obj = new FACTORY;
@@ -25,4 +23,3 @@ if (obj.constructor !== FACTORY) {
 if (obj.y !== 2) {
   $ERROR('#3: every function instance has a [[Construct]] property');
 }
-
diff --git a/test/suite/ch15/15.3/15.3.5/S15.3.5_A3_T2.js b/test/suite/ch15/15.3/15.3.5/S15.3.5_A3_T2.js
index ef8607eee..1762abba5 100644
--- a/test/suite/ch15/15.3/15.3.5/S15.3.5_A3_T2.js
+++ b/test/suite/ch15/15.3/15.3.5/S15.3.5_A3_T2.js
@@ -1,12 +1,12 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * every function instance has a [[Construct]] property
- *
- * @path ch15/15.3/15.3.5/S15.3.5_A3_T2.js
- * @description As constructor use new Function("arg1,arg2","var x =1; this.y=arg1+arg2;return \"OK\";")
- */
+/*---
+info: every function instance has a [[Construct]] property
+description: >
+    As constructor use new Function("arg1,arg2","var x =1;
+    this.y=arg1+arg2;return \"OK\";")
+---*/
 
 FACTORY = new Function("arg1,arg2","var x =1; this.y=arg1+arg2;return \"OK\";");
 obj = new FACTORY("1",2);
@@ -25,4 +25,3 @@ if (obj.constructor !== FACTORY) {
 if (obj.y !== "12") {
   $ERROR('#3: every function instance has a [[Construct]] property');
 }
-
diff --git a/test/suite/ch15/15.3/S15.3.1_A1_T1.js b/test/suite/ch15/15.3/S15.3.1_A1_T1.js
index 5031ad0e6..8fd644563 100644
--- a/test/suite/ch15/15.3/S15.3.1_A1_T1.js
+++ b/test/suite/ch15/15.3/S15.3.1_A1_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.
 
-/**
- * The function call Function(…) is equivalent to the object creation expression
- * new Function(…) with the same arguments.
- *
- * @path ch15/15.3/S15.3.1_A1_T1.js
- * @description Create simple functions and check returned values
- */
+/*---
+info: >
+    The function call Function(…) is equivalent to the object creation expression
+    new Function(…) with the same arguments.
+description: Create simple functions and check returned values
+---*/
 
 var f = Function("return arguments[0];");
 
@@ -38,4 +37,3 @@ if (g("A") !== "A") {
 if (g("A") !== f("A")) {
   $ERROR('#5: g("A") !== f("A")');
 }
-
diff --git a/test/suite/ch15/15.3/S15.3_A1.js b/test/suite/ch15/15.3/S15.3_A1.js
index 0b7f12e62..0777d6b09 100644
--- a/test/suite/ch15/15.3/S15.3_A1.js
+++ b/test/suite/ch15/15.3/S15.3_A1.js
@@ -1,12 +1,10 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Function is the property of global
- *
- * @path ch15/15.3/S15.3_A1.js
- * @description Compare Function with this.Function
- */
+/*---
+info: Function is the property of global
+description: Compare Function with this.Function
+---*/
 
 var obj = Function;
 
@@ -15,4 +13,3 @@ var thisobj = this.Function;
 if (obj !== thisobj) {
   $ERROR('Function is the property of global');
 }
-
diff --git a/test/suite/ch15/15.3/S15.3_A2_T1.js b/test/suite/ch15/15.3/S15.3_A2_T1.js
index 3b7b32995..cd67db417 100644
--- a/test/suite/ch15/15.3/S15.3_A2_T1.js
+++ b/test/suite/ch15/15.3/S15.3_A2_T1.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since applying the "call" method to Function constructor themself leads to creating a new function instance, the second argument must be a valid function body
- *
- * @path ch15/15.3/S15.3_A2_T1.js
- * @description Checking if executing "Function.call(this, "var x / = 1;")" fails
- */
+/*---
+info: >
+    Since applying the "call" method to Function constructor themself leads
+    to creating a new function instance, the second argument must be a valid
+    function body
+description: Checking if executing "Function.call(this, "var x / = 1;")" fails
+---*/
 
 //CHECK#
 try{
@@ -15,6 +16,4 @@ try{
   if (!(e instanceof SyntaxError)) {
   	$ERROR('#1: function body must be valid');
   }
-}    
-
-
+}
diff --git a/test/suite/ch15/15.3/S15.3_A2_T2.js b/test/suite/ch15/15.3/S15.3_A2_T2.js
index c2797b540..034fc748f 100644
--- a/test/suite/ch15/15.3/S15.3_A2_T2.js
+++ b/test/suite/ch15/15.3/S15.3_A2_T2.js
@@ -1,12 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Since applying the "call" method to Function constructor themself leads to creating a new function instance, the second argument must be a valid function body
- *
- * @path ch15/15.3/S15.3_A2_T2.js
- * @description Checking if executing "Function.call(this, "var #x  = 1;")" fails
- */
+/*---
+info: >
+    Since applying the "call" method to Function constructor themself leads
+    to creating a new function instance, the second argument must be a valid
+    function body
+description: Checking if executing "Function.call(this, "var #x  = 1;")" fails
+---*/
 
 //CHECK#
 try{
@@ -15,6 +16,4 @@ try{
   if (!(e instanceof SyntaxError)) {
   	$ERROR('#1: function body must be valid');
   }
-}    
-
-
+}
diff --git a/test/suite/ch15/15.3/S15.3_A3_T1.js b/test/suite/ch15/15.3/S15.3_A3_T1.js
index ad10b97e4..293a1a145 100644
--- a/test/suite/ch15/15.3/S15.3_A3_T1.js
+++ b/test/suite/ch15/15.3/S15.3_A3_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.
 
-/**
- * Since when call is used for Function constructor themself new function instance creates
- * and then first argument(thisArg) should be ignored
- *
- * @path ch15/15.3/S15.3_A3_T1.js
- * @description First argument is object
- */
+/*---
+info: >
+    Since when call is used for Function constructor themself new function instance creates
+    and then first argument(thisArg) should be ignored
+description: First argument is object
+---*/
 
 //CHECK#1 - does not throw
 var f = Function.call(mars, "return name;");
@@ -26,4 +25,3 @@ if (about_mars !== undefined) {
 if (this.godname !== "ares" && mars.godname===undefined) {
   $ERROR('#3: When applied to the Function object itself, thisArg should be ignored');
 }
-
diff --git a/test/suite/ch15/15.3/S15.3_A3_T2.js b/test/suite/ch15/15.3/S15.3_A3_T2.js
index cb4cb5740..494e4d2aa 100644
--- a/test/suite/ch15/15.3/S15.3_A3_T2.js
+++ b/test/suite/ch15/15.3/S15.3_A3_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.
 
-/**
- * Since when call is used for Function constructor themself new function instance creates
- * and then first argument(thisArg) should be ignored
- *
- * @path ch15/15.3/S15.3_A3_T2.js
- * @description First argument is string and null
- */
+/*---
+info: >
+    Since when call is used for Function constructor themself new function instance creates
+    and then first argument(thisArg) should be ignored
+description: First argument is string and null
+---*/
 
 this.color="red";
 var name="mars";
@@ -25,5 +24,3 @@ var g = Function.call(null, "return this.name;");
 if (g() !== "mars") {
   $ERROR('#2: ');
 }
-
-
diff --git a/test/suite/ch15/15.3/S15.3_A3_T3.js b/test/suite/ch15/15.3/S15.3_A3_T3.js
index 8f352b54c..eec919fa2 100644
--- a/test/suite/ch15/15.3/S15.3_A3_T3.js
+++ b/test/suite/ch15/15.3/S15.3_A3_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.
 
-/**
- * Since when call is used for Function constructor themself new function instance creates
- * and then first argument(thisArg) should be ignored
- *
- * @path ch15/15.3/S15.3_A3_T3.js
- * @description First argument is this, and this don`t have needed variable
- */
+/*---
+info: >
+    Since when call is used for Function constructor themself new function instance creates
+    and then first argument(thisArg) should be ignored
+description: First argument is this, and this don`t have needed variable
+---*/
 
 var f=Function.call(this, "return planet;");
 var g=Function.call(this, "return color;");
@@ -39,4 +38,3 @@ this.color="red";
 if (g() !== "red") {
   $ERROR('#4: ');
 }
-
diff --git a/test/suite/ch15/15.3/S15.3_A3_T4.js b/test/suite/ch15/15.3/S15.3_A3_T4.js
index 871c3762a..e6c23229f 100644
--- a/test/suite/ch15/15.3/S15.3_A3_T4.js
+++ b/test/suite/ch15/15.3/S15.3_A3_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.
 
-/**
- * Since when call is used for Function constructor themself new function instance creates
- * and then first argument(thisArg) should be ignored
- *
- * @path ch15/15.3/S15.3_A3_T4.js
- * @description First argument is this, and this have needed variable
- */
+/*---
+info: >
+    Since when call is used for Function constructor themself new function instance creates
+    and then first argument(thisArg) should be ignored
+description: First argument is this, and this have needed variable
+---*/
 
 var f=Function.call(this, "return planet;");
 
@@ -22,4 +21,3 @@ var planet="mars";
 if (f() !== "mars") {
   $ERROR('#2: ');
 }
-
diff --git a/test/suite/ch15/15.3/S15.3_A3_T5.js b/test/suite/ch15/15.3/S15.3_A3_T5.js
index 9d1df2ade..70ba81c29 100644
--- a/test/suite/ch15/15.3/S15.3_A3_T5.js
+++ b/test/suite/ch15/15.3/S15.3_A3_T5.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.
 
-/**
- * Since when call is used for Function constructor themself new function instance creates
- * and then first argument(thisArg) should be ignored
- *
- * @path ch15/15.3/S15.3_A3_T5.js
- * @description First argument is this, and this don`t have needed variable. Function return this.var_name
- */
+/*---
+info: >
+    Since when call is used for Function constructor themself new function instance creates
+    and then first argument(thisArg) should be ignored
+description: >
+    First argument is this, and this don`t have needed variable.
+    Function return this.var_name
+---*/
 
 var f=Function.call(this, "return this.planet;");
 var g=Function.call(this, "return this.color;");
@@ -35,4 +36,3 @@ this.color="red";
 if (g() !== "red") {
   $ERROR('#4: ');
 }
-
diff --git a/test/suite/ch15/15.3/S15.3_A3_T6.js b/test/suite/ch15/15.3/S15.3_A3_T6.js
index 4e324f8b6..a49c5b127 100644
--- a/test/suite/ch15/15.3/S15.3_A3_T6.js
+++ b/test/suite/ch15/15.3/S15.3_A3_T6.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.
 
-/**
- * Since when call is used for Function constructor themself new function instance creates
- * and then first argument(thisArg) should be ignored
- *
- * @path ch15/15.3/S15.3_A3_T6.js
- * @description First argument is this, and this have needed variable. Function return this.var_name
- */
+/*---
+info: >
+    Since when call is used for Function constructor themself new function instance creates
+    and then first argument(thisArg) should be ignored
+description: >
+    First argument is this, and this have needed variable. Function
+    return this.var_name
+---*/
 
 var f=Function.call(this, "return this.planet;");
 
@@ -22,4 +23,3 @@ var planet="mars";
 if (f() !== "mars") {
   $ERROR('#2: ');
 }
-