Normalize testcase format

This commit normalizes the test case format used across test262. It applies the following transformations:

* Convert to YAML for frontmatter
* Remove of trailing whitespace
* Replace /r/n with /n except in chapters 6 and 7.
* Copyright header always uses // comments
* new includes attribute replaces $INCLUDE
* No implicit assumptions about test environment other than $ERROR. Everything else appears in the include array. This includes "runTestCase" which is now included in a substantial number of tests.

240 files changed, 4733 insertions, 4146 deletions

diff --git a/test/suite/ch10/10.4/10.4.1/S10.4.1_A1_T1.js b/test/suite/ch10/10.4/10.4.1/S10.4.1_A1_T1.js
index 04abf8bef..c5c8fe848 100644
--- a/test/suite/ch10/10.4/10.4.1/S10.4.1_A1_T1.js
+++ b/test/suite/ch10/10.4/10.4.1/S10.4.1_A1_T1.js
@@ -1,14 +1,15 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Variable instantiation is performed using the global object as
- * the variable object and using property attributes { DontDelete }
- *
- * @path ch10/10.4/10.4.1/S10.4.1_A1_T1.js
- * @description Checking if deleting variable x, that is defined as var x = 1, fails
- * @noStrict
- */
+/*---
+info: >
+    Variable instantiation is performed using the global object as
+    the variable object and using property attributes { DontDelete }
+description: >
+    Checking if deleting variable x, that is defined as var x = 1,
+    fails
+flags: [noStrict]
+---*/
 
 var x = 1;
 
@@ -19,4 +20,3 @@ if (this.x !== 1) {
 if(delete this.x !== false){
   $ERROR("#2: variable x has property attribute DontDelete");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.1/S10.4.1_A1_T2.js b/test/suite/ch10/10.4/10.4.1/S10.4.1_A1_T2.js
index 107381f2d..78ab8fabf 100644
--- a/test/suite/ch10/10.4/10.4.1/S10.4.1_A1_T2.js
+++ b/test/suite/ch10/10.4/10.4.1/S10.4.1_A1_T2.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * Variable instantiation is performed using the global object as
- * the variable object and using property attributes { DontDelete }
- *
- * @path ch10/10.4/10.4.1/S10.4.1_A1_T2.js
- * @description Checking if deleting variable x, that is defined as x = 1, fails
- * @noStrict
- */
+/*---
+info: >
+    Variable instantiation is performed using the global object as
+    the variable object and using property attributes { DontDelete }
+description: Checking if deleting variable x, that is defined as x = 1, fails
+flags: [noStrict]
+---*/
 
 x = 1;
 
@@ -19,4 +18,3 @@ if (this.x !== 1) {
 if(delete this.x !== true){
   $ERROR("#2: variable x has property attribute DontDelete");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2-1-1.js b/test/suite/ch10/10.4/10.4.2/10.4.2-1-1.js
index 233eac2c8..bda0d51aa 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2-1-1.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2-1-1.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 ch10/10.4/10.4.2/10.4.2-1-1.js

- * @description Indirect call to eval has context set to global context

- */

-

-var __10_4_2_1_1_1 = "str";

-function testcase() {

-  try {

-

-    var _eval = eval;

-    var __10_4_2_1_1_1 = "str1";

-    if(_eval("\'str\' === __10_4_2_1_1_1") === true &&  // indirect eval

-       eval("\'str1\' === __10_4_2_1_1_1") === true) {   // direct eval

-       return true;

-    }

-    return false;

-  } finally {

-    delete this.__10_4_2_1_1_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: Indirect call to eval has context set to global context
+includes: [runTestCase.js]
+---*/
+
+var __10_4_2_1_1_1 = "str";
+function testcase() {
+  try {
+
+    var _eval = eval;
+    var __10_4_2_1_1_1 = "str1";
+    if(_eval("\'str\' === __10_4_2_1_1_1") === true &&  // indirect eval
+       eval("\'str1\' === __10_4_2_1_1_1") === true) {   // direct eval
+       return true;
+    }
+    return false;
+  } finally {
+    delete this.__10_4_2_1_1_1;
+  }
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2-1-2.js b/test/suite/ch10/10.4/10.4.2/10.4.2-1-2.js
index 7c144f552..4105bb2b6 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2-1-2.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2-1-2.js
@@ -1,31 +1,34 @@
-/// Copyright (c) 2012 Ecma International.  All rights reserved. 

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

-/// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 ch10/10.4/10.4.2/10.4.2-1-2.js

- * @description Indirect call to eval has context set to global context (nested function)

- */

-

-var __10_4_2_1_2 = "str";

-function testcase() {

-        try {

-

-            var _eval = eval;

-            var __10_4_2_1_2 = "str1";

-            function foo() {

-                var __10_4_2_1_2 = "str2";

-                if(_eval("\'str\' === __10_4_2_1_2") === true &&  // indirect eval

-                    eval("\'str2\' === __10_4_2_1_2") === true) {   // direct eval

-                    return true;

-                } else {

-                    return false;

-                }

-            }

-            return foo();

-        } finally {

-            delete this.__10_4_2_1_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: >
+    Indirect call to eval has context set to global context (nested
+    function)
+includes: [runTestCase.js]
+---*/
+
+var __10_4_2_1_2 = "str";
+function testcase() {
+        try {
+
+            var _eval = eval;
+            var __10_4_2_1_2 = "str1";
+            function foo() {
+                var __10_4_2_1_2 = "str2";
+                if(_eval("\'str\' === __10_4_2_1_2") === true &&  // indirect eval
+                    eval("\'str2\' === __10_4_2_1_2") === true) {   // direct eval
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+            return foo();
+        } finally {
+            delete this.__10_4_2_1_1_2;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2-1-3.js b/test/suite/ch10/10.4/10.4.2/10.4.2-1-3.js
index 078ea21ab..beca1c852 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2-1-3.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2-1-3.js
@@ -1,34 +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 ch10/10.4/10.4.2/10.4.2-1-3.js

- * @description Indirect call to eval has context set to global context (catch block)

- */

-

-var __10_4_2_1_3 = "str";

-function testcase() {

-

-        try {

-

-            var _eval = eval;

-            var __10_4_2_1_3 = "str1";

-            try {

-                throw "error";

-            }

-            catch (e) {

-                var __10_4_2_1_3 = "str2";

-                if (_eval("\'str\' === __10_4_2_1_3") === true &&  // indirect eval

-                    eval("\'str2\' === __10_4_2_1_3") === true) {  // direct eval

-                    return true;

-                } else {

-                    return false;

-                }

-            }

-        } finally {

-            delete this.__10_4_2_1_3;

-        }

-    }

-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: >
+    Indirect call to eval has context set to global context (catch
+    block)
+includes: [runTestCase.js]
+---*/
+
+var __10_4_2_1_3 = "str";
+function testcase() {
+
+        try {
+
+            var _eval = eval;
+            var __10_4_2_1_3 = "str1";
+            try {
+                throw "error";
+            }
+            catch (e) {
+                var __10_4_2_1_3 = "str2";
+                if (_eval("\'str\' === __10_4_2_1_3") === true &&  // indirect eval
+                    eval("\'str2\' === __10_4_2_1_3") === true) {  // direct eval
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+        } finally {
+            delete this.__10_4_2_1_3;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2-1-4.js b/test/suite/ch10/10.4/10.4.2/10.4.2-1-4.js
index 8a025f0d9..b4b9f7527 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2-1-4.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2-1-4.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.

-/**

- * @path ch10/10.4/10.4.2/10.4.2-1-4.js

- * @description Indirect call to eval has context set to global context (with block)

- */

-

-var __10_4_2_1_4 = "str";

-function testcase() {

-        try {

-            var o = new Object();

-            o.__10_4_2_1_4 = "str2";

-            var _eval = eval;

-            var __10_4_2_1_4 = "str1";

-            with (o) {

-                if (_eval("\'str\' === __10_4_2_1_4") === true &&  // indirect eval

-                    eval("\'str2\' === __10_4_2_1_4") === true) {  // direct eval

-                    return true;

-                }

-            }

-            return false;

-        } finally {

-            delete this.__10_4_2_1_4;

-        }

-    }

-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: >
+    Indirect call to eval has context set to global context (with
+    block)
+includes: [runTestCase.js]
+---*/
+
+var __10_4_2_1_4 = "str";
+function testcase() {
+        try {
+            var o = new Object();
+            o.__10_4_2_1_4 = "str2";
+            var _eval = eval;
+            var __10_4_2_1_4 = "str1";
+            with (o) {
+                if (_eval("\'str\' === __10_4_2_1_4") === true &&  // indirect eval
+                    eval("\'str2\' === __10_4_2_1_4") === true) {  // direct eval
+                    return true;
+                }
+            }
+            return false;
+        } finally {
+            delete this.__10_4_2_1_4;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2-1-5.js b/test/suite/ch10/10.4/10.4.2/10.4.2-1-5.js
index 3808a9988..62a90877a 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2-1-5.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2-1-5.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 ch10/10.4/10.4.2/10.4.2-1-5.js

- * @description Indirect call to eval has context set to global context (inside another eval)

- */

-

-var __10_4_2_1_5 = "str";

-function testcase() {

-        try {

-

-            var __10_4_2_1_5 = "str1";

-            var r = eval("\

-                          var _eval = eval; \

-                          var __10_4_2_1_5 = \'str2\'; \

-                          _eval(\"\'str\' === __10_4_2_1_5 \") && \

-                          eval(\"\'str2\' === __10_4_2_1_5\")\

-                        ");

-            return r;

-        } finally {

-            delete this.__10_4_2_1_5;

-        }

-    }

-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: >
+    Indirect call to eval has context set to global context (inside
+    another eval)
+includes: [runTestCase.js]
+---*/
+
+var __10_4_2_1_5 = "str";
+function testcase() {
+        try {
+
+            var __10_4_2_1_5 = "str1";
+            var r = eval("\
+                          var _eval = eval; \
+                          var __10_4_2_1_5 = \'str2\'; \
+                          _eval(\"\'str\' === __10_4_2_1_5 \") && \
+                          eval(\"\'str2\' === __10_4_2_1_5\")\
+                        ");
+            return r;
+        } finally {
+            delete this.__10_4_2_1_5;
+        }
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2-2-c-1.js b/test/suite/ch10/10.4/10.4.2/10.4.2-2-c-1.js
index 61d85cec0..308f5b01f 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2-2-c-1.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2-2-c-1.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 ch10/10.4/10.4.2/10.4.2-2-c-1.js

- * @description Direct val code in non-strict mode - can instantiate variable in calling context

- */

-

-

-function testcase() {

-  var x = 0;

-  return function inner() {

-     eval("var x = 1");

-     if (x === 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: >
+    Direct val code in non-strict mode - can instantiate variable in
+    calling context
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var x = 0;
+  return function inner() {
+     eval("var x = 1");
+     if (x === 1)
+        return true;
+     } ();
+   }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2-2-s.js b/test/suite/ch10/10.4/10.4.2/10.4.2-2-s.js
index fb00b04f5..a2bc24fbc 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2-2-s.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2-2-s.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 ch10/10.4/10.4.2/10.4.2-2-s.js

- * @description Strict Mode - Strict mode eval code cannot instantiate functions in the variable environment of the caller to eval

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-        eval("(function fun(x){ return x })(10)");

-        return typeof (fun) === "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: >
+    Strict Mode - Strict mode eval code cannot instantiate functions
+    in the variable environment of the caller to eval
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+        eval("(function fun(x){ return x })(10)");
+        return typeof (fun) === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2-3-c-1-s.js b/test/suite/ch10/10.4/10.4.2/10.4.2-3-c-1-s.js
index 57ee1912d..590dd21ed 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2-3-c-1-s.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2-3-c-1-s.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 ch10/10.4/10.4.2/10.4.2-3-c-1-s.js

- * @description Direct eval code in strict mode - cannot instantiate variable in the variable environment of the calling context

- * @onlyStrict

- */

-

-

-function testcase() {

-  var _10_4_2_3_c_1_s = 0;

-  function _10_4_2_3_c_1_sFunc() {

-     eval("'use strict';var _10_4_2_3_c_1_s = 1");

-     return _10_4_2_3_c_1_s===0;

-  } 

-  return _10_4_2_3_c_1_sFunc();

- }

-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: >
+    Direct eval code in strict mode - cannot instantiate variable in
+    the variable environment of the calling context
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var _10_4_2_3_c_1_s = 0;
+  function _10_4_2_3_c_1_sFunc() {
+     eval("'use strict';var _10_4_2_3_c_1_s = 1");
+     return _10_4_2_3_c_1_s===0;
+  } 
+  return _10_4_2_3_c_1_sFunc();
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2-3-c-2-s.js b/test/suite/ch10/10.4/10.4.2/10.4.2-3-c-2-s.js
index 91caa626b..7df57db62 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2-3-c-2-s.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2-3-c-2-s.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 ch10/10.4/10.4.2/10.4.2-3-c-2-s.js

- * @description Calling code in strict mode - eval cannot instantiate variable in the variable environment of the calling context

- * @onlyStrict

- */

-

-

-function testcase() {

-  var _10_4_2_3_c_2_s = 0;

-  function _10_4_2_3_c_2_sFunc() {

-     'use strict';

-     eval("var _10_4_2_3_c_2_s = 1");

-     return _10_4_2_3_c_2_s===0;

-  }

-  return _10_4_2_3_c_2_sFunc();

- }

-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: >
+    Calling code in strict mode - eval cannot instantiate variable in
+    the variable environment of the calling context
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+  var _10_4_2_3_c_2_s = 0;
+  function _10_4_2_3_c_2_sFunc() {
+     'use strict';
+     eval("var _10_4_2_3_c_2_s = 1");
+     return _10_4_2_3_c_2_s===0;
+  }
+  return _10_4_2_3_c_2_sFunc();
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2.1-1gs.js b/test/suite/ch10/10.4/10.4.2/10.4.2.1-1gs.js
index e0d77031f..e601d510a 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2.1-1gs.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2.1-1gs.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 ch10/10.4/10.4.2/10.4.2.1-1gs.js

- * @description Strict Mode - eval code cannot instantiate variable in the variable environment of the calling context that invoked the eval if the code of the calling context is strict code

- * @onlyStrict

- * @negative ^((?!NotEarlyError).)*$

- */

-

-"use strict";

-eval("var x = 7;");

-x = 9;

-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: >
+    Strict Mode - eval code cannot instantiate variable in the
+    variable environment of the calling context that invoked the eval
+    if the code of the calling context is strict code
+negative: ^((?!NotEarlyError).)*$
+flags: [onlyStrict]
+---*/
+
+"use strict";
+eval("var x = 7;");
+x = 9;
+throw NotEarlyError;
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2.1-2-s.js b/test/suite/ch10/10.4/10.4.2/10.4.2.1-2-s.js
index 5fc76cb35..894fa3cf5 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2.1-2-s.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2.1-2-s.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 ch10/10.4/10.4.2/10.4.2.1-2-s.js

- * @description Strict Mode - Strict mode eval code cannot instantiate functions in the variable environment of the caller to eval

- * @onlyStrict

- */

-

-

-function testcase() {

-        "use strict";

-

-        eval("function _10_4_2_1_2_fun(){}");

-        return typeof _10_4_2_1_2_fun === "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: >
+    Strict Mode - Strict mode eval code cannot instantiate functions
+    in the variable environment of the caller to eval
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+        "use strict";
+
+        eval("function _10_4_2_1_2_fun(){}");
+        return typeof _10_4_2_1_2_fun === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/10.4.2.1-4-s.js b/test/suite/ch10/10.4/10.4.2/10.4.2.1-4-s.js
index 89ce85399..06dcc1c21 100644
--- a/test/suite/ch10/10.4/10.4.2/10.4.2.1-4-s.js
+++ b/test/suite/ch10/10.4/10.4.2/10.4.2.1-4-s.js
@@ -1,18 +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 ch10/10.4/10.4.2/10.4.2.1-4-s.js

- * @description Strict Mode - Strict mode eval code cannot instantiate functions in the variable environment of the caller to eval which is contained in strict mode code

- * @onlyStrict

- */

-

-

-function testcase() {

-

-        eval("'use strict'; function _10_4_2_1_4_fun(){}");

-        return typeof _10_4_2_1_4_fun === "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: >
+    Strict Mode - Strict mode eval code cannot instantiate functions
+    in the variable environment of the caller to eval which is
+    contained in strict mode code
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+        eval("'use strict'; function _10_4_2_1_4_fun(){}");
+        return typeof _10_4_2_1_4_fun === "undefined";
+    }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2.1_A1.js b/test/suite/ch10/10.4/10.4.2/S10.4.2.1_A1.js
index 3a3690ce9..09644ea81 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2.1_A1.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2.1_A1.js
@@ -1,12 +1,12 @@
 // Copyright 2011 Google Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch10/10.4/10.4.2/S10.4.2.1_A1.js
- * @description Strict indirect eval should not leak top level
- * declarations into the global scope
- * @onlyStrict
- */
+/*---
+description: >
+    Strict indirect eval should not leak top level  declarations into
+    the global scope
+flags: [onlyStrict]
+---*/
 
 "use strict";
 if (!('foo' in this)) {
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T1.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T1.js
index 077ae7be1..b37957b30 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T1.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_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 scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T1.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -25,4 +24,3 @@ eval('for(j in this){\nstr2+=j;\n}');
 if(!(str1 === str2)){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T10.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T10.js
index 4903b5b3b..b598e1d6b 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T10.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T10.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 scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T10.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -25,4 +24,3 @@ eval('for(j in this){\nstr2+=j;\n}');
 if(!(str1 === str2)){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T11.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T11.js
index fb7b1690e..c8b782950 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T11.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T11.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 scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T11.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -26,4 +25,3 @@ if(!(str1 === str2)){
 
 this.x = 1;
 this.y = 2;
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T2.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T2.js
index b7eb20df0..d08fffb78 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T2.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_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 scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T2.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -26,4 +25,3 @@ if(!(str1 === str2)){
 
 var x = 1;
 var y = 2;
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T3.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T3.js
index 3b32b2bc2..5f1be6800 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T3.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_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.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T3.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -25,4 +24,3 @@ eval('for(j in this){\nstr2+=j;\n}');
 if(!(str1 === str2)){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T4.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T4.js
index c5e5d0a04..367abb89a 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T4.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_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.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T4.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -26,4 +25,3 @@ if(!(str1 === str2)){
 }
 
 y = 2;
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T5.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T5.js
index 927a8007d..3df5588b8 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T5.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_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.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T5.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -26,4 +25,3 @@ if(!(str1 === str2)){
 }
 
 var y = 2;
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T6.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T6.js
index b9fb461f6..6ad227206 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T6.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_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.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T6.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -26,4 +25,3 @@ if(!(str1 === str2)){
 }
 
 this.y = 2;
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T7.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T7.js
index 93160490c..73e02d71a 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T7.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T7.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 scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T7.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -26,4 +25,3 @@ if(!(str1 === str2)){
 }
 
 var y = 2;
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T8.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T8.js
index 5376140af..2ce15cbe4 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T8.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T8.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 scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T8.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -26,4 +25,3 @@ if(!(str1 === str2)){
 }
 
 var y = 2;
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T9.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T9.js
index 76d75b8f9..9ae52f34f 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T9.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.1_T9.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 scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.1_T9.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 var i;
 var j;
@@ -26,4 +25,3 @@ if(!(str1 === str2)){
 
 x = 1;
 y = 2;
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T1.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T1.js
index 229cfc63f..f13a63967 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T1.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_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 scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T1.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 function f(){
   var i;
@@ -28,4 +27,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T10.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T10.js
index 1707379cf..59be72d28 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T10.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T10.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 scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T10.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 function f(){
   var i;
@@ -29,4 +28,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T11.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T11.js
index b94f2aa56..e0c6e68e4 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T11.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T11.js
@@ -1,14 +1,13 @@
 // Copyright 2009 the Sputnik authors.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T11.js
- * @description eval within global execution context
- * @noStrict
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+flags: [noStrict]
+---*/
 
 function f(){
   var i;
@@ -31,4 +30,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T2.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T2.js
index 72611dc49..f128a6611 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T2.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_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 scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T2.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 function f(){
   var i;
@@ -29,4 +28,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T3.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T3.js
index f3cd1b0bf..b13f0e87f 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T3.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_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.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T3.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 function f(){
   var i;
@@ -29,4 +28,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T4.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T4.js
index cebe8f3a2..e2a672f54 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T4.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_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.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T4.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 function f(){
   var i;
@@ -30,4 +29,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T5.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T5.js
index 802434849..21c3c097a 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T5.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_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.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T5.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 function f(){
   var i;
@@ -30,5 +29,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T6.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T6.js
index 275f8ce98..ee0b953ff 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T6.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_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.
 
-/**
- * The scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T6.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 function f(){
   var i;
@@ -30,5 +29,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T7.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T7.js
index 1870bc1fd..47cc6087b 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T7.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T7.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 scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T7.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 function f(){
   var i;
@@ -30,6 +29,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
-
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T8.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T8.js
index 8f1282460..08d3b58ec 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T8.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T8.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 scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T8.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 function f(){
   var i;
@@ -30,5 +29,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
-
diff --git a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T9.js b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T9.js
index e77ca4323..ba5568f0a 100644
--- a/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T9.js
+++ b/test/suite/ch10/10.4/10.4.2/S10.4.2_A1.2_T9.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 scope chain is initialised to contain the same objects,
- * in the same order, as the calling context's scope chain
- *
- * @path ch10/10.4/10.4.2/S10.4.2_A1.2_T9.js
- * @description eval within global execution context
- */
+/*---
+info: >
+    The scope chain is initialised to contain the same objects,
+    in the same order, as the calling context's scope chain
+description: eval within global execution context
+---*/
 
 function f(){
   var i;
@@ -30,5 +29,3 @@ function f(){
 if(!f()){
   $ERROR("#1: scope chain must contain same objects in the same order as the calling context");
 }
-
-
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-1-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-1-s.js
index 9ed7152e4..9f07e3faa 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-1-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-1-s.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 ch10/10.4/10.4.3/10.4.3-1-1-s.js

- * @description this is not coerced to an object in strict mode (Number)

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-    'use strict';

-    return typeof(this);

-  }

-

-  function bar()

-  {

-    return typeof(this);

-  }

-

-

-  return foo.call(1) === 'number' && bar.call(1) === 'object';

- }

-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: this is not coerced to an object in strict mode (Number)
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    'use strict';
+    return typeof(this);
+  }
+
+  function bar()
+  {
+    return typeof(this);
+  }
+
+
+  return foo.call(1) === 'number' && bar.call(1) === 'object';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-10-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-10-s.js
index d737cff1a..c82fb4d9f 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-10-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-10-s.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 ch10/10.4/10.4.3/10.4.3-1-10-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var f = function () {

-    "use strict";

-    return typeof this;

-}

-return f() === "undefined";

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (FunctionExpression includes strict
+    directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var f = function () {
+    "use strict";
+    return typeof this;
+}
+return f() === "undefined";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-100-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-100-s.js
index 98deb941e..971841336 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-100-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-100-s.js
@@ -1,22 +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 ch10/10.4/10.4.3/10.4.3-1-100-s.js

- * @description Strict Mode - checking 'this' (strict function passed as arg to String.prototype.replace from non-strict context)

- * @onlyStrict

- */

-    

-function testcase() {

-var x = 3;

-

-function f() {

-    "use strict";

-    x = this;

-    return "a";

-}

-return ("ab".replace("b", f)==="aa") && (x===undefined);

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function passed as arg to
+    String.prototype.replace from non-strict context)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var x = 3;
+
+function f() {
+    "use strict";
+    x = this;
+    return "a";
+}
+return ("ab".replace("b", f)==="aa") && (x===undefined);
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-100gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-100gs.js
index b78f81660..8ca4fbfc5 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-100gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-100gs.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 ch10/10.4/10.4.3/10.4.3-1-100gs.js

- * @description Strict Mode - checking 'this' (strict function passed as arg to String.prototype.replace from non-strict context)

- * @onlyStrict

- */

-var x = 3;

-

-function f() {

-    "use strict";

-    x = this;

-    return "a";

-}

-if (("ab".replace("b", f)!=="aa") || (x!==undefined)) {

-        throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function passed as arg to
+    String.prototype.replace from non-strict context)
+flags: [onlyStrict]
+---*/
+
+var x = 3;
+
+function f() {
+    "use strict";
+    x = this;
+    return "a";
+}
+if (("ab".replace("b", f)!=="aa") || (x!==undefined)) {
+        throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-101-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-101-s.js
index bb7c2c7a9..8fa335df0 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-101-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-101-s.js
@@ -1,22 +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 ch10/10.4/10.4.3/10.4.3-1-101-s.js

- * @description Strict Mode - checking 'this' (non-strict function passed as arg to String.prototype.replace from strict context)

- * @noStrict

- */

-    

-function testcase() {

-var x = 3;

-

-function f() {

-    x = this;

-    return "a";

-}

-

-return (function() {"use strict"; return "ab".replace("b", f)==="aa";}()) && (x===fnGlobalObject());

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function passed as arg
+    to String.prototype.replace from strict context)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+var x = 3;
+
+function f() {
+    x = this;
+    return "a";
+}
+
+return (function() {"use strict"; return "ab".replace("b", f)==="aa";}()) && (x===fnGlobalObject());
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-101gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-101gs.js
index bc6eba526..e846d812b 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-101gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-101gs.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 ch10/10.4/10.4.3/10.4.3-1-101gs.js

- * @description Strict Mode - checking 'this' (non-strict function passed as arg to String.prototype.replace from strict context)

- * @noStrict

- */

-var x = 3;

-

-function f() {

-    x = this;

-    return "a";

-}

-

-if ( (!(function() {"use strict"; return "ab".replace("b", f)==="aa";}())) || (x!==fnGlobalObject())) {

-     throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function passed as arg
+    to String.prototype.replace from strict context)
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+var x = 3;
+
+function f() {
+    x = this;
+    return "a";
+}
+
+if ( (!(function() {"use strict"; return "ab".replace("b", f)==="aa";}())) || (x!==fnGlobalObject())) {
+     throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-102-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-102-s.js
index 0a11390ef..98807e688 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-102-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-102-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 ch10/10.4/10.4.3/10.4.3-1-102-s.js

- * @description Strict Mode - checking 'this' (strict anonymous function passed as arg to String.prototype.replace from non-strict context)

- * @onlyStrict

- */

-    

-function testcase() {

-var x = 3;

-

-return ("ab".replace("b", (function () { 

-                                "use strict";

-                                return function () {

-                                    x = this;

-                                    return "a";

-                                }

-                           })())==="aa") && (x===undefined);

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict anonymous function passed as
+    arg to String.prototype.replace from non-strict context)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var x = 3;
+
+return ("ab".replace("b", (function () { 
+                                "use strict";
+                                return function () {
+                                    x = this;
+                                    return "a";
+                                }
+                           })())==="aa") && (x===undefined);
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-102gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-102gs.js
index 90505a2fd..1eb1186b3 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-102gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-102gs.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 ch10/10.4/10.4.3/10.4.3-1-102gs.js

- * @description Strict Mode - checking 'this' (strict anonymous function passed as arg to String.prototype.replace from non-strict context)

- * @onlyStrict

- */

-var x = 3;

-if ( ("ab".replace("b", (function () { 

-                                "use strict";

-                                return function () {

-                                    x = this;

-                                    return "a";

-                                }

-                           })())!=="aa") || (x!==undefined)) {

-     throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict anonymous function passed as
+    arg to String.prototype.replace from non-strict context)
+flags: [onlyStrict]
+---*/
+
+var x = 3;
+if ( ("ab".replace("b", (function () { 
+                                "use strict";
+                                return function () {
+                                    x = this;
+                                    return "a";
+                                }
+                           })())!=="aa") || (x!==undefined)) {
+     throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-103.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-103.js
index a0bc90873..044348b6d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-103.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-103.js
@@ -1,18 +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 ch10/10.4/10.4.3/10.4.3-1-103.js

- * @description Non strict mode should ToObject thisArg if not an object.  Abstract equality operator should succeed.

- */

-

-function testcase(){

-  Object.defineProperty(Object.prototype, "x", { get: function () { return this; } }); 

-  if((5).x == 0) return false;

-  if(!((5).x == 5)) return 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: >
+    Non strict mode should ToObject thisArg if not an object.
+    Abstract equality operator should succeed.
+includes: [runTestCase.js]
+---*/
+
+function testcase(){
+  Object.defineProperty(Object.prototype, "x", { get: function () { return this; } }); 
+  if((5).x == 0) return false;
+  if(!((5).x == 5)) return false;
+  return true;
+}
+
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-104.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-104.js
index 42f89deb3..37b1191a4 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-104.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-104.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 ch10/10.4/10.4.3/10.4.3-1-104.js

- * @onlyStrict

- * @description Strict mode should not ToObject thisArg if not an object.  Strict equality operator should succeed.

- */

- 

- 

-function testcase(){

-  Object.defineProperty(Object.prototype, "x", { get: function () { "use strict"; return this; } }); 

-  if(!((5).x === 5)) return 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: >
+    Strict mode should not ToObject thisArg if not an object.  Strict
+    equality operator should succeed.
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase(){
+  Object.defineProperty(Object.prototype, "x", { get: function () { "use strict"; return this; } }); 
+  if(!((5).x === 5)) return false;
+  return true;
+}
+
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-105.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-105.js
index a66b850cf..3467792b5 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-105.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-105.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.

-/**

- * Created based on feedback in https://bugs.ecmascript.org/show_bug.cgi?id=333 

- *

- * @path ch10/10.4/10.4.3/10.4.3-1-105.js

- * @description Non strict mode should ToObject thisArg if not an object.  Return type should be object and strict equality should fail.

- */

- 

- function testcase(){

-  Object.defineProperty(Object.prototype, "x", { get: function () { return this; } }); 

-  if((5).x === 5) return false;

-  if(!(typeof (5).x === "object")) return 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.
+
+/*---
+info: >
+    Created based on feedback in
+    https://bugs.ecmascript.org/show_bug.cgi?id=333
+description: >
+    Non strict mode should ToObject thisArg if not an object.  Return
+    type should be object and strict equality should fail.
+includes: [runTestCase.js]
+---*/
+
+function testcase(){
+  Object.defineProperty(Object.prototype, "x", { get: function () { return this; } }); 
+  if((5).x === 5) return false;
+  if(!(typeof (5).x === "object")) return false;
+  return true;
+}
+
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-106.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-106.js
index 36afbda2a..8a1b63f8c 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-106.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-106.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.

-/**

- * Created based on feedback in https://bugs.ecmascript.org/show_bug.cgi?id=333 

- *

- * @path ch10/10.4/10.4.3/10.4.3-1-106.js

- * @onlyStrict

- * @description Strict mode should not ToObject thisArg if not an object.  Return type should be 'number'.

- */

- 

- function testcase(){

-  Object.defineProperty(Object.prototype, "x", { get: function () { "use strict"; return this; } }); 

-  if(!(typeof (5).x === "number")) return 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.
+
+/*---
+info: >
+    Created based on feedback in
+    https://bugs.ecmascript.org/show_bug.cgi?id=333
+description: >
+    Strict mode should not ToObject thisArg if not an object.  Return
+    type should be 'number'.
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase(){
+  Object.defineProperty(Object.prototype, "x", { get: function () { "use strict"; return this; } }); 
+  if(!(typeof (5).x === "number")) return false;
+  return true;
+}
+
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-10gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-10gs.js
index 74ee475ae..50ca536d3 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-10gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-10gs.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 ch10/10.4/10.4.3/10.4.3-1-10gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression includes strict directive prologue)

- * @onlyStrict

- */

-

-var f = function () {

-    "use strict";

-    return typeof this;

-}

-if (f() !== "undefined") {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionExpression
+    includes strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+var f = function () {
+    "use strict";
+    return typeof this;
+}
+if (f() !== "undefined") {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-11-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-11-s.js
index 8f7813338..9d1047e11 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-11-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-11-s.js
@@ -1,18 +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 ch10/10.4/10.4.3/10.4.3-1-11-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-return (function () {

-    return typeof this;

-})() === "undefined";

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Anonymous FunctionExpression
+    defined within strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+return (function () {
+    return typeof this;
+})() === "undefined";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-11gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-11gs.js
index 3be7db62a..8bd814301 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-11gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-11gs.js
@@ -1,18 +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 ch10/10.4/10.4.3/10.4.3-1-11gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-if ((function () {

-    return typeof this;

-})() !== "undefined") {

-    throw "'this' had incorrect value!";

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Anonymous
+    FunctionExpression defined within strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+if ((function () {
+    return typeof this;
+})() !== "undefined") {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-12-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-12-s.js
index a88b4c03f..727b12dc9 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-12-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-12-s.js
@@ -1,18 +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 ch10/10.4/10.4.3/10.4.3-1-12-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-return (function () {

-    "use strict";

-    return typeof this;

-})() === "undefined";

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Anonymous FunctionExpression
+    includes strict directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+return (function () {
+    "use strict";
+    return typeof this;
+})() === "undefined";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-12gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-12gs.js
index 0bb4a9781..89a79fab1 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-12gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-12gs.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 ch10/10.4/10.4.3/10.4.3-1-12gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression includes strict directive prologue)

- * @onlyStrict

- */

-

-if ((function () {

-    "use strict";

-    return typeof this;

-})() !== "undefined") {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Anonymous
+    FunctionExpression includes strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+if ((function () {
+    "use strict";
+    return typeof this;
+})() !== "undefined") {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-13-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-13-s.js
index c4ebc9d39..9f562a446 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-13-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-13-s.js
@@ -1,17 +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 ch10/10.4/10.4.3/10.4.3-1-13-s.js

- * @description Strict Mode - checking 'this' (Function constructor defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var f = Function("return typeof this;");

-return f() !== "undefined";

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Function constructor defined within
+    strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+var f = Function("return typeof this;");
+return f() !== "undefined";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-13gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-13gs.js
index d6c4d550a..c23774f00 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-13gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-13gs.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 ch10/10.4/10.4.3/10.4.3-1-13gs.js

- * @description Strict - checking 'this' from a global scope (Function constructor defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var f = Function("return typeof this;");

-if (f() === "undefined") {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Function constructor
+    defined within strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f = Function("return typeof this;");
+if (f() === "undefined") {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-14-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-14-s.js
index fe45b6931..9935be2f5 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-14-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-14-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-14-s.js

- * @description Strict Mode - checking 'this' (Function constructor includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var f = Function("\"use strict\";\nreturn typeof this;");

-return f() === "undefined";

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Function constructor includes
+    strict directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var f = Function("\"use strict\";\nreturn typeof this;");
+return f() === "undefined";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-14gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-14gs.js
index cec5e66d8..a823be7a9 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-14gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-14gs.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 ch10/10.4/10.4.3/10.4.3-1-14gs.js

- * @description Strict - checking 'this' from a global scope (Function constructor includes strict directive prologue)

- * @onlyStrict

- */

-

-var f = Function("\"use strict\";\nreturn typeof this;");

-if (f() !== "undefined") {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Function constructor
+    includes strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+var f = Function("\"use strict\";\nreturn typeof this;");
+if (f() !== "undefined") {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-15-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-15-s.js
index 961d55b6d..2df598ee7 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-15-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-15-s.js
@@ -1,17 +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 ch10/10.4/10.4.3/10.4.3-1-15-s.js

- * @description Strict Mode - checking 'this' (New'ed Function constructor defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var f = new Function("return typeof this;");

-return f() !== "undefined";

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (New'ed Function constructor defined
+    within strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+var f = new Function("return typeof this;");
+return f() !== "undefined";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-15gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-15gs.js
index 26d75fa64..aecf7b19b 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-15gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-15gs.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 ch10/10.4/10.4.3/10.4.3-1-15gs.js

- * @description Strict - checking 'this' from a global scope (New'ed Function constructor defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var f = new Function("return typeof this;");

-if (f() === "undefined") {

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (New'ed Function
+    constructor defined within strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f = new Function("return typeof this;");
+if (f() === "undefined") {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-16-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-16-s.js
index 6167f4c4a..175d2c3e2 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-16-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-16-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-16-s.js

- * @description Strict Mode - checking 'this' (New'ed Function constructor includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var f = new Function("\"use strict\";\nreturn typeof this;");

-return f() === "undefined";

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (New'ed Function constructor
+    includes strict directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var f = new Function("\"use strict\";\nreturn typeof this;");
+return f() === "undefined";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-16gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-16gs.js
index b7a2287e7..74a82fc46 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-16gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-16gs.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 ch10/10.4/10.4.3/10.4.3-1-16gs.js

- * @description Strict - checking 'this' from a global scope (New'ed Function constructor includes strict directive prologue)

- * @onlyStrict

- */

-

-var f = new Function("\"use strict\";\nreturn typeof this;");

-if (f() !== "undefined") {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (New'ed Function
+    constructor includes strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+var f = new Function("\"use strict\";\nreturn typeof this;");
+if (f() !== "undefined") {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-17-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-17-s.js
index 4d2caf063..21b806d45 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-17-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-17-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-17-s.js

- * @description Strict Mode - checking 'this' (eval used within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-return (eval("typeof this") === "undefined") && (eval("this") !== fnGlobalObject());

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (eval used within strict mode)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+"use strict";
+return (eval("typeof this") === "undefined") && (eval("this") !== fnGlobalObject());
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-17gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-17gs.js
index f583c6e89..bd52f0fe4 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-17gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-17gs.js
@@ -1,15 +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 ch10/10.4/10.4.3/10.4.3-1-17gs.js

- * @description Strict - checking 'this' from a global scope (eval used within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-if (eval("this") !== fnGlobalObject()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (eval used within
+    strict mode)
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+"use strict";
+if (eval("this") !== fnGlobalObject()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-18gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-18gs.js
index e1d35e497..c4e75abc8 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-18gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-18gs.js
@@ -1,14 +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 ch10/10.4/10.4.3/10.4.3-1-18gs.js

- * @description Strict - checking 'this' from a global scope (eval includes strict directive prologue)

- * @onlyStrict

- */

-

-if (eval("\"use strict\";\nthis") !== fnGlobalObject()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (eval includes strict
+    directive prologue)
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+if (eval("\"use strict\";\nthis") !== fnGlobalObject()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-19-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-19-s.js
index c2d412838..489ae9b68 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-19-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-19-s.js
@@ -1,17 +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 ch10/10.4/10.4.3/10.4.3-1-19-s.js

- * @description Strict Mode - checking 'this' (indirect eval used within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var my_eval = eval;

-return my_eval("this") === fnGlobalObject();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (indirect eval used within strict
+    mode)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+"use strict";
+var my_eval = eval;
+return my_eval("this") === fnGlobalObject();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-19gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-19gs.js
index 2d1c35edc..1647a9f8d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-19gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-19gs.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-19gs.js

- * @description Strict - checking 'this' from a global scope (indirect eval used within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var my_eval = eval;

-if (my_eval("this") !== fnGlobalObject()) {

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (indirect eval used
+    within strict mode)
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+"use strict";
+var my_eval = eval;
+if (my_eval("this") !== fnGlobalObject()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-2-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-2-s.js
index 0efe7fd65..3c25a997a 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-2-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-2-s.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 ch10/10.4/10.4.3/10.4.3-1-2-s.js

- * @description this is not coerced to an object in strict mode (string)

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-    'use strict';

-    return typeof(this);

-  }

-

-  function bar()

-  {

-    return typeof(this);

-  }

-

-

-  return foo.call('1') === 'string' && bar.call('1') === 'object';

- }

-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: this is not coerced to an object in strict mode (string)
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    'use strict';
+    return typeof(this);
+  }
+
+  function bar()
+  {
+    return typeof(this);
+  }
+
+
+  return foo.call('1') === 'string' && bar.call('1') === 'object';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-20-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-20-s.js
index 869bc53e4..6c151716d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-20-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-20-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-20-s.js

- * @description Strict Mode - checking 'this' (indirect eval includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var my_eval = eval;

-return my_eval("\"use strict\";\nthis") === fnGlobalObject();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (indirect eval includes strict
+    directive prologue)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+var my_eval = eval;
+return my_eval("\"use strict\";\nthis") === fnGlobalObject();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-20gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-20gs.js
index 48544cb0e..b346e6bc2 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-20gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-20gs.js
@@ -1,15 +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 ch10/10.4/10.4.3/10.4.3-1-20gs.js

- * @description Strict - checking 'this' from a global scope (indirect eval includes strict directive prologue)

- * @onlyStrict

- */

-

-var my_eval = eval;

-if (my_eval("\"use strict\";\nthis") !== fnGlobalObject() ) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (indirect eval
+    includes strict directive prologue)
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+var my_eval = eval;
+if (my_eval("\"use strict\";\nthis") !== fnGlobalObject() ) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-21-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-21-s.js
index 915f54ce8..a31f2b402 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-21-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-21-s.js
@@ -1,19 +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 ch10/10.4/10.4.3/10.4.3-1-21-s.js

- * @description Strict Mode - checking 'this' (New'ed object from FunctionDeclaration defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-function f() {

-    return this;

-}

-return ( (new f())!==fnGlobalObject()) && (typeof (new f()) !== "undefined");

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (New'ed object from
+    FunctionDeclaration defined within strict mode)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+"use strict";
+function f() {
+    return this;
+}
+return ( (new f())!==fnGlobalObject()) && (typeof (new f()) !== "undefined");
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-21gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-21gs.js
index b12634049..43faca4f9 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-21gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-21gs.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 ch10/10.4/10.4.3/10.4.3-1-21gs.js

- * @description Strict - checking 'this' from a global scope (New'ed object from FunctionDeclaration defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-function f() {

-    return this;

-}

-if (((new f()) === fnGlobalObject()) || (typeof (new f()) === "undefined")) {

-    throw "'this' had incorrect value!";

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (New'ed object from
+    FunctionDeclaration defined within strict mode)
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+"use strict";
+function f() {
+    return this;
+}
+if (((new f()) === fnGlobalObject()) || (typeof (new f()) === "undefined")) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-22-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-22-s.js
index 55d66e60c..8fd9e72cf 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-22-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-22-s.js
@@ -1,20 +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 ch10/10.4/10.4.3/10.4.3-1-22-s.js

- * @description Strict Mode - checking 'this' (New'ed object from FunctionDeclaration includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-function f() {

-    "use strict";

-    return this;

-}

-return ( (new f())!==fnGlobalObject()) && (typeof (new f()) !== "undefined");

-

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (New'ed object from
+    FunctionDeclaration includes strict directive prologue)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() {
+    "use strict";
+    return this;
+}
+return ( (new f())!==fnGlobalObject()) && (typeof (new f()) !== "undefined");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-22gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-22gs.js
index 1abde0e2f..f5f05df61 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-22gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-22gs.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 ch10/10.4/10.4.3/10.4.3-1-22gs.js

- * @description Strict - checking 'this' from a global scope (New'ed object from FunctionDeclaration includes strict directive prologue)

- * @onlyStrict

- */

-

-function f() {

-    "use strict";

-    return this;

-}

-if (((new f()) === fnGlobalObject()) || (typeof (new f()) === "undefined")) {

-    throw "'this' had incorrect value!";

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (New'ed object from
+    FunctionDeclaration includes strict directive prologue)
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() {
+    "use strict";
+    return this;
+}
+if (((new f()) === fnGlobalObject()) || (typeof (new f()) === "undefined")) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-23-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-23-s.js
index b2c40be4f..358fee765 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-23-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-23-s.js
@@ -1,20 +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 ch10/10.4/10.4.3/10.4.3-1-23-s.js

- * @description Strict Mode - checking 'this' (New'ed object from FunctionExpression defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var f = function () {

-    return this;

-}

-return ( (new f())!==fnGlobalObject()) && (typeof (new f()) !== "undefined");

-

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (New'ed object from
+    FunctionExpression defined within strict mode)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+"use strict";
+var f = function () {
+    return this;
+}
+return ( (new f())!==fnGlobalObject()) && (typeof (new f()) !== "undefined");
+
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-23gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-23gs.js
index 4aab84291..c472375c2 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-23gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-23gs.js
@@ -1,18 +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 ch10/10.4/10.4.3/10.4.3-1-23gs.js

- * @description Strict - checking 'this' from a global scope (New'ed object from FunctionExpression defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var f = function () {

-    return this;

-}

-if (((new f()) === fnGlobalObject()) || (typeof (new f()) === "undefined")) {

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (New'ed object from
+    FunctionExpression defined within strict mode)
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+"use strict";
+var f = function () {
+    return this;
+}
+if (((new f()) === fnGlobalObject()) || (typeof (new f()) === "undefined")) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-24-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-24-s.js
index 3499abe4d..1c2b3e3c4 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-24-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-24-s.js
@@ -1,19 +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 ch10/10.4/10.4.3/10.4.3-1-24-s.js

- * @description Strict Mode - checking 'this' (New'ed object from FunctionExpression includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var f = function () {

-    "use strict";

-    return this;

-}

-return ( (new f())!==fnGlobalObject()) && (typeof (new f()) !== "undefined");

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (New'ed object from
+    FunctionExpression includes strict directive prologue)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+var f = function () {
+    "use strict";
+    return this;
+}
+return ( (new f())!==fnGlobalObject()) && (typeof (new f()) !== "undefined");
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-24gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-24gs.js
index 38d5e1490..5f941c5ae 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-24gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-24gs.js
@@ -1,18 +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 ch10/10.4/10.4.3/10.4.3-1-24gs.js

- * @description Strict - checking 'this' from a global scope (New'ed object from FunctionExpression includes strict directive prologue)

- * @onlyStrict

- */

-

-var f = function () {

-    "use strict";

-    return this;

-}

-if (((new f()) === fnGlobalObject()) || (typeof (new f()) === "undefined")) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (New'ed object from
+    FunctionExpression includes strict directive prologue)
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+var f = function () {
+    "use strict";
+    return this;
+}
+if (((new f()) === fnGlobalObject()) || (typeof (new f()) === "undefined")) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-25-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-25-s.js
index 138802f64..196837e0a 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-25-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-25-s.js
@@ -1,19 +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 ch10/10.4/10.4.3/10.4.3-1-25-s.js

- * @description Strict Mode - checking 'this' (New'ed object from Anonymous FunctionExpression defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var obj = new (function () {

-    return this;

-});

-return (obj !== fnGlobalObject()) && ((typeof obj) !== "undefined");

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (New'ed object from Anonymous
+    FunctionExpression defined within strict mode)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+"use strict";
+var obj = new (function () {
+    return this;
+});
+return (obj !== fnGlobalObject()) && ((typeof obj) !== "undefined");
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-25gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-25gs.js
index 30ac917cb..2bbcb6ca1 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-25gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-25gs.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 ch10/10.4/10.4.3/10.4.3-1-25gs.js

- * @description Strict - checking 'this' from a global scope (New'ed object from Anonymous FunctionExpression defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var obj = new (function () {

-    return this;

-});

-if ((obj === fnGlobalObject()) || (typeof obj === "undefined")) {

-    throw "'this' had incorrect value!";

-}

-

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (New'ed object from
+    Anonymous FunctionExpression defined within strict mode)
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+"use strict";
+var obj = new (function () {
+    return this;
+});
+if ((obj === fnGlobalObject()) || (typeof obj === "undefined")) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-26-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-26-s.js
index a015f4082..55d67f778 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-26-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-26-s.js
@@ -1,19 +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 ch10/10.4/10.4.3/10.4.3-1-26-s.js

- * @description Strict Mode - checking 'this' (New'ed object from Anonymous FunctionExpression includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var obj = new (function () {

-    "use strict";

-    return this;

-});

-return (obj !== fnGlobalObject()) && ((typeof obj) !== "undefined");

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (New'ed object from Anonymous
+    FunctionExpression includes strict directive prologue)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+var obj = new (function () {
+    "use strict";
+    return this;
+});
+return (obj !== fnGlobalObject()) && ((typeof obj) !== "undefined");
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-26gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-26gs.js
index e19bce342..d660f7415 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-26gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-26gs.js
@@ -1,18 +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 ch10/10.4/10.4.3/10.4.3-1-26gs.js

- * @description Strict - checking 'this' from a global scope (New'ed object from Anonymous FunctionExpression includes strict directive prologue)

- * @onlyStrict

- */

-

-var obj = new (function () {

-    "use strict";

-    return this;

-});

-if ((obj === fnGlobalObject()) || (typeof obj === "undefined")) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (New'ed object from
+    Anonymous FunctionExpression includes strict directive prologue)
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+var obj = new (function () {
+    "use strict";
+    return this;
+});
+if ((obj === fnGlobalObject()) || (typeof obj === "undefined")) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-27-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-27-s.js
index 54eda820f..1c5b0eae3 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-27-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-27-s.js
@@ -1,22 +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 ch10/10.4/10.4.3/10.4.3-1-27-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration defined within a FunctionDeclaration inside strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-function f1() {

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (FunctionDeclaration defined within
+    a FunctionDeclaration inside strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+function f1() {
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-27gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-27gs.js
index 0cb1cb4f2..6d44954ab 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-27gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-27gs.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 ch10/10.4/10.4.3/10.4.3-1-27gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration defined within a FunctionDeclaration inside strict mode)

- * @onlyStrict

- */

-

-"use strict";

-function f1() {

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionDeclaration
+    defined within a FunctionDeclaration inside strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function f1() {
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-28-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-28-s.js
index c2a5578a8..32294dccd 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-28-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-28-s.js
@@ -1,22 +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 ch10/10.4/10.4.3/10.4.3-1-28-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression defined within a FunctionDeclaration inside strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-function f1() {

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (FunctionExpression defined within a
+    FunctionDeclaration inside strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+function f1() {
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-28gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-28gs.js
index 663a18e00..f5cfefebc 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-28gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-28gs.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 ch10/10.4/10.4.3/10.4.3-1-28gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression defined within a FunctionDeclaration inside strict mode)

- * @onlyStrict

- */

-

-"use strict";

-function f1() {

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionExpression
+    defined within a FunctionDeclaration inside strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function f1() {
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-29-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-29-s.js
index 87ea431d7..926949c12 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-29-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-29-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 ch10/10.4/10.4.3/10.4.3-1-29-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression defined within a FunctionDeclaration inside strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-function f1() {

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Anonymous FunctionExpression
+    defined within a FunctionDeclaration inside strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+function f1() {
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-29gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-29gs.js
index 416f1b4f3..e26c0e43b 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-29gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-29gs.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 ch10/10.4/10.4.3/10.4.3-1-29gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression defined within a FunctionDeclaration inside strict mode)

- * @onlyStrict

- */

-

-"use strict";

-function f1() {

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Anonymous
+    FunctionExpression defined within a FunctionDeclaration inside
+    strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function f1() {
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-3-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-3-s.js
index 19bafdcff..0ef7107e2 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-3-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-3-s.js
@@ -1,27 +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 ch10/10.4/10.4.3/10.4.3-1-3-s.js

- * @description this is not coerced to an object in strict mode (undefined)

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-    'use strict';

-    return typeof(this);

-  }

-

-  function bar()

-  {

-    return typeof(this);

-  }

-  return foo.call(undefined) === 'undefined' && bar.call() === 'object';

- }

-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: this is not coerced to an object in strict mode (undefined)
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    'use strict';
+    return typeof(this);
+  }
+
+  function bar()
+  {
+    return typeof(this);
+  }
+  return foo.call(undefined) === 'undefined' && bar.call() === 'object';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-30-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-30-s.js
index b4085931b..0d9aec5c0 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-30-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-30-s.js
@@ -1,22 +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 ch10/10.4/10.4.3/10.4.3-1-30-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration defined within a FunctionExpression inside strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var f1 = function () {

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (FunctionDeclaration defined within
+    a FunctionExpression inside strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+var f1 = function () {
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-30gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-30gs.js
index ab3c6222d..d868e21b1 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-30gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-30gs.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 ch10/10.4/10.4.3/10.4.3-1-30gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration defined within a FunctionExpression inside strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var f1 = function () {

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionDeclaration
+    defined within a FunctionExpression inside strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f1 = function () {
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-31-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-31-s.js
index dc32ca19e..ef2892469 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-31-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-31-s.js
@@ -1,22 +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 ch10/10.4/10.4.3/10.4.3-1-31-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression defined within a FunctionExpression inside strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var f1 = function () {

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (FunctionExpression defined within a
+    FunctionExpression inside strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+var f1 = function () {
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-31gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-31gs.js
index 1bbb2d161..2827d21a4 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-31gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-31gs.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 ch10/10.4/10.4.3/10.4.3-1-31gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression defined within a FunctionExpression inside strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var f1 = function () {

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionExpression
+    defined within a FunctionExpression inside strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f1 = function () {
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-32-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-32-s.js
index 4ba988920..0a2b5f7ca 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-32-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-32-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 ch10/10.4/10.4.3/10.4.3-1-32-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression defined within a FunctionExpression inside strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var f1 = function () {

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Anonymous FunctionExpression
+    defined within a FunctionExpression inside strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+var f1 = function () {
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-32gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-32gs.js
index 1cd2ad05a..16a2d55fa 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-32gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-32gs.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 ch10/10.4/10.4.3/10.4.3-1-32gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression defined within a FunctionExpression inside strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var f1 = function () {

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Anonymous
+    FunctionExpression defined within a FunctionExpression inside
+    strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f1 = function () {
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-33-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-33-s.js
index 6c4d66e2e..6a71187ac 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-33-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-33-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 ch10/10.4/10.4.3/10.4.3-1-33-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration defined within an Anonymous FunctionExpression inside strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-return (function () {

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (FunctionDeclaration defined within
+    an Anonymous FunctionExpression inside strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+return (function () {
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-33gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-33gs.js
index c288566cb..beaac2a32 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-33gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-33gs.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 ch10/10.4/10.4.3/10.4.3-1-33gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration defined within an Anonymous FunctionExpression inside strict mode)

- * @onlyStrict

- */

-

-"use strict";

-if (! ((function () {

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-})())) {

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionDeclaration
+    defined within an Anonymous FunctionExpression inside strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+if (! ((function () {
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+})())) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-34-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-34-s.js
index 9cf25b53d..e09ad0e27 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-34-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-34-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 ch10/10.4/10.4.3/10.4.3-1-34-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression defined within an Anonymous FunctionExpression inside strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-return (function () {

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (FunctionExpression defined within
+    an Anonymous FunctionExpression inside strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+return (function () {
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-34gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-34gs.js
index 72980aa41..7fcc11dac 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-34gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-34gs.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 ch10/10.4/10.4.3/10.4.3-1-34gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression defined within an Anonymous FunctionExpression inside strict mode)

- * @onlyStrict

- */

-

-"use strict";

-if (! ((function () {

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-})())) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionExpression
+    defined within an Anonymous FunctionExpression inside strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+if (! ((function () {
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+})())) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-35-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-35-s.js
index 8f7abb36f..fc40fe852 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-35-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-35-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 ch10/10.4/10.4.3/10.4.3-1-35-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression defined within an Anonymous FunctionExpression inside strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-return (function () {

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Anonymous FunctionExpression
+    defined within an Anonymous FunctionExpression inside strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+return (function () {
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-35gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-35gs.js
index ecee18fe3..06fc8dde1 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-35gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-35gs.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 ch10/10.4/10.4.3/10.4.3-1-35gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression defined within an Anonymous FunctionExpression inside strict mode)

- * @onlyStrict

- */

-

-"use strict";

-if (! ((function () {

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-})())) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Anonymous
+    FunctionExpression defined within an Anonymous FunctionExpression
+    inside strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+if (! ((function () {
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+})())) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-36-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-36-s.js
index 08bea7cc4..35de15a39 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-36-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-36-s.js
@@ -1,22 +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 ch10/10.4/10.4.3/10.4.3-1-36-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration defined within a FunctionDeclaration with a strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-function f1() {

-    "use strict";

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (FunctionDeclaration defined within
+    a FunctionDeclaration with a strict directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f1() {
+    "use strict";
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-36gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-36gs.js
index 88fab9f20..6593aa279 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-36gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-36gs.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 ch10/10.4/10.4.3/10.4.3-1-36gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration defined within a FunctionDeclaration with a strict directive prologue)

- * @onlyStrict

- */

-

-function f1() {

-    "use strict";

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionDeclaration
+    defined within a FunctionDeclaration with a strict directive
+    prologue)
+flags: [onlyStrict]
+---*/
+
+function f1() {
+    "use strict";
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-37-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-37-s.js
index 93e7fde28..dbacec527 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-37-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-37-s.js
@@ -1,22 +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 ch10/10.4/10.4.3/10.4.3-1-37-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression defined within a FunctionDeclaration with a strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-function f1() {

-    "use strict";

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (FunctionExpression defined within a
+    FunctionDeclaration with a strict directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f1() {
+    "use strict";
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-37gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-37gs.js
index 795b6032d..91ab8f2dd 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-37gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-37gs.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 ch10/10.4/10.4.3/10.4.3-1-37gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression defined within a FunctionDeclaration with a strict directive prologue)

- * @onlyStrict

- */

-

-function f1() {

-    "use strict";

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionExpression
+    defined within a FunctionDeclaration with a strict directive
+    prologue)
+flags: [onlyStrict]
+---*/
+
+function f1() {
+    "use strict";
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-38-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-38-s.js
index f496d4ed0..929ad8696 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-38-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-38-s.js
@@ -1,21 +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 ch10/10.4/10.4.3/10.4.3-1-38-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression defined within a FunctionDeclaration with a strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-function f1() {

-    "use strict";

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Anonymous FunctionExpression
+    defined within a FunctionDeclaration with a strict directive
+    prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f1() {
+    "use strict";
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-38gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-38gs.js
index 1c00b742e..fe33ec217 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-38gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-38gs.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 ch10/10.4/10.4.3/10.4.3-1-38gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression defined within a FunctionDeclaration with a strict directive prologue)

- * @onlyStrict

- */

-

-function f1() {

-    "use strict";

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Anonymous
+    FunctionExpression defined within a FunctionDeclaration with a
+    strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+function f1() {
+    "use strict";
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-39-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-39-s.js
index 22478bc26..b07803e54 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-39-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-39-s.js
@@ -1,22 +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 ch10/10.4/10.4.3/10.4.3-1-39-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration defined within a FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var f1 = function () {

-    "use strict";

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (FunctionDeclaration defined within
+    a FunctionExpression with a strict directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var f1 = function () {
+    "use strict";
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-39gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-39gs.js
index 7ec3adf91..c00fb8ece 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-39gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-39gs.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 ch10/10.4/10.4.3/10.4.3-1-39gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration defined within a FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-

-var f1 = function () {

-    "use strict";

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionDeclaration
+    defined within a FunctionExpression with a strict directive
+    prologue)
+flags: [onlyStrict]
+---*/
+
+var f1 = function () {
+    "use strict";
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-4-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-4-s.js
index 28bd8f059..f84fea34d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-4-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-4-s.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 ch10/10.4/10.4.3/10.4.3-1-4-s.js

- * @description this is not coerced to an object in strict mode (boolean)

- * @noStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-    'use strict';

-    return typeof(this);

-  }

-

-  function bar()

-  {

-    return typeof(this);

-  }

-

-

-  return foo.call(true) === 'boolean' && bar.call(true) === 'object';

- }

-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: this is not coerced to an object in strict mode (boolean)
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    'use strict';
+    return typeof(this);
+  }
+
+  function bar()
+  {
+    return typeof(this);
+  }
+
+
+  return foo.call(true) === 'boolean' && bar.call(true) === 'object';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-40-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-40-s.js
index b90817f63..cae158a6f 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-40-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-40-s.js
@@ -1,22 +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 ch10/10.4/10.4.3/10.4.3-1-40-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression defined within a FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var f1 = function () {

-    "use strict";

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (FunctionExpression defined within a
+    FunctionExpression with a strict directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var f1 = function () {
+    "use strict";
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-40gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-40gs.js
index 2d8fbf0ba..e28429002 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-40gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-40gs.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 ch10/10.4/10.4.3/10.4.3-1-40gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression defined within a FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-

-var f1 = function () {

-    "use strict";

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionExpression
+    defined within a FunctionExpression with a strict directive
+    prologue)
+flags: [onlyStrict]
+---*/
+
+var f1 = function () {
+    "use strict";
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-41-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-41-s.js
index 48495e392..3546cffc9 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-41-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-41-s.js
@@ -1,21 +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 ch10/10.4/10.4.3/10.4.3-1-41-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression defined within a FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var f1 = function () {

-    "use strict";

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Anonymous FunctionExpression
+    defined within a FunctionExpression with a strict directive
+    prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var f1 = function () {
+    "use strict";
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-41gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-41gs.js
index 43cba61c8..3c00f0076 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-41gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-41gs.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 ch10/10.4/10.4.3/10.4.3-1-41gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression defined within a FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-

-var f1 = function () {

-    "use strict";

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Anonymous
+    FunctionExpression defined within a FunctionExpression with a
+    strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+var f1 = function () {
+    "use strict";
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-42-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-42-s.js
index c4f705857..ff7922a69 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-42-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-42-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 ch10/10.4/10.4.3/10.4.3-1-42-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration defined within an Anonymous FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-return (function () {

-    "use strict";

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (FunctionDeclaration defined within
+    an Anonymous FunctionExpression with a strict directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+return (function () {
+    "use strict";
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-42gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-42gs.js
index b1802bf16..41f4ed3e5 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-42gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-42gs.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 ch10/10.4/10.4.3/10.4.3-1-42gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration defined within an Anonymous FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-

-if (! ((function () {

-    "use strict";

-    function f() {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-})())) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionDeclaration
+    defined within an Anonymous FunctionExpression with a strict
+    directive prologue)
+flags: [onlyStrict]
+---*/
+
+if (! ((function () {
+    "use strict";
+    function f() {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+})())) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-43-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-43-s.js
index 6575e56b9..0d2b490da 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-43-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-43-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 ch10/10.4/10.4.3/10.4.3-1-43-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression defined within an Anonymous FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-return (function () {

-    "use strict";

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (FunctionExpression defined within
+    an Anonymous FunctionExpression with a strict directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+return (function () {
+    "use strict";
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-43gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-43gs.js
index 0da4b7871..2f54d562c 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-43gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-43gs.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 ch10/10.4/10.4.3/10.4.3-1-43gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression defined within an Anonymous FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-

-if (! ((function () {

-    "use strict";

-    var f = function () {

-        return typeof this;

-    }

-    return (f()==="undefined") && ((typeof this)==="undefined");

-})())) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionExpression
+    defined within an Anonymous FunctionExpression with a strict
+    directive prologue)
+flags: [onlyStrict]
+---*/
+
+if (! ((function () {
+    "use strict";
+    var f = function () {
+        return typeof this;
+    }
+    return (f()==="undefined") && ((typeof this)==="undefined");
+})())) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-44-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-44-s.js
index b7ac11d8d..a10ded2f0 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-44-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-44-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 ch10/10.4/10.4.3/10.4.3-1-44-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression defined within an Anonymous FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-return (function () {

-    "use strict";

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Anonymous FunctionExpression
+    defined within an Anonymous FunctionExpression with a strict
+    directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+return (function () {
+    "use strict";
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-44gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-44gs.js
index 2300e4acb..2011deb9d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-44gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-44gs.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 ch10/10.4/10.4.3/10.4.3-1-44gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression defined within an Anonymous FunctionExpression with a strict directive prologue)

- * @onlyStrict

- */

-

-if (! ((function () {

-    "use strict";

-    return ((function () {

-        return typeof this;

-    })()==="undefined") && ((typeof this)==="undefined");

-})())) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Anonymous
+    FunctionExpression defined within an Anonymous FunctionExpression
+    with a strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+if (! ((function () {
+    "use strict";
+    return ((function () {
+        return typeof this;
+    })()==="undefined") && ((typeof this)==="undefined");
+})())) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-45-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-45-s.js
index e23f9fef0..b842ddd4b 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-45-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-45-s.js
@@ -1,22 +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 ch10/10.4/10.4.3/10.4.3-1-45-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration with a strict directive prologue defined within a FunctionDeclaration)

- * @noStrict

- */

-    

-function testcase() {

-function f1() {

-    function f() {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (FunctionDeclaration with a strict
+    directive prologue defined within a FunctionDeclaration)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f1() {
+    function f() {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-45gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-45gs.js
index ce99d6574..726690214 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-45gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-45gs.js
@@ -1,21 +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 ch10/10.4/10.4.3/10.4.3-1-45gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration with a strict directive prologue defined within a FunctionDeclaration)

- * @noStrict

- */

-

-function f1() {

-    function f() {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionDeclaration
+    with a strict directive prologue defined within a
+    FunctionDeclaration)
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f1() {
+    function f() {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-46-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-46-s.js
index 5945b2b21..0ca914625 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-46-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-46-s.js
@@ -1,22 +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 ch10/10.4/10.4.3/10.4.3-1-46-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression with a strict directive prologue defined within a FunctionDeclaration)

- * @noStrict

- */

-    

-function testcase() {

-function f1() {

-    var f = function () {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (FunctionExpression with a strict
+    directive prologue defined within a FunctionDeclaration)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f1() {
+    var f = function () {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-46gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-46gs.js
index 3d0ddd895..c424f491e 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-46gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-46gs.js
@@ -1,21 +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 ch10/10.4/10.4.3/10.4.3-1-46gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression with a strict directive prologue defined within a FunctionDeclaration)

- * @noStrict

- */

-

-function f1() {

-    var f = function () {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionExpression
+    with a strict directive prologue defined within a
+    FunctionDeclaration)
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f1() {
+    var f = function () {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-47-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-47-s.js
index 6a5fe9d40..6852fc0e5 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-47-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-47-s.js
@@ -1,21 +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 ch10/10.4/10.4.3/10.4.3-1-47-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression with a strict directive prologue defined within a FunctionDeclaration)

- * @noStrict

- */

-    

-function testcase() {

-function f1() {

-    return ((function () {

-        "use strict";

-        return typeof this;

-    })()==="undefined") && (this===fnGlobalObject());

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Anonymous FunctionExpression with a
+    strict directive prologue defined within a FunctionDeclaration)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f1() {
+    return ((function () {
+        "use strict";
+        return typeof this;
+    })()==="undefined") && (this===fnGlobalObject());
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-47gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-47gs.js
index 78884f8c6..ce6ef21f9 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-47gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-47gs.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 ch10/10.4/10.4.3/10.4.3-1-47gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression with a strict directive prologue defined within a FunctionDeclaration)

- * @noStrict

- */

-

-function f1() {

-    return ((function () {

-        "use strict";

-        return typeof this;

-    })()==="undefined") && (this===fnGlobalObject());

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Anonymous
+    FunctionExpression with a strict directive prologue defined within
+    a FunctionDeclaration)
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f1() {
+    return ((function () {
+        "use strict";
+        return typeof this;
+    })()==="undefined") && (this===fnGlobalObject());
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-48-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-48-s.js
index 3c4d49af4..281288e49 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-48-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-48-s.js
@@ -1,22 +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 ch10/10.4/10.4.3/10.4.3-1-48-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration with a strict directive prologue defined within a FunctionExpression)

- * @noStrict

- */

-    

-function testcase() {

-var f1 = function () {

-    function f() {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (FunctionDeclaration with a strict
+    directive prologue defined within a FunctionExpression)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+var f1 = function () {
+    function f() {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-48gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-48gs.js
index b6d619176..bfd715d30 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-48gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-48gs.js
@@ -1,21 +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 ch10/10.4/10.4.3/10.4.3-1-48gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration with a strict directive prologue defined within a FunctionExpression)

- * @noStrict

- */

-

-var f1 = function () {

-    function f() {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionDeclaration
+    with a strict directive prologue defined within a
+    FunctionExpression)
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+var f1 = function () {
+    function f() {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-49-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-49-s.js
index 3ae616eaa..4d521496f 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-49-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-49-s.js
@@ -1,22 +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 ch10/10.4/10.4.3/10.4.3-1-49-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression with a strict directive prologue defined within a FunctionExpression)

- * @noStrict

- */

-    

-function testcase() {

-var f1 = function () {

-    var f = function () {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (FunctionExpression with a strict
+    directive prologue defined within a FunctionExpression)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+var f1 = function () {
+    var f = function () {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-49gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-49gs.js
index d6aee3a91..1b6a45563 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-49gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-49gs.js
@@ -1,21 +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 ch10/10.4/10.4.3/10.4.3-1-49gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression with a strict directive prologue defined within a FunctionExpression)

- * @noStrict

- */

-

-var f1 = function () {

-    var f = function () {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionExpression
+    with a strict directive prologue defined within a
+    FunctionExpression)
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+var f1 = function () {
+    var f = function () {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-5-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-5-s.js
index 5d64cea6b..fdf1fa1dd 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-5-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-5-s.js
@@ -1,32 +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.

-/**

- * @path ch10/10.4/10.4.3/10.4.3-1-5-s.js

- * @description this is not coerced to an object in strict mode (function)

- * @onlyStrict

- */

-

-

-function testcase() {

-

-  function foo()

-  {

-    'use strict';

-    return typeof(this);

-  } 

-

-  function bar()

-  {

-    return typeof(this);

-  }

-

-  function foobar()

-  {

-  }

-

-  return foo.call(foobar) === 'function' && bar.call(foobar) === '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: this is not coerced to an object in strict mode (function)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+
+  function foo()
+  {
+    'use strict';
+    return typeof(this);
+  } 
+
+  function bar()
+  {
+    return typeof(this);
+  }
+
+  function foobar()
+  {
+  }
+
+  return foo.call(foobar) === 'function' && bar.call(foobar) === 'function';
+ }
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-50-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-50-s.js
index ad273ecb1..feb2bde58 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-50-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-50-s.js
@@ -1,21 +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 ch10/10.4/10.4.3/10.4.3-1-50-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression with a strict directive prologue defined within a FunctionExpression)

- * @noStrict

- */

-    

-function testcase() {

-var f1 = function () {

-    return ((function () {

-        "use strict";

-        return typeof this;

-    })()==="undefined") && (this===fnGlobalObject());

-}

-return f1();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Anonymous FunctionExpression with a
+    strict directive prologue defined within a FunctionExpression)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+var f1 = function () {
+    return ((function () {
+        "use strict";
+        return typeof this;
+    })()==="undefined") && (this===fnGlobalObject());
+}
+return f1();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-50gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-50gs.js
index 21cd879ef..508990195 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-50gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-50gs.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 ch10/10.4/10.4.3/10.4.3-1-50gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression with a strict directive prologue defined within a FunctionExpression)

- * @noStrict

- */

-

-var f1 = function () {

-    return ((function () {

-        "use strict";

-        return typeof this;

-    })()==="undefined") && (this===fnGlobalObject());

-}

-if (! f1()) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Anonymous
+    FunctionExpression with a strict directive prologue defined within
+    a FunctionExpression)
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+var f1 = function () {
+    return ((function () {
+        "use strict";
+        return typeof this;
+    })()==="undefined") && (this===fnGlobalObject());
+}
+if (! f1()) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-51-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-51-s.js
index e8935366e..c4c28f331 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-51-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-51-s.js
@@ -1,21 +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 ch10/10.4/10.4.3/10.4.3-1-51-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration with a strict directive prologue defined within an Anonymous FunctionExpression)

- * @noStrict

- */

-    

-function testcase() {

-return (function () {

-    function f() {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (FunctionDeclaration with a strict
+    directive prologue defined within an Anonymous FunctionExpression)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+return (function () {
+    function f() {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-51gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-51gs.js
index 52f8e35a6..68736ba0e 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-51gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-51gs.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 ch10/10.4/10.4.3/10.4.3-1-51gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration with a strict directive prologue defined within an Anonymous FunctionExpression)

- * @noStrict

- */

-

-if (! ((function () {

-    function f() {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-})())) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionDeclaration
+    with a strict directive prologue defined within an Anonymous
+    FunctionExpression)
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+if (! ((function () {
+    function f() {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+})())) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-52-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-52-s.js
index b2c3a0082..85ce0c23d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-52-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-52-s.js
@@ -1,21 +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 ch10/10.4/10.4.3/10.4.3-1-52-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression with a strict directive prologue defined within an Anonymous FunctionExpression)

- * @noStrict

- */

-    

-function testcase() {

-return (function () {

-    var f = function () {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (FunctionExpression with a strict
+    directive prologue defined within an Anonymous FunctionExpression)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+return (function () {
+    var f = function () {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-52gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-52gs.js
index cc617750d..36773a758 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-52gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-52gs.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 ch10/10.4/10.4.3/10.4.3-1-52gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression with a strict directive prologue defined within an Anonymous FunctionExpression)

- * @noStrict

- */

-

-if (! ((function () {

-    var f = function () {

-        "use strict";

-        return typeof this;

-    }

-    return (f()==="undefined") && (this===fnGlobalObject());

-})())) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionExpression
+    with a strict directive prologue defined within an Anonymous
+    FunctionExpression)
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+if (! ((function () {
+    var f = function () {
+        "use strict";
+        return typeof this;
+    }
+    return (f()==="undefined") && (this===fnGlobalObject());
+})())) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-53-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-53-s.js
index 2324bf44f..69e0338a2 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-53-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-53-s.js
@@ -1,20 +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 ch10/10.4/10.4.3/10.4.3-1-53-s.js

- * @description Strict Mode - checking 'this' (Anonymous FunctionExpression with a strict directive prologue defined within an Anonymous FunctionExpression)

- * @noStrict

- */

-    

-function testcase() {

-return (function () {

-    return ((function () {

-        "use strict";

-        return typeof this;

-    })()==="undefined") && (this===fnGlobalObject());

-})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Anonymous FunctionExpression with a
+    strict directive prologue defined within an Anonymous
+    FunctionExpression)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+return (function () {
+    return ((function () {
+        "use strict";
+        return typeof this;
+    })()==="undefined") && (this===fnGlobalObject());
+})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-53gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-53gs.js
index 0c6581f2e..b0bc6861f 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-53gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-53gs.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 ch10/10.4/10.4.3/10.4.3-1-53gs.js

- * @description Strict - checking 'this' from a global scope (Anonymous FunctionExpression with a strict directive prologue defined within an Anonymous FunctionExpression)

- * @noStrict

- */

-

-if (! ((function () {

-    return ((function () {

-        "use strict";

-        return typeof this;

-    })()==="undefined") && (this===fnGlobalObject());

-})())) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Anonymous
+    FunctionExpression with a strict directive prologue defined within
+    an Anonymous FunctionExpression)
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+if (! ((function () {
+    return ((function () {
+        "use strict";
+        return typeof this;
+    })()==="undefined") && (this===fnGlobalObject());
+})())) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-54-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-54-s.js
index ac481d610..d4b5f48fa 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-54-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-54-s.js
@@ -1,17 +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 ch10/10.4/10.4.3/10.4.3-1-54-s.js

- * @description Strict Mode - checking 'this' (Literal getter defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var o = { get foo() { return this; } }

-return o.foo===o;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Literal getter defined within
+    strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+var o = { get foo() { return this; } }
+return o.foo===o;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-54gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-54gs.js
index 571ad634e..c2f04093a 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-54gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-54gs.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 ch10/10.4/10.4.3/10.4.3-1-54gs.js

- * @description Strict - checking 'this' from a global scope (Literal getter defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var o = { get foo() { return this; } }

-if (o.foo!==o) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Literal getter
+    defined within strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var o = { get foo() { return this; } }
+if (o.foo!==o) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-55-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-55-s.js
index 49acc2d11..f25c6bc4b 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-55-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-55-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-55-s.js

- * @description Strict Mode - checking 'this' (Literal getter includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var o = { get foo() { "use strict"; return this; } }

-return o.foo===o;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Literal getter includes strict
+    directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var o = { get foo() { "use strict"; return this; } }
+return o.foo===o;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-55gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-55gs.js
index ab3ccbbc5..3df85463d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-55gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-55gs.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 ch10/10.4/10.4.3/10.4.3-1-55gs.js

- * @description Strict - checking 'this' from a global scope (Literal getter includes strict directive prologue)

- * @onlyStrict

- */

-

-var o = { get foo() { "use strict"; return this; } }

-if (o.foo!==o) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Literal getter
+    includes strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+var o = { get foo() { "use strict"; return this; } }
+if (o.foo!==o) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-56-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-56-s.js
index 1a492c462..e6aa7f8ce 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-56-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-56-s.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 ch10/10.4/10.4.3/10.4.3-1-56-s.js

- * @description Strict Mode - checking 'this' (Literal setter defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var x = 2;

-var o = { set foo(stuff) { x=this; } }

-o.foo = 3;

-return x===o;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Literal setter defined within
+    strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+var x = 2;
+var o = { set foo(stuff) { x=this; } }
+o.foo = 3;
+return x===o;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-56gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-56gs.js
index 7ea7c7a3f..4b26a0747 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-56gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-56gs.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 ch10/10.4/10.4.3/10.4.3-1-56gs.js

- * @description Strict - checking 'this' from a global scope (Literal setter defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var x = 2;

-var o = { set foo(stuff) { x=this; } }

-o.foo = 3;

-if (x!==o) {

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Literal setter
+    defined within strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var x = 2;
+var o = { set foo(stuff) { x=this; } }
+o.foo = 3;
+if (x!==o) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-57-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-57-s.js
index bcd4ef62c..a6149545c 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-57-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-57-s.js
@@ -1,18 +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 ch10/10.4/10.4.3/10.4.3-1-57-s.js

- * @description Strict Mode - checking 'this' (Literal setter includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var x = 2;

-var o = { set foo(stuff) { "use strict"; x=this;  } }

-o.foo = 3;

-return x===o;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Literal setter includes strict
+    directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var x = 2;
+var o = { set foo(stuff) { "use strict"; x=this;  } }
+o.foo = 3;
+return x===o;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-57gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-57gs.js
index e59df3357..f8f19472c 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-57gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-57gs.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 ch10/10.4/10.4.3/10.4.3-1-57gs.js

- * @description Strict - checking 'this' from a global scope (Literal setter includes strict directive prologue)

- * @onlyStrict

- */

-

-var x = 2;

-var o = { set foo(stuff) { "use strict"; x=this;  } }

-o.foo = 3;

-if (x!==o) {

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Literal setter
+    includes strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+var x = 2;
+var o = { set foo(stuff) { "use strict"; x=this;  } }
+o.foo = 3;
+if (x!==o) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-58-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-58-s.js
index 964f8d435..44358987e 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-58-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-58-s.js
@@ -1,18 +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 ch10/10.4/10.4.3/10.4.3-1-58-s.js

- * @description Strict Mode - checking 'this' (Injected getter defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var o = {};

-Object.defineProperty(o, "foo",  { get: function() { return this; } });

-return o.foo===o;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Injected getter defined within
+    strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+var o = {};
+Object.defineProperty(o, "foo",  { get: function() { return this; } });
+return o.foo===o;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-58gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-58gs.js
index 166e44079..17655967e 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-58gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-58gs.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 ch10/10.4/10.4.3/10.4.3-1-58gs.js

- * @description Strict - checking 'this' from a global scope (Injected getter defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var o = {};

-Object.defineProperty(o, "foo",  { get : function() { return this; } });

-if (o.foo!==o) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Injected getter
+    defined within strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var o = {};
+Object.defineProperty(o, "foo",  { get : function() { return this; } });
+if (o.foo!==o) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-59-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-59-s.js
index 7d0afddf5..4bd379437 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-59-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-59-s.js
@@ -1,17 +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 ch10/10.4/10.4.3/10.4.3-1-59-s.js

- * @description Strict Mode - checking 'this' (Injected getter includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var o = {};

-Object.defineProperty(o, "foo", { get: function() { "use strict"; return this; } });

-return o.foo===o;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Injected getter includes strict
+    directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var o = {};
+Object.defineProperty(o, "foo", { get: function() { "use strict"; return this; } });
+return o.foo===o;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-59gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-59gs.js
index 09e1d0648..f38f545f8 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-59gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-59gs.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 ch10/10.4/10.4.3/10.4.3-1-59gs.js

- * @description Strict - checking 'this' from a global scope (Injected getter includes strict directive prologue)

- * @onlyStrict

- */

-

-var o = {};

-Object.defineProperty(o, "foo", { get: function() { "use strict"; return this; } });

-if (o.foo!==o) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Injected getter
+    includes strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+var o = {};
+Object.defineProperty(o, "foo", { get: function() { "use strict"; return this; } });
+if (o.foo!==o) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-60-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-60-s.js
index 1bd803bee..73a691e4b 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-60-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-60-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 ch10/10.4/10.4.3/10.4.3-1-60-s.js

- * @description Strict Mode - checking 'this' (Injected setter defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var o = {};

-var x = 2;

-Object.defineProperty(o, "foo", { set: function(stuff) { x=this; } });

-o.foo = 3;

-return x===o;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Injected setter defined within
+    strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+var o = {};
+var x = 2;
+Object.defineProperty(o, "foo", { set: function(stuff) { x=this; } });
+o.foo = 3;
+return x===o;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-60gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-60gs.js
index 09053dbd1..7e934fe4d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-60gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-60gs.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 ch10/10.4/10.4.3/10.4.3-1-60gs.js

- * @description Strict - checking 'this' from a global scope (Injected setter defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var o = {};

-var x = 2;

-Object.defineProperty(o, "foo", { set: function(stuff) { x=this; } });

-o.foo = 3;

-if (x!==o) {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Injected setter
+    defined within strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var o = {};
+var x = 2;
+Object.defineProperty(o, "foo", { set: function(stuff) { x=this; } });
+o.foo = 3;
+if (x!==o) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-61-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-61-s.js
index 23586b250..7d8c5237a 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-61-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-61-s.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 ch10/10.4/10.4.3/10.4.3-1-61-s.js

- * @description Strict Mode - checking 'this' (Injected setter includes strict directive prologue)

- * @onlyStrict

- */

-    

-function testcase() {

-var o = {};

-var x = 2;

-Object.defineProperty(o, "foo", { set: function(stuff) { "use strict"; x=this; } });

-o.foo = 3;

-return x===o;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (Injected setter includes strict
+    directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var o = {};
+var x = 2;
+Object.defineProperty(o, "foo", { set: function(stuff) { "use strict"; x=this; } });
+o.foo = 3;
+return x===o;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-61gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-61gs.js
index 2d31c32d8..220b8d6e3 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-61gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-61gs.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 ch10/10.4/10.4.3/10.4.3-1-61gs.js

- * @description Strict - checking 'this' from a global scope (Injected setter includes strict directive prologue)

- * @onlyStrict

- */

-

-var o = {};

-var x = 2;

-Object.defineProperty(o, "foo", { set: function(stuff) { "use strict"; x=this; } });

-o.foo = 3;

-if (x!==o) {

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (Injected setter
+    includes strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+var o = {};
+var x = 2;
+Object.defineProperty(o, "foo", { set: function(stuff) { "use strict"; x=this; } });
+o.foo = 3;
+if (x!==o) {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-62-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-62-s.js
index a2e3c0bb8..4a99cb84f 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-62-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-62-s.js
@@ -1,17 +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 ch10/10.4/10.4.3/10.4.3-1-62-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by non-strict function declaration)

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this;};

-function foo() { return f();}

-return foo()===undefined;

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function declaration called
+    by non-strict function declaration)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this;};
+function foo() { return f();}
+return foo()===undefined;
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-62gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-62gs.js
index 9cd2ae0e7..30b1b5b48 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-62gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-62gs.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 ch10/10.4/10.4.3/10.4.3-1-62gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by non-strict function declaration)

- * @onlyStrict

- */

-

-function f() { "use strict"; return this;};

-function foo() { return f();}

-if (foo()!==undefined){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (strict function
+    declaration called by non-strict function declaration)
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this;};
+function foo() { return f();}
+if (foo()!==undefined){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-63-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-63-s.js
index 5b93d280b..e931de93c 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-63-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-63-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-63-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by non-strict eval)

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this===undefined;};

-return eval("f();");

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function declaration called
+    by non-strict eval)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this===undefined;};
+return eval("f();");
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-63gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-63gs.js
index 07f7a9cee..95c202569 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-63gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-63gs.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 ch10/10.4/10.4.3/10.4.3-1-63gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by non-strict eval)

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===undefined;};

-if (! eval("f();")){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (strict function
+    declaration called by non-strict eval)
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===undefined;};
+if (! eval("f();")){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-64-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-64-s.js
index ddb042449..d73863634 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-64-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-64-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-64-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by non-strict Function constructor)

- * @onlyStrict

- */

-    

-function testcase() {

-fnGlobalObject().f = function() { "use strict"; return this===undefined;};

-return Function("return f();")();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function declaration called
+    by non-strict Function constructor)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+fnGlobalObject().f = function() { "use strict"; return this===undefined;};
+return Function("return f();")();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-64gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-64gs.js
index 6877c8341..6d23df649 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-64gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-64gs.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 ch10/10.4/10.4.3/10.4.3-1-64gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by non-strict Function constructor)

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===undefined;};

-if (! (Function("return f();")())){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (strict function
+    declaration called by non-strict Function constructor)
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===undefined;};
+if (! (Function("return f();")())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-65-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-65-s.js
index 5b0f20a65..ee43f6ac1 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-65-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-65-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-65-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by non-strict new'ed Function constructor)

- * @onlyStrict

- */

-    

-function testcase() {

-fnGlobalObject().f = function()  { "use strict"; return this===undefined;};

-return (new Function("return f();"))();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function declaration called
+    by non-strict new'ed Function constructor)
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+fnGlobalObject().f = function()  { "use strict"; return this===undefined;};
+return (new Function("return f();"))();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-65gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-65gs.js
index 567a12360..0e4349006 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-65gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-65gs.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 ch10/10.4/10.4.3/10.4.3-1-65gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by non-strict new'ed Function constructor)

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===undefined;};

-if (! ( (new Function("return f();")) () )){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (strict function
+    declaration called by non-strict new'ed Function constructor)
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===undefined;};
+if (! ( (new Function("return f();")) () )){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-66-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-66-s.js
index 3b4401827..7ae13faf1 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-66-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-66-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-66-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.apply())

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this===undefined;};

-return f.apply();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function declaration called
+    by Function.prototype.apply())
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this===undefined;};
+return f.apply();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-66gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-66gs.js
index 29a609b7a..8652e2769 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-66gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-66gs.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 ch10/10.4/10.4.3/10.4.3-1-66gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.apply())

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===undefined;};

-if (! f.apply()){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.apply())
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===undefined;};
+if (! f.apply()){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-67-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-67-s.js
index baf57dc0c..c59fb8f64 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-67-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-67-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-67-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.apply(null))

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this===null;};

-return f.apply(null);

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function declaration called
+    by Function.prototype.apply(null))
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this===null;};
+return f.apply(null);
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-67gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-67gs.js
index 9122b9fde..2141f88c0 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-67gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-67gs.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 ch10/10.4/10.4.3/10.4.3-1-67gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.apply(null))

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===null;};

-if (! f.apply(null)){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.apply(null))
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===null;};
+if (! f.apply(null)){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-68-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-68-s.js
index 10a5294e1..8f18d9609 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-68-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-68-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-68-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.apply(undefined))

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this===undefined;};

-return f.apply(undefined);

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function declaration called
+    by Function.prototype.apply(undefined))
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this===undefined;};
+return f.apply(undefined);
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-68gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-68gs.js
index 5bfeee3f0..d11ec5c28 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-68gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-68gs.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 ch10/10.4/10.4.3/10.4.3-1-68gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.apply(undefined))

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===undefined;};

-if (! f.apply(undefined)){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.apply(undefined))
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===undefined;};
+if (! f.apply(undefined)){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-69-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-69-s.js
index 8db3b94ce..6bdbd1057 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-69-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-69-s.js
@@ -1,17 +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 ch10/10.4/10.4.3/10.4.3-1-69-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.apply(someObject))

- * @onlyStrict

- */

-    

-function testcase() {

-var o = {};

-function f() { "use strict"; return this===o;};

-return f.apply(o);

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function declaration called
+    by Function.prototype.apply(someObject))
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var o = {};
+function f() { "use strict"; return this===o;};
+return f.apply(o);
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-69gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-69gs.js
index f32b45575..080e4494b 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-69gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-69gs.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 ch10/10.4/10.4.3/10.4.3-1-69gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.apply(someObject))

- * @onlyStrict

- */

-

-var o = {};

-function f() { "use strict"; return this===o;};

-if (! f.apply(o)){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.apply(someObject))
+flags: [onlyStrict]
+---*/
+
+var o = {};
+function f() { "use strict"; return this===o;};
+if (! f.apply(o)){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-7-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-7-s.js
index ae370f766..fafdf813a 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-7-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-7-s.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 ch10/10.4/10.4.3/10.4.3-1-7-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration defined within strict mode)

- * @onlyStrict

- */

-

-

-function testcase() {

-"use strict";

-function f() {

-    return typeof this;

-}

-return f() === "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: >
+    Strict Mode - checking 'this' (FunctionDeclaration defined within
+    strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+function f() {
+    return typeof this;
+}
+return f() === "undefined";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-70-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-70-s.js
index d1bf918ee..d94ac9e4d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-70-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-70-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-70-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.apply(globalObject))

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this;};

-return f.apply(fnGlobalObject()) === fnGlobalObject();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function declaration called
+    by Function.prototype.apply(globalObject))
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { "use strict"; return this;};
+return f.apply(fnGlobalObject()) === fnGlobalObject();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-70gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-70gs.js
index 0044b8afd..9c71387d6 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-70gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-70gs.js
@@ -1,15 +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 ch10/10.4/10.4.3/10.4.3-1-70gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.apply(globalObject))

- * @onlyStrict

- */

-

-function f() { "use strict"; return this;};

-if (f.apply(fnGlobalObject()) !== fnGlobalObject()){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.apply(globalObject))
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { "use strict"; return this;};
+if (f.apply(fnGlobalObject()) !== fnGlobalObject()){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-71-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-71-s.js
index 5fe5dcba3..a6c6ad720 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-71-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-71-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-71-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.call())

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this===undefined;};

-return f.call();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function declaration called
+    by Function.prototype.call())
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this===undefined;};
+return f.call();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-71gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-71gs.js
index c978be9ad..366ccffe6 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-71gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-71gs.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 ch10/10.4/10.4.3/10.4.3-1-71gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.call())

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===undefined;};

-if (! f.call()){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.call())
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===undefined;};
+if (! f.call()){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-72-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-72-s.js
index b9c669291..683ab4da2 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-72-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-72-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-72-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.call(null))

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this===null;};

-return f.call(null);

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function declaration called
+    by Function.prototype.call(null))
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this===null;};
+return f.call(null);
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-72gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-72gs.js
index 49ca243d1..e848e1134 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-72gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-72gs.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 ch10/10.4/10.4.3/10.4.3-1-72gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.call(null))

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===null;};

-if (! f.call(null)){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.call(null))
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===null;};
+if (! f.call(null)){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-73-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-73-s.js
index e04b5d7be..2f1f7adcb 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-73-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-73-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-73-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.call(undefined))

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this===undefined;};

-return f.call(undefined);

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function declaration called
+    by Function.prototype.call(undefined))
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this===undefined;};
+return f.call(undefined);
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-73gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-73gs.js
index 10a3176db..dfa5d1c86 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-73gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-73gs.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 ch10/10.4/10.4.3/10.4.3-1-73gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.call(undefined))

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===undefined;};

-if (! f.call(undefined)){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.call(undefined))
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===undefined;};
+if (! f.call(undefined)){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-74-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-74-s.js
index 7e2d746e3..47bcffc9b 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-74-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-74-s.js
@@ -1,17 +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 ch10/10.4/10.4.3/10.4.3-1-74-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.call(someObject))

- * @onlyStrict

- */

-    

-function testcase() {

-var o = {};

-function f() { "use strict"; return this===o;};

-return f.call(o);

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function declaration called
+    by Function.prototype.call(someObject))
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var o = {};
+function f() { "use strict"; return this===o;};
+return f.call(o);
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-74gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-74gs.js
index 27a73d67f..feff6fc04 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-74gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-74gs.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 ch10/10.4/10.4.3/10.4.3-1-74gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.call(someObject))

- * @onlyStrict

- */

-

-var o = {};

-function f() { "use strict"; return this===o;};

-if (! f.call(o)){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.call(someObject))
+flags: [onlyStrict]
+---*/
+
+var o = {};
+function f() { "use strict"; return this===o;};
+if (! f.call(o)){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-75-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-75-s.js
index fa8f4d4b0..56d0785ca 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-75-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-75-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-75-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.call(globalObject))

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this;};

-return f.call(fnGlobalObject()) === fnGlobalObject();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function declaration called
+    by Function.prototype.call(globalObject))
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { "use strict"; return this;};
+return f.call(fnGlobalObject()) === fnGlobalObject();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-75gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-75gs.js
index 3df699177..87d1b404d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-75gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-75gs.js
@@ -1,15 +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 ch10/10.4/10.4.3/10.4.3-1-75gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.call(globalObject))

- * @onlyStrict

- */

-

-function f() { "use strict"; return this;};

-if (f.call(fnGlobalObject()) !== fnGlobalObject()){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.call(globalObject))
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { "use strict"; return this;};
+if (f.call(fnGlobalObject()) !== fnGlobalObject()){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-76-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-76-s.js
index 7918f0dfa..3e55ddbcf 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-76-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-76-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-76-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.bind()())

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this===undefined;};

-return f.bind()();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function declaration called
+    by Function.prototype.bind()())
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this===undefined;};
+return f.bind()();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-76gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-76gs.js
index f61d0e324..0457f92bd 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-76gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-76gs.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 ch10/10.4/10.4.3/10.4.3-1-76gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.bind()())

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===undefined;};

-if (! (f.bind()())){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.bind()())
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===undefined;};
+if (! (f.bind()())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-77-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-77-s.js
index fb5614dd9..c158b62e6 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-77-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-77-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-77-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.bind(null)())

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this===null;};

-return f.bind(null)();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function declaration called
+    by Function.prototype.bind(null)())
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this===null;};
+return f.bind(null)();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-77gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-77gs.js
index 51d38c398..78d1d7971 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-77gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-77gs.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 ch10/10.4/10.4.3/10.4.3-1-77gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.bind(null)())

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===null;};

-if (! (f.bind(null)())){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.bind(null)())
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===null;};
+if (! (f.bind(null)())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-78-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-78-s.js
index 3d50f279c..d67bcc012 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-78-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-78-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-78-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.bind(undefined)())

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this===undefined;};

-return f.bind(undefined)();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function declaration called
+    by Function.prototype.bind(undefined)())
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { "use strict"; return this===undefined;};
+return f.bind(undefined)();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-78gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-78gs.js
index 8d67642fa..cc1e65f54 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-78gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-78gs.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 ch10/10.4/10.4.3/10.4.3-1-78gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.bind(undefined)())

- * @onlyStrict

- */

-

-function f() { "use strict"; return this===undefined;};

-if (! (f.bind(undefined)())){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.bind(undefined)())
+flags: [onlyStrict]
+---*/
+
+function f() { "use strict"; return this===undefined;};
+if (! (f.bind(undefined)())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-79-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-79-s.js
index 5dace0a45..9b8df1fb7 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-79-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-79-s.js
@@ -1,17 +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 ch10/10.4/10.4.3/10.4.3-1-79-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.bind(someObject)())

- * @onlyStrict

- */

-    

-function testcase() {

-var o = {};

-function f() { "use strict"; return this===o;};

-return f.bind(o)();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function declaration called
+    by Function.prototype.bind(someObject)())
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var o = {};
+function f() { "use strict"; return this===o;};
+return f.bind(o)();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-79gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-79gs.js
index a347c004a..3ff714660 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-79gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-79gs.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 ch10/10.4/10.4.3/10.4.3-1-79gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.bind(someObject)())

- * @onlyStrict

- */

-

-var o = {};

-function f() { "use strict"; return this===o;};

-if (! (f.bind(o)())){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.bind(someObject)())
+flags: [onlyStrict]
+---*/
+
+var o = {};
+function f() { "use strict"; return this===o;};
+if (! (f.bind(o)())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-7gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-7gs.js
index 23b1c0583..459167364 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-7gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-7gs.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 ch10/10.4/10.4.3/10.4.3-1-7gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-function f() {

-    return typeof this;

-}

-if (f() !== "undefined") {

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionDeclaration
+    defined within strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+function f() {
+    return typeof this;
+}
+if (f() !== "undefined") {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-8-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-8-s.js
index 7d6beaa1a..c68bea923 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-8-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-8-s.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 ch10/10.4/10.4.3/10.4.3-1-8-s.js

- * @description Strict Mode - checking 'this' (FunctionDeclaration includes strict directive prologue)

- * @onlyStrict

- */

-

-

-function testcase() {

-function f() {

-    "use strict";

-    return typeof this;

-}

-return f() === "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: >
+    Strict Mode - checking 'this' (FunctionDeclaration includes strict
+    directive prologue)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() {
+    "use strict";
+    return typeof this;
+}
+return f() === "undefined";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-80-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-80-s.js
index 86951b61a..bde1f45c6 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-80-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-80-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-80-s.js

- * @description Strict Mode - checking 'this' (strict function declaration called by Function.prototype.bind(globalObject)())

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { "use strict"; return this;};

-return f.bind(fnGlobalObject())() === fnGlobalObject();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (strict function declaration called
+    by Function.prototype.bind(globalObject)())
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { "use strict"; return this;};
+return f.bind(fnGlobalObject())() === fnGlobalObject();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-80gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-80gs.js
index e3ed02e6a..f9e844d54 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-80gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-80gs.js
@@ -1,15 +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 ch10/10.4/10.4.3/10.4.3-1-80gs.js

- * @description Strict - checking 'this' from a global scope (strict function declaration called by Function.prototype.bind(globalObject)())

- * @onlyStrict

- */

-

-function f() { "use strict"; return this;};

-if (f.bind(fnGlobalObject())() !== fnGlobalObject()){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (strict function
+    declaration called by Function.prototype.bind(globalObject)())
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { "use strict"; return this;};
+if (f.bind(fnGlobalObject())() !== fnGlobalObject()){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-81-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-81-s.js
index 61be6b784..49dbd5439 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-81-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-81-s.js
@@ -1,17 +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 ch10/10.4/10.4.3/10.4.3-1-81-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict function declaration)

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this!==undefined;};

-function foo() { "use strict"; return f();}

-return foo();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function declaration
+    called by strict function declaration)
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { return this!==undefined;};
+function foo() { "use strict"; return f();}
+return foo();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-81gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-81gs.js
index 0544e0cd7..500f08293 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-81gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-81gs.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 ch10/10.4/10.4.3/10.4.3-1-81gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict function declaration)

- * @noStrict

- */

-

-function f() { return this!==undefined;};

-function foo() { "use strict"; return f();}

-if (! foo()){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (non-strict function
+    declaration called by strict function declaration)
+flags: [noStrict]
+---*/
+
+function f() { return this!==undefined;};
+function foo() { "use strict"; return f();}
+if (! foo()){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-82-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-82-s.js
index 0a2b16600..76237925d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-82-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-82-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-82-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict eval)

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this!==undefined;};

-return (function () {"use strict"; return eval("f();");})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function declaration
+    called by strict eval)
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { return this!==undefined;};
+return (function () {"use strict"; return eval("f();");})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-82gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-82gs.js
index 305435eeb..6f631c1b3 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-82gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-82gs.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 ch10/10.4/10.4.3/10.4.3-1-82gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict eval)

- * @noStrict

- */

-

-function f() { return this!==undefined;};

-if (! ((function () {"use strict"; return eval("f();");})()) ){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (non-strict function
+    declaration called by strict eval)
+flags: [noStrict]
+---*/
+
+function f() { return this!==undefined;};
+if (! ((function () {"use strict"; return eval("f();");})()) ){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-83-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-83-s.js
index f03adeff5..0b983413e 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-83-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-83-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-83-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function constructor)

- * @noStrict

- */

-    

-function testcase() {

-fnGlobalObject().f = function() {return this!==undefined;};

-return (function () {return Function("\"use strict\";return f();")();})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function declaration
+    called by strict Function constructor)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+fnGlobalObject().f = function() {return this!==undefined;};
+return (function () {return Function("\"use strict\";return f();")();})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-83gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-83gs.js
index dfe59d84e..464aa6f41 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-83gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-83gs.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 ch10/10.4/10.4.3/10.4.3-1-83gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function constructor)

- * @noStrict

- */

-

-function f() {return this!==undefined;};

-if (! ((function () {return Function("\"use strict\";return f();")();})()) ){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function constructor)
+flags: [noStrict]
+---*/
+
+function f() {return this!==undefined;};
+if (! ((function () {return Function("\"use strict\";return f();")();})()) ){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-84-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-84-s.js
index 807817846..3c3daaad7 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-84-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-84-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-84-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict new'ed Function constructor)

- * @noStrict

- */

-    

-function testcase() {

-fnGlobalObject().f = function()  { return this!==undefined;};

-return (function () {return new Function("\"use strict\";return f();")();})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function declaration
+    called by strict new'ed Function constructor)
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+fnGlobalObject().f = function()  { return this!==undefined;};
+return (function () {return new Function("\"use strict\";return f();")();})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-84gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-84gs.js
index 23a20910d..13b21a69b 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-84gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-84gs.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 ch10/10.4/10.4.3/10.4.3-1-84gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict new'ed Function constructor)

- * @noStrict

- */

-

-function f() { return this!==undefined;};

-if (! ((function () {return new Function("\"use strict\";return f();")();})()) ){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (non-strict function
+    declaration called by strict new'ed Function constructor)
+flags: [noStrict]
+---*/
+
+function f() { return this!==undefined;};
+if (! ((function () {return new Function("\"use strict\";return f();")();})()) ){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-85-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-85-s.js
index abdb33b92..b0055eee8 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-85-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-85-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-85-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.apply())

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this!==undefined;};

-return (function () {"use strict"; return f.apply();})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function declaration
+    called by strict Function.prototype.apply())
+flags: [noStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+function f() { return this!==undefined;};
+return (function () {"use strict"; return f.apply();})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-85gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-85gs.js
index 093115f32..eb4a9e1a8 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-85gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-85gs.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 ch10/10.4/10.4.3/10.4.3-1-85gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.apply())

- * @noStrict

- */

-

-function f() { return this!==undefined;};

-if (! ((function () {"use strict"; return f.apply();})())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.apply())
+flags: [noStrict]
+---*/
+
+function f() { return this!==undefined;};
+if (! ((function () {"use strict"; return f.apply();})())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-86-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-86-s.js
index fca8007f3..cc3987935 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-86-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-86-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-86-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.apply(null))

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this===fnGlobalObject();};

-return (function () {"use strict"; return f.apply(null);})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function declaration
+    called by strict Function.prototype.apply(null))
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this===fnGlobalObject();};
+return (function () {"use strict"; return f.apply(null);})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-86gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-86gs.js
index f1e23cce2..3a7fbc6ca 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-86gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-86gs.js
@@ -1,15 +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 ch10/10.4/10.4.3/10.4.3-1-86gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.apply(null))

- * @noStrict

- */

-

-function f() { return this===fnGlobalObject();};

-if (! ((function () {"use strict"; return f.apply(null);})())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.apply(null))
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this===fnGlobalObject();};
+if (! ((function () {"use strict"; return f.apply(null);})())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-87-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-87-s.js
index be4505ace..84ce5d7a0 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-87-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-87-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-87-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.apply(undefined))

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this===fnGlobalObject()};

-return (function () {"use strict"; return f.apply(undefined);})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function declaration
+    called by strict Function.prototype.apply(undefined))
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this===fnGlobalObject()};
+return (function () {"use strict"; return f.apply(undefined);})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-87gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-87gs.js
index af76c9a8b..b156e92ec 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-87gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-87gs.js
@@ -1,15 +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 ch10/10.4/10.4.3/10.4.3-1-87gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.apply(undefined))

- * @noStrict

- */

-

-function f() { return this===fnGlobalObject();};

-if (! ((function () {"use strict"; return f.apply(undefined);})())){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.apply(undefined))
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this===fnGlobalObject();};
+if (! ((function () {"use strict"; return f.apply(undefined);})())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-88-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-88-s.js
index 72c424567..01004523a 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-88-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-88-s.js
@@ -1,17 +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 ch10/10.4/10.4.3/10.4.3-1-88-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.apply(someObject))

- * @onlyStrict

- */

-    

-function testcase() {

-var o = {};

-function f() { return this===o;};

-return (function () {"use strict"; return f.apply(o);})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function declaration
+    called by strict Function.prototype.apply(someObject))
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var o = {};
+function f() { return this===o;};
+return (function () {"use strict"; return f.apply(o);})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-88gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-88gs.js
index 8b85f6993..e69957606 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-88gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-88gs.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 ch10/10.4/10.4.3/10.4.3-1-88gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.apply(someObject))

- * @onlyStrict

- */

-

-var o = {};

-function f() { return this===o;};

-if (! ((function () {"use strict"; return f.apply(o);})())){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.apply(someObject))
+flags: [onlyStrict]
+---*/
+
+var o = {};
+function f() { return this===o;};
+if (! ((function () {"use strict"; return f.apply(o);})())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-89-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-89-s.js
index 451851d5b..45c80e414 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-89-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-89-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-89-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.apply(globalObject))

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { return this;};

-return (function () {"use strict"; return f.apply(fnGlobalObject()); })() === fnGlobalObject();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function declaration
+    called by strict Function.prototype.apply(globalObject))
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this;};
+return (function () {"use strict"; return f.apply(fnGlobalObject()); })() === fnGlobalObject();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-89gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-89gs.js
index 68f415a64..5ec17a401 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-89gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-89gs.js
@@ -1,15 +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 ch10/10.4/10.4.3/10.4.3-1-89gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.apply(globalObject))

- * @onlyStrict

- */

-

-function f() { return this;};

-if ((function () {"use strict"; return f.apply(fnGlobalObject());})() !== fnGlobalObject()){

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (non-strict function
+    declaration called by strict
+    Function.prototype.apply(globalObject))
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this;};
+if ((function () {"use strict"; return f.apply(fnGlobalObject());})() !== fnGlobalObject()){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-8gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-8gs.js
index 814fb7ec7..ea2c0d309 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-8gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-8gs.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 ch10/10.4/10.4.3/10.4.3-1-8gs.js

- * @description Strict - checking 'this' from a global scope (FunctionDeclaration includes strict directive prologue)

- * @onlyStrict

- */

-

-function f() {

-    "use strict";

-    return typeof this;

-}

-if (f() !== "undefined") {

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionDeclaration
+    includes strict directive prologue)
+flags: [onlyStrict]
+---*/
+
+function f() {
+    "use strict";
+    return typeof this;
+}
+if (f() !== "undefined") {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-9-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-9-s.js
index 38ca374e7..16981a9af 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-9-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-9-s.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 ch10/10.4/10.4.3/10.4.3-1-9-s.js

- * @description Strict Mode - checking 'this' (FunctionExpression defined within strict mode)

- * @onlyStrict

- */

-    

-function testcase() {

-"use strict";

-var f = function () {

-    return typeof this;

-}

-return f() === "undefined";

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (FunctionExpression defined within
+    strict mode)
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+"use strict";
+var f = function () {
+    return typeof this;
+}
+return f() === "undefined";
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-90-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-90-s.js
index 0b6a4b3f1..f78c8e013 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-90-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-90-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-90-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.call())

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this===fnGlobalObject();};

-return (function () {"use strict"; return f.call(); })();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function declaration
+    called by strict Function.prototype.call())
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this===fnGlobalObject();};
+return (function () {"use strict"; return f.call(); })();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-90gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-90gs.js
index 78a91247f..95ab45a65 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-90gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-90gs.js
@@ -1,15 +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 ch10/10.4/10.4.3/10.4.3-1-90gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.call())

- * @noStrict

- */

-

-function f() { return this===fnGlobalObject();};

-if (! ((function () {"use strict"; return f.call();})())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.call())
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this===fnGlobalObject();};
+if (! ((function () {"use strict"; return f.call();})())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-91-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-91-s.js
index 2dc4007e9..088fcc162 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-91-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-91-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-91-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.call(null))

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this===fnGlobalObject();};

-return (function () {"use strict"; return f.call(null); })();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function declaration
+    called by strict Function.prototype.call(null))
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this===fnGlobalObject();};
+return (function () {"use strict"; return f.call(null); })();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-91gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-91gs.js
index c1052a773..44406330f 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-91gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-91gs.js
@@ -1,15 +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 ch10/10.4/10.4.3/10.4.3-1-91gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.call(null))

- * @noStrict

- */

-

-function f() { return this===fnGlobalObject();};

-if (! ((function () {"use strict"; return f.call(null); })())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.call(null))
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this===fnGlobalObject();};
+if (! ((function () {"use strict"; return f.call(null); })())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-92-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-92-s.js
index 3a04a7b6f..9776ac416 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-92-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-92-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-92-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.call(undefined))

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this===fnGlobalObject();};

-return (function () {"use strict"; return f.call(undefined);})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function declaration
+    called by strict Function.prototype.call(undefined))
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this===fnGlobalObject();};
+return (function () {"use strict"; return f.call(undefined);})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-92gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-92gs.js
index 4517302f3..5b4625a83 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-92gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-92gs.js
@@ -1,15 +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 ch10/10.4/10.4.3/10.4.3-1-92gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.call(undefined))

- * @noStrict

- */

-

-function f() { return this===fnGlobalObject();};

-if (! ((function () {"use strict"; return f.call(undefined);})())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.call(undefined))
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this===fnGlobalObject();};
+if (! ((function () {"use strict"; return f.call(undefined);})())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-93-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-93-s.js
index e8da599e7..237f072f0 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-93-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-93-s.js
@@ -1,17 +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 ch10/10.4/10.4.3/10.4.3-1-93-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.call(someObject))

- * @onlyStrict

- */

-    

-function testcase() {

-var o = {};

-function f() { return this===o;};

-return (function () {"use strict"; return f.call(o); })();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function declaration
+    called by strict Function.prototype.call(someObject))
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var o = {};
+function f() { return this===o;};
+return (function () {"use strict"; return f.call(o); })();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-93gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-93gs.js
index 44bd495b4..737d29f8c 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-93gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-93gs.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 ch10/10.4/10.4.3/10.4.3-1-93gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.call(someObject))

- * @onlyStrict

- */

-

-var o = {};

-function f() { return this===o;};

-if (! ((function () {"use strict"; return f.call(o); })())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.call(someObject))
+flags: [onlyStrict]
+---*/
+
+var o = {};
+function f() { return this===o;};
+if (! ((function () {"use strict"; return f.call(o); })())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-94-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-94-s.js
index 655ac9e76..79fdac7bf 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-94-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-94-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-94-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.call(globalObject))

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { return this===fnGlobalObject();};

-return (function () {"use strict"; return f.call(fnGlobalObject());})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function declaration
+    called by strict Function.prototype.call(globalObject))
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this===fnGlobalObject();};
+return (function () {"use strict"; return f.call(fnGlobalObject());})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-94gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-94gs.js
index e752c688e..aa5ca4b11 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-94gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-94gs.js
@@ -1,15 +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 ch10/10.4/10.4.3/10.4.3-1-94gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.call(globalObject))

- * @onlyStrict

- */

-

-function f() { return this===fnGlobalObject();};

-if (! ((function () {"use strict"; return f.call(fnGlobalObject());})())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.call(globalObject))
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this===fnGlobalObject();};
+if (! ((function () {"use strict"; return f.call(fnGlobalObject());})())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-95-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-95-s.js
index db48e89d9..4bc3c8cce 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-95-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-95-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-95-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.bind()())

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this===fnGlobalObject();};

-return (function () {"use strict"; return f.bind()(); })();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function declaration
+    called by strict Function.prototype.bind()())
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this===fnGlobalObject();};
+return (function () {"use strict"; return f.bind()(); })();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-95gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-95gs.js
index 5d5fc09b8..c549c94f3 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-95gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-95gs.js
@@ -1,15 +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 ch10/10.4/10.4.3/10.4.3-1-95gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.bind()())

- * @noStrict

- */

-

-function f() { return this===fnGlobalObject();};

-if (! ((function () {"use strict"; return f.bind()(); })())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.bind()())
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this===fnGlobalObject();};
+if (! ((function () {"use strict"; return f.bind()(); })())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-96-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-96-s.js
index 3c4e652c3..fd2c678a1 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-96-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-96-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-96-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.bind(null)())

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this===fnGlobalObject();};

-return (function () {"use strict"; return f.bind(null)(); })();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function declaration
+    called by strict Function.prototype.bind(null)())
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this===fnGlobalObject();};
+return (function () {"use strict"; return f.bind(null)(); })();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-96gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-96gs.js
index cbfe417c4..c4574087f 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-96gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-96gs.js
@@ -1,15 +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 ch10/10.4/10.4.3/10.4.3-1-96gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.bind(null)())

- * @noStrict

- */

-

-function f() { return this===fnGlobalObject();};

-if (! ((function () {"use strict"; return f.bind(null)(); })())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.bind(null)())
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this===fnGlobalObject();};
+if (! ((function () {"use strict"; return f.bind(null)(); })())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-97-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-97-s.js
index feac73bd6..5677a0e1e 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-97-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-97-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-97-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.bind(undefined)())

- * @noStrict

- */

-    

-function testcase() {

-function f() { return this===fnGlobalObject();};

-return (function () {"use strict"; return f.bind(undefined)();})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function declaration
+    called by strict Function.prototype.bind(undefined)())
+flags: [noStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this===fnGlobalObject();};
+return (function () {"use strict"; return f.bind(undefined)();})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-97gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-97gs.js
index 1e79dd96e..913f76fe3 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-97gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-97gs.js
@@ -1,15 +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 ch10/10.4/10.4.3/10.4.3-1-97gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.bind(undefined)())

- * @noStrict

- */

-

-function f() { return this===fnGlobalObject();};

-if (! ((function () {"use strict"; return f.bind(undefined)(); })())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.bind(undefined)())
+flags: [noStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this===fnGlobalObject();};
+if (! ((function () {"use strict"; return f.bind(undefined)(); })())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-98-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-98-s.js
index 1c07cafc6..0db0b149d 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-98-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-98-s.js
@@ -1,17 +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 ch10/10.4/10.4.3/10.4.3-1-98-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.bind(someObject)())

- * @onlyStrict

- */

-    

-function testcase() {

-var o = {};

-function f() { return this===o;};

-return (function () {"use strict"; return f.bind(o)();})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function declaration
+    called by strict Function.prototype.bind(someObject)())
+flags: [onlyStrict]
+includes: [runTestCase.js]
+---*/
+
+function testcase() {
+var o = {};
+function f() { return this===o;};
+return (function () {"use strict"; return f.bind(o)();})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-98gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-98gs.js
index c72e9dcc6..a773fdaf9 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-98gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-98gs.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 ch10/10.4/10.4.3/10.4.3-1-98gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.bind(someObject)())

- * @onlyStrict

- */

-

-var o = {};

-function f() { return this===o;};

-if (! ((function () {"use strict"; return f.bind(o)();})())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (non-strict function
+    declaration called by strict Function.prototype.bind(someObject)())
+flags: [onlyStrict]
+---*/
+
+var o = {};
+function f() { return this===o;};
+if (! ((function () {"use strict"; return f.bind(o)();})())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-99-s.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-99-s.js
index 47b1dac4d..ad85e9d00 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-99-s.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-99-s.js
@@ -1,16 +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 ch10/10.4/10.4.3/10.4.3-1-99-s.js

- * @description Strict Mode - checking 'this' (non-strict function declaration called by strict Function.prototype.bind(globalObject)())

- * @onlyStrict

- */

-    

-function testcase() {

-function f() { return this===fnGlobalObject();};

-return (function () {"use strict"; return f.bind(fnGlobalObject())();})();

-}

-runTestCase(testcase);
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 'this' (non-strict function declaration
+    called by strict Function.prototype.bind(globalObject)())
+flags: [onlyStrict]
+includes:
+    - runTestCase.js
+    - fnGlobalObject.js
+---*/
+
+function testcase() {
+function f() { return this===fnGlobalObject();};
+return (function () {"use strict"; return f.bind(fnGlobalObject())();})();
+}
+runTestCase(testcase);
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-99gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-99gs.js
index 5e9730d9f..3275cf2a0 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-99gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-99gs.js
@@ -1,15 +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 ch10/10.4/10.4.3/10.4.3-1-99gs.js

- * @description Strict - checking 'this' from a global scope (non-strict function declaration called by strict Function.prototype.bind(globalObject)())

- * @onlyStrict

- */

-

-function f() { return this===fnGlobalObject();};

-if (! ((function () {"use strict"; return f.bind(fnGlobalObject())();})())){

-    throw "'this' had incorrect value!";

-}

+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (non-strict function
+    declaration called by strict
+    Function.prototype.bind(globalObject)())
+flags: [onlyStrict]
+includes: [fnGlobalObject.js]
+---*/
+
+function f() { return this===fnGlobalObject();};
+if (! ((function () {"use strict"; return f.bind(fnGlobalObject())();})())){
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/10.4.3-1-9gs.js b/test/suite/ch10/10.4/10.4.3/10.4.3-1-9gs.js
index 56c150c89..4ed3fd47a 100644
--- a/test/suite/ch10/10.4/10.4.3/10.4.3-1-9gs.js
+++ b/test/suite/ch10/10.4/10.4.3/10.4.3-1-9gs.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 ch10/10.4/10.4.3/10.4.3-1-9gs.js

- * @description Strict - checking 'this' from a global scope (FunctionExpression defined within strict mode)

- * @onlyStrict

- */

-

-"use strict";

-var f = function () {

-    return typeof this;

-}

-if (f() !== "undefined") {

-    throw "'this' had incorrect value!";

-}
\ No newline at end of file
+// Copyright (c) 2012 Ecma International.  All rights reserved.
+// Ecma International makes this code available under the terms and conditions set
+// forth on http://hg.ecmascript.org/tests/test262/raw-file/tip/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 - checking 'this' from a global scope (FunctionExpression
+    defined within strict mode)
+flags: [onlyStrict]
+---*/
+
+"use strict";
+var f = function () {
+    return typeof this;
+}
+if (f() !== "undefined") {
+    throw "'this' had incorrect value!";
+}
diff --git a/test/suite/ch10/10.4/10.4.3/S10.4.3_A1.js b/test/suite/ch10/10.4/10.4.3/S10.4.3_A1.js
index ea2432219..b7b6ff3d7 100644
--- a/test/suite/ch10/10.4/10.4.3/S10.4.3_A1.js
+++ b/test/suite/ch10/10.4/10.4.3/S10.4.3_A1.js
@@ -1,16 +1,15 @@
 // Copyright 2011 Google, Inc.  All rights reserved.
 // This code is governed by the BSD license found in the LICENSE file.
 
-/**
- * @path ch10/10.4/10.4.3/S10.4.3_A1.js
- * @description When calling a strict anonymous function as a
- * function, "this" should be bound to undefined.
- * @onlyStrict
- */
+/*---
+description: >
+    When calling a strict anonymous function as a  function, "this"
+    should be bound to undefined.
+flags: [onlyStrict]
+---*/
 
 "use strict";
 var that = (function() { return this; })();
 if (that !== undefined) {
   $ERROR('#1: "this" leaked as: ' + that);
 }
-
diff --git a/test/suite/ch10/10.4/S10.4A1.1_T2.js b/test/suite/ch10/10.4/S10.4A1.1_T2.js
index 080aad06a..fee20ce5d 100644
--- a/test/suite/ch10/10.4/S10.4A1.1_T2.js
+++ b/test/suite/ch10/10.4/S10.4A1.1_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.
 
-/**
- * Every function call enters a new execution context
- *
- * @path ch10/10.4/S10.4A1.1_T2.js
- * @description Recursive function call
- */
+/*---
+info: Every function call enters a new execution context
+description: Recursive function call
+---*/
 
 var y;
 
@@ -30,4 +28,3 @@ y = f(0);
 if(!(y === undefined)){
   $ERROR("#1: Recursive function calls shares execution context");
 }
-
diff --git a/test/suite/ch10/10.4/S10.4_A1.1_T1.js b/test/suite/ch10/10.4/S10.4_A1.1_T1.js
index 408d50770..737541467 100644
--- a/test/suite/ch10/10.4/S10.4_A1.1_T1.js
+++ b/test/suite/ch10/10.4/S10.4_A1.1_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 call enters a new execution context
- *
- * @path ch10/10.4/S10.4_A1.1_T1.js
- * @description Sequence of function calls
- */
+/*---
+info: Every function call enters a new execution context
+description: Sequence of function calls
+---*/
 
 var y;
 
@@ -28,4 +26,3 @@ y = f();
 if(!(y === 0)){
   $ERROR("#1: Sequenced function calls shares execution context");
 }
-