From 9f7d9f6ab5a1a349ef88219cf4839f84eadc60e2 Mon Sep 17 00:00:00 2001
From: Mark Miller <erights@gmail.com>
Date: Tue, 13 Sep 2011 22:06:04 -0700
Subject: [PATCH 1/4] Fixed test262.py to handle strict options correctly.
 Fixed convert.py to convert a "use strict" into an @strict_only

---
 tools/converter/convert.js | 10 +++--
 tools/test262.py           | 77 ++++++++++++++++++++++----------------
 2 files changed, 51 insertions(+), 36 deletions(-)

diff --git a/tools/converter/convert.js b/tools/converter/convert.js
index 902551e72d..b9f47763a1 100644
--- a/tools/converter/convert.js
+++ b/tools/converter/convert.js
@@ -39,11 +39,13 @@
    var captureCommentPattern = /\/\*\*?((?:\s|\S)*?)\*\/\s*\n/;
    var anyPattern = /(?:\s|\S)*/;
    var blanksPattern = /(?:\s|\n)*/;
+   var captureStrictPattern = /\s*('use strict'|"use strict");/;
 
    // Should match anything
    var testEnvelopePattern =
      regExp('^(', headerPattern,
             ')(?:', captureCommentPattern,
+            ')?(?:', captureStrictPattern,
             ')?(', anyPattern,
             ')$');
 
@@ -102,7 +104,6 @@
        throw new Error('unrecognized: ' + name);
      }
      envelope.header = trim(envelopeMatch[1]);
-
      if (envelopeMatch[2]) {
        var propTexts = envelopeMatch[2].split(/\s*\n\s*\*\s*@/);
        envelope.comment = stripStars(propTexts.shift()), // notice side effect
@@ -120,7 +121,10 @@
          envelope.testRecord[propName] = propVal;
        });
      }
-     envelope.rest = envelopeMatch[3]; // Do not trim
+     if (envelopeMatch[3]) {
+       envelope.testRecord.strict_only = '';
+     }
+     envelope.rest = envelopeMatch[4]; // Do not trim
 
      var registerMatch = registerPattern.exec(envelope.rest);
      if (registerMatch) {
@@ -247,7 +251,7 @@
        if (!('strict_only' in testRecord)) {
          testRecord.strict_only = '';
        }
-       if (!'negative' in testRecord) {
+       if (!('negative' in testRecord)) {
          testRecord.negative = testRecord.strict_mode_negative;
          delete testRecord.strict_mode_negative;
        }
diff --git a/tools/test262.py b/tools/test262.py
index a247e86b6f..061c813fbd 100644
--- a/tools/test262.py
+++ b/tools/test262.py
@@ -36,8 +36,10 @@ def BuildOptions():
                     help="Print summary after running tests")
   result.add_option("--full-summary", default=False, action="store_true",
                     help="Print summary and test output after running tests")
-  result.add_option("--enable-strict-mode", default=False, action="store_true", 
-                    help="Run the mode also in ES5 strict mode")
+  result.add_option("--strict_only", default=False, action="store_true", 
+                    help="Test only strict mode")
+  result.add_option("--non_strict_only", default=False, action="store_true", 
+                    help="Test only non-strict mode")
 
   return result
 
@@ -122,16 +124,15 @@ class TestResult(object):
 
   def ReportOutcome(self, long_format):
     name = self.case.GetName()
+    mode = self.case.GetMode()
     if self.HasUnexpectedOutcome():
       if self.case.IsNegative():
-        print "%s was expected to fail but didn't" % name
-      elif (self.case.strict_mode and self.case.IsStrictModeNegative()):
-        print "%s was expected to fail in strict mode, but didn't" % name
+        print "%s was expected to fail in %s, but didn't" % (name, mode)
       else:
         if long_format:
-          print "=== %s failed ===" % name
+          print "=== %s failed in %s ===" % (name, mode)
         else:
-          print "%s: " % name
+          print "%s in %s: " % (name, mode)
         out = self.stdout.strip()
         if len(out) > 0:
           print "--- output ---"
@@ -143,14 +144,9 @@ class TestResult(object):
         if long_format:
           print "==="
     elif self.case.IsNegative():
-      print "%s failed as expected" % name
-    elif self.case.strict_mode:
-      if self.case.IsStrictModeNegative():
-        print "%s failed in strict mode as expected" % name
-      else: 
-        print "%s passed in strict mode" % name
+      print "%s failed in %s as expected" % (name, mode)
     else:
-      print "%s passed" % name
+      print "%s passed in %s" % (name, mode)
 
   def HasFailed(self):
     return self.exit_code != 0
@@ -158,26 +154,31 @@ class TestResult(object):
   def HasUnexpectedOutcome(self):
     if self.case.IsNegative():
        return not self.HasFailed()
-    if self.case.IsStrictModeNegative():
-       return not self.HasFailed()
     else:
        return self.HasFailed()
 
 
 class TestCase(object):
 
-  def __init__(self, suite, name, full_path, strict_mode=False):
+  def __init__(self, suite, name, full_path, strict_mode):
     self.suite = suite
     self.name = name
     self.full_path = full_path
     self.contents = None
     self.is_negative = None
     self.strict_mode = strict_mode
-    self.is_strict_mode_negative = None
+    self.is_strict_only = None
+    self.is_non_strict_only = None
 
   def GetName(self):
     return path.join(*self.name)
 
+  def GetMode(self):
+    if self.strict_mode:
+      return "strict mode"
+    else:
+      return "non-strict mode"
+
   def GetPath(self):
     return self.name
 
@@ -193,11 +194,15 @@ class TestCase(object):
       self.is_negative = ("@negative" in self.GetRawContents())
     return self.is_negative
 
-  def IsStrictModeNegative(self):
-    if self.strict_mode and self.is_strict_mode_negative is None:
-      self.is_strict_mode_negative = \
-          ("@strict_mode_negative" in self.GetRawContents())
-    return self.is_strict_mode_negative
+  def IsStrictOnly(self):
+    if self.is_strict_only is None:
+      self.is_strict_only = ("@strict_only" in self.GetRawContents())
+    return self.is_strict_only
+
+  def IsNonStrictOnly(self):
+    if self.is_non_strict_only is None:
+      self.is_non_strict_only = ("@non_strict_only" in self.GetRawContents())
+    return self.is_non_strict_only
 
   def GetSource(self):
     source = self.suite.GetInclude("framework.js", False) + \
@@ -293,12 +298,11 @@ def MakePlural(n):
 
 class TestSuite(object):
 
-  def __init__(self, root, stric_mode):
-#    self.test_root = path.join(root, 'test', 'suite', 'Sputnik', 'Conformance')
-#    self.test_root = path.join(root, 'test', 'suite', 'other')
+  def __init__(self, root, strict_only, non_strict_only):
     self.test_root = path.join(root, 'test', 'suite', 'converted')
     self.lib_root = path.join(root, 'test', 'harness')
-    self.strict_mode = stric_mode
+    self.strict_only = strict_only
+    self.non_strict_only = non_strict_only
     self.include_cache = { }
 
   def Validate(self):
@@ -375,9 +379,14 @@ class TestSuite(object):
           if self.ShouldRun(rel_path, tests):
             basename = path.basename(full_path)[:-3]
             name = rel_path.split(path.sep)[:-1] + [basename]
-            cases.append(TestCase(self, name, full_path, False))
-            if self.strict_mode:
-              cases.append(TestCase(self, name, full_path, True))
+            if not self.non_strict_only:
+              strict_case = TestCase(self, name, full_path, True)
+              if not strict_case.IsNonStrictOnly():
+                cases.append(strict_case)
+            if not self.strict_only:
+              non_strict_case = TestCase(self, name, full_path, False)
+              if not non_strict_case.IsStrictOnly():
+                cases.append(non_strict_case)
     logging.info("Done listing tests")
     return cases
 
@@ -401,12 +410,12 @@ class TestSuite(object):
         print
         print "Failed tests"
         for result in positive:
-          print "  %s" % result.case.GetName()
+          print "  %s in %s" % (result.case.GetName(), result.case.GetMode())
       if len(negative) > 0:
         print
         print "Expected to fail but passed ---"
         for result in negative:
-          print " %s" % result.case.GetName()
+          print " %s in %s" % (result.case.GetName(), result.case.GetMode())
 
   def PrintFailureOutput(self, progress):
     for result in progress.failed_tests:
@@ -512,7 +521,9 @@ def Main():
   parser = BuildOptions()
   (options, args) = parser.parse_args()
   ValidateOptions(options)
-  test_suite = TestSuite(options.tests, options.enable_strict_mode)
+  test_suite = TestSuite(options.tests, 
+                         options.strict_only, 
+                         options.non_strict_only)
   test_suite.Validate()
   if options.cat:
     test_suite.Print(args)

From bd72486ff2eb41d84a2541e3cb0e107be5e1350f Mon Sep 17 00:00:00 2001
From: Mark Miller <erights@gmail.com>
Date: Tue, 13 Sep 2011 22:12:02 -0700
Subject: [PATCH 2/4] Fixed a very large number of bad test case sources,
 especially gratuitous strict mode incompatibility. Too many to continue
 fixing manually this way. Don't know what to do about that.

---
 .../7.4_Comments/S7.4_A5.js                   |  24 +--
 .../7.4_Comments/S7.4_A6.js                   |  16 +-
 .../7.5.1_Reserved_Words/S7.5.1_A2.js         | 171 +++++++++---------
 .../S7.5.3_A1.1.js                            |   2 +-
 .../S7.5.3_A1.10.js                           |   4 +-
 .../S7.5.3_A1.11.js                           |   4 +-
 .../S7.5.3_A1.12.js                           |   2 +-
 .../S7.5.3_A1.13.js                           |   2 +-
 .../S7.5.3_A1.14.js                           |   2 +-
 .../S7.5.3_A1.15.js                           |   4 +-
 .../S7.5.3_A1.15ns.js                         |   3 +-
 .../S7.5.3_A1.16.js                           |   4 +-
 .../S7.5.3_A1.17.js                           |   2 +-
 .../S7.5.3_A1.18.js                           |   2 +-
 .../S7.5.3_A1.18ns.js                         |   3 +-
 .../S7.5.3_A1.19.js                           |   2 +-
 .../S7.5.3_A1.2.js                            |   2 +-
 .../S7.5.3_A1.20.js                           |   2 +-
 .../S7.5.3_A1.21.js                           |   2 +-
 .../S7.5.3_A1.21ns.js                         |   3 +-
 .../S7.5.3_A1.22.js                           |   2 +-
 .../S7.5.3_A1.22ns.js                         |   3 +-
 .../S7.5.3_A1.23.js                           |   2 +-
 .../S7.5.3_A1.23ns.js                         |   3 +-
 .../S7.5.3_A1.24.js                           |   2 +-
 .../S7.5.3_A1.24ns.js                         |   3 +-
 .../S7.5.3_A1.25.js                           |   2 +-
 .../S7.5.3_A1.26.js                           |   2 +-
 .../S7.5.3_A1.26ns.js                         |   3 +-
 .../S7.5.3_A1.27.js                           |   4 +-
 .../S7.5.3_A1.28.js                           |   2 +-
 .../S7.5.3_A1.29.js                           |   2 +-
 .../S7.5.3_A1.3.js                            |   2 +-
 .../S7.5.3_A1.30.js                           |   2 +-
 .../S7.5.3_A1.31.js                           |   2 +-
 .../S7.5.3_A1.4.js                            |   2 +-
 .../S7.5.3_A1.5.js                            |   4 +-
 .../S7.5.3_A1.6.js                            |   4 +-
 .../S7.5.3_A1.7.js                            |   4 +-
 .../S7.5.3_A1.8.js                            |   2 +-
 .../S7.5.3_A1.9.js                            |   4 +-
 .../7.6_Identifiers/S7.6_A4.1_T1.js           |  52 +++---
 .../7.6_Identifiers/S7.6_A4.1_T2.js           |  52 +++---
 .../7.6_Identifiers/S7.6_A4.2_T1.js           |  66 +++----
 .../7.6_Identifiers/S7.6_A4.2_T2.js           |  66 +++----
 .../7.6_Identifiers/S7.6_A4.3_T1.js           |  20 +-
 .../7.8.4_String_Literals/S7.8.4_A2.1_T1.js   |   6 +-
 .../7.8.4_String_Literals/S7.8.4_A2.1_T2.js   |   6 +-
 .../7.8.4_String_Literals/S7.8.4_A2.2_T1.js   |   6 +-
 .../7.8.4_String_Literals/S7.8.4_A2.2_T2.js   |   6 +-
 .../7.8.4_String_Literals/S7.8.4_A2.3_T1.js   |   6 +-
 .../7.8.4_String_Literals/S7.8.4_A4.2_T1.js   |   8 +-
 .../7.8.4_String_Literals/S7.8.4_A4.2_T3.js   |   8 +-
 .../7.8.4_String_Literals/S7.8.4_A4.2_T5.js   |   8 +-
 .../7.8.4_String_Literals/S7.8.4_A4.2_T7.js   |   8 +-
 .../7.8.4_String_Literals/S7.8.4_A4.3_T7.js   |  12 +-
 .../7.8.4_String_Literals/S7.8.4_A6.1_T2.js   |   6 +-
 .../7.8.4_String_Literals/S7.8.4_A6.1_T3.js   |   6 +-
 .../7.8.4_String_Literals/S7.8.4_A7.1_T2.js   |   6 +-
 .../7.8.4_String_Literals/S7.8.4_A7.1_T3.js   |   6 +-
 .../S7.8.5_A1.1_T2.js                         |  48 ++---
 .../S7.8.5_A2.1_T2.js                         |  48 ++---
 .../S7.8.5_A2.4_T2.js                         |  48 ++---
 .../S7.9_A11_T1.js                            |   2 +-
 .../S7.9_A11_T10.js                           |   2 +-
 .../S7.9_A11_T11.js                           |   4 +-
 .../S7.9_A11_T2.js                            |   6 +-
 .../S7.9_A11_T3.js                            |   4 +-
 .../S7.9_A11_T4.js                            |   2 +-
 .../S7.9_A11_T5.js                            |   2 +-
 .../S7.9_A11_T6.js                            |   4 +-
 .../S7.9_A11_T7.js                            |   4 +-
 .../S7.9_A11_T8.js                            |   4 +-
 .../S7.9_A11_T9.js                            |   4 +-
 .../S7.9_A5.7_T1.js                           |   2 +-
 .../S7.9_A5.8_T1.js                           |   6 +-
 .../S7.9_A5.9_T1.js                           |   4 +-
 .../08_Types/8.2_The_Null_Type/S8.2_A1_T2.js  |   4 +-
 .../S8.6.2_A2.js                              |   7 +-
 .../S8.6.2_A5_T1.js                           |   2 +-
 .../S8.6.2_A5_T2.js                           |   2 +-
 .../S8.6.2_A5_T3.js                           |   4 +-
 .../S8.6.2_A5_T4.js                           |   2 +-
 .../8.6_The_Object_Type/S8.6_A4_T1.js         |   8 +-
 .../8.7_The_Reference_Type/S8.7.1_A2.js       |   3 +-
 .../9.9_ToObject/S9.9_A1.js                   |  11 +-
 .../9.9_ToObject/S9.9_A2.js                   |  11 +-
 .../S10.1.3_A2.js                             |   5 +-
 .../S10.1.3_A4_T1.js                          |  11 +-
 .../S10.1.4_A1_T5.js                          |   5 +-
 .../S10.1.4_A1_T6.js                          |   5 +-
 .../S10.1.4_A1_T7.js                          |   7 +-
 .../S10.1.4_A1_T8.js                          |   5 +-
 .../S10.1.4_A1_T9.js                          |   5 +-
 .../10.1.8_Arguments_Object/S10.1.8_A3_T3.js  |   9 +-
 .../10.1.8_Arguments_Object/S10.1.8_A3_T4.js  |   9 +-
 .../10.1.8_Arguments_Object/S10.1.8_A4.js     |   3 +-
 .../10.1.8_Arguments_Object/S10.1.8_A5_T4.js  |  10 +-
 .../10.1_Definitions/S10.1.6_A1_T1.js         |   5 +-
 .../10.1_Definitions/S10.1.6_A1_T3.js         |   1 +
 .../10.2.1_Global_Code/S10.2.1_A1_T1.js       |   5 +-
 .../10.2.1_Global_Code/S10.2.1_A1_T2.js       |   3 +-
 .../11.10.1_AND_Operator/S11.10.1_A2.4_T3.js  |   5 +-
 .../11.10.2_XOR_Operator/S11.10.2_A2.4_T3.js  |   5 +-
 .../11.10.3_OR_Operator/S11.10.3_A2.4_T3.js   |   5 +-
 .../S11.11.1_A2.4_T3.js                       |   5 +-
 .../S11.11.2_A2.4_T3.js                       |   5 +-
 .../11.13.1_Simple_Assignment/S11.13.1_A1.js  |   5 +-
 .../11.1.1_The_this_Keyword/S11.1.1_A2.js     |   7 +-
 .../11.1.1_The_this_Keyword/S11.1.1_A3.1.js   |   5 +-
 .../11.1.1_The_this_Keyword/S11.1.1_A3.2.js   |   5 +-
 .../11.1.1_The_this_Keyword/S11.1.1_A4.1.js   |   6 +-
 .../11.1.1_The_this_Keyword/S11.1.1_A4.2.js   |   8 +-
 .../12.7_The_continue_Statement/S12.7_A3.js   |   2 +-
 .../S13.2.1_A7_T3.js                          |   6 +-
 .../S13.2.2_A14.js                            |   7 +-
 116 files changed, 555 insertions(+), 523 deletions(-)

diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.4_Comments/S7.4_A5.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.4_Comments/S7.4_A5.js
index eb0eea8cdb..7218e3879b 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.4_Comments/S7.4_A5.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.4_Comments/S7.4_A5.js
@@ -9,20 +9,20 @@
 */
 
 //CHECK
-errorCount = 0;
-count = 0;
+var errorCount = 0;
+var count = 0;
 var hex = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"];
-for (i1 = 0; i1 < 16; i1++) {
-  for (i2 = 0; i2 < 16; i2++) {
-    for (i3 = 0; i3 < 16; i3++) {
-      for (i4 = 0; i4 < 16; i4++) {
-        try {    
+for (var i1 = 0; i1 < 16; i1++) {
+  for (var i2 = 0; i2 < 16; i2++) {
+    for (var i3 = 0; i3 < 16; i3++) {
+      for (var i4 = 0; i4 < 16; i4++) {
+        try {
           var uu = hex[i1] + hex[i2] + hex[i3] + hex[i4];
           var xx = String.fromCharCode("0x" + uu);
           var LineTerminators = ((uu === "000A") || (uu === "000D") || (uu === "2028") || (uu === "2029"));
-          var yy = 0;     
-          eval("//var " + xx + "yy = -1");          
-          if (LineTerminators !== true) { 
+          var yy = 0;
+          eval("//var " + xx + "yy = -1");
+          if (LineTerminators !== true) {
             if (yy !== 0) {
               $ERROR('#' + uu + ' ');
               errorCount++;
@@ -38,11 +38,11 @@ for (i1 = 0; i1 < 16; i1++) {
           errorCount++;
         }
         count++;
-      }  
+      }
     }
   }
 }
 
-if (errorCount > 0) {    
+if (errorCount > 0) {
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count);
 }
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.4_Comments/S7.4_A6.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.4_Comments/S7.4_A6.js
index 159e663223..ceffd99b87 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.4_Comments/S7.4_A6.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.4_Comments/S7.4_A6.js
@@ -5,29 +5,29 @@
  * @name: S7.4_A6;
  * @section: 7.4;
  * @assertion: If multi line comments csn not nest, they can contain any Unicode character;
- * @description: "var"+ yy+ "xx = 1", insert instead of yy all Unicode characters; 
+ * @description: "var"+ yy+ "xx = 1", insert instead of yy all Unicode characters;
 */
 
 //CHECK
-errorCount = 0;
-count = 0;
-for (indexI = 0; indexI <= 65535; indexI++) {
+var errorCount = 0;
+var count = 0;
+for (var indexI = 0; indexI <= 65535; indexI++) {
   try {
-    var xx = 0;    
+    var xx = 0;
     eval("/*var " + String.fromCharCode(indexI) + "xx = 1*/");
     var hex = decimalToHexString(indexI);
     if (xx !== 0) {
       $ERROR('#' + hex + ' ');
       errorCount++;
-    }    
+    }
   } catch (e){
     $ERROR('#' + hex + ' ');
     errorCount++;
   }
   count++;
-}  
+}
 
-if (errorCount > 0) {    
+if (errorCount > 0) {
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count);
 }
 
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.1_Reserved_Words/S7.5.1_A2.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.1_Reserved_Words/S7.5.1_A2.js
index b58498dedb..405a1bed38 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.1_Reserved_Words/S7.5.1_A2.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.1_Reserved_Words/S7.5.1_A2.js
@@ -4,118 +4,117 @@
 /**
  * @name: S7.5.1_A2;
  * @section: 7.5.1;
- * @assertion: List of words that are not reserved; 
+ * @assertion: List of words that are not reserved;
  * @description: Try assign 1 for not reserved words;
 */
 
 // a
-and = 1;
-and_eq = 1;
-as = 1;
-asm = 1; 
-assert = 1;
-auto = 1;
+var and = 1;
+var and_eq = 1;
+var as = 1;
+var asm = 1;
+var assert = 1;
+var auto = 1;
 // b
-base = 1;
-bitand = 1;
-bitor = 1;
-bool = 1;
-byvalue = 1;
+var base = 1;
+var bitand = 1;
+var bitor = 1;
+var bool = 1;
+var byvalue = 1;
 // c
-checked = 1;
-clone = 1;
-comment = 1;
-compl = 1;
-const_cast = 1;
+var checked = 1;
+var clone = 1;
+var comment = 1;
+var compl = 1;
+var const_cast = 1;
 // d
-decimal = 1;
-delegate = 1;
-dynamic_cast = 1;
+var decimal = 1;
+var delegate = 1;
+var dynamic_cast = 1;
 // e
-explicit = 1;
-extern = 1;
-equals = 1;
-event = 1;
+var explicit = 1;
+var extern = 1;
+var equals = 1;
+var event = 1;
 // f
-finalize = 1;
-fixed = 1;
-friend = 1;
-foreach = 1;
-future = 1;
+var finalize = 1;
+var fixed = 1;
+var friend = 1;
+var foreach = 1;
+var future = 1;
 // g
-getClass = 1;
-generic = 1;
+var getClass = 1;
+var generic = 1;
 // h
-hashCode = 1;
+var hashCode = 1;
 // i
-implicit = 1;
-infinity = 1;
-inline = 1;
-inner = 1;
-internal = 1;
-is = 1;
+var implicit = 1;
+var infinity = 1;
+var inline = 1;
+var inner = 1;
+var internal = 1;
+var is = 1;
 // j
 // k
 // l
-lock = 1;
+var lock = 1;
 // m
-mutable = 1;
+var mutable = 1;
 // n
-NaN = 1;
-namespace = 1;
-not = 1;
-notify = 1;
-notifyAll = 1;
-not_eq = 1;
+var namespace = 1;
+var not = 1;
+var notify = 1;
+var notifyAll = 1;
+var not_eq = 1;
 // o
-object = 1;
-operator = 1;
-or = 1;
-or_eq = 1;
-out = 1;
-outer = 1;
-override = 1;
+var object = 1;
+var operator = 1;
+var or = 1;
+var or_eq = 1;
+var out = 1;
+var outer = 1;
+var override = 1;
 // p
-params = 1;
+var params = 1;
 // q
 // r
-readonly = 1;
-reinterpret_cast = 1;
-ref = 1;
-register = 1;
+var readonly = 1;
+var reinterpret_cast = 1;
+var ref = 1;
+var register = 1;
 
 // s
-sbyte = 1;
-signed = 1;
-sizeof = 1;
-stackalloc = 1;
-static_cast = 1;
-string = 1;
-strictfp = 1;
-struct = 1;
+var sbyte = 1;
+var signed = 1;
+var sizeof = 1;
+var stackalloc = 1;
+var static_cast = 1;
+var string = 1;
+var strictfp = 1;
+var struct = 1;
 // t
-template = 1;
-toString = 1;
-typedef = 1;
-typeid = 1;
+var template = 1;
+var toString = 1;
+var typedef = 1;
+var typeid = 1;
 // u
-uint = 1;
-unchecked = 1;
-undefiend = 1;
-union = 1;
-unsafe = 1;
-unsigned = 1;
-use = 1;
-using = 1;
-ushort = 1;
+var uint = 1;
+var unchecked = 1;
+var undefiend = 1;
+var union = 1;
+var unsafe = 1;
+var unsigned = 1;
+var use = 1;
+var using = 1;
+var ushort = 1;
 // v
-valueOf = 1;
-virtual = 1;
+var valueOf = 1;
+var virtual = 1;
 // w
-wait = 1;
-wchar_t = 1;
+var wait = 1;
+var wchar_t = 1;
 // x
-xor = 1;
-xor_eq = 1;
+var xor = 1;
+var xor_eq = 1;
 // y
-// z 
+// z
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.1.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.1.js
index d37ca0f535..cb0e9bcc74 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.1.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.1.js
@@ -8,4 +8,4 @@
  * @description: Checking if execution of "abstract=1" succeeds;
  */
 
-abstract = 1;
+var abstract = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.10.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.10.js
index cf96e6239e..1ff312bc90 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.10.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.10.js
@@ -5,8 +5,8 @@
  * @name: S7.5.3_A1.10;
  * @section: 7.5.3;
  * @assertion: The "export" token can not be used as identifier;
- * @description: Checking if execution of "export=1" fails;  
+ * @description: Checking if execution of "export=1" fails;
  * @negative
 */
 
-export = 1;
+var export = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.11.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.11.js
index e7c47e5713..24c249df7a 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.11.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.11.js
@@ -5,8 +5,8 @@
  * @name: S7.5.3_A1.11;
  * @section: 7.5.3;
  * @assertion: The "extends" token can not be used as identifier;
- * @description: Checking if execution of "extends=1" fails;  
+ * @description: Checking if execution of "extends=1" fails;
  * @negative
 */
 
-extends = 1;
+var extends = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.12.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.12.js
index 2fbba1c645..6865200099 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.12.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.12.js
@@ -8,4 +8,4 @@
  * @description: Checking if execution of "final=1" succeeds;
  */
 
-final = 1;
+var final = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.13.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.13.js
index 9e436929a0..3101cb2ef5 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.13.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.13.js
@@ -8,4 +8,4 @@
  * @description: Checking if execution of "float=1" succeeds;
 */
 
-float = 1;
+var float = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.14.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.14.js
index 6399276b5f..2cb26879e3 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.14.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.14.js
@@ -8,4 +8,4 @@
  * @description: Checking if execution of "goto=1" succeeds;
  */
 
-goto = 1;
+var goto = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.15.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.15.js
index cc74d369c1..4fccdec7af 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.15.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.15.js
@@ -7,7 +7,7 @@
  * @assertion: The "implements" token can not be used as identifier in strict code;
  * @description: Checking if execution of "implements=1" fails in strict code;
  * @negative
+ * @strict_only
  */
 
-"use strict";
-implements = 1;
\ No newline at end of file
+var implements = 1;
\ No newline at end of file
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.15ns.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.15ns.js
index a2f6d2c94b..4a69e8e5aa 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.15ns.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.15ns.js
@@ -6,6 +6,7 @@
  * @section: 7.5.3;
  * @assertion: The "implements" token can be used as identifier in non-strict code;
  * @description: Checking if execution of "implements=1" succeeds in non-strict code;
+ * @non_strict_only
  */
 
-new Function('implements = 1');
\ No newline at end of file
+var implements = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.16.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.16.js
index f294d61a7e..18efb30e41 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.16.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.16.js
@@ -4,9 +4,9 @@
 /**
  * @name: S7.5.3_A1.16;
  * @section: 7.5.3;
- * @assertion: The "import" token can not be used as identifier;  
+ * @assertion: The "import" token can not be used as identifier;
  * @description: Checking if execution of "import=1" fails;
  * @negative
 */
 
-import = 1;
+var import = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.17.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.17.js
index 5e7e72bdea..6b894155bb 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.17.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.17.js
@@ -8,4 +8,4 @@
  * @description: Checking if execution of "int=1" succeeds;
 */
 
-int = 1;
+var int = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.18.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.18.js
index a233c39896..9d64ba4caa 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.18.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.18.js
@@ -11,4 +11,4 @@
  */
 
 "use strict";
-interface = 1;
+var interface = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.18ns.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.18ns.js
index 71635216c2..f4b1cff027 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.18ns.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.18ns.js
@@ -8,6 +8,7 @@
  * non-strict code;
  * @description: Checking if execution of "interface = 1" succeeds in
  * non-strict code;
+ * @non_strict_only
  */
 
-new Function('interface = 1');
+var interface = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.19.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.19.js
index 1667d3905c..7a6ca21a02 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.19.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.19.js
@@ -8,4 +8,4 @@
  * @description: Checking if execution of "long=1" succeeds;
  */
 
-long = 1;
+var long = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.2.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.2.js
index 76c3c81c2c..26e8a39f8c 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.2.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.2.js
@@ -8,4 +8,4 @@
  * @description: Checking if execution of "boolean=1" succeeds;
  */
 
-boolean = 1;
+var boolean = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.20.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.20.js
index 979fff751e..57de0cf23c 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.20.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.20.js
@@ -8,4 +8,4 @@
  * @description: Checking if execution of "native=1" succeeds;
  */
 
-native = 1;
+var native = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.21.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.21.js
index 0cb32fc574..12a5c43cd8 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.21.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.21.js
@@ -10,4 +10,4 @@
  */
 
 "use strict";
-package = 1;
+var package = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.21ns.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.21ns.js
index a5f084cff5..c46efb5c74 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.21ns.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.21ns.js
@@ -6,6 +6,7 @@
  * @section: 7.5.3;
  * @assertion: The "package" token can be used as identifier in non-strict code;
  * @description: Checking if execution of "package=1" succeeds in non-strict code;
+ * @non_strict_only
  */
 
-new Function('package = 1');
+var package = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.22.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.22.js
index ca66532a2c..9990d6d34f 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.22.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.22.js
@@ -10,4 +10,4 @@
  */
 
 "use strict";
-private = 1;
+var private = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.22ns.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.22ns.js
index d224cef880..0b722bc64f 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.22ns.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.22ns.js
@@ -6,6 +6,7 @@
  * @section: 7.5.3;
  * @assertion: The "private" token can be used as identifier in non-strict code;
  * @description: Checking if execution of "private=1" succeeds in non-strict code;
+ * @non_strict_only
  */
 
-new Function('private = 1');
+var private = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.23.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.23.js
index d834d92f6c..0c1cd16f07 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.23.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.23.js
@@ -11,4 +11,4 @@
  */
 
 "use strict";
-protected = 1;
+var protected = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.23ns.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.23ns.js
index 6241fb2f61..c6afe569b3 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.23ns.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.23ns.js
@@ -6,6 +6,7 @@
  * @section: 7.5.3;
  * @assertion: The "protected" token can be used as identifier in non-strict code;
  * @description: Checking if execution of "protected=1" succeeds in non-strict code;
+ * @non_strict_only
  */
 
-new Function('protected = 1');
+var protected = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.24.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.24.js
index 5124862832..6eeaea3743 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.24.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.24.js
@@ -10,4 +10,4 @@
  */
 
 "use strict";
-public = 1;
+var public = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.24ns.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.24ns.js
index 7fe3f00a57..4561bf5fb9 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.24ns.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.24ns.js
@@ -6,6 +6,7 @@
  * @section: 7.5.3;
  * @assertion: The "public" token can be used as identifier in non-strict code;
  * @description: Checking if execution of "public=1" succeeds in non-strict code;
+ * @non_strict_only
  */
 
-new Function('public = 1');
+var public = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.25.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.25.js
index 10218efbcb..7b6870249f 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.25.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.25.js
@@ -8,4 +8,4 @@
  * @description: Checking if execution of "short=1" succeeds;
  */
 
-short = 1;
+var short = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.26.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.26.js
index 9823c3caf6..bdc6071109 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.26.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.26.js
@@ -10,4 +10,4 @@
 */
 
 "use strict";
-static = 1;
+var static = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.26ns.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.26ns.js
index f98cb4dafd..95cb162c8e 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.26ns.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.26ns.js
@@ -6,6 +6,7 @@
  * @section: 7.5.3;
  * @assertion: The "static" token can be used as identifier in non-strict code;
  * @description: Checking if execution of "static=1" succeeds in non-strict code;
+ * @non_strict_only
  */
 
-new Function('static = 1');
+var static = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.27.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.27.js
index 5f140e63c1..9ed4772275 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.27.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.27.js
@@ -5,8 +5,8 @@
  * @name: S7.5.3_A1.27;
  * @section: 7.5.3;
  * @assertion: The "super" token can not be used as identifier;
- * @description: Checking if execution of "super=1" fails;  
+ * @description: Checking if execution of "super=1" fails;
  * @negative
 */
 
-super = 1;
+var super = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.28.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.28.js
index d70f857abf..1b54f30c6f 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.28.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.28.js
@@ -8,4 +8,4 @@
  * @description: Checking if execution of "synchronized=1" succeeds;
 */
 
-synchronized = 1;
+var synchronized = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.29.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.29.js
index 6aa1b70e4d..892eb5177c 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.29.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.29.js
@@ -8,4 +8,4 @@
  * @description: Checking if execution of "throws=1" succeeds;
 */
 
-throws = 1;
+var throws = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.3.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.3.js
index 5d17b3639f..8d343563e4 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.3.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.3.js
@@ -8,4 +8,4 @@
  * @description: Checking if execution of "byte=1" succeeds;
  */
 
-byte = 1;
+var byte = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.30.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.30.js
index 23d1e296f5..7869f399d9 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.30.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.30.js
@@ -8,4 +8,4 @@
  * @description: Checking if execution of "transient=1" succeeds;
  */
 
-transient = 1;
+var transient = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.31.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.31.js
index 67fcbc7228..1a9a7bec04 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.31.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.31.js
@@ -8,4 +8,4 @@
  * @description: Checking if execution of "volatile=1" succeeds;
  */
 
-volatile = 1;
+var volatile = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.4.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.4.js
index 589c6b5533..9aeac262fc 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.4.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.4.js
@@ -8,4 +8,4 @@
  * @description: Checking if execution of "char=1" succeeds;
  */
 
-char = 1;
+var char = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.5.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.5.js
index 2c30d4fa6b..e4ae7d7a41 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.5.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.5.js
@@ -5,8 +5,8 @@
  * @name: S7.5.3_A1.5;
  * @section: 7.5.3;
  * @assertion: The "class" token can not be used as identifier;
- * @description: Checking if execution of "class=1" fails;  
+ * @description: Checking if execution of "class=1" fails;
  * @negative
 */
 
-class = 1;
+var class = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.6.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.6.js
index c28c893f85..db4c708e1d 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.6.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.6.js
@@ -5,8 +5,8 @@
  * @name: S7.5.3_A1.6;
  * @section: 7.5.3;
  * @assertion: The "const" token can not be used as identifier;
- * @description: Checking if execution of "const=1" fails;  
+ * @description: Checking if execution of "const=1" fails;
  * @negative
 */
 
-const = 1;
+var const = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.7.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.7.js
index e481d25bc0..2bd49aae91 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.7.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.7.js
@@ -5,8 +5,8 @@
  * @name: S7.5.3_A1.7;
  * @section: 7.5.3;
  * @assertion: The "debugger" token can not be used as identifier;
- * @description: Checking if execution of "debugger=1" fails;  
+ * @description: Checking if execution of "debugger=1" fails;
  * @negative
 */
 
-debugger = 1;
+var debugger = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.8.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.8.js
index 40e509a3e7..156500e4a8 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.8.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.8.js
@@ -8,4 +8,4 @@
  * @description: Checking if execution of "double=1" succeeds;
  */
 
-double = 1;
+var double = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.9.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.9.js
index d24d8e9285..7afa6a6e2b 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.9.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.9.js
@@ -4,9 +4,9 @@
 /**
  * @name: S7.5.3_A1.9;
  * @section: 7.5.3;
- * @assertion: The "enum" token can not be used as identifier;  
+ * @assertion: The "enum" token can not be used as identifier;
  * @description: Checking if execution of "enum=1" fails;
  * @negative
 */
 
-enum = 1;
+var enum = 1;
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.1_T1.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.1_T1.js
index 04a9ec0a71..c7f831ac65 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.1_T1.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.1_T1.js
@@ -9,107 +9,107 @@
 */
 
 //CHECK#A-Z
-\u0041 = 1;
+var \u0041 = 1;
 if (A !== 1) {
   $ERROR('#A');
 }
-\u0042 = 1;
+var \u0042 = 1;
 if (B !== 1) {
   $ERROR('#B');
 }
-\u0043 = 1;
+var \u0043 = 1;
 if (C !== 1) {
   $ERROR('#C');
 }
-\u0044 = 1;
+var \u0044 = 1;
 if (D !== 1) {
   $ERROR('#D');
 }
-\u0045 = 1;
+var \u0045 = 1;
 if (E !== 1) {
   $ERROR('#E');
 }
-\u0046 = 1;
+var \u0046 = 1;
 if (F !== 1) {
   $ERROR('#F');
 }
-\u0047 = 1;
+var \u0047 = 1;
 if (G !== 1) {
   $ERROR('#G');
 }
-\u0048 = 1;
+var \u0048 = 1;
 if (H !== 1) {
   $ERROR('#H');
 }
-\u0049 = 1;
+var \u0049 = 1;
 if (I !== 1) {
   $ERROR('#I');
 }
-\u004A = 1;
+var \u004A = 1;
 if (J !== 1) {
   $ERROR('#J');
 }
-\u004B = 1;
+var \u004B = 1;
 if (K !== 1) {
   $ERROR('#K');
 }
-\u004C = 1;
+var \u004C = 1;
 if (L !== 1) {
   $ERROR('#L');
 }
-\u004D = 1;
+var \u004D = 1;
 if (M !== 1) {
   $ERROR('#M');
 }
-\u004E = 1;
+var \u004E = 1;
 if (N !== 1) {
   $ERROR('#N');
 }
-\u004F = 1;
+var \u004F = 1;
 if (O !== 1) {
   $ERROR('#O');
 }
-\u0050 = 1;
+var \u0050 = 1;
 if (P !== 1) {
   $ERROR('#P');
 }
-\u0051 = 1;
+var \u0051 = 1;
 if (Q !== 1) {
   $ERROR('#Q');
 }
-\u0052 = 1;
+var \u0052 = 1;
 if (R !== 1) {
   $ERROR('#R');
 }
-\u0053 = 1;
+var \u0053 = 1;
 if (S !== 1) {
   $ERROR('#S');
 }
-\u0054 = 1;
+var \u0054 = 1;
 if (T !== 1) {
   $ERROR('#T');
 }
-\u0055 = 1;
+var \u0055 = 1;
 if (U !== 1) {
   $ERROR('#U');
 }
-\u0056 = 1;
+var \u0056 = 1;
 if (V !== 1) {
   $ERROR('#V');
 }
-\u0057 = 1;
+var \u0057 = 1;
 if (W !== 1) {
   $ERROR('#W');
 }
-\u0058 = 1;
+var \u0058 = 1;
 if (X !== 1) {
   $ERROR('#X');
 }
-\u0059 = 1;
+var \u0059 = 1;
 if (Y !== 1) {
   $ERROR('#Y');
 }
-\u005A = 1;
+var \u005A = 1;
 if (Z !== 1) {
   $ERROR('#Z');
 }
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.1_T2.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.1_T2.js
index 614d6b8a62..ff9109e883 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.1_T2.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.1_T2.js
@@ -9,107 +9,107 @@
 */
 
 //CHECK#a-z
-\u0061 = 1;
+var \u0061 = 1;
 if (a !== 1) {
   $ERROR('#a');
 }
-\u0062 = 1;
+var \u0062 = 1;
 if (b !== 1) {
   $ERROR('#b');
 }
-\u0063 = 1;
+var \u0063 = 1;
 if (c !== 1) {
   $ERROR('#c');
 }
-\u0064 = 1;
+var \u0064 = 1;
 if (d !== 1) {
   $ERROR('#d');
 }
-\u0065 = 1;
+var \u0065 = 1;
 if (e !== 1) {
   $ERROR('#e');
 }
-\u0066 = 1;
+var \u0066 = 1;
 if (f !== 1) {
   $ERROR('#f');
 }
-\u0067 = 1;
+var \u0067 = 1;
 if (g !== 1) {
   $ERROR('#g');
 }
-\u0068 = 1;
+var \u0068 = 1;
 if (h !== 1) {
   $ERROR('#h');
 }
-\u0069 = 1;
+var \u0069 = 1;
 if (i !== 1) {
   $ERROR('#i');
 }
-\u006A = 1;
+var \u006A = 1;
 if (j !== 1) {
   $ERROR('#j');
 }
-\u006B = 1;
+var \u006B = 1;
 if (k !== 1) {
   $ERROR('#k');
 }
-\u006C = 1;
+var \u006C = 1;
 if (l !== 1) {
   $ERROR('#l');
 }
-\u006D = 1;
+var \u006D = 1;
 if (m !== 1) {
   $ERROR('#m');
 }
-\u006E = 1;
+var \u006E = 1;
 if (n !== 1) {
   $ERROR('#n');
 }
-\u006F = 1;
+var \u006F = 1;
 if (o !== 1) {
   $ERROR('#o');
 }
-\u0070 = 1;
+var \u0070 = 1;
 if (p !== 1) {
   $ERROR('#p');
 }
-\u0071 = 1;
+var \u0071 = 1;
 if (q !== 1) {
   $ERROR('#q');
 }
-\u0072 = 1;
+var \u0072 = 1;
 if (r !== 1) {
   $ERROR('#r');
 }
-\u0073 = 1;
+var \u0073 = 1;
 if (s !== 1) {
   $ERROR('#s');
 }
-\u0074 = 1;
+var \u0074 = 1;
 if (t !== 1) {
   $ERROR('#t');
 }
-\u0075 = 1;
+var \u0075 = 1;
 if (u !== 1) {
   $ERROR('#u');
 }
-\u0076 = 1;
+var \u0076 = 1;
 if (v !== 1) {
   $ERROR('#v');
 }
-\u0077 = 1;
+var \u0077 = 1;
 if (w !== 1) {
   $ERROR('#w');
 }
-\u0078 = 1;
+var \u0078 = 1;
 if (x !== 1) {
   $ERROR('#x');
 }
-\u0079 = 1;
+var \u0079 = 1;
 if (y !== 1) {
   $ERROR('#y');
 }
-\u007A = 1;
+var \u007A = 1;
 if (z !== 1) {
   $ERROR('#z');
 }
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.2_T1.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.2_T1.js
index 12e181f209..ae72fdd81b 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.2_T1.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.2_T1.js
@@ -9,135 +9,135 @@
 */
 
 //CHECK#А-Я
-\u0410 = 1;
+var \u0410 = 1;
 if (А !== 1) {
   $ERROR('#А');
 }
-\u0411 = 1;
+var \u0411 = 1;
 if (Б !== 1) {
   $ERROR('#Б');
 }
-\u0412 = 1;
+var \u0412 = 1;
 if (В !== 1) {
   $ERROR('#В');
 }
-\u0413 = 1;
+var \u0413 = 1;
 if (Г !== 1) {
   $ERROR('#Г');
 }
-\u0414 = 1;
+var \u0414 = 1;
 if (Д !== 1) {
   $ERROR('#Д');
 }
-\u0415 = 1;
+var \u0415 = 1;
 if (Е !== 1) {
   $ERROR('#Е');
 }
-\u0416 = 1;
+var \u0416 = 1;
 if (Ж !== 1) {
   $ERROR('#Ж');
 }
-\u0417 = 1;
+var \u0417 = 1;
 if (З !== 1) {
   $ERROR('#З');
 }
-\u0418 = 1;
+var \u0418 = 1;
 if (И !== 1) {
   $ERROR('#И');
 }
-\u0419 = 1;
+var \u0419 = 1;
 if (Й !== 1) {
   $ERROR('#Й');
 }
-\u041A = 1;
+var \u041A = 1;
 if (К !== 1) {
   $ERROR('#К');
 }
-\u041B = 1;
+var \u041B = 1;
 if (Л !== 1) {
   $ERROR('#Л');
 }
-\u041C = 1;
+var \u041C = 1;
 if (М !== 1) {
   $ERROR('#М');
 }
-\u041D = 1;
+var \u041D = 1;
 if (Н !== 1) {
   $ERROR('#Н');
 }
-\u041E = 1;
+var \u041E = 1;
 if (О !== 1) {
   $ERROR('#О');
 }
-\u041F = 1;
+var \u041F = 1;
 if (П !== 1) {
   $ERROR('#П');
 }
-\u0420 = 1;
+var \u0420 = 1;
 if (Р !== 1) {
   $ERROR('#Р');
 }
-\u0421 = 1;
+var \u0421 = 1;
 if (С !== 1) {
   $ERROR('#С');
 }
-\u0422 = 1;
+var \u0422 = 1;
 if (Т !== 1) {
   $ERROR('#Т');
 }
-\u0423 = 1;
+var \u0423 = 1;
 if (У !== 1) {
   $ERROR('#У');
 }
-\u0424 = 1;
+var \u0424 = 1;
 if (Ф !== 1) {
   $ERROR('#Ф');
 }
-\u0425 = 1;
+var \u0425 = 1;
 if (Х !== 1) {
   $ERROR('#Х');
 }
-\u0426 = 1;
+var \u0426 = 1;
 if (Ц !== 1) {
   $ERROR('#Ц');
 }
-\u0427 = 1;
+var \u0427 = 1;
 if (Ч !== 1) {
   $ERROR('#Ч');
 }
-\u0428 = 1;
+var \u0428 = 1;
 if (Ш !== 1) {
   $ERROR('#Ш');
 }
-\u0429 = 1;
+var \u0429 = 1;
 if (Щ !== 1) {
   $ERROR('#Щ');
 }
-\u042A = 1;
+var \u042A = 1;
 if (Ъ !== 1) {
   $ERROR('#Ъ');
 }
-\u042B = 1;
+var \u042B = 1;
 if (Ы !== 1) {
   $ERROR('#Ы');
 }
-\u042C = 1;
+var \u042C = 1;
 if (Ь !== 1) {
   $ERROR('#Ь');
 }
-\u042D = 1;
+var \u042D = 1;
 if (Э !== 1) {
   $ERROR('#Э');
 }
-\u042E = 1;
+var \u042E = 1;
 if (Ю !== 1) {
   $ERROR('#Ю');
 }
-\u042F = 1;
+var \u042F = 1;
 if (Я !== 1) {
   $ERROR('#Я');
 }
-\u0401 = 1;
+var \u0401 = 1;
 if (Ё !== 1) {
   $ERROR('#Ё');
 }
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.2_T2.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.2_T2.js
index 6ed7c177be..7786eef309 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.2_T2.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.2_T2.js
@@ -9,135 +9,135 @@
 */
 
 //CHECK#а-я
-\u0430 = 1;
+var \u0430 = 1;
 if (а !== 1) {
   $ERROR('#а');
 }
-\u0431 = 1;
+var \u0431 = 1;
 if (б !== 1) {
   $ERROR('#б');
 }
-\u0432 = 1;
+var \u0432 = 1;
 if (в !== 1) {
   $ERROR('#в');
 }
-\u0433 = 1;
+var \u0433 = 1;
 if (г !== 1) {
   $ERROR('#г');
 }
-\u0434 = 1;
+var \u0434 = 1;
 if (д !== 1) {
   $ERROR('#д');
 }
-\u0435 = 1;
+var \u0435 = 1;
 if (е !== 1) {
   $ERROR('#е');
 }
-\u0436 = 1;
+var \u0436 = 1;
 if (ж !== 1) {
   $ERROR('#ж');
 }
-\u0437 = 1;
+var \u0437 = 1;
 if (з !== 1) {
   $ERROR('#з');
 }
-\u0438 = 1;
+var \u0438 = 1;
 if (и !== 1) {
   $ERROR('#и');
 }
-\u0439 = 1;
+var \u0439 = 1;
 if (й !== 1) {
   $ERROR('#й');
 }
-\u043A = 1;
+var \u043A = 1;
 if (к !== 1) {
   $ERROR('#к');
 }
-\u043B = 1;
+var \u043B = 1;
 if (л !== 1) {
   $ERROR('#л');
 }
-\u043C = 1;
+var \u043C = 1;
 if (м !== 1) {
   $ERROR('#м');
 }
-\u043D = 1;
+var \u043D = 1;
 if (н !== 1) {
   $ERROR('#н');
 }
-\u043E = 1;
+var \u043E = 1;
 if (о !== 1) {
   $ERROR('#о');
 }
-\u043F = 1;
+var \u043F = 1;
 if (п !== 1) {
   $ERROR('#п');
 }
-\u0440 = 1;
+var \u0440 = 1;
 if (р !== 1) {
   $ERROR('#р');
 }
-\u0441 = 1;
+var \u0441 = 1;
 if (с !== 1) {
   $ERROR('#с');
 }
-\u0442 = 1;
+var \u0442 = 1;
 if (т !== 1) {
   $ERROR('#т');
 }
-\u0443 = 1;
+var \u0443 = 1;
 if (у !== 1) {
   $ERROR('#у');
 }
-\u0444 = 1;
+var \u0444 = 1;
 if (ф !== 1) {
   $ERROR('#ф');
 }
-\u0445 = 1;
+var \u0445 = 1;
 if (х !== 1) {
   $ERROR('#х');
 }
-\u0446 = 1;
+var \u0446 = 1;
 if (ц !== 1) {
   $ERROR('#ц');
 }
-\u0447 = 1;
+var \u0447 = 1;
 if (ч !== 1) {
   $ERROR('#ч');
 }
-\u0448 = 1;
+var \u0448 = 1;
 if (ш !== 1) {
   $ERROR('#ш');
 }
-\u0449 = 1;
+var \u0449 = 1;
 if (щ !== 1) {
   $ERROR('#щ');
 }
-\u044A = 1;
+var \u044A = 1;
 if (ъ !== 1) {
   $ERROR('#ъ');
 }
-\u044B = 1;
+var \u044B = 1;
 if (ы !== 1) {
   $ERROR('#ы');
 }
-\u044C = 1;
+var \u044C = 1;
 if (ь !== 1) {
   $ERROR('#ь');
 }
-\u044D = 1;
+var \u044D = 1;
 if (э !== 1) {
   $ERROR('#э');
 }
-\u044E = 1;
+var \u044E = 1;
 if (ю !== 1) {
   $ERROR('#ю');
 }
-\u044F = 1;
+var \u044F = 1;
 if (я !== 1) {
   $ERROR('#я');
 }
-\u0451 = 1;
+var \u0451 = 1;
 if (ё !== 1) {
   $ERROR('#ё');
 }
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.3_T1.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.3_T1.js
index 1bb0eb42eb..674b7a5f85 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.3_T1.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.3_T1.js
@@ -9,43 +9,43 @@
 */
 
 //CHECK#0-9
-$\u0030 = 0;
+var $\u0030 = 0;
 if ($0 !== 0) {
   $ERROR('#0: $\\u0030 = 0; $0 === 0');
 }
-$\u0031 = 1;
+var $\u0031 = 1;
 if ($1 !== 1) {
   $ERROR('#1: $\\u0031 = 1; $1 === 1');
 }
-$\u0032 = 2;
+var $\u0032 = 2;
 if ($2 !== 2) {
   $ERROR('#2: $\\u0032 = 2; $2 === 2');
 }
-$\u0033 = 3;
+var $\u0033 = 3;
 if ($3 !== 3) {
   $ERROR('#3: $\\u0033 = 3; $3 === 3');
 }
-$\u0034 = 4;
+var $\u0034 = 4;
 if ($4 !== 4) {
   $ERROR('#4: $\\u0034 = 4; $4 === 4');
 }
-$\u0035 = 5;
+var $\u0035 = 5;
 if ($5 !== 5) {
   $ERROR('#5: $\\u0035 = 5; $5 === 5');
 }
-$\u0036 = 6;
+var $\u0036 = 6;
 if ($6 !== 6) {
   $ERROR('#6: $\\u0036 = 6; $6 === 6');
 }
-$\u0037 = 7;
+var $\u0037 = 7;
 if ($7 !== 7) {
   $ERROR('#7: $\\u0037 = 7; $7 === 7');
 }
-$\u0038 = 8;
+var $\u0038 = 8;
 if ($8 !== 8) {
   $ERROR('#8: $\\u0038 = 8; $8 === 8');
 }
-$\u0039 = 9;
+var $\u0039 = 9;
 if ($9 !== 9) {
   $ERROR('#9: $\\u0039 = 9; $9 === 9');
 }
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.1_T1.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.1_T1.js
index 81c76ad07d..a7d6a14454 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.1_T1.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.1_T1.js
@@ -9,9 +9,9 @@
 */
 
 //CHECK#A-Z
-unicode = ["\u0041", "\u0042", "\u0043", "\u0044", "\u0045", "\u0046", "\u0047", "\u0048", "\u0049", "\u004A", "\u004B", "\u004C", "\u004D", "\u004E", "\u004F", "\u0050", "\u0051", "\u0052", "\u0053", "\u0054", "\u0055", "\u0056", "\u0057", "\u0058", "\u0059", "\u005A"];
-character = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"];
-for (index = 0; index <= 25; index++) {
+var unicode = ["\u0041", "\u0042", "\u0043", "\u0044", "\u0045", "\u0046", "\u0047", "\u0048", "\u0049", "\u004A", "\u004B", "\u004C", "\u004D", "\u004E", "\u004F", "\u0050", "\u0051", "\u0052", "\u0053", "\u0054", "\u0055", "\u0056", "\u0057", "\u0058", "\u0059", "\u005A"];
+var character = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"];
+for (var index = 0; index <= 25; index++) {
   if (unicode[index] !== character[index]) {
     $ERROR('#' + character[index] + ' ');
   }
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.1_T2.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.1_T2.js
index 963cc12943..0443209cce 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.1_T2.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.1_T2.js
@@ -9,9 +9,9 @@
 */
 
 //CHECK#a-z
-hex = ["\u0061", "\u0062", "\u0063", "\u0064", "\u0065", "\u0066", "\u0067", "\u0068", "\u0069", "\u006A", "\u006B", "\u006C", "\u006D", "\u006E", "\u006F", "\u0070", "\u0071", "\u0072", "\u0073", "\u0074", "\u0075", "\u0076", "\u0077", "\u0078", "\u0079", "\u007A"];
-character = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
-for (index = 0; index <= 25; index++) {
+var hex = ["\u0061", "\u0062", "\u0063", "\u0064", "\u0065", "\u0066", "\u0067", "\u0068", "\u0069", "\u006A", "\u006B", "\u006C", "\u006D", "\u006E", "\u006F", "\u0070", "\u0071", "\u0072", "\u0073", "\u0074", "\u0075", "\u0076", "\u0077", "\u0078", "\u0079", "\u007A"];
+var character = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
+for (var index = 0; index <= 25; index++) {
   if (hex[index] !== character[index]) {
     $ERROR('#' + character[index] + ' ');
   }
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.2_T1.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.2_T1.js
index 1abea74aa1..d964362fe6 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.2_T1.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.2_T1.js
@@ -9,9 +9,9 @@
 */
 
 //CHECK#А-Я
-unicode = ["\u0410", "\u0411", "\u0412", "\u0413", "\u0414", "\u0415", "\u0416", "\u0417", "\u0418", "\u0419", "\u041A", "\u041B", "\u041C", "\u041D", "\u041E", "\u041F", "\u0420", "\u0421", "\u0422", "\u0423", "\u0424", "\u0425", "\u0426", "\u0427", "\u0428", "\u0429", "\u042A", "\u042B", "\u042C", "\u042D", "\u042E", "\u042F", "\u0401"];
-character = ["А", "Б", "В", "Г", "Д", "Е", "Ж", "З", "И", "Й", "К", "Л", "М", "Н", "О", "П", "Р", "С", "Т", "У", "Ф", "Х", "Ц", "Ч", "Ш", "Щ", "Ъ", "Ы", "Ь", "Э", "Ю", "Я", "Ё"];
-for (index = 0; index <= 32; index++) {
+var unicode = ["\u0410", "\u0411", "\u0412", "\u0413", "\u0414", "\u0415", "\u0416", "\u0417", "\u0418", "\u0419", "\u041A", "\u041B", "\u041C", "\u041D", "\u041E", "\u041F", "\u0420", "\u0421", "\u0422", "\u0423", "\u0424", "\u0425", "\u0426", "\u0427", "\u0428", "\u0429", "\u042A", "\u042B", "\u042C", "\u042D", "\u042E", "\u042F", "\u0401"];
+var character = ["А", "Б", "В", "Г", "Д", "Е", "Ж", "З", "И", "Й", "К", "Л", "М", "Н", "О", "П", "Р", "С", "Т", "У", "Ф", "Х", "Ц", "Ч", "Ш", "Щ", "Ъ", "Ы", "Ь", "Э", "Ю", "Я", "Ё"];
+for (var index = 0; index <= 32; index++) {
   if (unicode[index] !== character[index]) {
     $ERROR('#' + character[index] + ' ');
   }
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.2_T2.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.2_T2.js
index 1a2f59b6c6..ab8e1083f5 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.2_T2.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.2_T2.js
@@ -9,9 +9,9 @@
 */
 
 //CHECK#а-я
-unicode = ["\u0430", "\u0431", "\u0432", "\u0433", "\u0434", "\u0435", "\u0436", "\u0437", "\u0438", "\u0439", "\u043A", "\u043B", "\u043C", "\u043D", "\u043E", "\u043F", "\u0440", "\u0441", "\u0442", "\u0443", "\u0444", "\u0445", "\u0446", "\u0447", "\u0448", "\u0449", "\u044A", "\u044B", "\u044C", "\u044D", "\u044E", "\u044F", "\u0451"];
-character = ["а", "б", "в", "г", "д", "е", "ж", "з", "и", "й", "к", "л", "м", "н", "о", "п", "р", "с", "т", "у", "ф", "х", "ц", "ч", "ш", "щ", "ъ", "ы", "ь", "э", "ю", "я", "ё"];
-for (index = 0; index <= 32; index++) {
+var unicode = ["\u0430", "\u0431", "\u0432", "\u0433", "\u0434", "\u0435", "\u0436", "\u0437", "\u0438", "\u0439", "\u043A", "\u043B", "\u043C", "\u043D", "\u043E", "\u043F", "\u0440", "\u0441", "\u0442", "\u0443", "\u0444", "\u0445", "\u0446", "\u0447", "\u0448", "\u0449", "\u044A", "\u044B", "\u044C", "\u044D", "\u044E", "\u044F", "\u0451"];
+var character = ["а", "б", "в", "г", "д", "е", "ж", "з", "и", "й", "к", "л", "м", "н", "о", "п", "р", "с", "т", "у", "ф", "х", "ц", "ч", "ш", "щ", "ъ", "ы", "ь", "э", "ю", "я", "ё"];
+for (var index = 0; index <= 32; index++) {
   if (unicode[index] !== character[index]) {
     $ERROR('#' + character[index] + ' ');
   }
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.3_T1.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.3_T1.js
index 31129c517d..bdf8765d82 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.3_T1.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.3_T1.js
@@ -9,9 +9,9 @@
 */
 
 //CHECK#0-9
-unicode = ["\u0030", "\u0031", "\u0032", "\u0033", "\u0034", "\u0035", "\u0036", "\u0037", "\u0038", "\u0039"];
-character = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
-for (index = 0; index <= 9; index++) {
+var unicode = ["\u0030", "\u0031", "\u0032", "\u0033", "\u0034", "\u0035", "\u0036", "\u0037", "\u0038", "\u0039"];
+var character = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
+for (var index = 0; index <= 9; index++) {
   if (unicode[index] !== character[index]) {
     $ERROR('#' + character[index] + ' ');
   }
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T1.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T1.js
index 0668fd4978..3fefb580a6 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T1.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T1.js
@@ -4,14 +4,14 @@
 /**
  * @name: S7.8.4_A4.2_T1;
  * @section: 7.8.4;
- * @assertion: CharacterEscapeSequnce :: NonEscapeSequence;  
+ * @assertion: CharacterEscapeSequnce :: NonEscapeSequence;
  * @description: NonEscapeSequence :: ENGLISH CAPITAL ALPHABET;
 */
 
 //CHECK#A-Z
-CharacterCode = [0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A];
-NonEscapeCharacter = ["\A", "\B", "\C", "\D", "\E", "\F", "\G", "\H", "\I", "\J", "\K", "\L", "\M", "\N", "\O", "\P", "\Q", "\R", "\S", "\T", "\U", "\V", "\W", "\X", "\Y", "\Z"];
-for (index = 0; index <= 25; index++) {
+var CharacterCode = [0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A];
+var NonEscapeCharacter = ["\A", "\B", "\C", "\D", "\E", "\F", "\G", "\H", "\I", "\J", "\K", "\L", "\M", "\N", "\O", "\P", "\Q", "\R", "\S", "\T", "\U", "\V", "\W", "\X", "\Y", "\Z"];
+for (var index = 0; index <= 25; index++) {
   if (String.fromCharCode(CharacterCode[index]) !== NonEscapeCharacter[index]) {
     $ERROR('#' + NonEscapeCharacter[index] + ' ');
   }
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T3.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T3.js
index 426ce8b9dd..abc7a298a3 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T3.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T3.js
@@ -4,14 +4,14 @@
 /**
  * @name: S7.8.4_A4.2_T3;
  * @section: 7.8.4;
- * @assertion: CharacterEscapeSequnce :: NonEscapeSequence;  
+ * @assertion: CharacterEscapeSequnce :: NonEscapeSequence;
  * @description: NonEscapeSequence :: ENGLISH SMALL ALPHABET;
 */
 
 //CHECK#a-z without b, f, n, r, t, v, x, u
-CharacterCode = [0x0061, 0x0063, 0x0064, 0x0065, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006F, 0x0070, 0x0071, 0x0073, 0x0077, 0x0079, 0x007A];
-NonEscapeCharacter = ["\a", "\c", "\d", "\e", "\g", "\h", "\i", "\j", "\k", "\l", "\m", "\o", "\p", "\q", "\s", "\w", "\y", "\z"];
-for (index = 0; index <= 17; index++) {
+var CharacterCode = [0x0061, 0x0063, 0x0064, 0x0065, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006F, 0x0070, 0x0071, 0x0073, 0x0077, 0x0079, 0x007A];
+var NonEscapeCharacter = ["\a", "\c", "\d", "\e", "\g", "\h", "\i", "\j", "\k", "\l", "\m", "\o", "\p", "\q", "\s", "\w", "\y", "\z"];
+for (var index = 0; index <= 17; index++) {
   if (String.fromCharCode(CharacterCode[index]) !== NonEscapeCharacter[index]) {
     $ERROR('#' + NonEscapeCharacter[index] + ' ');
   }
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T5.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T5.js
index 2a96ff509c..b673dadc32 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T5.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T5.js
@@ -4,14 +4,14 @@
 /**
  * @name: S7.8.4_A4.2_T5;
  * @section: 7.8.4;
- * @assertion: CharacterEscapeSequnce :: NonEscapeSequence; 
+ * @assertion: CharacterEscapeSequnce :: NonEscapeSequence;
  * @description: NonEscapeSequence :: RUSSIAN CAPITAL ALPHABET;
 */
 
 //CHECK#А-Я
-CharacterCode = [0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, 0x0401];
-NonEscapeCharacter = ["\А", "\Б", "\В", "\Г", "\Д", "\Е", "\Ж", "\З", "\И", "\Й", "\К", "\Л", "\М", "\Н", "\О", "\П", "\Р", "\С", "\Т", "\У", "\Ф", "\Х", "\Ц", "\Ч", "\Ш", "\Щ", "\Ъ", "\Ы", "\Ь", "\Э", "\Ю", "\Я", "\Ё"];
-for (index = 0; index <= 32; index++) {
+var CharacterCode = [0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, 0x0401];
+var NonEscapeCharacter = ["\А", "\Б", "\В", "\Г", "\Д", "\Е", "\Ж", "\З", "\И", "\Й", "\К", "\Л", "\М", "\Н", "\О", "\П", "\Р", "\С", "\Т", "\У", "\Ф", "\Х", "\Ц", "\Ч", "\Ш", "\Щ", "\Ъ", "\Ы", "\Ь", "\Э", "\Ю", "\Я", "\Ё"];
+for (var index = 0; index <= 32; index++) {
   if (String.fromCharCode(CharacterCode[index]) !== NonEscapeCharacter[index]) {
     $ERROR('#' + NonEscapeCharacter[index] + ' ');
   }
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T7.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T7.js
index f42cde27ef..c63ceacbca 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T7.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T7.js
@@ -4,14 +4,14 @@
 /**
  * @name: S7.8.4_A4.2_T7;
  * @section: 7.8.4;
- * @assertion: CharacterEscapeSequnce :: NonEscapeSequence; 
+ * @assertion: CharacterEscapeSequnce :: NonEscapeSequence;
  * @description: NonEscapeSequence :: RUSSIAN SMALL ALPHABET;
 */
 
 //CHECK#а-я
-CharacterCode = [0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, 0x0451];
-NonEscapeCharacter = ["\а", "\б", "\в", "\г", "\д", "\е", "\ж", "\з", "\и", "\й", "\к", "\л", "\м", "\н", "\о", "\п", "\р", "\с", "\т", "\у", "\ф", "\х", "\ц", "\ч", "\ш", "\щ", "\ъ", "\ы", "\ь", "\э", "\ю", "\я", "\ё"];
-for (index = 0; index <= 32; index++) {
+var CharacterCode = [0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, 0x0451];
+var NonEscapeCharacter = ["\а", "\б", "\в", "\г", "\д", "\е", "\ж", "\з", "\и", "\й", "\к", "\л", "\м", "\н", "\о", "\п", "\р", "\с", "\т", "\у", "\ф", "\х", "\ц", "\ч", "\ш", "\щ", "\ъ", "\ы", "\ь", "\э", "\ю", "\я", "\ё"];
+for (var index = 0; index <= 32; index++) {
   if (String.fromCharCode(CharacterCode[index]) !== NonEscapeCharacter[index]) {
     $ERROR('#' + NonEscapeCharacter[index] + ' ');
   }
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.3_T7.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.3_T7.js
index e4e9db352a..6ce01acb2c 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.3_T7.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.3_T7.js
@@ -10,26 +10,26 @@
 
 //CHECK#bfnrtv
 if ("b" === "\b") {
-  $ERROR('#b')
+  $ERROR('#b');
 }
 
 if ("f" === "\f") {
-  $ERROR('#f')
+  $ERROR('#f');
 }
 
 if ("n" === "\n") {
-  $ERROR('#n')
+  $ERROR('#n');
 }
 
 if ("r" === "\r") {
-  $ERROR('#r')
+  $ERROR('#r');
 }
 
 if ("t" === "\t") {
-  $ERROR('#t')
+  $ERROR('#t');
 }
 
 if ("v" === "\v") {
-  $ERROR('#v')
+  $ERROR('#v');
 }
 
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A6.1_T2.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A6.1_T2.js
index 4825c125e3..19a52d278b 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A6.1_T2.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A6.1_T2.js
@@ -9,9 +9,9 @@
 */
 
 //CHECK#A-Z
-hex = ["\x41", "\x42", "\x43", "\x44", "\x45", "\x46", "\x47", "\x48", "\x49", "\x4A", "\x4B", "\x4C", "\x4D", "\x4E", "\x4F", "\x50", "\x51", "\x52", "\x53", "\x54", "\x55", "\x56", "\x57", "\x58", "\x59", "\x5A"];
-character = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"];
-for (index = 0; index <= 25; index++) {
+var hex = ["\x41", "\x42", "\x43", "\x44", "\x45", "\x46", "\x47", "\x48", "\x49", "\x4A", "\x4B", "\x4C", "\x4D", "\x4E", "\x4F", "\x50", "\x51", "\x52", "\x53", "\x54", "\x55", "\x56", "\x57", "\x58", "\x59", "\x5A"];
+var character = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"];
+for (var index = 0; index <= 25; index++) {
   if (hex[index] !== character[index]) {
     $ERROR('#' + character[index] + ' ');
   }
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A6.1_T3.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A6.1_T3.js
index b9513c937b..f5977521d8 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A6.1_T3.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A6.1_T3.js
@@ -9,9 +9,9 @@
 */
 
 //CHECK#a-z
-hex = ["\x61", "\x62", "\x63", "\x64", "\x65", "\x66", "\x67", "\x68", "\x69", "\x6A", "\x6B", "\x6C", "\x6D", "\x6E", "\x6F", "\x70", "\x71", "\x72", "\x73", "\x74", "\x75", "\x76", "\x77", "\x78", "\x79", "\x7A"];
-character = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
-for (index = 0; index <= 25; index++) {
+var hex = ["\x61", "\x62", "\x63", "\x64", "\x65", "\x66", "\x67", "\x68", "\x69", "\x6A", "\x6B", "\x6C", "\x6D", "\x6E", "\x6F", "\x70", "\x71", "\x72", "\x73", "\x74", "\x75", "\x76", "\x77", "\x78", "\x79", "\x7A"];
+var character = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
+for (var index = 0; index <= 25; index++) {
   if (hex[index] !== character[index]) {
     $ERROR('#' + character[index] + ' ');
   }
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A7.1_T2.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A7.1_T2.js
index ac437eb082..9086b69be5 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A7.1_T2.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A7.1_T2.js
@@ -9,9 +9,9 @@
 */
 
 //CHECK#A-Z
-unicode = ["\u0041", "\u0042", "\u0043", "\u0044", "\u0045", "\u0046", "\u0047", "\u0048", "\u0049", "\u004A", "\u004B", "\u004C", "\u004D", "\u004E", "\u004F", "\u0050", "\u0051", "\u0052", "\u0053", "\u0054", "\u0055", "\u0056", "\u0057", "\u0058", "\u0059", "\u005A"];
-character = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"];
-for (index = 0; index <= 25; index++) {
+var unicode = ["\u0041", "\u0042", "\u0043", "\u0044", "\u0045", "\u0046", "\u0047", "\u0048", "\u0049", "\u004A", "\u004B", "\u004C", "\u004D", "\u004E", "\u004F", "\u0050", "\u0051", "\u0052", "\u0053", "\u0054", "\u0055", "\u0056", "\u0057", "\u0058", "\u0059", "\u005A"];
+var character = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"];
+for (var index = 0; index <= 25; index++) {
   if (unicode[index] !== character[index]) {
     $ERROR('#' + character[index] + ' ');
   }
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A7.1_T3.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A7.1_T3.js
index bd1ddf44c3..ad0d4883de 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A7.1_T3.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A7.1_T3.js
@@ -9,9 +9,9 @@
 */
 
 //CHECK#a-z
-unicode = ["\u0061", "\u0062", "\u0063", "\u0064", "\u0065", "\u0066", "\u0067", "\u0068", "\u0069", "\u006A", "\u006B", "\u006C", "\u006D", "\u006E", "\u006F", "\u0070", "\u0071", "\u0072", "\u0073", "\u0074", "\u0075", "\u0076", "\u0077", "\u0078", "\u0079", "\u007A"];
-character = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
-for (index = 0; index <= 25; index++) {
+var unicode = ["\u0061", "\u0062", "\u0063", "\u0064", "\u0065", "\u0066", "\u0067", "\u0068", "\u0069", "\u006A", "\u006B", "\u006C", "\u006D", "\u006E", "\u006F", "\u0070", "\u0071", "\u0072", "\u0073", "\u0074", "\u0075", "\u0076", "\u0077", "\u0078", "\u0079", "\u007A"];
+var character = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
+for (var index = 0; index <= 25; index++) {
   if (unicode[index] !== character[index]) {
     $ERROR('#' + character[index] + ' ');
   }
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A1.1_T2.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A1.1_T2.js
index 88d4a89c9e..edb04085f0 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A1.1_T2.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A1.1_T2.js
@@ -4,51 +4,51 @@
 /**
  * @name: S7.8.5_A1.1_T2;
  * @section: 7.8.5, 15.10.1;
- * @assertion: RegularExpressionFirstChar :: NonTerminator but not * or \ or /, 
- * RegularExpressionChars :: [empty], RegularExpressionFlags :: [empty];  
+ * @assertion: RegularExpressionFirstChar :: NonTerminator but not * or \ or /,
+ * RegularExpressionChars :: [empty], RegularExpressionFlags :: [empty];
  * @description: Complex test with eval, using syntax pattern;
 */
 
 //CHECK
-errorCount = 0;
-count = 0;
+var errorCount = 0;
+var count = 0;
 var hex = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"];
-for (i1 = 0; i1 < 16; i1++) {
-  for (i2 = 0; i2 < 16; i2++) {
-    for (i3 = 0; i3 < 16; i3++) {
-      for (i4 = 0; i4 < 16; i4++) {
-        try {    
+for (var i1 = 0; i1 < 16; i1++) {
+  for (var i2 = 0; i2 < 16; i2++) {
+    for (var i3 = 0; i3 < 16; i3++) {
+      for (var i4 = 0; i4 < 16; i4++) {
+        try {
           var uu = hex[i1] + hex[i2] + hex[i3] + hex[i4];
-	      var Elimination = 
-          ((uu === "002A") || (uu === "002F") || (uu === "005C") || (uu === "002B") || 
-           (uu === "003F") || (uu === "0028") || (uu === "0029") || 
+	      var Elimination =
+          ((uu === "002A") || (uu === "002F") || (uu === "005C") || (uu === "002B") ||
+           (uu === "003F") || (uu === "0028") || (uu === "0029") ||
            (uu === "005B") || (uu === "005D") || (uu === "007B") || (uu === "007D"));
-           /* 
+           /*
                 * \u002A     / \u002F     \ \u005C     + \u002B
                 ? \u003F     ( \u0028     ) \u0029
-                [ \u005B     ] \u005D     { \u007B     } \u007D          
+                [ \u005B     ] \u005D     { \u007B     } \u007D
            */
-          var LineTerminator = ((uu === "000A") || (uu === "000D") || (uu === "2028") || (uu === "2029"));                      
-          if ((Elimination || LineTerminator ) === false) {              
-            var xx = String.fromCharCode("0x" + uu);          
-            var pattern = eval("/" + xx + "/");  
+          var LineTerminator = ((uu === "000A") || (uu === "000D") || (uu === "2028") || (uu === "2029"));
+          if ((Elimination || LineTerminator ) === false) {
+            var xx = String.fromCharCode("0x" + uu);
+            var pattern = eval("/" + xx + "/");
             if (pattern.source !== xx) {
               $ERROR('#' + uu + ' ');
               errorCount++;
-            }  
+            }
           } else {
             count--;
-          }                     
-        } catch (e) {         
+          }
+        } catch (e) {
           $ERROR('#' + uu + ' ');
           errorCount++;
         }
         count++;
-      }  
+      }
     }
   }
 }
 
-if (errorCount > 0) {    
+if (errorCount > 0) {
   $ERROR('Total error: ' + errorCount + ' bad Regular Expression First Char in ' + count);
-} 
+}
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A2.1_T2.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A2.1_T2.js
index c4e6936967..7ebf8b1e31 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A2.1_T2.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A2.1_T2.js
@@ -4,52 +4,52 @@
 /**
  * @name: S7.8.5_A2.1_T2;
  * @section: 7.8.5, 15.10.1;
- * @assertion: RegularExpressionChar :: NonTerminator but not \ or /, 
+ * @assertion: RegularExpressionChar :: NonTerminator but not \ or /,
  * RegularExpressionFlags :: [empty];
  * @description: Complex test with eval, using syntax pattern;
 */
 
 //CHECK
-errorCount = 0;
-count = 0;
+var errorCount = 0;
+var count = 0;
 var hex = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"];
-for (i1 = 0; i1 < 16; i1++) {
-  for (i2 = 0; i2 < 16; i2++) {
-    for (i3 = 0; i3 < 16; i3++) {
-      for (i4 = 0; i4 < 16; i4++) {
-        try {               
+for (var i1 = 0; i1 < 16; i1++) {
+  for (var i2 = 0; i2 < 16; i2++) {
+    for (var i3 = 0; i3 < 16; i3++) {
+      for (var i4 = 0; i4 < 16; i4++) {
+        try {
           var uu = hex[i1] + hex[i2] + hex[i3] + hex[i4];
-	      var Elimination = 
-          ((uu === "002A") || (uu === "002F") || (uu === "005C") || (uu === "002B") || 
-           (uu === "003F") || (uu === "0028") || (uu === "0029") || 
+	      var Elimination =
+          ((uu === "002A") || (uu === "002F") || (uu === "005C") || (uu === "002B") ||
+           (uu === "003F") || (uu === "0028") || (uu === "0029") ||
            (uu === "005B") || (uu === "005D") || (uu === "007B") || (uu === "007D"));
-           /* 
+           /*
                 * \u002A     / \u002F     \ \u005C     + \u002B
                 ? \u003F     ( \u0028     ) \u0029
-                [ \u005B     ] \u005D     { \u007B     } \u007D          
+                [ \u005B     ] \u005D     { \u007B     } \u007D
            */
-          var LineTerminator = ((uu === "000A") || (uu === "000D") || (uu === "2028") || (uu === "2029"));                      
-          if ((Elimination || LineTerminator ) === false) {                       
-            var xx = "nnnn" + String.fromCharCode("0x" + uu);                  
-            var pattern = eval("/" + xx + "/");  
+          var LineTerminator = ((uu === "000A") || (uu === "000D") || (uu === "2028") || (uu === "2029"));
+          if ((Elimination || LineTerminator ) === false) {
+            var xx = "nnnn" + String.fromCharCode("0x" + uu);
+            var pattern = eval("/" + xx + "/");
             if (pattern.source !== xx) {
               $ERROR('#' + uu + ' ');
               errorCount++;
-            }                   
-      
+            }
+
           } else {
             count--;
-          }                     
-        } catch (e) {         
+          }
+        } catch (e) {
           $ERROR('#' + uu + ' ');
           errorCount++;
         }
         count++;
-      }  
+      }
     }
   }
 }
 
-if (errorCount > 0) {    
+if (errorCount > 0) {
   $ERROR('Total error: ' + errorCount + ' bad Regular Expression First Char in ' + count);
-} 
+}
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A2.4_T2.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A2.4_T2.js
index 19f8838772..b8d957a96d 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A2.4_T2.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A2.4_T2.js
@@ -4,51 +4,51 @@
 /**
  * @name: S7.8.5_A2.4_T2;
  * @section: 7.8.5, 15.10.1;
- * @assertion: RegularExpressionChar :: BackslashSequence :: \NonTerminator,  
- * RegularExpressionFlags :: [empty];  
+ * @assertion: RegularExpressionChar :: BackslashSequence :: \NonTerminator,
+ * RegularExpressionFlags :: [empty];
  * @description: Complex test with eval, using syntax pattern;
 */
 
 //CHECK
-errorCount = 0;
-count = 0;
+var errorCount = 0;
+var count = 0;
 var hex = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"];
-for (i1 = 0; i1 < 16; i1++) {
-  for (i2 = 0; i2 < 16; i2++) {
-    for (i3 = 0; i3 < 16; i3++) {
-      for (i4 = 0; i4 < 16; i4++) {
-        try {    
+for (var i1 = 0; i1 < 16; i1++) {
+  for (var i2 = 0; i2 < 16; i2++) {
+    for (var i3 = 0; i3 < 16; i3++) {
+      for (var i4 = 0; i4 < 16; i4++) {
+        try {
           var uu = hex[i1] + hex[i2] + hex[i3] + hex[i4];
-	      var Elimination = 
-          ((uu === "002A") || (uu === "002F") || (uu === "005C") || (uu === "002B") || 
-           (uu === "003F") || (uu === "0028") || (uu === "0029") || 
+	      var Elimination =
+          ((uu === "002A") || (uu === "002F") || (uu === "005C") || (uu === "002B") ||
+           (uu === "003F") || (uu === "0028") || (uu === "0029") ||
            (uu === "005B") || (uu === "005D") || (uu === "007B") || (uu === "007D"));
-           /* 
+           /*
                 * \u002A     / \u002F     \ \u005C     + \u002B
                 ? \u003F     ( \u0028     ) \u0029
-                [ \u005B     ] \u005D     { \u007B     } \u007D          
+                [ \u005B     ] \u005D     { \u007B     } \u007D
            */
-          var LineTerminator = ((uu === "000A") || (uu === "000D") || (uu === "2028") || (uu === "2029"));                      
-          if ((Elimination || LineTerminator ) === false) {              
-            var xx = "a\\" + String.fromCharCode("0x" + uu);          
-            var pattern = eval("/" + xx + "/");  
+          var LineTerminator = ((uu === "000A") || (uu === "000D") || (uu === "2028") || (uu === "2029"));
+          if ((Elimination || LineTerminator ) === false) {
+            var xx = "a\\" + String.fromCharCode("0x" + uu);
+            var pattern = eval("/" + xx + "/");
             if (pattern.source !== xx) {
               $ERROR('#' + uu + ' ');
               errorCount++;
-            }                   
+            }
           } else {
             count--;
-          }                     
-        } catch (e) {         
+          }
+        } catch (e) {
           $ERROR('#' + uu + ' ');
           errorCount++;
         }
         count++;
-      }  
+      }
     }
   }
 }
 
-if (errorCount > 0) {    
+if (errorCount > 0) {
   $ERROR('Total error: ' + errorCount + ' bad Regular Expression First Char in ' + count);
-} 
+}
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T1.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T1.js
index e0dfa0e2f0..e489e88379 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T1.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T1.js
@@ -9,7 +9,7 @@
 */
 
 //CHECK#1
-x = 0;
+var x = 0;
 if (false) x = 1
 if (x !== 0) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T10.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T10.js
index 06516121b7..235474f855 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T10.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T10.js
@@ -9,7 +9,7 @@
 */
 
 //CHECK#1
-x = 0;
+var x = 0;
 if (false) {x = 1} else {x = -1}
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T11.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T11.js
index e6cbccf178..9ccd11f1f0 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T11.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T11.js
@@ -9,8 +9,8 @@
 */
 
 //CHECK#1
-x = 0;
-if (false) {{x = 1};} 
+var x = 0;
+if (false) {{x = 1};}
 else x = -1
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T2.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T2.js
index 7608d3dd48..1afe6ba147 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T2.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T2.js
@@ -5,12 +5,12 @@
  * @name: S7.9_A11_T2;
  * @section: 7.9, 12.5;
  * @assertion: Check If Statement for automatic semicolon insertion;
- * @description: Use if (false) \n x = 1 and check x; 
+ * @description: Use if (false) \n x = 1 and check x;
 */
 
 //CHECK#1
-x = 0;
-if (false) 
+var x = 0;
+if (false)
 x = 1
 if (x !== 0) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T3.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T3.js
index 780341bdb1..87f6ad09b9 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T3.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T3.js
@@ -9,8 +9,8 @@
 */
 
 //CHECK#1
-x = 0;
-if (false); 
+var x = 0;
+if (false);
 x = 1
 if (x !== 1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T4.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T4.js
index 946ba54861..558fdd6de5 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T4.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T4.js
@@ -10,5 +10,5 @@
 */
 
 //CHECK#1
-x = 0;
+var x = 0;
 if (false) x = 1 else x = -1
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T5.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T5.js
index fd3d27c54c..7866eb9cb1 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T5.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T5.js
@@ -9,7 +9,7 @@
 */
 
 //CHECK#1
-x = 0;
+var x = 0;
 if (false) x = 1; else x = -1
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T6.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T6.js
index a55e909f61..2bded25a20 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T6.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T6.js
@@ -9,8 +9,8 @@
 */
 
 //CHECK#1
-x = 0;
-if (false) x = 1 
+var x = 0;
+if (false) x = 1
 else x = -1
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T7.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T7.js
index 419fb77277..7ae5db57c5 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T7.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T7.js
@@ -9,8 +9,8 @@
 */
 
 //CHECK#1
-x = 0;
-if (false) x = 1; 
+var x = 0;
+if (false) x = 1;
 else x = -1
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T8.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T8.js
index 218371929b..94c83168fb 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T8.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T8.js
@@ -10,8 +10,8 @@
 */
 
 //CHECK#1
-x = 0;
-if (false) {x = 1}; 
+var x = 0;
+if (false) {x = 1};
 else x = -1
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T9.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T9.js
index 24522a93c3..438b5e17a4 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T9.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T9.js
@@ -9,8 +9,8 @@
 */
 
 //CHECK#1
-x = 0;
-if (false) {x = 1} 
+var x = 0;
+if (false) {x = 1}
 else x = -1
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.7_T1.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.7_T1.js
index 2da8bc0d5f..6b0651595f 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.7_T1.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.7_T1.js
@@ -11,7 +11,7 @@
 */
 
 var x=0, y=0;
-z=
+var z=
 x
 ++
 ++
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.8_T1.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.8_T1.js
index 370e5f8e00..3489a26586 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.8_T1.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.8_T1.js
@@ -4,15 +4,15 @@
 /**
 * @name: S7.9_A5.8_T1;
 * @section: 7.9;
-* @assertion: Since LineTerminator(LT) between Postfix Increment/Decrement Operator(I/DO) and operand is admitted, 
+* @assertion: Since LineTerminator(LT) between Postfix Increment/Decrement Operator(I/DO) and operand is admitted,
 * Additive/Substract Operator(A/SO) in combination with I/DO separated by LT or white spaces after automatic semicolon insertion gives valid result;
 * @description: Try use Variable1 \n + \n ++ \n Variable2 construction;
 */
 
 var x=0, y=0;
-z=
+var z=
 x
-+ 
++
 ++
 y
 
diff --git a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.9_T1.js b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.9_T1.js
index e0c8b83b08..18662de01a 100644
--- a/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.9_T1.js
+++ b/test/suite/sputnik/Conformance/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.9_T1.js
@@ -10,9 +10,9 @@
 */
 
 var x=1, y=1;
-z=
+var z=
 x
-+ 
++
 +
 +
 y
diff --git a/test/suite/sputnik/Conformance/08_Types/8.2_The_Null_Type/S8.2_A1_T2.js b/test/suite/sputnik/Conformance/08_Types/8.2_The_Null_Type/S8.2_A1_T2.js
index 385a4860f2..74081ae2ac 100644
--- a/test/suite/sputnik/Conformance/08_Types/8.2_The_Null_Type/S8.2_A1_T2.js
+++ b/test/suite/sputnik/Conformance/08_Types/8.2_The_Null_Type/S8.2_A1_T2.js
@@ -5,12 +5,12 @@
  * @name: S8.2_A1_T2;
  * @section: 8.2;
  * @assertion: The Null Type has one value, called null;
- * @description: Checking if execution of "x = null" passes; 
+ * @description: Checking if execution of "x = null" passes;
 */
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
-x = null;
+var x = null;
 //
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A2.js b/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A2.js
index 618f394128..f441e455d6 100644
--- a/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A2.js
+++ b/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A2.js
@@ -4,13 +4,12 @@
 /**
  * @name: S8.6.2_A2;
  * @section: 8.6.2, 15.2.4;
- * @assertion: Properties of the [[Prototype]] object 
+ * @assertion: Properties of the [[Prototype]] object
  * are visible as properties of the child object for the purposes of get access, but not for put access;
  * @description: Check visibility properties of the child object for the purposes of get access, but not for put access;
- * @strict_mode_negative
 */
- 
-//Establish foo object 
+
+//Establish foo object
 function FooObj(){};
 FooObj.prototype.prop="some";
 
diff --git a/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T1.js b/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T1.js
index 13989bbde5..33073d2217 100644
--- a/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T1.js
+++ b/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T1.js
@@ -11,7 +11,7 @@
 
 this.count=0;
 
-screen = {touch:function(){count++}};
+var screen = {touch:function(){count++}};
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 screen.touch();
diff --git a/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T2.js b/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T2.js
index 6a2209a916..7a02b801e5 100644
--- a/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T2.js
+++ b/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T2.js
@@ -10,7 +10,7 @@
 */
 
 this.position=0;
-seat = {};
+var seat = {};
 seat['move']=function(){position++};
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T3.js b/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T3.js
index 9044ef90ca..925082bbe8 100644
--- a/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T3.js
+++ b/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T3.js
@@ -9,8 +9,8 @@
 *  as knock=function(){count++};
 */
 
-count=0;
-knock=function(){count++};
+var count=0;
+var knock=function(){count++};
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 knock();
diff --git a/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T4.js b/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T4.js
index 72dda5a889..cc7a2ddb22 100644
--- a/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T4.js
+++ b/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T4.js
@@ -9,7 +9,7 @@
 *  as this['beep']=function(){__count++};
 */
 
-__count=0;
+var __count=0;
 
 this["beep"]=function(){__count++};
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/S8.6_A4_T1.js b/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/S8.6_A4_T1.js
index 2b0631bb7a..b67f6b9c4d 100644
--- a/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/S8.6_A4_T1.js
+++ b/test/suite/sputnik/Conformance/08_Types/8.6_The_Object_Type/S8.6_A4_T1.js
@@ -10,9 +10,9 @@
 
 ///////////////////////////////////////////////////////
 // CHECK#1
-obj = {bar:true, some:1, foo:"a"};
+var obj = {bar:true, some:1, foo:"a"};
 
-count=0;
+var count=0;
 
 for (property in obj)	count++;
 
@@ -24,7 +24,7 @@ if (count !== 3){
 
 ///////////////////////////////////////////////////////
 // CHECK#2
-obj_ = {bar:true};
+var obj_ = {bar:true};
 obj_.some = 1;
 obj_.foo = "a";
 
@@ -40,7 +40,7 @@ if (count !== 3){
 
 ///////////////////////////////////////////////////////
 // CHECK#3
-obj__ = new Object();
+var obj__ = new Object();
 obj__.bar = true;
 obj__.some = 1;
 obj__.foo = "a";
diff --git a/test/suite/sputnik/Conformance/08_Types/8.7_The_Reference_Type/S8.7.1_A2.js b/test/suite/sputnik/Conformance/08_Types/8.7_The_Reference_Type/S8.7.1_A2.js
index fbf71072be..72672b409f 100644
--- a/test/suite/sputnik/Conformance/08_Types/8.7_The_Reference_Type/S8.7.1_A2.js
+++ b/test/suite/sputnik/Conformance/08_Types/8.7_The_Reference_Type/S8.7.1_A2.js
@@ -5,7 +5,8 @@
 * @name: S8.7.1_A2;
 * @section: 8.7.1;
 * @assertion: Delete operator can't delete reference, so it returns false to be applyed to reference;
-* @description: Try to delete y, where y is var y=1; 
+* @description: Try to delete y, where y is var y=1;
+* @non_strict_only
 */
 
 var y = 1;
diff --git a/test/suite/sputnik/Conformance/09_Type_Conversion/9.9_ToObject/S9.9_A1.js b/test/suite/sputnik/Conformance/09_Type_Conversion/9.9_ToObject/S9.9_A1.js
index 5e6be1d8f7..b1d8c857fe 100644
--- a/test/suite/sputnik/Conformance/09_Type_Conversion/9.9_ToObject/S9.9_A1.js
+++ b/test/suite/sputnik/Conformance/09_Type_Conversion/9.9_ToObject/S9.9_A1.js
@@ -5,14 +5,15 @@
  * @name: S9.9_A1;
  * @section: 9.9;
  * @assertion: ToObject conversion from undefined value must throw TypeError;
- * @description: Trying to convert undefined to Object; 
+ * @description: Trying to convert undefined to Object;
+ * @non_strict_only
 */
 
 // CHECK#1
 try{
   undefined['foo'];
   $ERROR('#1.1: undefined[\'foo\'] must throw TypeError. Actual: ' + (undefined['foo']));
-} 
+}
 catch(e){
   if((e instanceof TypeError) !== true){
     $ERROR('#1.2: undefined[\'foo\'] must throw TypeError. Actual: ' + (e));
@@ -23,7 +24,7 @@ catch(e){
 try{
   with(undefined) x = 2;
   $ERROR('#2.1: with(undefined) x = 2 must throw TypeError. Actual: x === ' + (x));
-} 
+}
 catch(e){
   if((e instanceof TypeError) !== true){
     $ERROR('#2.2: with(undefined) x = 2 must throw TypeError. Actual: ' + (e));
@@ -34,7 +35,7 @@ catch(e){
 try{
   for(var y in undefined) y = 2;
   $ERROR('#3.1: for(var y in undefined) y = 2 must throw TypeError. Actual: y === ' + (y));
-} 
+}
 catch(e){
   if((e instanceof TypeError) !== true){
     $ERROR('#3.2: for(var y in undefined) y = 2 must throw TypeError. Actual: ' + (e));
@@ -45,7 +46,7 @@ catch(e){
 try{
   for(var z in this.foo) z = 2;
   $ERROR('#4.1: for(var z in this.foo) z = 2 must throw TypeError. Actual: z === ' + (z));
-} 
+}
 catch(e){
   if((e instanceof TypeError) !== true){
     $ERROR('#4.2: for(var z in this.foo) z = 2 must throw TypeError. Actual: ' + (e));
diff --git a/test/suite/sputnik/Conformance/09_Type_Conversion/9.9_ToObject/S9.9_A2.js b/test/suite/sputnik/Conformance/09_Type_Conversion/9.9_ToObject/S9.9_A2.js
index a2519178d0..6cb73c5768 100644
--- a/test/suite/sputnik/Conformance/09_Type_Conversion/9.9_ToObject/S9.9_A2.js
+++ b/test/suite/sputnik/Conformance/09_Type_Conversion/9.9_ToObject/S9.9_A2.js
@@ -6,13 +6,14 @@
  * @section: 9.9;
  * @assertion: ToObject conversion from null value must throw TypeError;
  * @description: Trying to convert null to Object;
+ * @non_strict_only
 */
 
 // CHECK#1
 try{
   null['foo'];
   $ERROR('#1.1: null[\'foo\'] throw TypeError. Actual: ' + (null['foo']));
-} 
+}
 catch(e){
   if((e instanceof TypeError) !== true){
     $ERROR('#1.2: null[\'foo\'] must throw TypeError. Actual: ' + (e));
@@ -23,7 +24,7 @@ catch(e){
 try{
   with(null) x = 2;
   $ERROR('#2.1: with(null) x = 2 must throw TypeError. Actual: x === . Actual: ' + (x));
-} 
+}
 catch(e){
   if((e instanceof TypeError) !== true){
     $ERROR('#2.2: with(null) x = 2 must throw TypeError. Actual: ' + (e));
@@ -31,10 +32,10 @@ catch(e){
 }
 
 // CHECK#3
-try{  
+try{
   for(var y in null) y = 2;
   $ERROR('#3.1:  for(var y in null) y = 2 must throw TypeError. Actual: y === . Actual: ' + (y));
-} 
+}
 catch(e){
   if((e instanceof TypeError) !== true){
     $ERROR('#3.2:  for(var y in null) y = 2 must throw TypeError. Actual: ' + (e));
@@ -45,7 +46,7 @@ catch(e){
 try{
   for(var z in 'bbb'.match(/aaa/)) z = 2;
   $ERROR('#4.1: for(var z in \'bbb\'.match(/aaa/)) z = 2 must throw TypeError. Actual: z === . Actual: ' + (z));
-} 
+}
 catch(e){
   if((e instanceof TypeError) !== true){
     $ERROR('#4.2: for(var z in \'bbb\'.match(/aaa/)) z = 2 must throw TypeError. Actual: ' + (e));
diff --git a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.3_Variable_Instantiation/S10.1.3_A2.js b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.3_Variable_Instantiation/S10.1.3_A2.js
index 19239bd08d..e3a661ebeb 100644
--- a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.3_Variable_Instantiation/S10.1.3_A2.js
+++ b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.3_Variable_Instantiation/S10.1.3_A2.js
@@ -4,10 +4,11 @@
 /**
  * @name: S10.1.3_A2;
  * @section: 10.1.3;
- * @assertion: If two or more formal parameters share the same name, hence 
- * the same property, the corresponding property is given the value that was 
+ * @assertion: If two or more formal parameters share the same name, hence
+ * the same property, the corresponding property is given the value that was
  * supplied for the last parameter with this name;
  * @description: Creating functions initialized with two or more formal parameters, which have the same name;
+ * @non_strict_only
 */
 
 //CHECK#1
diff --git a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.3_Variable_Instantiation/S10.1.3_A4_T1.js b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.3_Variable_Instantiation/S10.1.3_A4_T1.js
index e838981f5a..a837c279f6 100644
--- a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.3_Variable_Instantiation/S10.1.3_A4_T1.js
+++ b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.3_Variable_Instantiation/S10.1.3_A4_T1.js
@@ -4,17 +4,18 @@
 /**
  * @name: S10.1.3_A4_T1;
  * @section: 10.1.3;
- * @assertion: Function declaration in function code - If the variable object 
- * already has a property with the name of Function Identifier, replace its 
- * value and attributes. Semantically, this step must follow the creation of 
+ * @assertion: Function declaration in function code - If the variable object
+ * already has a property with the name of Function Identifier, replace its
+ * value and attributes. Semantically, this step must follow the creation of
  * FormalParameterList properties;
  * @description: Checking existence of a function with passed parameter;
+ * @non_strict_only
 */
 
 //CHECK#1
 function f1(x){
   return x;
-  
+
   function x(){
     return 7;
   }
@@ -26,7 +27,7 @@ if(!(f1().constructor.prototype === Function.prototype)){
 //CHECK#2
 function f2(x){
   return typeof x;
-  
+
   function x(){
     return 7;
   }
diff --git a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T5.js b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T5.js
index 3d87add1f4..58cce64bef 100644
--- a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T5.js
+++ b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T5.js
@@ -4,10 +4,11 @@
 /**
  * @name: S10.1.4_A1_T5;
  * @section: 10.1.4;
- * @assertion: Every execution context has associated with it a scope chain. 
- * A scope chain is a list of objects that are searched when evaluating an 
+ * @assertion: Every execution context has associated with it a scope chain.
+ * A scope chain is a list of objects that are searched when evaluating an
  * Identifier;
  * @description: Checking scope chain containing function declarations and "with";
+ * @non_strict_only
 */
 
 var x = 0;
diff --git a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T6.js b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T6.js
index a95b9448df..5758eeef7b 100644
--- a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T6.js
+++ b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T6.js
@@ -4,10 +4,11 @@
 /**
  * @name: S10.1.4_A1_T6;
  * @section: 10.1.4;
- * @assertion: Every execution context has associated with it a scope chain. 
- * A scope chain is a list of objects that are searched when evaluating an 
+ * @assertion: Every execution context has associated with it a scope chain.
+ * A scope chain is a list of objects that are searched when evaluating an
  * Identifier;
  * @description: Checking scope chain containing function declarations and "with";
+ * @non_strict_only
 */
 
 var x = 0;
diff --git a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T7.js b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T7.js
index 8e4d7faca0..82decbdf0c 100644
--- a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T7.js
+++ b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T7.js
@@ -4,10 +4,11 @@
 /**
  * @name: S10.1.4_A1_T7;
  * @section: 10.1.4;
- * @assertion: Every execution context has associated with it a scope chain. 
- * A scope chain is a list of objects that are searched when evaluating an 
+ * @assertion: Every execution context has associated with it a scope chain.
+ * A scope chain is a list of objects that are searched when evaluating an
  * Identifier;
  * @description: Checking scope chain containing function declarations and "with";
+ * @non_strict_only
 */
 
 var x = 0;
@@ -21,7 +22,7 @@ function f1(){
     }
   };
   return f2();
-  
+
   var x = 1;
 }
 
diff --git a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T8.js b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T8.js
index b17ef6ba2b..67839cc790 100644
--- a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T8.js
+++ b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T8.js
@@ -4,10 +4,11 @@
 /**
  * @name: S10.1.4_A1_T8;
  * @section: 10.1.4;
- * @assertion: Every execution context has associated with it a scope chain. 
- * A scope chain is a list of objects that are searched when evaluating an 
+ * @assertion: Every execution context has associated with it a scope chain.
+ * A scope chain is a list of objects that are searched when evaluating an
  * Identifier;
  * @description: Checking scope chain containing function declarations and "with";
+ * @non_strict_only
 */
 
 var x = 0;
diff --git a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T9.js b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T9.js
index 83bfa2204a..7f5ee7cc47 100644
--- a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T9.js
+++ b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T9.js
@@ -4,10 +4,11 @@
 /**
  * @name: S10.1.4_A1_T9;
  * @section: 10.1.4;
- * @assertion: Every execution context has associated with it a scope chain. 
- * A scope chain is a list of objects that are searched when evaluating an 
+ * @assertion: Every execution context has associated with it a scope chain.
+ * A scope chain is a list of objects that are searched when evaluating an
  * Identifier;
  * @description: Checking scope chain containing function declarations and "with";
+ * @non_strict_only
 */
 
 var x = 0;
diff --git a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A3_T3.js b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A3_T3.js
index e2b6560e94..5f2fd5a33c 100644
--- a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A3_T3.js
+++ b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A3_T3.js
@@ -4,14 +4,15 @@
 /**
  * @name: S10.1.8_A3_T3;
  * @section: 10.1.8;
- * @assertion: A property is created with name callee with property 
+ * @assertion: A property is created with name callee with property
  * attributes { DontEnum } and no others;
- * @description: Checking if deleting arguments.callee property fails;  
+ * @description: Checking if deleting arguments.callee property fails;
+ * @non_strict_only
 */
 
 //CHECK#1
 function f1(){
-  return (delete arguments.callee); 
+  return (delete arguments.callee);
 }
 
 try{
@@ -25,7 +26,7 @@ catch(e){
 
 //CHECK#2
 var f2 = function(){
-  return (delete arguments.callee); 
+  return (delete arguments.callee);
 }
 
 try{
diff --git a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A3_T4.js b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A3_T4.js
index c52ff9f056..fb51ddc8a3 100644
--- a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A3_T4.js
+++ b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A3_T4.js
@@ -4,16 +4,17 @@
 /**
  * @name: S10.1.8_A3_T4;
  * @section: 10.1.8;
- * @assertion: A property is created with name callee with property 
+ * @assertion: A property is created with name callee with property
  * attributes { DontEnum } and no others;
- * @description: Overriding arguments.callee property;  
+ * @description: Overriding arguments.callee property;
+ * @non_strict_only
 */
 
 var str = "something different";
 //CHECK#1
 function f1(){
   arguments.callee = str;
-  return arguments; 
+  return arguments;
 }
 
 try{
@@ -28,7 +29,7 @@ catch(e){
 //CHECK#2
 var f2 = function(){
     arguments.callee = str;
-    return arguments; 
+    return arguments;
   }
 try{
   if(f2().callee !== str){
diff --git a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A4.js b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A4.js
index 2ceac9d044..178adfcf29 100644
--- a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A4.js
+++ b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A4.js
@@ -4,9 +4,10 @@
 /**
  * @name: S10.1.8_A4;
  * @section: 10.1.8;
- * @assertion: The initial value of the created property callee is the  
+ * @assertion: The initial value of the created property callee is the
  * Function object being executed;
  * @description: Checking that arguments.callee === function object;
+ * @non_strict_only
 */
 
 //CHECK#1
diff --git a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A5_T4.js b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A5_T4.js
index ca47955802..f378452b34 100644
--- a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A5_T4.js
+++ b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A5_T4.js
@@ -4,16 +4,16 @@
 /**
  * @name: S10.1.8_A5_T4;
  * @section: 10.1.8;
- * @assertion: A property is created with name length with property 
+ * @assertion: A property is created with name length with property
  * attributes { DontEnum } and no others;
- * @description: Overriding arguments.length property;  
+ * @description: Overriding arguments.length property;
 */
 
 var str = "something different";
 //CHECK#1
 function f1(){
   arguments.length = str;
-  return arguments; 
+  return arguments;
 }
 
 try{
@@ -28,8 +28,8 @@ catch(e){
 //CHECK#2
 var f2 = function(){
     arguments.length = str;
-    return arguments; 
-  }
+    return arguments;
+  };
 try{
   if(f2().length !== str){
     $ERROR("#2: A property length have attribute { ReadOnly }");
diff --git a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/S10.1.6_A1_T1.js b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/S10.1.6_A1_T1.js
index 2761bf8613..3668fc458b 100644
--- a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/S10.1.6_A1_T1.js
+++ b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/S10.1.6_A1_T1.js
@@ -5,7 +5,8 @@
  * @name: S10.1.6_A1_T1;
  * @section: 10.1.6;
  * @assertion: The activation object is initialised with a property with name arguments and attributes {DontDelete};
- * @description: Checking ifdeleting function parameter is possible;
+ * @description: Checking if deleting function parameter is possible;
+ * @non_strict_only
 */
 
 //CHECK#1
@@ -15,4 +16,4 @@ function f1(a){
 }
 if (f1(1) !== 1)
   $ERROR('#1: Function parameter was deleted');
-  
+
diff --git a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/S10.1.6_A1_T3.js b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/S10.1.6_A1_T3.js
index 0c2d67704a..eda9d8ac51 100644
--- a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/S10.1.6_A1_T3.js
+++ b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.1_Definitions/S10.1.6_A1_T3.js
@@ -6,6 +6,7 @@
  * @section: 10.1.6;
  * @assertion: The activation object is initialised with a property with name arguments and attributes {DontDelete};
  * @description: Checking function which returns "this";
+ * @non_strict_only
 */
 
 function f1() {
diff --git a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.1_Global_Code/S10.2.1_A1_T1.js b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.1_Global_Code/S10.2.1_A1_T1.js
index 00f81b92d2..a45cca6ee7 100644
--- a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.1_Global_Code/S10.2.1_A1_T1.js
+++ b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.1_Global_Code/S10.2.1_A1_T1.js
@@ -4,9 +4,10 @@
 /**
  * @name: S10.2.1_A1_T1;
  * @section: 10.2.1;
- * @assertion: Variable instantiation is performed using the global object as 
+ * @assertion: 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; 
+ * @description: Checking if deleting variable x, that is defined as var x = 1, fails;
+ * @non_strict_only
 */
 
 var x = 1;
diff --git a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.1_Global_Code/S10.2.1_A1_T2.js b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.1_Global_Code/S10.2.1_A1_T2.js
index 285dc134ad..7e080aa4ff 100644
--- a/test/suite/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.1_Global_Code/S10.2.1_A1_T2.js
+++ b/test/suite/sputnik/Conformance/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.1_Global_Code/S10.2.1_A1_T2.js
@@ -4,9 +4,10 @@
 /**
  * @name: S10.2.1_A1_T2;
  * @section: 10.2.1;
- * @assertion: Variable instantiation is performed using the global object as 
+ * @assertion: 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;
+ * @non_strict_only
 */
 
 x = 1;
diff --git a/test/suite/sputnik/Conformance/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.1_AND_Operator/S11.10.1_A2.4_T3.js b/test/suite/sputnik/Conformance/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.1_AND_Operator/S11.10.1_A2.4_T3.js
index 6bcedce626..ed4263979a 100644
--- a/test/suite/sputnik/Conformance/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.1_AND_Operator/S11.10.1_A2.4_T3.js
+++ b/test/suite/sputnik/Conformance/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.1_AND_Operator/S11.10.1_A2.4_T3.js
@@ -6,16 +6,17 @@
  * @section: 11.10.1;
  * @assertion: First expression is evaluated first, and then second expression;
  * @description: Checking with undeclarated variables;
+ * @non_strict_only
 */
 
 //CHECK#1
 try {
   x & (x = 1);
-  $ERROR('#1.1: x & (x = 1) throw ReferenceError. Actual: ' + (x & (x = 1)));  
+  $ERROR('#1.1: x & (x = 1) throw ReferenceError. Actual: ' + (x & (x = 1)));
 }
 catch (e) {
   if ((e instanceof ReferenceError) !== true) {
-    $ERROR('#1.2: x & (x = 1) throw ReferenceError. Actual: ' + (e));  
+    $ERROR('#1.2: x & (x = 1) throw ReferenceError. Actual: ' + (e));
   }
 }
 
diff --git a/test/suite/sputnik/Conformance/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.2_XOR_Operator/S11.10.2_A2.4_T3.js b/test/suite/sputnik/Conformance/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.2_XOR_Operator/S11.10.2_A2.4_T3.js
index 1cdd0cf686..c3c5312106 100644
--- a/test/suite/sputnik/Conformance/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.2_XOR_Operator/S11.10.2_A2.4_T3.js
+++ b/test/suite/sputnik/Conformance/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.2_XOR_Operator/S11.10.2_A2.4_T3.js
@@ -6,16 +6,17 @@
  * @section: 11.10.2;
  * @assertion: First expression is evaluated first, and then second expression;
  * @description: Checking with undeclarated variables;
+ * @non_strict_only
 */
 
 //CHECK#1
 try {
   x ^ (x = 1);
-  $ERROR('#1.1: x ^ (x = 1) throw ReferenceError. Actual: ' + (x ^ (x = 1)));  
+  $ERROR('#1.1: x ^ (x = 1) throw ReferenceError. Actual: ' + (x ^ (x = 1)));
 }
 catch (e) {
   if ((e instanceof ReferenceError) !== true) {
-    $ERROR('#1.2: x ^ (x = 1) throw ReferenceError. Actual: ' + (e));  
+    $ERROR('#1.2: x ^ (x = 1) throw ReferenceError. Actual: ' + (e));
   }
 }
 
diff --git a/test/suite/sputnik/Conformance/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.3_OR_Operator/S11.10.3_A2.4_T3.js b/test/suite/sputnik/Conformance/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.3_OR_Operator/S11.10.3_A2.4_T3.js
index b820b1d22a..73cd2e03f9 100644
--- a/test/suite/sputnik/Conformance/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.3_OR_Operator/S11.10.3_A2.4_T3.js
+++ b/test/suite/sputnik/Conformance/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.3_OR_Operator/S11.10.3_A2.4_T3.js
@@ -6,16 +6,17 @@
  * @section: 11.10.3;
  * @assertion: First expression is evaluated first, and then second expression;
  * @description: Checking with undeclarated variables;
+ * @non_strict_only
 */
 
 //CHECK#1
 try {
   x | (x = 1);
-  $ERROR('#1.1: x | (x = 1) throw ReferenceError. Actual: ' + (x | (x = 1)));  
+  $ERROR('#1.1: x | (x = 1) throw ReferenceError. Actual: ' + (x | (x = 1)));
 }
 catch (e) {
   if ((e instanceof ReferenceError) !== true) {
-    $ERROR('#1.2: x | (x = 1) throw ReferenceError. Actual: ' + (e));  
+    $ERROR('#1.2: x | (x = 1) throw ReferenceError. Actual: ' + (e));
   }
 }
 
diff --git a/test/suite/sputnik/Conformance/11_Expressions/11.11_Binary_Logical_Operators/11.11.1_Logical_AND_Operator/S11.11.1_A2.4_T3.js b/test/suite/sputnik/Conformance/11_Expressions/11.11_Binary_Logical_Operators/11.11.1_Logical_AND_Operator/S11.11.1_A2.4_T3.js
index 971481242b..1dc1ded9b1 100644
--- a/test/suite/sputnik/Conformance/11_Expressions/11.11_Binary_Logical_Operators/11.11.1_Logical_AND_Operator/S11.11.1_A2.4_T3.js
+++ b/test/suite/sputnik/Conformance/11_Expressions/11.11_Binary_Logical_Operators/11.11.1_Logical_AND_Operator/S11.11.1_A2.4_T3.js
@@ -6,16 +6,17 @@
  * @section: 11.11.1;
  * @assertion: First expression is evaluated first, and then second expression;
  * @description: Checking with undeclarated variables;
+ * @non_strict_only
 */
 
 //CHECK#1
 try {
   x && (x = true);
-  $ERROR('#1.1: x && (x = true) throw ReferenceError. Actual: ' + (x && (x = true)));  
+  $ERROR('#1.1: x && (x = true) throw ReferenceError. Actual: ' + (x && (x = true)));
 }
 catch (e) {
   if ((e instanceof ReferenceError) !== true) {
-    $ERROR('#1.2: x && (x = true) throw ReferenceError. Actual: ' + (e));  
+    $ERROR('#1.2: x && (x = true) throw ReferenceError. Actual: ' + (e));
   }
 }
 
diff --git a/test/suite/sputnik/Conformance/11_Expressions/11.11_Binary_Logical_Operators/11.11.2_Logical_OR_Operator/S11.11.2_A2.4_T3.js b/test/suite/sputnik/Conformance/11_Expressions/11.11_Binary_Logical_Operators/11.11.2_Logical_OR_Operator/S11.11.2_A2.4_T3.js
index 8fe84c018a..91906298f0 100644
--- a/test/suite/sputnik/Conformance/11_Expressions/11.11_Binary_Logical_Operators/11.11.2_Logical_OR_Operator/S11.11.2_A2.4_T3.js
+++ b/test/suite/sputnik/Conformance/11_Expressions/11.11_Binary_Logical_Operators/11.11.2_Logical_OR_Operator/S11.11.2_A2.4_T3.js
@@ -6,16 +6,17 @@
  * @section: 11.11.2;
  * @assertion: First expression is evaluated first, and then second expression;
  * @description: Checking with undeclarated variables;
+ * @non_strict_only
 */
 
 //CHECK#1
 try {
   x || (x = true);
-  $ERROR('#1.1: x || (x = true) throw ReferenceError. Actual: ' + (x || (x = true)));  
+  $ERROR('#1.1: x || (x = true) throw ReferenceError. Actual: ' + (x || (x = true)));
 }
 catch (e) {
   if ((e instanceof ReferenceError) !== true) {
-    $ERROR('#1.2: x || (x = true) throw ReferenceError. Actual: ' + (e));  
+    $ERROR('#1.2: x || (x = true) throw ReferenceError. Actual: ' + (e));
   }
 }
 
diff --git a/test/suite/sputnik/Conformance/11_Expressions/11.13_Assignment_Operators/11.13.1_Simple_Assignment/S11.13.1_A1.js b/test/suite/sputnik/Conformance/11_Expressions/11.13_Assignment_Operators/11.13.1_Simple_Assignment/S11.13.1_A1.js
index 01dab25949..3165ce3685 100644
--- a/test/suite/sputnik/Conformance/11_Expressions/11.13_Assignment_Operators/11.13.1_Simple_Assignment/S11.13.1_A1.js
+++ b/test/suite/sputnik/Conformance/11_Expressions/11.13_Assignment_Operators/11.13.1_Simple_Assignment/S11.13.1_A1.js
@@ -6,6 +6,7 @@
 * @section: 11.13.1;
 * @assertion: White Space and Line Terminator between LeftHandSideExpression and "=" or between "=" and AssignmentExpression are allowed;
 * @description: Checking by using eval;
+* @non_strict_only
 */
 
 //CHECK#1
@@ -15,7 +16,7 @@ if ((eval("x\u0009=\u0009true")) !== true) {
 
 //CHECK#2
 if ((eval("x\u000B=\u000Btrue")) !== true) {
-  $ERROR('#2: (x\\u000B=\\u000Btrue) === true');  
+  $ERROR('#2: (x\\u000B=\\u000Btrue) === true');
 }
 
 //CHECK#3
@@ -35,7 +36,7 @@ if ((eval("x\u00A0=\u00A0true")) !== true) {
 
 //CHECK#6
 if ((eval("x\u000A=\u000Atrue")) !== true) {
-  $ERROR('#6: (x\\u000A=\\u000Atrue) === true');  
+  $ERROR('#6: (x\\u000A=\\u000Atrue) === true');
 }
 
 //CHECK#7
diff --git a/test/suite/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A2.js b/test/suite/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A2.js
index 983f15947f..3b836b5ad4 100644
--- a/test/suite/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A2.js
+++ b/test/suite/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A2.js
@@ -5,15 +5,16 @@
  * @name: S11.1.1_A2;
  * @section: 11.1.1;
  * @assertion: Being in global code, "this" and "eval("this")" return the global object;
- * @description: Checking if execution of "this" and eval("this"), which are in global code, return the global object by using toString function;	
+ * @description: Checking if execution of "this" and eval("this"), which are in global code, return the global object by using toString function;
+ * @non_strict_only
 */
 
 //CHECK#1
 if (this.toString() !== toString()) {
-  $ERROR('#1: this.toString() === toString(). Actual: ' + (this.toString()));  
+  $ERROR('#1: this.toString() === toString(). Actual: ' + (this.toString()));
 }
 
 //CHECK#2
 if (eval("this").toString() !== toString()) {
-  $ERROR('#2: eval("this").toString() === toString(). Actual: ' + (this.toString()));  
+  $ERROR('#2: eval("this").toString() === toString(). Actual: ' + (this.toString()));
 }
diff --git a/test/suite/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A3.1.js b/test/suite/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A3.1.js
index 8c168a87eb..a45f547f72 100644
--- a/test/suite/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A3.1.js
+++ b/test/suite/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A3.1.js
@@ -6,18 +6,19 @@
  * @section: 11.1.1;
  * @assertion: Being in function code, "this" and eval("this"), called as a functions, return the global object;
  * @description: Creating function which returns "this" or eval("this");
+ * @non_strict_only
 */
 
 //CHECK#1
 function MyFunction() {return this}
 if (MyFunction() !== this) {
-  $ERROR('#1: function MyFunction() {return this} MyFunction() === this. Actual: ' + (MyFunction()));  
+  $ERROR('#1: function MyFunction() {return this} MyFunction() === this. Actual: ' + (MyFunction()));
 }
 
 //CHECK#2
 function MyFunction() {return eval("this")}
 if (MyFunction() !== this) {
-  $ERROR('#2: function MyFunction() {return eval("this")} MyFunction() === this. Actual: ' + (MyFunction()));  
+  $ERROR('#2: function MyFunction() {return eval("this")} MyFunction() === this. Actual: ' + (MyFunction()));
 }
 
 
diff --git a/test/suite/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A3.2.js b/test/suite/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A3.2.js
index 96361b6da4..6c591b0c69 100644
--- a/test/suite/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A3.2.js
+++ b/test/suite/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A3.2.js
@@ -6,17 +6,18 @@
  * @section: 11.1.1;
  * @assertion: Being in function code, "this" and eval("this"), called as a constructors, return the object;
  * @description: Create function. It have property, that returned "this";
+ * @non_strict_only
 */
 
 //CHECK#1
 function MyFunction() {this.THIS = this}
 if ((new MyFunction()).THIS.toString() !== "[object Object]") {
-  $ERROR('#1: function MyFunction() {this.THIS = this} (new MyFunction()).THIS.toString() !== "[object Object]". Actual: ' + ((new MyFunction()).THIS.toString()));  
+  $ERROR('#1: function MyFunction() {this.THIS = this} (new MyFunction()).THIS.toString() !== "[object Object]". Actual: ' + ((new MyFunction()).THIS.toString()));
 }
 
 //CHECK#2
 function MyFunction() {this.THIS = eval("this")}
 if ((new MyFunction()).THIS.toString() !== "[object Object]") {
-  $ERROR('#2: function MyFunction() {this.THIS = eval("this")} (new MyFunction()).THIS.toString() !== "[object Object]". Actual: ' + ((new MyFunction()).THIS.toString()));  
+  $ERROR('#2: function MyFunction() {this.THIS = eval("this")} (new MyFunction()).THIS.toString() !== "[object Object]". Actual: ' + ((new MyFunction()).THIS.toString()));
 }
 
diff --git a/test/suite/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A4.1.js b/test/suite/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A4.1.js
index 5b7c1c87a4..8acf412c59 100644
--- a/test/suite/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A4.1.js
+++ b/test/suite/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A4.1.js
@@ -11,13 +11,13 @@
 //CHECK#1
 var MyFunction = new Function("return this");
 if (MyFunction() !== this) {
-  $ERROR('#1: var MyFunction = new Function("return this"); MyFunction() === this. Actual: ' + (MyFunction()));  
+  $ERROR('#1: var MyFunction = new Function("return this"); MyFunction() === this. Actual: ' + (MyFunction()));
 }
 
 //CHECK#2
-var MyFunction = new Function("return eval(\'this\')");
+MyFunction = new Function("return eval(\'this\')");
 if (MyFunction() !== this) {
-  $ERROR('#2: var MyFunction = new Function("return eval(\'this\')"); MyFunction() === this. Actual: ' + (MyFunction()));  
+  $ERROR('#2: var MyFunction = new Function("return eval(\'this\')"); MyFunction() === this. Actual: ' + (MyFunction()));
 }
 
 
diff --git a/test/suite/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A4.2.js b/test/suite/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A4.2.js
index 279d81775c..877ab1b5fd 100644
--- a/test/suite/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A4.2.js
+++ b/test/suite/sputnik/Conformance/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A4.2.js
@@ -12,13 +12,13 @@
 var MyFunction = new Function("this.THIS = this");
 var MyObject = new MyFunction();
 if (MyObject.THIS.toString() !== "[object Object]") {
-  $ERROR('#1: var MyFunction = new Function("this.THIS = this"); var MyObject = new MyFunction(); MyObject.THIS.toString() === "[object Object]". Actual: ' + (MyObject.THIS.toString()));  
+  $ERROR('#1: var MyFunction = new Function("this.THIS = this"); var MyObject = new MyFunction(); MyObject.THIS.toString() === "[object Object]". Actual: ' + (MyObject.THIS.toString()));
 }
 
 //CHECK#2
-var MyFunction = new Function("this.THIS = eval(\'this\')");
-var MyObject = new MyFunction();
+MyFunction = new Function("this.THIS = eval(\'this\')");
+MyObject = new MyFunction();
 if (MyObject.THIS.toString() !== "[object Object]") {
-  $ERROR('#2: var MyFunction = new Function("this.THIS = eval(\'this\')"); var MyObject = new MyFunction(); MyObject.THIS.toString() === "[object Object]". Actual: ' + (MyObject.THIS.toString()));  
+  $ERROR('#2: var MyFunction = new Function("this.THIS = eval(\'this\')"); var MyObject = new MyFunction(); MyObject.THIS.toString() === "[object Object]". Actual: ' + (MyObject.THIS.toString()));
 }
 
diff --git a/test/suite/sputnik/Conformance/12_Statement/12.7_The_continue_Statement/S12.7_A3.js b/test/suite/sputnik/Conformance/12_Statement/12.7_The_continue_Statement/S12.7_A3.js
index 21bac20239..9d2c52cea1 100644
--- a/test/suite/sputnik/Conformance/12_Statement/12.7_The_continue_Statement/S12.7_A3.js
+++ b/test/suite/sputnik/Conformance/12_Statement/12.7_The_continue_Statement/S12.7_A3.js
@@ -14,7 +14,7 @@ LABEL_DO_LOOP : do {
     LABEL_IN : x=2;
     continue ;
     LABEL_IN_2 : var y=2;
-    
+
     function IN_DO_FUNC(){}
 } while(0);
 
diff --git a/test/suite/sputnik/Conformance/13_Function_Definition/13.2_Creating_Function_Objects/S13.2.1_A7_T3.js b/test/suite/sputnik/Conformance/13_Function_Definition/13.2_Creating_Function_Objects/S13.2.1_A7_T3.js
index e1c3038a57..a75a414f0e 100644
--- a/test/suite/sputnik/Conformance/13_Function_Definition/13.2_Creating_Function_Objects/S13.2.1_A7_T3.js
+++ b/test/suite/sputnik/Conformance/13_Function_Definition/13.2_Creating_Function_Objects/S13.2.1_A7_T3.js
@@ -4,14 +4,14 @@
 /**
 * @name: S13.2.1_A7_T3;
 * @section: 13.2.1;
-* @assertion: When the [[Call]] property for a Function object F is called, the following steps are taken: 
-* 2. Evaluate F's FunctionBody; 
+* @assertion: When the [[Call]] property for a Function object F is called, the following steps are taken:
+* 2. Evaluate F's FunctionBody;
 * if Result.type is returned  then Result.value is returned too;
 * @description: Returning number. Declaring a function with "function __func()";
 */
 
 function __func(){
-    x = 1;
+    var x = 1;
     return x;
 }
 
diff --git a/test/suite/sputnik/Conformance/13_Function_Definition/13.2_Creating_Function_Objects/S13.2.2_A14.js b/test/suite/sputnik/Conformance/13_Function_Definition/13.2_Creating_Function_Objects/S13.2.2_A14.js
index b5594124e7..c668d6bdf8 100644
--- a/test/suite/sputnik/Conformance/13_Function_Definition/13.2_Creating_Function_Objects/S13.2.2_A14.js
+++ b/test/suite/sputnik/Conformance/13_Function_Definition/13.2_Creating_Function_Objects/S13.2.2_A14.js
@@ -6,15 +6,16 @@
 * @section: 13.2.2;
 * @assertion: Calling a function as a constructor is inadmissible as long as this.any_Function is declared by eval and called;
 * @description: Calling a function as a constructor after it has been declared by eval;
+* @non_strict_only
 */
 
 function FACTORY(){
    this.id = 0;
-   
+
    eval("function func(){return \"id_string\";}");
-      
+
    this.id = func();
-     
+
 }
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1

From b796d10c4b5cf5785a60919258692c44f217f140 Mon Sep 17 00:00:00 2001
From: Mark Miller <erights@gmail.com>
Date: Tue, 13 Sep 2011 22:37:44 -0700
Subject: [PATCH 3/4] The generated converted test, as generated from fixed
 converter applied to many fixed sources, corresponding to previous two
 commits

---
 .../7.4_Comments/S7.4_A5.js                   |  24 +--
 .../7.4_Comments/S7.4_A6.js                   |  14 +-
 .../7.5.1_Reserved_Words/S7.5.1_A2.js         | 169 +++++++++---------
 .../S7.5.3_A1.1.js                            |   2 +-
 .../S7.5.3_A1.10.js                           |   2 +-
 .../S7.5.3_A1.11.js                           |   2 +-
 .../S7.5.3_A1.12.js                           |   2 +-
 .../S7.5.3_A1.13.js                           |   2 +-
 .../S7.5.3_A1.14.js                           |   2 +-
 .../S7.5.3_A1.15.js                           |   4 +-
 .../S7.5.3_A1.15ns.js                         |   4 +-
 .../S7.5.3_A1.16.js                           |   2 +-
 .../S7.5.3_A1.17.js                           |   2 +-
 .../S7.5.3_A1.18.js                           |   5 +-
 .../S7.5.3_A1.18ns.js                         |   3 +-
 .../S7.5.3_A1.19.js                           |   2 +-
 .../S7.5.3_A1.2.js                            |   2 +-
 .../S7.5.3_A1.20.js                           |   2 +-
 .../S7.5.3_A1.21.js                           |   5 +-
 .../S7.5.3_A1.21ns.js                         |   3 +-
 .../S7.5.3_A1.22.js                           |   5 +-
 .../S7.5.3_A1.22ns.js                         |   3 +-
 .../S7.5.3_A1.23.js                           |   5 +-
 .../S7.5.3_A1.23ns.js                         |   3 +-
 .../S7.5.3_A1.24.js                           |   5 +-
 .../S7.5.3_A1.24ns.js                         |   3 +-
 .../S7.5.3_A1.25.js                           |   2 +-
 .../S7.5.3_A1.26.js                           |   5 +-
 .../S7.5.3_A1.26ns.js                         |   3 +-
 .../S7.5.3_A1.27.js                           |   2 +-
 .../S7.5.3_A1.28.js                           |   2 +-
 .../S7.5.3_A1.29.js                           |   2 +-
 .../S7.5.3_A1.3.js                            |   2 +-
 .../S7.5.3_A1.30.js                           |   2 +-
 .../S7.5.3_A1.31.js                           |   2 +-
 .../S7.5.3_A1.4.js                            |   2 +-
 .../S7.5.3_A1.5.js                            |   2 +-
 .../S7.5.3_A1.6.js                            |   2 +-
 .../S7.5.3_A1.7.js                            |   2 +-
 .../S7.5.3_A1.8.js                            |   2 +-
 .../S7.5.3_A1.9.js                            |   2 +-
 .../7.6_Identifiers/S7.6_A4.1_T1.js           |  52 +++---
 .../7.6_Identifiers/S7.6_A4.1_T2.js           |  52 +++---
 .../7.6_Identifiers/S7.6_A4.2_T1.js           |  66 +++----
 .../7.6_Identifiers/S7.6_A4.2_T2.js           |  66 +++----
 .../7.6_Identifiers/S7.6_A4.3_T1.js           |  20 +--
 .../7.8.4_String_Literals/S7.8.4_A2.1_T1.js   |   6 +-
 .../7.8.4_String_Literals/S7.8.4_A2.1_T2.js   |   6 +-
 .../7.8.4_String_Literals/S7.8.4_A2.2_T1.js   |   6 +-
 .../7.8.4_String_Literals/S7.8.4_A2.2_T2.js   |   6 +-
 .../7.8.4_String_Literals/S7.8.4_A2.3_T1.js   |   6 +-
 .../7.8.4_String_Literals/S7.8.4_A4.2_T1.js   |   6 +-
 .../7.8.4_String_Literals/S7.8.4_A4.2_T3.js   |   6 +-
 .../7.8.4_String_Literals/S7.8.4_A4.2_T5.js   |   6 +-
 .../7.8.4_String_Literals/S7.8.4_A4.2_T7.js   |   6 +-
 .../7.8.4_String_Literals/S7.8.4_A4.3_T7.js   |  12 +-
 .../7.8.4_String_Literals/S7.8.4_A6.1_T2.js   |   6 +-
 .../7.8.4_String_Literals/S7.8.4_A6.1_T3.js   |   6 +-
 .../7.8.4_String_Literals/S7.8.4_A7.1_T2.js   |   6 +-
 .../7.8.4_String_Literals/S7.8.4_A7.1_T3.js   |   6 +-
 .../S7.8.5_A1.1_T2.js                         |  44 ++---
 .../S7.8.5_A2.1_T2.js                         |  46 ++---
 .../S7.8.5_A2.4_T2.js                         |  44 ++---
 .../S7.9_A11_T1.js                            |   2 +-
 .../S7.9_A11_T10.js                           |   2 +-
 .../S7.9_A11_T11.js                           |   4 +-
 .../S7.9_A11_T2.js                            |   4 +-
 .../S7.9_A11_T3.js                            |   4 +-
 .../S7.9_A11_T4.js                            |   2 +-
 .../S7.9_A11_T5.js                            |   2 +-
 .../S7.9_A11_T6.js                            |   4 +-
 .../S7.9_A11_T7.js                            |   4 +-
 .../S7.9_A11_T8.js                            |   4 +-
 .../S7.9_A11_T9.js                            |   4 +-
 .../S7.9_A5.7_T1.js                           |   2 +-
 .../S7.9_A5.8_T1.js                           |   4 +-
 .../S7.9_A5.9_T1.js                           |   4 +-
 .../08_Types/8.2_The_Null_Type/S8.2_A1_T2.js  |   2 +-
 .../08_Types/8.5_The_Number_Type/S8.5_A9.js   |   2 +-
 .../8.6.1_Property_Attributes/S8.6.1_A1.js    |   2 +-
 .../8.6.1_Property_Attributes/S8.6.1_A3.js    |   2 +-
 .../S8.6.2.3_A1.js                            |   2 +-
 .../S8.6.2.5_A1.js                            |   2 +-
 .../S8.6.2_A2.js                              |   4 +-
 .../S8.6.2_A5_T1.js                           |   2 +-
 .../S8.6.2_A5_T2.js                           |   2 +-
 .../S8.6.2_A5_T3.js                           |   4 +-
 .../S8.6.2_A5_T4.js                           |   2 +-
 .../8.6_The_Object_Type/S8.6_A4_T1.js         |   8 +-
 .../8.7_The_Reference_Type/S8.7.1_A2.js       |   1 +
 .../8.7_The_Reference_Type/S8.7_A5_T1.js      |   2 +-
 .../8.7_The_Reference_Type/S8.7_A5_T2.js      |   2 +-
 .../9.9_ToObject/S9.9_A1.js                   |   9 +-
 .../9.9_ToObject/S9.9_A2.js                   |  11 +-
 .../S10.1.3_A2.js                             |   1 +
 .../S10.1.3_A4_T1.js                          |   5 +-
 .../S10.1.4_A1_T5.js                          |   1 +
 .../S10.1.4_A1_T6.js                          |   1 +
 .../S10.1.4_A1_T7.js                          |   3 +-
 .../S10.1.4_A1_T8.js                          |   1 +
 .../S10.1.4_A1_T9.js                          |   1 +
 .../10.1.8_Arguments_Object/S10.1.8_A3_T3.js  |   5 +-
 .../10.1.8_Arguments_Object/S10.1.8_A3_T4.js  |   5 +-
 .../10.1.8_Arguments_Object/S10.1.8_A4.js     |   1 +
 .../10.1.8_Arguments_Object/S10.1.8_A5_T4.js  |   6 +-
 .../10.1_Definitions/S10.1.6_A1_T1.js         |   5 +-
 .../10.1_Definitions/S10.1.6_A1_T3.js         |   1 +
 .../10.2.1_Global_Code/S10.2.1_A1_T1.js       |   1 +
 .../10.2.1_Global_Code/S10.2.1_A1_T2.js       |   1 +
 .../11.10.1_AND_Operator/S11.10.1_A2.4_T3.js  |   5 +-
 .../11.10.2_XOR_Operator/S11.10.2_A2.4_T3.js  |   5 +-
 .../11.10.3_OR_Operator/S11.10.3_A2.4_T3.js   |   5 +-
 .../S11.11.1_A2.4_T3.js                       |   5 +-
 .../S11.11.2_A2.4_T3.js                       |   5 +-
 .../11.13.1_Simple_Assignment/S11.13.1_A1.js  |   5 +-
 .../11.1.1_The_this_Keyword/S11.1.1_A2.js     |   5 +-
 .../11.1.1_The_this_Keyword/S11.1.1_A3.1.js   |   5 +-
 .../11.1.1_The_this_Keyword/S11.1.1_A3.2.js   |   5 +-
 .../11.1.1_The_this_Keyword/S11.1.1_A4.1.js   |   6 +-
 .../11.1.1_The_this_Keyword/S11.1.1_A4.2.js   |   8 +-
 .../S12.10_A1.10_T1.js                        |   2 +-
 .../S12.10_A1.10_T2.js                        |   2 +-
 .../S12.10_A1.10_T3.js                        |   2 +-
 .../S12.10_A1.10_T4.js                        |   2 +-
 .../S12.10_A1.10_T5.js                        |   2 +-
 .../S12.10_A1.11_T1.js                        |   2 +-
 .../S12.10_A1.11_T2.js                        |   2 +-
 .../S12.10_A1.11_T3.js                        |   2 +-
 .../S12.10_A1.11_T4.js                        |   2 +-
 .../S12.10_A1.11_T5.js                        |   2 +-
 .../S12.10_A1.12_T1.js                        |   2 +-
 .../S12.10_A1.12_T2.js                        |   2 +-
 .../S12.10_A1.12_T3.js                        |   2 +-
 .../S12.10_A1.12_T4.js                        |   2 +-
 .../S12.10_A1.12_T5.js                        |   2 +-
 .../S12.10_A1.1_T1.js                         |   2 +-
 .../S12.10_A1.1_T2.js                         |   2 +-
 .../S12.10_A1.1_T3.js                         |   2 +-
 .../S12.10_A1.2_T1.js                         |   2 +-
 .../S12.10_A1.2_T2.js                         |   2 +-
 .../S12.10_A1.2_T3.js                         |   2 +-
 .../S12.10_A1.2_T4.js                         |   2 +-
 .../S12.10_A1.2_T5.js                         |   2 +-
 .../S12.10_A1.3_T1.js                         |   2 +-
 .../S12.10_A1.3_T2.js                         |   2 +-
 .../S12.10_A1.3_T3.js                         |   2 +-
 .../S12.10_A1.3_T4.js                         |   2 +-
 .../S12.10_A1.3_T5.js                         |   2 +-
 .../S12.10_A1.4_T1.js                         |   2 +-
 .../S12.10_A1.4_T2.js                         |   2 +-
 .../S12.10_A1.4_T3.js                         |   2 +-
 .../S12.10_A1.4_T4.js                         |   2 +-
 .../S12.10_A1.4_T5.js                         |   2 +-
 .../S12.10_A1.5_T1.js                         |   2 +-
 .../S12.10_A1.5_T2.js                         |   2 +-
 .../S12.10_A1.5_T3.js                         |   2 +-
 .../S12.10_A1.5_T4.js                         |   2 +-
 .../S12.10_A1.5_T5.js                         |   2 +-
 .../S12.10_A1.6_T1.js                         |   2 +-
 .../S12.10_A1.6_T2.js                         |   2 +-
 .../S12.10_A1.6_T3.js                         |   2 +-
 .../S12.10_A1.7_T1.js                         |   2 +-
 .../S12.10_A1.7_T2.js                         |   2 +-
 .../S12.10_A1.7_T3.js                         |   2 +-
 .../S12.10_A1.7_T4.js                         |   2 +-
 .../S12.10_A1.7_T5.js                         |   2 +-
 .../S12.10_A1.8_T1.js                         |   2 +-
 .../S12.10_A1.8_T2.js                         |   2 +-
 .../S12.10_A1.8_T3.js                         |   2 +-
 .../S12.10_A1.8_T4.js                         |   2 +-
 .../S12.10_A1.8_T5.js                         |   2 +-
 .../S12.10_A1.9_T1.js                         |   2 +-
 .../S12.10_A1.9_T2.js                         |   2 +-
 .../S12.10_A1.9_T3.js                         |   2 +-
 .../S12.10_A3.10_T1.js                        |   2 +-
 .../S12.10_A3.10_T2.js                        |   2 +-
 .../S12.10_A3.10_T3.js                        |   2 +-
 .../S12.10_A3.10_T4.js                        |   2 +-
 .../S12.10_A3.10_T5.js                        |   2 +-
 .../S12.10_A3.11_T1.js                        |   2 +-
 .../S12.10_A3.11_T2.js                        |   2 +-
 .../S12.10_A3.11_T3.js                        |   2 +-
 .../S12.10_A3.11_T4.js                        |   2 +-
 .../S12.10_A3.11_T5.js                        |   2 +-
 .../S12.10_A3.12_T1.js                        |   2 +-
 .../S12.10_A3.12_T2.js                        |   2 +-
 .../S12.10_A3.12_T3.js                        |   2 +-
 .../S12.10_A3.12_T4.js                        |   2 +-
 .../S12.10_A3.12_T5.js                        |   2 +-
 .../S12.10_A3.1_T1.js                         |   2 +-
 .../S12.10_A3.1_T2.js                         |   2 +-
 .../S12.10_A3.1_T3.js                         |   2 +-
 .../S12.10_A3.2_T1.js                         |   2 +-
 .../S12.10_A3.2_T2.js                         |   2 +-
 .../S12.10_A3.2_T3.js                         |   2 +-
 .../S12.10_A3.2_T4.js                         |   2 +-
 .../S12.10_A3.2_T5.js                         |   2 +-
 .../S12.10_A3.3_T1.js                         |   2 +-
 .../S12.10_A3.3_T2.js                         |   2 +-
 .../S12.10_A3.3_T3.js                         |   2 +-
 .../S12.10_A3.3_T4.js                         |   2 +-
 .../S12.10_A3.3_T5.js                         |   2 +-
 .../S12.10_A3.4_T1.js                         |   2 +-
 .../S12.10_A3.4_T2.js                         |   2 +-
 .../S12.10_A3.4_T3.js                         |   2 +-
 .../S12.10_A3.4_T4.js                         |   2 +-
 .../S12.10_A3.4_T5.js                         |   2 +-
 .../S12.10_A3.5_T1.js                         |   2 +-
 .../S12.10_A3.5_T2.js                         |   2 +-
 .../S12.10_A3.5_T3.js                         |   2 +-
 .../S12.10_A3.5_T4.js                         |   2 +-
 .../S12.10_A3.5_T5.js                         |   2 +-
 .../S12.10_A3.6_T1.js                         |   2 +-
 .../S12.10_A3.6_T2.js                         |   2 +-
 .../S12.10_A3.6_T3.js                         |   2 +-
 .../S12.10_A3.7_T1.js                         |   2 +-
 .../S12.10_A3.7_T2.js                         |   2 +-
 .../S12.10_A3.7_T3.js                         |   2 +-
 .../S12.10_A3.7_T4.js                         |   2 +-
 .../S12.10_A3.7_T5.js                         |   2 +-
 .../S12.10_A3.8_T1.js                         |   2 +-
 .../S12.10_A3.8_T2.js                         |   2 +-
 .../S12.10_A3.8_T3.js                         |   2 +-
 .../S12.10_A3.8_T4.js                         |   2 +-
 .../S12.10_A3.8_T5.js                         |   2 +-
 .../S12.10_A3.9_T1.js                         |   2 +-
 .../S12.10_A3.9_T2.js                         |   2 +-
 .../S12.10_A3.9_T3.js                         |   2 +-
 .../12.10_The_with_Statement/S12.10_A4_T1.js  |   2 +-
 .../12.10_The_with_Statement/S12.10_A4_T2.js  |   2 +-
 .../12.10_The_with_Statement/S12.10_A4_T3.js  |   2 +-
 .../12.10_The_with_Statement/S12.10_A4_T4.js  |   2 +-
 .../12.10_The_with_Statement/S12.10_A4_T5.js  |   2 +-
 .../12.10_The_with_Statement/S12.10_A4_T6.js  |   2 +-
 .../12.10_The_with_Statement/S12.10_A5_T1.js  |   2 +-
 .../12.10_The_with_Statement/S12.10_A5_T2.js  |   2 +-
 .../12.10_The_with_Statement/S12.10_A5_T3.js  |   2 +-
 .../12.10_The_with_Statement/S12.10_A5_T4.js  |   2 +-
 .../12.10_The_with_Statement/S12.10_A5_T5.js  |   2 +-
 .../12.10_The_with_Statement/S12.10_A5_T6.js  |   2 +-
 .../12.14_The_try_Statement/S12.14_A14.js     |   2 +-
 .../12.14_The_try_Statement/S12.14_A4.js      |   2 +-
 .../12_Statement/12.1_Block/S12.1_A1.js       |   3 +-
 .../12.5_The_if_Statement/S12.5_A9_T1.js      |   3 +-
 .../S12.6.1_A13_T1.js                         |   3 +-
 .../12.7_The_continue_Statement/S12.7_A3.js   |   2 +-
 .../S13.2.1_A7_T3.js                          |   2 +-
 .../S13.2.2_A14.js                            |   7 +-
 .../15.1.1.1_NaN/S15.1.1.1_A2_T1.js           |   2 +-
 .../15.1.1.1_NaN/S15.1.1.1_A3.1.js            |   2 +-
 .../15.1.1.2_Infinity/S15.1.1.2_A2_T1.js      |   2 +-
 .../15.1.1.2_Infinity/S15.1.1.2_A3.1.js       |   2 +-
 .../15.1.1.3_undefined/S15.1.1.3_A2_T1.js     |   2 +-
 .../15.1.1.3_undefined/S15.1.1.3_A2_T2.js     |   2 +-
 .../15.1.1.3_undefined/S15.1.1.3_A3.1.js      |   2 +-
 .../15.1.2.1_eval/S15.1.2.1_A4.3.js           |   2 +-
 .../15.1.2.2_parseInt/S15.1.2.2_A9.2.js       |   2 +-
 .../15.1.2.2_parseInt/S15.1.2.2_A9.3.js       |   2 +-
 .../15.1.2.3_parseFloat/S15.1.2.3_A7.2.js     |   2 +-
 .../15.1.2.3_parseFloat/S15.1.2.3_A7.3.js     |   2 +-
 .../15.1.2.4_isNaN/S15.1.2.4_A2.2.js          |   2 +-
 .../15.1.2.4_isNaN/S15.1.2.4_A2.3.js          |   2 +-
 .../15.1.2.5_isFinite/S15.1.2.5_A2.2.js       |   2 +-
 .../15.1.2.5_isFinite/S15.1.2.5_A2.3.js       |   2 +-
 .../15.1.3.1_decodeURI/S15.1.3.1_A5.2.js      |   2 +-
 .../15.1.3.1_decodeURI/S15.1.3.1_A5.3.js      |   2 +-
 .../S15.2.4.2_A10.js                          |   2 +-
 .../S15.2.4.2_A9.js                           |   2 +-
 .../S15.2.4.3_A9.js                           |   2 +-
 .../S15.2.4.4_A9.js                           |   2 +-
 .../S15.2.4.6_A10.js                          |   2 +-
 .../S15.2.4.7_A10.js                          |   2 +-
 .../15.4.3.1_Array_prototype/S15.4.3.1_A3.js  |   2 +-
 .../15.4.3.1_Array_prototype/S15.4.3.1_A4.js  |   2 +-
 .../S15.4.4.10_A5.3.js                        |   2 +-
 .../S15.4.4.11_A7.2.js                        |   2 +-
 .../S15.4.4.11_A7.3.js                        |   2 +-
 .../S15.4.4.12_A5.2.js                        |   2 +-
 .../S15.4.4.12_A5.3.js                        |   2 +-
 .../S15.4.4.13_A5.2.js                        |   2 +-
 .../S15.4.4.13_A5.3.js                        |   2 +-
 .../S15.4.4.2_A4.2.js                         |   2 +-
 .../S15.4.4.2_A4.3.js                         |   2 +-
 .../S15.4.4.3_A4.3.js                         |   2 +-
 .../S15.4.4.4_A4.2.js                         |   2 +-
 .../S15.4.4.4_A4.3.js                         |   2 +-
 .../S15.4.4.5_A6.2.js                         |   2 +-
 .../S15.4.4.5_A6.3.js                         |   2 +-
 .../S15.4.4.6_A5.2.js                         |   2 +-
 .../S15.4.4.6_A5.3.js                         |   2 +-
 .../S15.4.4.7_A6.2.js                         |   2 +-
 .../S15.4.4.7_A6.3.js                         |   2 +-
 .../S15.4.4.8_A5.2.js                         |   2 +-
 .../S15.4.4.8_A5.3.js                         |   2 +-
 .../S15.4.4.9_A5.3.js                         |   2 +-
 .../S15.7.3.1_A1_T2.js                        |   2 +-
 .../15.7.3.2_Number.MAX_VALUE/S15.7.3.2_A3.js |   2 +-
 .../15.7.3.3_Number.MIN_VALUE/S15.7.3.3_A3.js |   2 +-
 .../15.7.3.4_Number.NaN/S15.7.3.4_A3.js       |   2 +-
 .../S15.7.3.5_A3.js                           |   2 +-
 .../S15.7.3.6_A3.js                           |   2 +-
 .../15.8.1.1_E/S15.8.1.1_A3.js                |   2 +-
 .../15.8.1.1_E/S15.8.1.1_A4.js                |   2 +-
 .../15.8.1.2_LN10/S15.8.1.2_A3.js             |   2 +-
 .../15.8.1.2_LN10/S15.8.1.2_A4.js             |   2 +-
 .../15.8.1.3_LN2/S15.8.1.3_A3.js              |   2 +-
 .../15.8.1.3_LN2/S15.8.1.3_A4.js              |   2 +-
 .../15.8.1.4_LOG2E/S15.8.1.4_A3.js            |   2 +-
 .../15.8.1.4_LOG2E/S15.8.1.4_A4.js            |   2 +-
 .../15.8.1.5_LOG10E/S15.8.1.5_A3.js           |   2 +-
 .../15.8.1.5_LOG10E/S15.8.1.5_A4.js           |   2 +-
 .../15.8.1.6_PI/S15.8.1.6_A3.js               |   2 +-
 .../15.8.1.6_PI/S15.8.1.6_A4.js               |   2 +-
 .../15.8.1.7_SQRT1_2/S15.8.1.7_A3.js          |   2 +-
 .../15.8.1.7_SQRT1_2/S15.8.1.7_A4.js          |   2 +-
 .../15.8.1.8_SQRT2/S15.8.1.8_A3.js            |   2 +-
 .../15.8.1.8_SQRT2/S15.8.1.8_A4.js            |   2 +-
 317 files changed, 718 insertions(+), 677 deletions(-)

diff --git a/test/suite/converted/07_Lexical_Conventions/7.4_Comments/S7.4_A5.js b/test/suite/converted/07_Lexical_Conventions/7.4_Comments/S7.4_A5.js
index 119d9f342c..459ce84750 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.4_Comments/S7.4_A5.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.4_Comments/S7.4_A5.js
@@ -10,20 +10,20 @@
  */
 
 //CHECK
-errorCount = 0;
-count = 0;
+var errorCount = 0;
+var count = 0;
 var hex = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"];
-for (i1 = 0; i1 < 16; i1++) {
-  for (i2 = 0; i2 < 16; i2++) {
-    for (i3 = 0; i3 < 16; i3++) {
-      for (i4 = 0; i4 < 16; i4++) {
-        try {    
+for (var i1 = 0; i1 < 16; i1++) {
+  for (var i2 = 0; i2 < 16; i2++) {
+    for (var i3 = 0; i3 < 16; i3++) {
+      for (var i4 = 0; i4 < 16; i4++) {
+        try {
           var uu = hex[i1] + hex[i2] + hex[i3] + hex[i4];
           var xx = String.fromCharCode("0x" + uu);
           var LineTerminators = ((uu === "000A") || (uu === "000D") || (uu === "2028") || (uu === "2029"));
-          var yy = 0;     
-          eval("//var " + xx + "yy = -1");          
-          if (LineTerminators !== true) { 
+          var yy = 0;
+          eval("//var " + xx + "yy = -1");
+          if (LineTerminators !== true) {
             if (yy !== 0) {
               $ERROR('#' + uu + ' ');
               errorCount++;
@@ -39,12 +39,12 @@ for (i1 = 0; i1 < 16; i1++) {
           errorCount++;
         }
         count++;
-      }  
+      }
     }
   }
 }
 
-if (errorCount > 0) {    
+if (errorCount > 0) {
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count);
 }
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.4_Comments/S7.4_A6.js b/test/suite/converted/07_Lexical_Conventions/7.4_Comments/S7.4_A6.js
index 4aac94170e..b2787e86c6 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.4_Comments/S7.4_A6.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.4_Comments/S7.4_A6.js
@@ -10,25 +10,25 @@
  */
 
 //CHECK
-errorCount = 0;
-count = 0;
-for (indexI = 0; indexI <= 65535; indexI++) {
+var errorCount = 0;
+var count = 0;
+for (var indexI = 0; indexI <= 65535; indexI++) {
   try {
-    var xx = 0;    
+    var xx = 0;
     eval("/*var " + String.fromCharCode(indexI) + "xx = 1*/");
     var hex = decimalToHexString(indexI);
     if (xx !== 0) {
       $ERROR('#' + hex + ' ');
       errorCount++;
-    }    
+    }
   } catch (e){
     $ERROR('#' + hex + ' ');
     errorCount++;
   }
   count++;
-}  
+}
 
-if (errorCount > 0) {    
+if (errorCount > 0) {
   $ERROR('Total error: ' + errorCount + ' bad Unicode character in ' + count);
 }
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.1_Reserved_Words/S7.5.1_A2.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.1_Reserved_Words/S7.5.1_A2.js
index bd5945db90..56c19cb741 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.1_Reserved_Words/S7.5.1_A2.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.1_Reserved_Words/S7.5.1_A2.js
@@ -10,114 +10,113 @@
  */
 
 // a
-and = 1;
-and_eq = 1;
-as = 1;
-asm = 1; 
-assert = 1;
-auto = 1;
+var and = 1;
+var and_eq = 1;
+var as = 1;
+var asm = 1;
+var assert = 1;
+var auto = 1;
 // b
-base = 1;
-bitand = 1;
-bitor = 1;
-bool = 1;
-byvalue = 1;
+var base = 1;
+var bitand = 1;
+var bitor = 1;
+var bool = 1;
+var byvalue = 1;
 // c
-checked = 1;
-clone = 1;
-comment = 1;
-compl = 1;
-const_cast = 1;
+var checked = 1;
+var clone = 1;
+var comment = 1;
+var compl = 1;
+var const_cast = 1;
 // d
-decimal = 1;
-delegate = 1;
-dynamic_cast = 1;
+var decimal = 1;
+var delegate = 1;
+var dynamic_cast = 1;
 // e
-explicit = 1;
-extern = 1;
-equals = 1;
-event = 1;
+var explicit = 1;
+var extern = 1;
+var equals = 1;
+var event = 1;
 // f
-finalize = 1;
-fixed = 1;
-friend = 1;
-foreach = 1;
-future = 1;
+var finalize = 1;
+var fixed = 1;
+var friend = 1;
+var foreach = 1;
+var future = 1;
 // g
-getClass = 1;
-generic = 1;
+var getClass = 1;
+var generic = 1;
 // h
-hashCode = 1;
+var hashCode = 1;
 // i
-implicit = 1;
-infinity = 1;
-inline = 1;
-inner = 1;
-internal = 1;
-is = 1;
+var implicit = 1;
+var infinity = 1;
+var inline = 1;
+var inner = 1;
+var internal = 1;
+var is = 1;
 // j
 // k
 // l
-lock = 1;
+var lock = 1;
 // m
-mutable = 1;
+var mutable = 1;
 // n
-NaN = 1;
-namespace = 1;
-not = 1;
-notify = 1;
-notifyAll = 1;
-not_eq = 1;
+var namespace = 1;
+var not = 1;
+var notify = 1;
+var notifyAll = 1;
+var not_eq = 1;
 // o
-object = 1;
-operator = 1;
-or = 1;
-or_eq = 1;
-out = 1;
-outer = 1;
-override = 1;
+var object = 1;
+var operator = 1;
+var or = 1;
+var or_eq = 1;
+var out = 1;
+var outer = 1;
+var override = 1;
 // p
-params = 1;
+var params = 1;
 // q
 // r
-readonly = 1;
-reinterpret_cast = 1;
-ref = 1;
-register = 1;
+var readonly = 1;
+var reinterpret_cast = 1;
+var ref = 1;
+var register = 1;
 
 // s
-sbyte = 1;
-signed = 1;
-sizeof = 1;
-stackalloc = 1;
-static_cast = 1;
-string = 1;
-strictfp = 1;
-struct = 1;
+var sbyte = 1;
+var signed = 1;
+var sizeof = 1;
+var stackalloc = 1;
+var static_cast = 1;
+var string = 1;
+var strictfp = 1;
+var struct = 1;
 // t
-template = 1;
-toString = 1;
-typedef = 1;
-typeid = 1;
+var template = 1;
+var toString = 1;
+var typedef = 1;
+var typeid = 1;
 // u
-uint = 1;
-unchecked = 1;
-undefiend = 1;
-union = 1;
-unsafe = 1;
-unsigned = 1;
-use = 1;
-using = 1;
-ushort = 1;
+var uint = 1;
+var unchecked = 1;
+var undefiend = 1;
+var union = 1;
+var unsafe = 1;
+var unsigned = 1;
+var use = 1;
+var using = 1;
+var ushort = 1;
 // v
-valueOf = 1;
-virtual = 1;
+var valueOf = 1;
+var virtual = 1;
 // w
-wait = 1;
-wchar_t = 1;
+var wait = 1;
+var wchar_t = 1;
 // x
-xor = 1;
-xor_eq = 1;
+var xor = 1;
+var xor_eq = 1;
 // y
-// z 
+// z
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.1.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.1.js
index 3bc1827b22..c2ff39fd8c 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.1.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.1.js
@@ -9,5 +9,5 @@
  * @description Checking if execution of "abstract=1" succeeds
  */
 
-abstract = 1;
+var abstract = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.10.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.10.js
index e91f05ad21..98c8bc9e6b 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.10.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.10.js
@@ -10,5 +10,5 @@
  * @negative
  */
 
-export = 1;
+var export = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.11.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.11.js
index 80e231b854..f20f38f1a9 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.11.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.11.js
@@ -10,5 +10,5 @@
  * @negative
  */
 
-extends = 1;
+var extends = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.12.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.12.js
index 4a8512ab45..7f188afff6 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.12.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.12.js
@@ -9,5 +9,5 @@
  * @description Checking if execution of "final=1" succeeds
  */
 
-final = 1;
+var final = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.13.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.13.js
index 0b156c6a37..7011336b1d 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.13.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.13.js
@@ -9,5 +9,5 @@
  * @description Checking if execution of "float=1" succeeds
  */
 
-float = 1;
+var float = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.14.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.14.js
index 1b6934ad49..e8e0b36b3e 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.14.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.14.js
@@ -9,5 +9,5 @@
  * @description Checking if execution of "goto=1" succeeds
  */
 
-goto = 1;
+var goto = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.15.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.15.js
index b54627b0cd..716876c874 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.15.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.15.js
@@ -7,8 +7,8 @@
  * @section 7.5.3
  * @path 07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.15.js
  * @description Checking if execution of "implements=1" fails in strict code
+ * @strict_only
  * @negative
  */
 
-"use strict";
-implements = 1;
+var implements = 1;
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.15ns.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.15ns.js
index ce7d5d6224..5a137e3224 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.15ns.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.15ns.js
@@ -7,6 +7,8 @@
  * @section 7.5.3
  * @path 07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.15ns.js
  * @description Checking if execution of "implements=1" succeeds in non-strict code
+ * @non_strict_only
  */
 
-new Function('implements = 1');
+var implements = 1;
+
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.16.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.16.js
index ecf01acbe6..56f787db09 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.16.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.16.js
@@ -10,5 +10,5 @@
  * @negative
  */
 
-import = 1;
+var import = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.17.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.17.js
index 4a61e4d010..9444aa861a 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.17.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.17.js
@@ -9,5 +9,5 @@
  * @description Checking if execution of "int=1" succeeds
  */
 
-int = 1;
+var int = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.18.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.18.js
index 8c10e716ce..0811539c89 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.18.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.18.js
@@ -8,9 +8,10 @@
  * @path 07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.18.js
  * @description Checking if execution of "interface = 1" fails in
  *               strict code
+ * @strict_only
  * @negative
  */
 
-"use strict";
-interface = 1;
+
+var interface = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.18ns.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.18ns.js
index 71e6430575..f80a39fe63 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.18ns.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.18ns.js
@@ -9,7 +9,8 @@
  * @path 07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.18ns.js
  * @description Checking if execution of "interface = 1" succeeds in
  * non-strict code
+ * @non_strict_only
  */
 
-new Function('interface = 1');
+var interface = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.19.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.19.js
index 832560cac8..470e6e85c7 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.19.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.19.js
@@ -9,5 +9,5 @@
  * @description Checking if execution of "long=1" succeeds
  */
 
-long = 1;
+var long = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.2.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.2.js
index 52b4fdd224..803a878617 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.2.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.2.js
@@ -9,5 +9,5 @@
  * @description Checking if execution of "boolean=1" succeeds
  */
 
-boolean = 1;
+var boolean = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.20.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.20.js
index 231fd7ccfe..fc975e8057 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.20.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.20.js
@@ -9,5 +9,5 @@
  * @description Checking if execution of "native=1" succeeds
  */
 
-native = 1;
+var native = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.21.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.21.js
index f9c5597aee..b21b379ef2 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.21.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.21.js
@@ -7,9 +7,10 @@
  * @section 7.5.3
  * @path 07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.21.js
  * @description Checking if execution of "package=1" fails in strict code
+ * @strict_only
  * @negative
  */
 
-"use strict";
-package = 1;
+
+var package = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.21ns.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.21ns.js
index 450ad3ae4c..e6b0d5b3a0 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.21ns.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.21ns.js
@@ -7,7 +7,8 @@
  * @section 7.5.3
  * @path 07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.21ns.js
  * @description Checking if execution of "package=1" succeeds in non-strict code
+ * @non_strict_only
  */
 
-new Function('package = 1');
+var package = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.22.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.22.js
index 85a037122f..ac58a889ab 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.22.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.22.js
@@ -7,9 +7,10 @@
  * @section 7.5.3
  * @path 07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.22.js
  * @description Checking if execution of "private=1" fails in strict code
+ * @strict_only
  * @negative
  */
 
-"use strict";
-private = 1;
+
+var private = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.22ns.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.22ns.js
index ddd323b507..a1c68d90fa 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.22ns.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.22ns.js
@@ -7,7 +7,8 @@
  * @section 7.5.3
  * @path 07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.22ns.js
  * @description Checking if execution of "private=1" succeeds in non-strict code
+ * @non_strict_only
  */
 
-new Function('private = 1');
+var private = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.23.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.23.js
index 0419c181da..1723eecf5b 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.23.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.23.js
@@ -8,9 +8,10 @@
  * @path 07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.23.js
  * @description Checking if execution of "protected=1" fails in
  * strict code
+ * @strict_only
  * @negative
  */
 
-"use strict";
-protected = 1;
+
+var protected = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.23ns.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.23ns.js
index c0c2f95b20..567de26e5a 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.23ns.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.23ns.js
@@ -7,7 +7,8 @@
  * @section 7.5.3
  * @path 07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.23ns.js
  * @description Checking if execution of "protected=1" succeeds in non-strict code
+ * @non_strict_only
  */
 
-new Function('protected = 1');
+var protected = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.24.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.24.js
index 0b4942216d..dedf6abab8 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.24.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.24.js
@@ -7,9 +7,10 @@
  * @section 7.5.3
  * @path 07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.24.js
  * @description Checking if execution of "public=1" fails in strict code
+ * @strict_only
  * @negative
  */
 
-"use strict";
-public = 1;
+
+var public = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.24ns.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.24ns.js
index b326847e89..590b41208a 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.24ns.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.24ns.js
@@ -7,7 +7,8 @@
  * @section 7.5.3
  * @path 07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.24ns.js
  * @description Checking if execution of "public=1" succeeds in non-strict code
+ * @non_strict_only
  */
 
-new Function('public = 1');
+var public = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.25.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.25.js
index 0ba42f502b..f5470c99d6 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.25.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.25.js
@@ -9,5 +9,5 @@
  * @description Checking if execution of "short=1" succeeds
  */
 
-short = 1;
+var short = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.26.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.26.js
index 073773abc0..fad2b4068b 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.26.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.26.js
@@ -7,9 +7,10 @@
  * @section 7.5.3
  * @path 07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.26.js
  * @description Checking if execution of "static=1" fails in strict code
+ * @strict_only
  * @negative
  */
 
-"use strict";
-static = 1;
+
+var static = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.26ns.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.26ns.js
index ebd78d9718..764f75bd53 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.26ns.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.26ns.js
@@ -7,7 +7,8 @@
  * @section 7.5.3
  * @path 07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.26ns.js
  * @description Checking if execution of "static=1" succeeds in non-strict code
+ * @non_strict_only
  */
 
-new Function('static = 1');
+var static = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.27.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.27.js
index c0330a1719..0cb8b6b6c5 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.27.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.27.js
@@ -10,5 +10,5 @@
  * @negative
  */
 
-super = 1;
+var super = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.28.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.28.js
index 8a41cc47e9..f024250d7c 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.28.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.28.js
@@ -9,5 +9,5 @@
  * @description Checking if execution of "synchronized=1" succeeds
  */
 
-synchronized = 1;
+var synchronized = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.29.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.29.js
index 2dcea03a31..049746ad7b 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.29.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.29.js
@@ -9,5 +9,5 @@
  * @description Checking if execution of "throws=1" succeeds
  */
 
-throws = 1;
+var throws = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.3.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.3.js
index ee2770fb54..1d47c26a05 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.3.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.3.js
@@ -9,5 +9,5 @@
  * @description Checking if execution of "byte=1" succeeds
  */
 
-byte = 1;
+var byte = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.30.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.30.js
index b61765477b..379b69827c 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.30.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.30.js
@@ -9,5 +9,5 @@
  * @description Checking if execution of "transient=1" succeeds
  */
 
-transient = 1;
+var transient = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.31.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.31.js
index aac5fc7fad..0350faaa02 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.31.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.31.js
@@ -9,5 +9,5 @@
  * @description Checking if execution of "volatile=1" succeeds
  */
 
-volatile = 1;
+var volatile = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.4.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.4.js
index 1cbf9de5fe..160c4bf353 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.4.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.4.js
@@ -9,5 +9,5 @@
  * @description Checking if execution of "char=1" succeeds
  */
 
-char = 1;
+var char = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.5.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.5.js
index f7c441367d..32ede3ad95 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.5.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.5.js
@@ -10,5 +10,5 @@
  * @negative
  */
 
-class = 1;
+var class = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.6.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.6.js
index db31ddeccd..af1bb84eba 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.6.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.6.js
@@ -10,5 +10,5 @@
  * @negative
  */
 
-const = 1;
+var const = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.7.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.7.js
index ba1d81f0a2..bc483f738c 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.7.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.7.js
@@ -10,5 +10,5 @@
  * @negative
  */
 
-debugger = 1;
+var debugger = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.8.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.8.js
index db7d19dd08..8f2ad71252 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.8.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.8.js
@@ -9,5 +9,5 @@
  * @description Checking if execution of "double=1" succeeds
  */
 
-double = 1;
+var double = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.9.js b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.9.js
index cd74246128..b12bb502b3 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.9.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.5_Tokens/7.5.3_Future_Reserved_Words/S7.5.3_A1.9.js
@@ -10,5 +10,5 @@
  * @negative
  */
 
-enum = 1;
+var enum = 1;
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.1_T1.js b/test/suite/converted/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.1_T1.js
index f58428166a..578dcaadfc 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.1_T1.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.1_T1.js
@@ -10,107 +10,107 @@
  */
 
 //CHECK#A-Z
-\u0041 = 1;
+var \u0041 = 1;
 if (A !== 1) {
   $ERROR('#A');
 }
-\u0042 = 1;
+var \u0042 = 1;
 if (B !== 1) {
   $ERROR('#B');
 }
-\u0043 = 1;
+var \u0043 = 1;
 if (C !== 1) {
   $ERROR('#C');
 }
-\u0044 = 1;
+var \u0044 = 1;
 if (D !== 1) {
   $ERROR('#D');
 }
-\u0045 = 1;
+var \u0045 = 1;
 if (E !== 1) {
   $ERROR('#E');
 }
-\u0046 = 1;
+var \u0046 = 1;
 if (F !== 1) {
   $ERROR('#F');
 }
-\u0047 = 1;
+var \u0047 = 1;
 if (G !== 1) {
   $ERROR('#G');
 }
-\u0048 = 1;
+var \u0048 = 1;
 if (H !== 1) {
   $ERROR('#H');
 }
-\u0049 = 1;
+var \u0049 = 1;
 if (I !== 1) {
   $ERROR('#I');
 }
-\u004A = 1;
+var \u004A = 1;
 if (J !== 1) {
   $ERROR('#J');
 }
-\u004B = 1;
+var \u004B = 1;
 if (K !== 1) {
   $ERROR('#K');
 }
-\u004C = 1;
+var \u004C = 1;
 if (L !== 1) {
   $ERROR('#L');
 }
-\u004D = 1;
+var \u004D = 1;
 if (M !== 1) {
   $ERROR('#M');
 }
-\u004E = 1;
+var \u004E = 1;
 if (N !== 1) {
   $ERROR('#N');
 }
-\u004F = 1;
+var \u004F = 1;
 if (O !== 1) {
   $ERROR('#O');
 }
-\u0050 = 1;
+var \u0050 = 1;
 if (P !== 1) {
   $ERROR('#P');
 }
-\u0051 = 1;
+var \u0051 = 1;
 if (Q !== 1) {
   $ERROR('#Q');
 }
-\u0052 = 1;
+var \u0052 = 1;
 if (R !== 1) {
   $ERROR('#R');
 }
-\u0053 = 1;
+var \u0053 = 1;
 if (S !== 1) {
   $ERROR('#S');
 }
-\u0054 = 1;
+var \u0054 = 1;
 if (T !== 1) {
   $ERROR('#T');
 }
-\u0055 = 1;
+var \u0055 = 1;
 if (U !== 1) {
   $ERROR('#U');
 }
-\u0056 = 1;
+var \u0056 = 1;
 if (V !== 1) {
   $ERROR('#V');
 }
-\u0057 = 1;
+var \u0057 = 1;
 if (W !== 1) {
   $ERROR('#W');
 }
-\u0058 = 1;
+var \u0058 = 1;
 if (X !== 1) {
   $ERROR('#X');
 }
-\u0059 = 1;
+var \u0059 = 1;
 if (Y !== 1) {
   $ERROR('#Y');
 }
-\u005A = 1;
+var \u005A = 1;
 if (Z !== 1) {
   $ERROR('#Z');
 }
diff --git a/test/suite/converted/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.1_T2.js b/test/suite/converted/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.1_T2.js
index 7616d921f5..7ffa7a1770 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.1_T2.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.1_T2.js
@@ -10,107 +10,107 @@
  */
 
 //CHECK#a-z
-\u0061 = 1;
+var \u0061 = 1;
 if (a !== 1) {
   $ERROR('#a');
 }
-\u0062 = 1;
+var \u0062 = 1;
 if (b !== 1) {
   $ERROR('#b');
 }
-\u0063 = 1;
+var \u0063 = 1;
 if (c !== 1) {
   $ERROR('#c');
 }
-\u0064 = 1;
+var \u0064 = 1;
 if (d !== 1) {
   $ERROR('#d');
 }
-\u0065 = 1;
+var \u0065 = 1;
 if (e !== 1) {
   $ERROR('#e');
 }
-\u0066 = 1;
+var \u0066 = 1;
 if (f !== 1) {
   $ERROR('#f');
 }
-\u0067 = 1;
+var \u0067 = 1;
 if (g !== 1) {
   $ERROR('#g');
 }
-\u0068 = 1;
+var \u0068 = 1;
 if (h !== 1) {
   $ERROR('#h');
 }
-\u0069 = 1;
+var \u0069 = 1;
 if (i !== 1) {
   $ERROR('#i');
 }
-\u006A = 1;
+var \u006A = 1;
 if (j !== 1) {
   $ERROR('#j');
 }
-\u006B = 1;
+var \u006B = 1;
 if (k !== 1) {
   $ERROR('#k');
 }
-\u006C = 1;
+var \u006C = 1;
 if (l !== 1) {
   $ERROR('#l');
 }
-\u006D = 1;
+var \u006D = 1;
 if (m !== 1) {
   $ERROR('#m');
 }
-\u006E = 1;
+var \u006E = 1;
 if (n !== 1) {
   $ERROR('#n');
 }
-\u006F = 1;
+var \u006F = 1;
 if (o !== 1) {
   $ERROR('#o');
 }
-\u0070 = 1;
+var \u0070 = 1;
 if (p !== 1) {
   $ERROR('#p');
 }
-\u0071 = 1;
+var \u0071 = 1;
 if (q !== 1) {
   $ERROR('#q');
 }
-\u0072 = 1;
+var \u0072 = 1;
 if (r !== 1) {
   $ERROR('#r');
 }
-\u0073 = 1;
+var \u0073 = 1;
 if (s !== 1) {
   $ERROR('#s');
 }
-\u0074 = 1;
+var \u0074 = 1;
 if (t !== 1) {
   $ERROR('#t');
 }
-\u0075 = 1;
+var \u0075 = 1;
 if (u !== 1) {
   $ERROR('#u');
 }
-\u0076 = 1;
+var \u0076 = 1;
 if (v !== 1) {
   $ERROR('#v');
 }
-\u0077 = 1;
+var \u0077 = 1;
 if (w !== 1) {
   $ERROR('#w');
 }
-\u0078 = 1;
+var \u0078 = 1;
 if (x !== 1) {
   $ERROR('#x');
 }
-\u0079 = 1;
+var \u0079 = 1;
 if (y !== 1) {
   $ERROR('#y');
 }
-\u007A = 1;
+var \u007A = 1;
 if (z !== 1) {
   $ERROR('#z');
 }
diff --git a/test/suite/converted/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.2_T1.js b/test/suite/converted/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.2_T1.js
index 4d6b1cff81..457579f04a 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.2_T1.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.2_T1.js
@@ -10,135 +10,135 @@
  */
 
 //CHECK#А-Я
-\u0410 = 1;
+var \u0410 = 1;
 if (А !== 1) {
   $ERROR('#А');
 }
-\u0411 = 1;
+var \u0411 = 1;
 if (Б !== 1) {
   $ERROR('#Б');
 }
-\u0412 = 1;
+var \u0412 = 1;
 if (В !== 1) {
   $ERROR('#В');
 }
-\u0413 = 1;
+var \u0413 = 1;
 if (Г !== 1) {
   $ERROR('#Г');
 }
-\u0414 = 1;
+var \u0414 = 1;
 if (Д !== 1) {
   $ERROR('#Д');
 }
-\u0415 = 1;
+var \u0415 = 1;
 if (Е !== 1) {
   $ERROR('#Е');
 }
-\u0416 = 1;
+var \u0416 = 1;
 if (Ж !== 1) {
   $ERROR('#Ж');
 }
-\u0417 = 1;
+var \u0417 = 1;
 if (З !== 1) {
   $ERROR('#З');
 }
-\u0418 = 1;
+var \u0418 = 1;
 if (И !== 1) {
   $ERROR('#И');
 }
-\u0419 = 1;
+var \u0419 = 1;
 if (Й !== 1) {
   $ERROR('#Й');
 }
-\u041A = 1;
+var \u041A = 1;
 if (К !== 1) {
   $ERROR('#К');
 }
-\u041B = 1;
+var \u041B = 1;
 if (Л !== 1) {
   $ERROR('#Л');
 }
-\u041C = 1;
+var \u041C = 1;
 if (М !== 1) {
   $ERROR('#М');
 }
-\u041D = 1;
+var \u041D = 1;
 if (Н !== 1) {
   $ERROR('#Н');
 }
-\u041E = 1;
+var \u041E = 1;
 if (О !== 1) {
   $ERROR('#О');
 }
-\u041F = 1;
+var \u041F = 1;
 if (П !== 1) {
   $ERROR('#П');
 }
-\u0420 = 1;
+var \u0420 = 1;
 if (Р !== 1) {
   $ERROR('#Р');
 }
-\u0421 = 1;
+var \u0421 = 1;
 if (С !== 1) {
   $ERROR('#С');
 }
-\u0422 = 1;
+var \u0422 = 1;
 if (Т !== 1) {
   $ERROR('#Т');
 }
-\u0423 = 1;
+var \u0423 = 1;
 if (У !== 1) {
   $ERROR('#У');
 }
-\u0424 = 1;
+var \u0424 = 1;
 if (Ф !== 1) {
   $ERROR('#Ф');
 }
-\u0425 = 1;
+var \u0425 = 1;
 if (Х !== 1) {
   $ERROR('#Х');
 }
-\u0426 = 1;
+var \u0426 = 1;
 if (Ц !== 1) {
   $ERROR('#Ц');
 }
-\u0427 = 1;
+var \u0427 = 1;
 if (Ч !== 1) {
   $ERROR('#Ч');
 }
-\u0428 = 1;
+var \u0428 = 1;
 if (Ш !== 1) {
   $ERROR('#Ш');
 }
-\u0429 = 1;
+var \u0429 = 1;
 if (Щ !== 1) {
   $ERROR('#Щ');
 }
-\u042A = 1;
+var \u042A = 1;
 if (Ъ !== 1) {
   $ERROR('#Ъ');
 }
-\u042B = 1;
+var \u042B = 1;
 if (Ы !== 1) {
   $ERROR('#Ы');
 }
-\u042C = 1;
+var \u042C = 1;
 if (Ь !== 1) {
   $ERROR('#Ь');
 }
-\u042D = 1;
+var \u042D = 1;
 if (Э !== 1) {
   $ERROR('#Э');
 }
-\u042E = 1;
+var \u042E = 1;
 if (Ю !== 1) {
   $ERROR('#Ю');
 }
-\u042F = 1;
+var \u042F = 1;
 if (Я !== 1) {
   $ERROR('#Я');
 }
-\u0401 = 1;
+var \u0401 = 1;
 if (Ё !== 1) {
   $ERROR('#Ё');
 }
diff --git a/test/suite/converted/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.2_T2.js b/test/suite/converted/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.2_T2.js
index 1f869f54b2..fe4c83ba55 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.2_T2.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.2_T2.js
@@ -10,135 +10,135 @@
  */
 
 //CHECK#а-я
-\u0430 = 1;
+var \u0430 = 1;
 if (а !== 1) {
   $ERROR('#а');
 }
-\u0431 = 1;
+var \u0431 = 1;
 if (б !== 1) {
   $ERROR('#б');
 }
-\u0432 = 1;
+var \u0432 = 1;
 if (в !== 1) {
   $ERROR('#в');
 }
-\u0433 = 1;
+var \u0433 = 1;
 if (г !== 1) {
   $ERROR('#г');
 }
-\u0434 = 1;
+var \u0434 = 1;
 if (д !== 1) {
   $ERROR('#д');
 }
-\u0435 = 1;
+var \u0435 = 1;
 if (е !== 1) {
   $ERROR('#е');
 }
-\u0436 = 1;
+var \u0436 = 1;
 if (ж !== 1) {
   $ERROR('#ж');
 }
-\u0437 = 1;
+var \u0437 = 1;
 if (з !== 1) {
   $ERROR('#з');
 }
-\u0438 = 1;
+var \u0438 = 1;
 if (и !== 1) {
   $ERROR('#и');
 }
-\u0439 = 1;
+var \u0439 = 1;
 if (й !== 1) {
   $ERROR('#й');
 }
-\u043A = 1;
+var \u043A = 1;
 if (к !== 1) {
   $ERROR('#к');
 }
-\u043B = 1;
+var \u043B = 1;
 if (л !== 1) {
   $ERROR('#л');
 }
-\u043C = 1;
+var \u043C = 1;
 if (м !== 1) {
   $ERROR('#м');
 }
-\u043D = 1;
+var \u043D = 1;
 if (н !== 1) {
   $ERROR('#н');
 }
-\u043E = 1;
+var \u043E = 1;
 if (о !== 1) {
   $ERROR('#о');
 }
-\u043F = 1;
+var \u043F = 1;
 if (п !== 1) {
   $ERROR('#п');
 }
-\u0440 = 1;
+var \u0440 = 1;
 if (р !== 1) {
   $ERROR('#р');
 }
-\u0441 = 1;
+var \u0441 = 1;
 if (с !== 1) {
   $ERROR('#с');
 }
-\u0442 = 1;
+var \u0442 = 1;
 if (т !== 1) {
   $ERROR('#т');
 }
-\u0443 = 1;
+var \u0443 = 1;
 if (у !== 1) {
   $ERROR('#у');
 }
-\u0444 = 1;
+var \u0444 = 1;
 if (ф !== 1) {
   $ERROR('#ф');
 }
-\u0445 = 1;
+var \u0445 = 1;
 if (х !== 1) {
   $ERROR('#х');
 }
-\u0446 = 1;
+var \u0446 = 1;
 if (ц !== 1) {
   $ERROR('#ц');
 }
-\u0447 = 1;
+var \u0447 = 1;
 if (ч !== 1) {
   $ERROR('#ч');
 }
-\u0448 = 1;
+var \u0448 = 1;
 if (ш !== 1) {
   $ERROR('#ш');
 }
-\u0449 = 1;
+var \u0449 = 1;
 if (щ !== 1) {
   $ERROR('#щ');
 }
-\u044A = 1;
+var \u044A = 1;
 if (ъ !== 1) {
   $ERROR('#ъ');
 }
-\u044B = 1;
+var \u044B = 1;
 if (ы !== 1) {
   $ERROR('#ы');
 }
-\u044C = 1;
+var \u044C = 1;
 if (ь !== 1) {
   $ERROR('#ь');
 }
-\u044D = 1;
+var \u044D = 1;
 if (э !== 1) {
   $ERROR('#э');
 }
-\u044E = 1;
+var \u044E = 1;
 if (ю !== 1) {
   $ERROR('#ю');
 }
-\u044F = 1;
+var \u044F = 1;
 if (я !== 1) {
   $ERROR('#я');
 }
-\u0451 = 1;
+var \u0451 = 1;
 if (ё !== 1) {
   $ERROR('#ё');
 }
diff --git a/test/suite/converted/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.3_T1.js b/test/suite/converted/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.3_T1.js
index 52fb5c9fcf..791a16b94f 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.3_T1.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.6_Identifiers/S7.6_A4.3_T1.js
@@ -10,43 +10,43 @@
  */
 
 //CHECK#0-9
-$\u0030 = 0;
+var $\u0030 = 0;
 if ($0 !== 0) {
   $ERROR('#0: $\\u0030 = 0; $0 === 0');
 }
-$\u0031 = 1;
+var $\u0031 = 1;
 if ($1 !== 1) {
   $ERROR('#1: $\\u0031 = 1; $1 === 1');
 }
-$\u0032 = 2;
+var $\u0032 = 2;
 if ($2 !== 2) {
   $ERROR('#2: $\\u0032 = 2; $2 === 2');
 }
-$\u0033 = 3;
+var $\u0033 = 3;
 if ($3 !== 3) {
   $ERROR('#3: $\\u0033 = 3; $3 === 3');
 }
-$\u0034 = 4;
+var $\u0034 = 4;
 if ($4 !== 4) {
   $ERROR('#4: $\\u0034 = 4; $4 === 4');
 }
-$\u0035 = 5;
+var $\u0035 = 5;
 if ($5 !== 5) {
   $ERROR('#5: $\\u0035 = 5; $5 === 5');
 }
-$\u0036 = 6;
+var $\u0036 = 6;
 if ($6 !== 6) {
   $ERROR('#6: $\\u0036 = 6; $6 === 6');
 }
-$\u0037 = 7;
+var $\u0037 = 7;
 if ($7 !== 7) {
   $ERROR('#7: $\\u0037 = 7; $7 === 7');
 }
-$\u0038 = 8;
+var $\u0038 = 8;
 if ($8 !== 8) {
   $ERROR('#8: $\\u0038 = 8; $8 === 8');
 }
-$\u0039 = 9;
+var $\u0039 = 9;
 if ($9 !== 9) {
   $ERROR('#9: $\\u0039 = 9; $9 === 9');
 }
diff --git a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.1_T1.js b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.1_T1.js
index 23fe4ab0a4..16510c2445 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.1_T1.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.1_T1.js
@@ -10,9 +10,9 @@
  */
 
 //CHECK#A-Z
-unicode = ["\u0041", "\u0042", "\u0043", "\u0044", "\u0045", "\u0046", "\u0047", "\u0048", "\u0049", "\u004A", "\u004B", "\u004C", "\u004D", "\u004E", "\u004F", "\u0050", "\u0051", "\u0052", "\u0053", "\u0054", "\u0055", "\u0056", "\u0057", "\u0058", "\u0059", "\u005A"];
-character = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"];
-for (index = 0; index <= 25; index++) {
+var unicode = ["\u0041", "\u0042", "\u0043", "\u0044", "\u0045", "\u0046", "\u0047", "\u0048", "\u0049", "\u004A", "\u004B", "\u004C", "\u004D", "\u004E", "\u004F", "\u0050", "\u0051", "\u0052", "\u0053", "\u0054", "\u0055", "\u0056", "\u0057", "\u0058", "\u0059", "\u005A"];
+var character = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"];
+for (var index = 0; index <= 25; index++) {
   if (unicode[index] !== character[index]) {
     $ERROR('#' + character[index] + ' ');
   }
diff --git a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.1_T2.js b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.1_T2.js
index 3893ce88dc..7a71da1189 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.1_T2.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.1_T2.js
@@ -10,9 +10,9 @@
  */
 
 //CHECK#a-z
-hex = ["\u0061", "\u0062", "\u0063", "\u0064", "\u0065", "\u0066", "\u0067", "\u0068", "\u0069", "\u006A", "\u006B", "\u006C", "\u006D", "\u006E", "\u006F", "\u0070", "\u0071", "\u0072", "\u0073", "\u0074", "\u0075", "\u0076", "\u0077", "\u0078", "\u0079", "\u007A"];
-character = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
-for (index = 0; index <= 25; index++) {
+var hex = ["\u0061", "\u0062", "\u0063", "\u0064", "\u0065", "\u0066", "\u0067", "\u0068", "\u0069", "\u006A", "\u006B", "\u006C", "\u006D", "\u006E", "\u006F", "\u0070", "\u0071", "\u0072", "\u0073", "\u0074", "\u0075", "\u0076", "\u0077", "\u0078", "\u0079", "\u007A"];
+var character = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
+for (var index = 0; index <= 25; index++) {
   if (hex[index] !== character[index]) {
     $ERROR('#' + character[index] + ' ');
   }
diff --git a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.2_T1.js b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.2_T1.js
index 8b61c40390..c2299fd5d2 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.2_T1.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.2_T1.js
@@ -10,9 +10,9 @@
  */
 
 //CHECK#А-Я
-unicode = ["\u0410", "\u0411", "\u0412", "\u0413", "\u0414", "\u0415", "\u0416", "\u0417", "\u0418", "\u0419", "\u041A", "\u041B", "\u041C", "\u041D", "\u041E", "\u041F", "\u0420", "\u0421", "\u0422", "\u0423", "\u0424", "\u0425", "\u0426", "\u0427", "\u0428", "\u0429", "\u042A", "\u042B", "\u042C", "\u042D", "\u042E", "\u042F", "\u0401"];
-character = ["А", "Б", "В", "Г", "Д", "Е", "Ж", "З", "И", "Й", "К", "Л", "М", "Н", "О", "П", "Р", "С", "Т", "У", "Ф", "Х", "Ц", "Ч", "Ш", "Щ", "Ъ", "Ы", "Ь", "Э", "Ю", "Я", "Ё"];
-for (index = 0; index <= 32; index++) {
+var unicode = ["\u0410", "\u0411", "\u0412", "\u0413", "\u0414", "\u0415", "\u0416", "\u0417", "\u0418", "\u0419", "\u041A", "\u041B", "\u041C", "\u041D", "\u041E", "\u041F", "\u0420", "\u0421", "\u0422", "\u0423", "\u0424", "\u0425", "\u0426", "\u0427", "\u0428", "\u0429", "\u042A", "\u042B", "\u042C", "\u042D", "\u042E", "\u042F", "\u0401"];
+var character = ["А", "Б", "В", "Г", "Д", "Е", "Ж", "З", "И", "Й", "К", "Л", "М", "Н", "О", "П", "Р", "С", "Т", "У", "Ф", "Х", "Ц", "Ч", "Ш", "Щ", "Ъ", "Ы", "Ь", "Э", "Ю", "Я", "Ё"];
+for (var index = 0; index <= 32; index++) {
   if (unicode[index] !== character[index]) {
     $ERROR('#' + character[index] + ' ');
   }
diff --git a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.2_T2.js b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.2_T2.js
index 2182c15dac..c9be025e32 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.2_T2.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.2_T2.js
@@ -10,9 +10,9 @@
  */
 
 //CHECK#а-я
-unicode = ["\u0430", "\u0431", "\u0432", "\u0433", "\u0434", "\u0435", "\u0436", "\u0437", "\u0438", "\u0439", "\u043A", "\u043B", "\u043C", "\u043D", "\u043E", "\u043F", "\u0440", "\u0441", "\u0442", "\u0443", "\u0444", "\u0445", "\u0446", "\u0447", "\u0448", "\u0449", "\u044A", "\u044B", "\u044C", "\u044D", "\u044E", "\u044F", "\u0451"];
-character = ["а", "б", "в", "г", "д", "е", "ж", "з", "и", "й", "к", "л", "м", "н", "о", "п", "р", "с", "т", "у", "ф", "х", "ц", "ч", "ш", "щ", "ъ", "ы", "ь", "э", "ю", "я", "ё"];
-for (index = 0; index <= 32; index++) {
+var unicode = ["\u0430", "\u0431", "\u0432", "\u0433", "\u0434", "\u0435", "\u0436", "\u0437", "\u0438", "\u0439", "\u043A", "\u043B", "\u043C", "\u043D", "\u043E", "\u043F", "\u0440", "\u0441", "\u0442", "\u0443", "\u0444", "\u0445", "\u0446", "\u0447", "\u0448", "\u0449", "\u044A", "\u044B", "\u044C", "\u044D", "\u044E", "\u044F", "\u0451"];
+var character = ["а", "б", "в", "г", "д", "е", "ж", "з", "и", "й", "к", "л", "м", "н", "о", "п", "р", "с", "т", "у", "ф", "х", "ц", "ч", "ш", "щ", "ъ", "ы", "ь", "э", "ю", "я", "ё"];
+for (var index = 0; index <= 32; index++) {
   if (unicode[index] !== character[index]) {
     $ERROR('#' + character[index] + ' ');
   }
diff --git a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.3_T1.js b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.3_T1.js
index f62dea1bcf..796bdbdc33 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.3_T1.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A2.3_T1.js
@@ -10,9 +10,9 @@
  */
 
 //CHECK#0-9
-unicode = ["\u0030", "\u0031", "\u0032", "\u0033", "\u0034", "\u0035", "\u0036", "\u0037", "\u0038", "\u0039"];
-character = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
-for (index = 0; index <= 9; index++) {
+var unicode = ["\u0030", "\u0031", "\u0032", "\u0033", "\u0034", "\u0035", "\u0036", "\u0037", "\u0038", "\u0039"];
+var character = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9"];
+for (var index = 0; index <= 9; index++) {
   if (unicode[index] !== character[index]) {
     $ERROR('#' + character[index] + ' ');
   }
diff --git a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T1.js b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T1.js
index 601f590346..0fd69bce2b 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T1.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T1.js
@@ -10,9 +10,9 @@
  */
 
 //CHECK#A-Z
-CharacterCode = [0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A];
-NonEscapeCharacter = ["\A", "\B", "\C", "\D", "\E", "\F", "\G", "\H", "\I", "\J", "\K", "\L", "\M", "\N", "\O", "\P", "\Q", "\R", "\S", "\T", "\U", "\V", "\W", "\X", "\Y", "\Z"];
-for (index = 0; index <= 25; index++) {
+var CharacterCode = [0x0041, 0x0042, 0x0043, 0x0044, 0x0045, 0x0046, 0x0047, 0x0048, 0x0049, 0x004A, 0x004B, 0x004C, 0x004D, 0x004E, 0x004F, 0x0050, 0x0051, 0x0052, 0x0053, 0x0054, 0x0055, 0x0056, 0x0057, 0x0058, 0x0059, 0x005A];
+var NonEscapeCharacter = ["\A", "\B", "\C", "\D", "\E", "\F", "\G", "\H", "\I", "\J", "\K", "\L", "\M", "\N", "\O", "\P", "\Q", "\R", "\S", "\T", "\U", "\V", "\W", "\X", "\Y", "\Z"];
+for (var index = 0; index <= 25; index++) {
   if (String.fromCharCode(CharacterCode[index]) !== NonEscapeCharacter[index]) {
     $ERROR('#' + NonEscapeCharacter[index] + ' ');
   }
diff --git a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T3.js b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T3.js
index 8e3e2d6fec..eafbb96211 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T3.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T3.js
@@ -10,9 +10,9 @@
  */
 
 //CHECK#a-z without b, f, n, r, t, v, x, u
-CharacterCode = [0x0061, 0x0063, 0x0064, 0x0065, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006F, 0x0070, 0x0071, 0x0073, 0x0077, 0x0079, 0x007A];
-NonEscapeCharacter = ["\a", "\c", "\d", "\e", "\g", "\h", "\i", "\j", "\k", "\l", "\m", "\o", "\p", "\q", "\s", "\w", "\y", "\z"];
-for (index = 0; index <= 17; index++) {
+var CharacterCode = [0x0061, 0x0063, 0x0064, 0x0065, 0x0067, 0x0068, 0x0069, 0x006A, 0x006B, 0x006C, 0x006D, 0x006F, 0x0070, 0x0071, 0x0073, 0x0077, 0x0079, 0x007A];
+var NonEscapeCharacter = ["\a", "\c", "\d", "\e", "\g", "\h", "\i", "\j", "\k", "\l", "\m", "\o", "\p", "\q", "\s", "\w", "\y", "\z"];
+for (var index = 0; index <= 17; index++) {
   if (String.fromCharCode(CharacterCode[index]) !== NonEscapeCharacter[index]) {
     $ERROR('#' + NonEscapeCharacter[index] + ' ');
   }
diff --git a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T5.js b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T5.js
index 51a9dfde40..7db3bb383a 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T5.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T5.js
@@ -10,9 +10,9 @@
  */
 
 //CHECK#А-Я
-CharacterCode = [0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, 0x0401];
-NonEscapeCharacter = ["\А", "\Б", "\В", "\Г", "\Д", "\Е", "\Ж", "\З", "\И", "\Й", "\К", "\Л", "\М", "\Н", "\О", "\П", "\Р", "\С", "\Т", "\У", "\Ф", "\Х", "\Ц", "\Ч", "\Ш", "\Щ", "\Ъ", "\Ы", "\Ь", "\Э", "\Ю", "\Я", "\Ё"];
-for (index = 0; index <= 32; index++) {
+var CharacterCode = [0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417, 0x0418, 0x0419, 0x041A, 0x041B, 0x041C, 0x041D, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423, 0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042A, 0x042B, 0x042C, 0x042D, 0x042E, 0x042F, 0x0401];
+var NonEscapeCharacter = ["\А", "\Б", "\В", "\Г", "\Д", "\Е", "\Ж", "\З", "\И", "\Й", "\К", "\Л", "\М", "\Н", "\О", "\П", "\Р", "\С", "\Т", "\У", "\Ф", "\Х", "\Ц", "\Ч", "\Ш", "\Щ", "\Ъ", "\Ы", "\Ь", "\Э", "\Ю", "\Я", "\Ё"];
+for (var index = 0; index <= 32; index++) {
   if (String.fromCharCode(CharacterCode[index]) !== NonEscapeCharacter[index]) {
     $ERROR('#' + NonEscapeCharacter[index] + ' ');
   }
diff --git a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T7.js b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T7.js
index 5efa7b42cf..9fc99dc1e0 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T7.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.2_T7.js
@@ -10,9 +10,9 @@
  */
 
 //CHECK#а-я
-CharacterCode = [0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, 0x0451];
-NonEscapeCharacter = ["\а", "\б", "\в", "\г", "\д", "\е", "\ж", "\з", "\и", "\й", "\к", "\л", "\м", "\н", "\о", "\п", "\р", "\с", "\т", "\у", "\ф", "\х", "\ц", "\ч", "\ш", "\щ", "\ъ", "\ы", "\ь", "\э", "\ю", "\я", "\ё"];
-for (index = 0; index <= 32; index++) {
+var CharacterCode = [0x0430, 0x0431, 0x0432, 0x0433, 0x0434, 0x0435, 0x0436, 0x0437, 0x0438, 0x0439, 0x043A, 0x043B, 0x043C, 0x043D, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443, 0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044A, 0x044B, 0x044C, 0x044D, 0x044E, 0x044F, 0x0451];
+var NonEscapeCharacter = ["\а", "\б", "\в", "\г", "\д", "\е", "\ж", "\з", "\и", "\й", "\к", "\л", "\м", "\н", "\о", "\п", "\р", "\с", "\т", "\у", "\ф", "\х", "\ц", "\ч", "\ш", "\щ", "\ъ", "\ы", "\ь", "\э", "\ю", "\я", "\ё"];
+for (var index = 0; index <= 32; index++) {
   if (String.fromCharCode(CharacterCode[index]) !== NonEscapeCharacter[index]) {
     $ERROR('#' + NonEscapeCharacter[index] + ' ');
   }
diff --git a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.3_T7.js b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.3_T7.js
index 3127576496..86d32d2c67 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.3_T7.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A4.3_T7.js
@@ -11,27 +11,27 @@
 
 //CHECK#bfnrtv
 if ("b" === "\b") {
-  $ERROR('#b')
+  $ERROR('#b');
 }
 
 if ("f" === "\f") {
-  $ERROR('#f')
+  $ERROR('#f');
 }
 
 if ("n" === "\n") {
-  $ERROR('#n')
+  $ERROR('#n');
 }
 
 if ("r" === "\r") {
-  $ERROR('#r')
+  $ERROR('#r');
 }
 
 if ("t" === "\t") {
-  $ERROR('#t')
+  $ERROR('#t');
 }
 
 if ("v" === "\v") {
-  $ERROR('#v')
+  $ERROR('#v');
 }
 
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A6.1_T2.js b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A6.1_T2.js
index 124fdbdea5..c78bdc2ac0 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A6.1_T2.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A6.1_T2.js
@@ -10,9 +10,9 @@
  */
 
 //CHECK#A-Z
-hex = ["\x41", "\x42", "\x43", "\x44", "\x45", "\x46", "\x47", "\x48", "\x49", "\x4A", "\x4B", "\x4C", "\x4D", "\x4E", "\x4F", "\x50", "\x51", "\x52", "\x53", "\x54", "\x55", "\x56", "\x57", "\x58", "\x59", "\x5A"];
-character = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"];
-for (index = 0; index <= 25; index++) {
+var hex = ["\x41", "\x42", "\x43", "\x44", "\x45", "\x46", "\x47", "\x48", "\x49", "\x4A", "\x4B", "\x4C", "\x4D", "\x4E", "\x4F", "\x50", "\x51", "\x52", "\x53", "\x54", "\x55", "\x56", "\x57", "\x58", "\x59", "\x5A"];
+var character = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"];
+for (var index = 0; index <= 25; index++) {
   if (hex[index] !== character[index]) {
     $ERROR('#' + character[index] + ' ');
   }
diff --git a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A6.1_T3.js b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A6.1_T3.js
index 149aa19674..dc6af9dab3 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A6.1_T3.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A6.1_T3.js
@@ -10,9 +10,9 @@
  */
 
 //CHECK#a-z
-hex = ["\x61", "\x62", "\x63", "\x64", "\x65", "\x66", "\x67", "\x68", "\x69", "\x6A", "\x6B", "\x6C", "\x6D", "\x6E", "\x6F", "\x70", "\x71", "\x72", "\x73", "\x74", "\x75", "\x76", "\x77", "\x78", "\x79", "\x7A"];
-character = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
-for (index = 0; index <= 25; index++) {
+var hex = ["\x61", "\x62", "\x63", "\x64", "\x65", "\x66", "\x67", "\x68", "\x69", "\x6A", "\x6B", "\x6C", "\x6D", "\x6E", "\x6F", "\x70", "\x71", "\x72", "\x73", "\x74", "\x75", "\x76", "\x77", "\x78", "\x79", "\x7A"];
+var character = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
+for (var index = 0; index <= 25; index++) {
   if (hex[index] !== character[index]) {
     $ERROR('#' + character[index] + ' ');
   }
diff --git a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A7.1_T2.js b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A7.1_T2.js
index 3325e8c5ff..2257ff27d2 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A7.1_T2.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A7.1_T2.js
@@ -10,9 +10,9 @@
  */
 
 //CHECK#A-Z
-unicode = ["\u0041", "\u0042", "\u0043", "\u0044", "\u0045", "\u0046", "\u0047", "\u0048", "\u0049", "\u004A", "\u004B", "\u004C", "\u004D", "\u004E", "\u004F", "\u0050", "\u0051", "\u0052", "\u0053", "\u0054", "\u0055", "\u0056", "\u0057", "\u0058", "\u0059", "\u005A"];
-character = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"];
-for (index = 0; index <= 25; index++) {
+var unicode = ["\u0041", "\u0042", "\u0043", "\u0044", "\u0045", "\u0046", "\u0047", "\u0048", "\u0049", "\u004A", "\u004B", "\u004C", "\u004D", "\u004E", "\u004F", "\u0050", "\u0051", "\u0052", "\u0053", "\u0054", "\u0055", "\u0056", "\u0057", "\u0058", "\u0059", "\u005A"];
+var character = ["A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"];
+for (var index = 0; index <= 25; index++) {
   if (unicode[index] !== character[index]) {
     $ERROR('#' + character[index] + ' ');
   }
diff --git a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A7.1_T3.js b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A7.1_T3.js
index d61237af9d..1c73826ce2 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A7.1_T3.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.4_String_Literals/S7.8.4_A7.1_T3.js
@@ -10,9 +10,9 @@
  */
 
 //CHECK#a-z
-unicode = ["\u0061", "\u0062", "\u0063", "\u0064", "\u0065", "\u0066", "\u0067", "\u0068", "\u0069", "\u006A", "\u006B", "\u006C", "\u006D", "\u006E", "\u006F", "\u0070", "\u0071", "\u0072", "\u0073", "\u0074", "\u0075", "\u0076", "\u0077", "\u0078", "\u0079", "\u007A"];
-character = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
-for (index = 0; index <= 25; index++) {
+var unicode = ["\u0061", "\u0062", "\u0063", "\u0064", "\u0065", "\u0066", "\u0067", "\u0068", "\u0069", "\u006A", "\u006B", "\u006C", "\u006D", "\u006E", "\u006F", "\u0070", "\u0071", "\u0072", "\u0073", "\u0074", "\u0075", "\u0076", "\u0077", "\u0078", "\u0079", "\u007A"];
+var character = ["a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s", "t", "u", "v", "w", "x", "y", "z"];
+for (var index = 0; index <= 25; index++) {
   if (unicode[index] !== character[index]) {
     $ERROR('#' + character[index] + ' ');
   }
diff --git a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A1.1_T2.js b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A1.1_T2.js
index 8488e96bff..514b97de48 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A1.1_T2.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A1.1_T2.js
@@ -11,46 +11,46 @@
  */
 
 //CHECK
-errorCount = 0;
-count = 0;
+var errorCount = 0;
+var count = 0;
 var hex = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"];
-for (i1 = 0; i1 < 16; i1++) {
-  for (i2 = 0; i2 < 16; i2++) {
-    for (i3 = 0; i3 < 16; i3++) {
-      for (i4 = 0; i4 < 16; i4++) {
-        try {    
+for (var i1 = 0; i1 < 16; i1++) {
+  for (var i2 = 0; i2 < 16; i2++) {
+    for (var i3 = 0; i3 < 16; i3++) {
+      for (var i4 = 0; i4 < 16; i4++) {
+        try {
           var uu = hex[i1] + hex[i2] + hex[i3] + hex[i4];
-	      var Elimination = 
-          ((uu === "002A") || (uu === "002F") || (uu === "005C") || (uu === "002B") || 
-           (uu === "003F") || (uu === "0028") || (uu === "0029") || 
+	      var Elimination =
+          ((uu === "002A") || (uu === "002F") || (uu === "005C") || (uu === "002B") ||
+           (uu === "003F") || (uu === "0028") || (uu === "0029") ||
            (uu === "005B") || (uu === "005D") || (uu === "007B") || (uu === "007D"));
-           /* 
+           /*
                 * \u002A     / \u002F     \ \u005C     + \u002B
                 ? \u003F     ( \u0028     ) \u0029
-                [ \u005B     ] \u005D     { \u007B     } \u007D          
+                [ \u005B     ] \u005D     { \u007B     } \u007D
            */
-          var LineTerminator = ((uu === "000A") || (uu === "000D") || (uu === "2028") || (uu === "2029"));                      
-          if ((Elimination || LineTerminator ) === false) {              
-            var xx = String.fromCharCode("0x" + uu);          
-            var pattern = eval("/" + xx + "/");  
+          var LineTerminator = ((uu === "000A") || (uu === "000D") || (uu === "2028") || (uu === "2029"));
+          if ((Elimination || LineTerminator ) === false) {
+            var xx = String.fromCharCode("0x" + uu);
+            var pattern = eval("/" + xx + "/");
             if (pattern.source !== xx) {
               $ERROR('#' + uu + ' ');
               errorCount++;
-            }  
+            }
           } else {
             count--;
-          }                     
-        } catch (e) {         
+          }
+        } catch (e) {
           $ERROR('#' + uu + ' ');
           errorCount++;
         }
         count++;
-      }  
+      }
     }
   }
 }
 
-if (errorCount > 0) {    
+if (errorCount > 0) {
   $ERROR('Total error: ' + errorCount + ' bad Regular Expression First Char in ' + count);
-} 
+}
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A2.1_T2.js b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A2.1_T2.js
index 9516fd5bf4..606ba57581 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A2.1_T2.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A2.1_T2.js
@@ -11,47 +11,47 @@
  */
 
 //CHECK
-errorCount = 0;
-count = 0;
+var errorCount = 0;
+var count = 0;
 var hex = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"];
-for (i1 = 0; i1 < 16; i1++) {
-  for (i2 = 0; i2 < 16; i2++) {
-    for (i3 = 0; i3 < 16; i3++) {
-      for (i4 = 0; i4 < 16; i4++) {
-        try {               
+for (var i1 = 0; i1 < 16; i1++) {
+  for (var i2 = 0; i2 < 16; i2++) {
+    for (var i3 = 0; i3 < 16; i3++) {
+      for (var i4 = 0; i4 < 16; i4++) {
+        try {
           var uu = hex[i1] + hex[i2] + hex[i3] + hex[i4];
-	      var Elimination = 
-          ((uu === "002A") || (uu === "002F") || (uu === "005C") || (uu === "002B") || 
-           (uu === "003F") || (uu === "0028") || (uu === "0029") || 
+	      var Elimination =
+          ((uu === "002A") || (uu === "002F") || (uu === "005C") || (uu === "002B") ||
+           (uu === "003F") || (uu === "0028") || (uu === "0029") ||
            (uu === "005B") || (uu === "005D") || (uu === "007B") || (uu === "007D"));
-           /* 
+           /*
                 * \u002A     / \u002F     \ \u005C     + \u002B
                 ? \u003F     ( \u0028     ) \u0029
-                [ \u005B     ] \u005D     { \u007B     } \u007D          
+                [ \u005B     ] \u005D     { \u007B     } \u007D
            */
-          var LineTerminator = ((uu === "000A") || (uu === "000D") || (uu === "2028") || (uu === "2029"));                      
-          if ((Elimination || LineTerminator ) === false) {                       
-            var xx = "nnnn" + String.fromCharCode("0x" + uu);                  
-            var pattern = eval("/" + xx + "/");  
+          var LineTerminator = ((uu === "000A") || (uu === "000D") || (uu === "2028") || (uu === "2029"));
+          if ((Elimination || LineTerminator ) === false) {
+            var xx = "nnnn" + String.fromCharCode("0x" + uu);
+            var pattern = eval("/" + xx + "/");
             if (pattern.source !== xx) {
               $ERROR('#' + uu + ' ');
               errorCount++;
-            }                   
-      
+            }
+
           } else {
             count--;
-          }                     
-        } catch (e) {         
+          }
+        } catch (e) {
           $ERROR('#' + uu + ' ');
           errorCount++;
         }
         count++;
-      }  
+      }
     }
   }
 }
 
-if (errorCount > 0) {    
+if (errorCount > 0) {
   $ERROR('Total error: ' + errorCount + ' bad Regular Expression First Char in ' + count);
-} 
+}
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A2.4_T2.js b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A2.4_T2.js
index 8d907e7999..84a5b8df97 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A2.4_T2.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.8_Literals/7.8.5_Regular_Expression_Literals/S7.8.5_A2.4_T2.js
@@ -11,46 +11,46 @@
  */
 
 //CHECK
-errorCount = 0;
-count = 0;
+var errorCount = 0;
+var count = 0;
 var hex = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F"];
-for (i1 = 0; i1 < 16; i1++) {
-  for (i2 = 0; i2 < 16; i2++) {
-    for (i3 = 0; i3 < 16; i3++) {
-      for (i4 = 0; i4 < 16; i4++) {
-        try {    
+for (var i1 = 0; i1 < 16; i1++) {
+  for (var i2 = 0; i2 < 16; i2++) {
+    for (var i3 = 0; i3 < 16; i3++) {
+      for (var i4 = 0; i4 < 16; i4++) {
+        try {
           var uu = hex[i1] + hex[i2] + hex[i3] + hex[i4];
-	      var Elimination = 
-          ((uu === "002A") || (uu === "002F") || (uu === "005C") || (uu === "002B") || 
-           (uu === "003F") || (uu === "0028") || (uu === "0029") || 
+	      var Elimination =
+          ((uu === "002A") || (uu === "002F") || (uu === "005C") || (uu === "002B") ||
+           (uu === "003F") || (uu === "0028") || (uu === "0029") ||
            (uu === "005B") || (uu === "005D") || (uu === "007B") || (uu === "007D"));
-           /* 
+           /*
                 * \u002A     / \u002F     \ \u005C     + \u002B
                 ? \u003F     ( \u0028     ) \u0029
-                [ \u005B     ] \u005D     { \u007B     } \u007D          
+                [ \u005B     ] \u005D     { \u007B     } \u007D
            */
-          var LineTerminator = ((uu === "000A") || (uu === "000D") || (uu === "2028") || (uu === "2029"));                      
-          if ((Elimination || LineTerminator ) === false) {              
-            var xx = "a\\" + String.fromCharCode("0x" + uu);          
-            var pattern = eval("/" + xx + "/");  
+          var LineTerminator = ((uu === "000A") || (uu === "000D") || (uu === "2028") || (uu === "2029"));
+          if ((Elimination || LineTerminator ) === false) {
+            var xx = "a\\" + String.fromCharCode("0x" + uu);
+            var pattern = eval("/" + xx + "/");
             if (pattern.source !== xx) {
               $ERROR('#' + uu + ' ');
               errorCount++;
-            }                   
+            }
           } else {
             count--;
-          }                     
-        } catch (e) {         
+          }
+        } catch (e) {
           $ERROR('#' + uu + ' ');
           errorCount++;
         }
         count++;
-      }  
+      }
     }
   }
 }
 
-if (errorCount > 0) {    
+if (errorCount > 0) {
   $ERROR('Total error: ' + errorCount + ' bad Regular Expression First Char in ' + count);
-} 
+}
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T1.js b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T1.js
index 51bde070b2..165a48b08e 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T1.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T1.js
@@ -10,7 +10,7 @@
  */
 
 //CHECK#1
-x = 0;
+var x = 0;
 if (false) x = 1
 if (x !== 0) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
diff --git a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T10.js b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T10.js
index c4796e08e2..4cb97182a5 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T10.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T10.js
@@ -10,7 +10,7 @@
  */
 
 //CHECK#1
-x = 0;
+var x = 0;
 if (false) {x = 1} else {x = -1}
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
diff --git a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T11.js b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T11.js
index ac1b7f0291..c0c2929247 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T11.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T11.js
@@ -10,8 +10,8 @@
  */
 
 //CHECK#1
-x = 0;
-if (false) {{x = 1};} 
+var x = 0;
+if (false) {{x = 1};}
 else x = -1
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
diff --git a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T2.js b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T2.js
index c9ebc81c6c..2f5e5e24af 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T2.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T2.js
@@ -10,8 +10,8 @@
  */
 
 //CHECK#1
-x = 0;
-if (false) 
+var x = 0;
+if (false)
 x = 1
 if (x !== 0) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
diff --git a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T3.js b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T3.js
index d12ab81fec..489fae1932 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T3.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T3.js
@@ -10,8 +10,8 @@
  */
 
 //CHECK#1
-x = 0;
-if (false); 
+var x = 0;
+if (false);
 x = 1
 if (x !== 1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
diff --git a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T4.js b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T4.js
index 2d1d03c011..3dc6342fe5 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T4.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T4.js
@@ -11,6 +11,6 @@
  */
 
 //CHECK#1
-x = 0;
+var x = 0;
 if (false) x = 1 else x = -1
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T5.js b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T5.js
index 9ce571113d..deb8f43f2a 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T5.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T5.js
@@ -10,7 +10,7 @@
  */
 
 //CHECK#1
-x = 0;
+var x = 0;
 if (false) x = 1; else x = -1
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
diff --git a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T6.js b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T6.js
index 5cec1f1fae..795bbe7e9f 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T6.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T6.js
@@ -10,8 +10,8 @@
  */
 
 //CHECK#1
-x = 0;
-if (false) x = 1 
+var x = 0;
+if (false) x = 1
 else x = -1
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
diff --git a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T7.js b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T7.js
index e95e124c2e..e6b80f220f 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T7.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T7.js
@@ -10,8 +10,8 @@
  */
 
 //CHECK#1
-x = 0;
-if (false) x = 1; 
+var x = 0;
+if (false) x = 1;
 else x = -1
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
diff --git a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T8.js b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T8.js
index 4ba43c89ec..51437fd2d8 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T8.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T8.js
@@ -11,8 +11,8 @@
  */
 
 //CHECK#1
-x = 0;
-if (false) {x = 1}; 
+var x = 0;
+if (false) {x = 1};
 else x = -1
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
diff --git a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T9.js b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T9.js
index e4d6ea5a87..8da854608b 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T9.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A11_T9.js
@@ -10,8 +10,8 @@
  */
 
 //CHECK#1
-x = 0;
-if (false) {x = 1} 
+var x = 0;
+if (false) {x = 1}
 else x = -1
 if (x !== -1) {
   $ERROR('#1: Check If Statement for automatic semicolon insertion');
diff --git a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.7_T1.js b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.7_T1.js
index b7168bf68e..7589b2b131 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.7_T1.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.7_T1.js
@@ -12,7 +12,7 @@
  */
 
 var x=0, y=0;
-z=
+var z=
 x
 ++
 ++
diff --git a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.8_T1.js b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.8_T1.js
index 764c1196da..bfa10c11ec 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.8_T1.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.8_T1.js
@@ -11,9 +11,9 @@
  */
 
 var x=0, y=0;
-z=
+var z=
 x
-+ 
++
 ++
 y
 
diff --git a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.9_T1.js b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.9_T1.js
index 4ad6e2d073..adbd103e15 100644
--- a/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.9_T1.js
+++ b/test/suite/converted/07_Lexical_Conventions/7.9_Automatic_Semicolon_Insertion/S7.9_A5.9_T1.js
@@ -11,9 +11,9 @@
  */
 
 var x=1, y=1;
-z=
+var z=
 x
-+ 
++
 +
 +
 y
diff --git a/test/suite/converted/08_Types/8.2_The_Null_Type/S8.2_A1_T2.js b/test/suite/converted/08_Types/8.2_The_Null_Type/S8.2_A1_T2.js
index 1049ecb8ad..8f258783a1 100644
--- a/test/suite/converted/08_Types/8.2_The_Null_Type/S8.2_A1_T2.js
+++ b/test/suite/converted/08_Types/8.2_The_Null_Type/S8.2_A1_T2.js
@@ -11,7 +11,7 @@
 
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
-x = null;
+var x = null;
 //
 //////////////////////////////////////////////////////////////////////////////
 
diff --git a/test/suite/converted/08_Types/8.5_The_Number_Type/S8.5_A9.js b/test/suite/converted/08_Types/8.5_The_Number_Type/S8.5_A9.js
index 927d40efa8..fe9eee1c46 100644
--- a/test/suite/converted/08_Types/8.5_The_Number_Type/S8.5_A9.js
+++ b/test/suite/converted/08_Types/8.5_The_Number_Type/S8.5_A9.js
@@ -8,7 +8,7 @@
  * @path 08_Types/8.5_The_Number_Type/S8.5_A9.js
  * @description Try alter globally defined variable NaN
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 Number.NaN = 1;
diff --git a/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.1_Property_Attributes/S8.6.1_A1.js b/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.1_Property_Attributes/S8.6.1_A1.js
index 466bd65465..441b97cb7e 100644
--- a/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.1_Property_Attributes/S8.6.1_A1.js
+++ b/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.1_Property_Attributes/S8.6.1_A1.js
@@ -8,7 +8,7 @@
  * @path 08_Types/8.6_The_Object_Type/8.6.1_Property_Attributes/S8.6.1_A1.js
  * @description Try change Math.E property
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 var __e = Math.E;
diff --git a/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.1_Property_Attributes/S8.6.1_A3.js b/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.1_Property_Attributes/S8.6.1_A3.js
index 3218ce26ab..64b15ee0b5 100644
--- a/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.1_Property_Attributes/S8.6.1_A3.js
+++ b/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.1_Property_Attributes/S8.6.1_A3.js
@@ -8,7 +8,7 @@
  * @path 08_Types/8.6_The_Object_Type/8.6.1_Property_Attributes/S8.6.1_A3.js
  * @description Try to delete Number.NaN
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2.3_A1.js b/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2.3_A1.js
index 79fdd7029b..f685704412 100644
--- a/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2.3_A1.js
+++ b/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2.3_A1.js
@@ -8,7 +8,7 @@
  * @path 08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2.3_A1.js
  * @description Try put other value for Math.E property
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 var __e = Math.E;
diff --git a/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2.5_A1.js b/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2.5_A1.js
index 585c947e19..d1638c2cc3 100644
--- a/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2.5_A1.js
+++ b/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2.5_A1.js
@@ -9,7 +9,7 @@
  * @path 08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2.5_A1.js
  * @description Try to delete Math.E, that has the DontDelete attribute
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A2.js b/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A2.js
index 418383380e..579232e6b5 100644
--- a/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A2.js
+++ b/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A2.js
@@ -8,11 +8,9 @@
  * @section 8.6.2, 15.2.4
  * @path 08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A2.js
  * @description Check visibility properties of the child object for the purposes of get access, but not for put access
- * @strict_only
- * @strict_mode_negative
  */
 
-//Establish foo object 
+//Establish foo object
 function FooObj(){};
 FooObj.prototype.prop="some";
 
diff --git a/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T1.js b/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T1.js
index 28801d9442..db12bdf631 100644
--- a/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T1.js
+++ b/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T1.js
@@ -12,7 +12,7 @@
 
 this.count=0;
 
-screen = {touch:function(){count++}};
+var screen = {touch:function(){count++}};
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 screen.touch();
diff --git a/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T2.js b/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T2.js
index ed26826d0e..20712a429b 100644
--- a/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T2.js
+++ b/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T2.js
@@ -11,7 +11,7 @@
  */
 
 this.position=0;
-seat = {};
+var seat = {};
 seat['move']=function(){position++};
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T3.js b/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T3.js
index fae2e25535..752295c968 100644
--- a/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T3.js
+++ b/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T3.js
@@ -10,8 +10,8 @@
  *  as knock=function(){count++}
  */
 
-count=0;
-knock=function(){count++};
+var count=0;
+var knock=function(){count++};
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 knock();
diff --git a/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T4.js b/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T4.js
index 14eb3bc2bf..7c88c5e237 100644
--- a/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T4.js
+++ b/test/suite/converted/08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T4.js
@@ -10,7 +10,7 @@
  *  as this['beep']=function(){__count++}
  */
 
-__count=0;
+var __count=0;
 
 this["beep"]=function(){__count++};
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/suite/converted/08_Types/8.6_The_Object_Type/S8.6_A4_T1.js b/test/suite/converted/08_Types/8.6_The_Object_Type/S8.6_A4_T1.js
index 36c82d0b95..76c4e75bf2 100644
--- a/test/suite/converted/08_Types/8.6_The_Object_Type/S8.6_A4_T1.js
+++ b/test/suite/converted/08_Types/8.6_The_Object_Type/S8.6_A4_T1.js
@@ -11,9 +11,9 @@
 
 ///////////////////////////////////////////////////////
 // CHECK#1
-obj = {bar:true, some:1, foo:"a"};
+var obj = {bar:true, some:1, foo:"a"};
 
-count=0;
+var count=0;
 
 for (property in obj)	count++;
 
@@ -25,7 +25,7 @@ if (count !== 3){
 
 ///////////////////////////////////////////////////////
 // CHECK#2
-obj_ = {bar:true};
+var obj_ = {bar:true};
 obj_.some = 1;
 obj_.foo = "a";
 
@@ -41,7 +41,7 @@ if (count !== 3){
 
 ///////////////////////////////////////////////////////
 // CHECK#3
-obj__ = new Object();
+var obj__ = new Object();
 obj__.bar = true;
 obj__.some = 1;
 obj__.foo = "a";
diff --git a/test/suite/converted/08_Types/8.7_The_Reference_Type/S8.7.1_A2.js b/test/suite/converted/08_Types/8.7_The_Reference_Type/S8.7.1_A2.js
index fc34243fdc..f425c24fe3 100644
--- a/test/suite/converted/08_Types/8.7_The_Reference_Type/S8.7.1_A2.js
+++ b/test/suite/converted/08_Types/8.7_The_Reference_Type/S8.7.1_A2.js
@@ -7,6 +7,7 @@
  * @section 8.7.1
  * @path 08_Types/8.7_The_Reference_Type/S8.7.1_A2.js
  * @description Try to delete y, where y is var y=1
+ * @non_strict_only
  */
 
 var y = 1;
diff --git a/test/suite/converted/08_Types/8.7_The_Reference_Type/S8.7_A5_T1.js b/test/suite/converted/08_Types/8.7_The_Reference_Type/S8.7_A5_T1.js
index 29864a163b..9e79e782c9 100644
--- a/test/suite/converted/08_Types/8.7_The_Reference_Type/S8.7_A5_T1.js
+++ b/test/suite/converted/08_Types/8.7_The_Reference_Type/S8.7_A5_T1.js
@@ -8,7 +8,7 @@
  * @path 08_Types/8.7_The_Reference_Type/S8.7_A5_T1.js
  * @description Delete referenced object, var __ref = obj
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/suite/converted/08_Types/8.7_The_Reference_Type/S8.7_A5_T2.js b/test/suite/converted/08_Types/8.7_The_Reference_Type/S8.7_A5_T2.js
index af869d96d8..20ba76822b 100644
--- a/test/suite/converted/08_Types/8.7_The_Reference_Type/S8.7_A5_T2.js
+++ b/test/suite/converted/08_Types/8.7_The_Reference_Type/S8.7_A5_T2.js
@@ -8,7 +8,7 @@
  * @path 08_Types/8.7_The_Reference_Type/S8.7_A5_T2.js
  * @description Delete referenced object, __ref = obj
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/test/suite/converted/09_Type_Conversion/9.9_ToObject/S9.9_A1.js b/test/suite/converted/09_Type_Conversion/9.9_ToObject/S9.9_A1.js
index 64bd9ed06b..a8e43db082 100644
--- a/test/suite/converted/09_Type_Conversion/9.9_ToObject/S9.9_A1.js
+++ b/test/suite/converted/09_Type_Conversion/9.9_ToObject/S9.9_A1.js
@@ -7,13 +7,14 @@
  * @section 9.9
  * @path 09_Type_Conversion/9.9_ToObject/S9.9_A1.js
  * @description Trying to convert undefined to Object
+ * @non_strict_only
  */
 
 // CHECK#1
 try{
   undefined['foo'];
   $ERROR('#1.1: undefined[\'foo\'] must throw TypeError. Actual: ' + (undefined['foo']));
-} 
+}
 catch(e){
   if((e instanceof TypeError) !== true){
     $ERROR('#1.2: undefined[\'foo\'] must throw TypeError. Actual: ' + (e));
@@ -24,7 +25,7 @@ catch(e){
 try{
   with(undefined) x = 2;
   $ERROR('#2.1: with(undefined) x = 2 must throw TypeError. Actual: x === ' + (x));
-} 
+}
 catch(e){
   if((e instanceof TypeError) !== true){
     $ERROR('#2.2: with(undefined) x = 2 must throw TypeError. Actual: ' + (e));
@@ -35,7 +36,7 @@ catch(e){
 try{
   for(var y in undefined) y = 2;
   $ERROR('#3.1: for(var y in undefined) y = 2 must throw TypeError. Actual: y === ' + (y));
-} 
+}
 catch(e){
   if((e instanceof TypeError) !== true){
     $ERROR('#3.2: for(var y in undefined) y = 2 must throw TypeError. Actual: ' + (e));
@@ -46,7 +47,7 @@ catch(e){
 try{
   for(var z in this.foo) z = 2;
   $ERROR('#4.1: for(var z in this.foo) z = 2 must throw TypeError. Actual: z === ' + (z));
-} 
+}
 catch(e){
   if((e instanceof TypeError) !== true){
     $ERROR('#4.2: for(var z in this.foo) z = 2 must throw TypeError. Actual: ' + (e));
diff --git a/test/suite/converted/09_Type_Conversion/9.9_ToObject/S9.9_A2.js b/test/suite/converted/09_Type_Conversion/9.9_ToObject/S9.9_A2.js
index 5452fbe7c9..71a29b85bb 100644
--- a/test/suite/converted/09_Type_Conversion/9.9_ToObject/S9.9_A2.js
+++ b/test/suite/converted/09_Type_Conversion/9.9_ToObject/S9.9_A2.js
@@ -7,13 +7,14 @@
  * @section 9.9
  * @path 09_Type_Conversion/9.9_ToObject/S9.9_A2.js
  * @description Trying to convert null to Object
+ * @non_strict_only
  */
 
 // CHECK#1
 try{
   null['foo'];
   $ERROR('#1.1: null[\'foo\'] throw TypeError. Actual: ' + (null['foo']));
-} 
+}
 catch(e){
   if((e instanceof TypeError) !== true){
     $ERROR('#1.2: null[\'foo\'] must throw TypeError. Actual: ' + (e));
@@ -24,7 +25,7 @@ catch(e){
 try{
   with(null) x = 2;
   $ERROR('#2.1: with(null) x = 2 must throw TypeError. Actual: x === . Actual: ' + (x));
-} 
+}
 catch(e){
   if((e instanceof TypeError) !== true){
     $ERROR('#2.2: with(null) x = 2 must throw TypeError. Actual: ' + (e));
@@ -32,10 +33,10 @@ catch(e){
 }
 
 // CHECK#3
-try{  
+try{
   for(var y in null) y = 2;
   $ERROR('#3.1:  for(var y in null) y = 2 must throw TypeError. Actual: y === . Actual: ' + (y));
-} 
+}
 catch(e){
   if((e instanceof TypeError) !== true){
     $ERROR('#3.2:  for(var y in null) y = 2 must throw TypeError. Actual: ' + (e));
@@ -46,7 +47,7 @@ catch(e){
 try{
   for(var z in 'bbb'.match(/aaa/)) z = 2;
   $ERROR('#4.1: for(var z in \'bbb\'.match(/aaa/)) z = 2 must throw TypeError. Actual: z === . Actual: ' + (z));
-} 
+}
 catch(e){
   if((e instanceof TypeError) !== true){
     $ERROR('#4.2: for(var z in \'bbb\'.match(/aaa/)) z = 2 must throw TypeError. Actual: ' + (e));
diff --git a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.3_Variable_Instantiation/S10.1.3_A2.js b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.3_Variable_Instantiation/S10.1.3_A2.js
index cf2332b4aa..68bd42230e 100644
--- a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.3_Variable_Instantiation/S10.1.3_A2.js
+++ b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.3_Variable_Instantiation/S10.1.3_A2.js
@@ -9,6 +9,7 @@
  * @section 10.1.3
  * @path 10_Execution_Contexts/10.1_Definitions/10.1.3_Variable_Instantiation/S10.1.3_A2.js
  * @description Creating functions initialized with two or more formal parameters, which have the same name
+ * @non_strict_only
  */
 
 //CHECK#1
diff --git a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.3_Variable_Instantiation/S10.1.3_A4_T1.js b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.3_Variable_Instantiation/S10.1.3_A4_T1.js
index f666e8c9d6..08f1574477 100644
--- a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.3_Variable_Instantiation/S10.1.3_A4_T1.js
+++ b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.3_Variable_Instantiation/S10.1.3_A4_T1.js
@@ -10,12 +10,13 @@
  * @section 10.1.3
  * @path 10_Execution_Contexts/10.1_Definitions/10.1.3_Variable_Instantiation/S10.1.3_A4_T1.js
  * @description Checking existence of a function with passed parameter
+ * @non_strict_only
  */
 
 //CHECK#1
 function f1(x){
   return x;
-  
+
   function x(){
     return 7;
   }
@@ -27,7 +28,7 @@ if(!(f1().constructor.prototype === Function.prototype)){
 //CHECK#2
 function f2(x){
   return typeof x;
-  
+
   function x(){
     return 7;
   }
diff --git a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T5.js b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T5.js
index c56f7bf816..c10ec803d6 100644
--- a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T5.js
+++ b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T5.js
@@ -9,6 +9,7 @@
  * @section 10.1.4
  * @path 10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T5.js
  * @description Checking scope chain containing function declarations and "with"
+ * @non_strict_only
  */
 
 var x = 0;
diff --git a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T6.js b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T6.js
index 77ee5c866d..e48228f40e 100644
--- a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T6.js
+++ b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T6.js
@@ -9,6 +9,7 @@
  * @section 10.1.4
  * @path 10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T6.js
  * @description Checking scope chain containing function declarations and "with"
+ * @non_strict_only
  */
 
 var x = 0;
diff --git a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T7.js b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T7.js
index 80f23356cc..657e529366 100644
--- a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T7.js
+++ b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T7.js
@@ -9,6 +9,7 @@
  * @section 10.1.4
  * @path 10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T7.js
  * @description Checking scope chain containing function declarations and "with"
+ * @non_strict_only
  */
 
 var x = 0;
@@ -22,7 +23,7 @@ function f1(){
     }
   };
   return f2();
-  
+
   var x = 1;
 }
 
diff --git a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T8.js b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T8.js
index 519584553a..55ac34929b 100644
--- a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T8.js
+++ b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T8.js
@@ -9,6 +9,7 @@
  * @section 10.1.4
  * @path 10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T8.js
  * @description Checking scope chain containing function declarations and "with"
+ * @non_strict_only
  */
 
 var x = 0;
diff --git a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T9.js b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T9.js
index 3ec2377de0..be56a22c5c 100644
--- a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T9.js
+++ b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T9.js
@@ -9,6 +9,7 @@
  * @section 10.1.4
  * @path 10_Execution_Contexts/10.1_Definitions/10.1.4_Scope_Chain_and_Identifier_Resolution/S10.1.4_A1_T9.js
  * @description Checking scope chain containing function declarations and "with"
+ * @non_strict_only
  */
 
 var x = 0;
diff --git a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A3_T3.js b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A3_T3.js
index a99bf4191d..6029c65819 100644
--- a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A3_T3.js
+++ b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A3_T3.js
@@ -8,11 +8,12 @@
  * @section 10.1.8
  * @path 10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A3_T3.js
  * @description Checking if deleting arguments.callee property fails
+ * @non_strict_only
  */
 
 //CHECK#1
 function f1(){
-  return (delete arguments.callee); 
+  return (delete arguments.callee);
 }
 
 try{
@@ -26,7 +27,7 @@ catch(e){
 
 //CHECK#2
 var f2 = function(){
-  return (delete arguments.callee); 
+  return (delete arguments.callee);
 }
 
 try{
diff --git a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A3_T4.js b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A3_T4.js
index cc7c5e0323..f9546c7429 100644
--- a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A3_T4.js
+++ b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A3_T4.js
@@ -8,13 +8,14 @@
  * @section 10.1.8
  * @path 10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A3_T4.js
  * @description Overriding arguments.callee property
+ * @non_strict_only
  */
 
 var str = "something different";
 //CHECK#1
 function f1(){
   arguments.callee = str;
-  return arguments; 
+  return arguments;
 }
 
 try{
@@ -29,7 +30,7 @@ catch(e){
 //CHECK#2
 var f2 = function(){
     arguments.callee = str;
-    return arguments; 
+    return arguments;
   }
 try{
   if(f2().callee !== str){
diff --git a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A4.js b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A4.js
index 7bbbccba83..f18bd79065 100644
--- a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A4.js
+++ b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A4.js
@@ -8,6 +8,7 @@
  * @section 10.1.8
  * @path 10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A4.js
  * @description Checking that arguments.callee === function object
+ * @non_strict_only
  */
 
 //CHECK#1
diff --git a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A5_T4.js b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A5_T4.js
index 6ce60545b0..927cd01f4f 100644
--- a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A5_T4.js
+++ b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/10.1.8_Arguments_Object/S10.1.8_A5_T4.js
@@ -14,7 +14,7 @@ var str = "something different";
 //CHECK#1
 function f1(){
   arguments.length = str;
-  return arguments; 
+  return arguments;
 }
 
 try{
@@ -29,8 +29,8 @@ catch(e){
 //CHECK#2
 var f2 = function(){
     arguments.length = str;
-    return arguments; 
-  }
+    return arguments;
+  };
 try{
   if(f2().length !== str){
     $ERROR("#2: A property length have attribute { ReadOnly }");
diff --git a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/S10.1.6_A1_T1.js b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/S10.1.6_A1_T1.js
index b4535662cb..22f1d6c167 100644
--- a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/S10.1.6_A1_T1.js
+++ b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/S10.1.6_A1_T1.js
@@ -6,7 +6,8 @@
  *
  * @section 10.1.6
  * @path 10_Execution_Contexts/10.1_Definitions/S10.1.6_A1_T1.js
- * @description Checking ifdeleting function parameter is possible
+ * @description Checking if deleting function parameter is possible
+ * @non_strict_only
  */
 
 //CHECK#1
@@ -16,5 +17,5 @@ function f1(a){
 }
 if (f1(1) !== 1)
   $ERROR('#1: Function parameter was deleted');
-  
+
 
diff --git a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/S10.1.6_A1_T3.js b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/S10.1.6_A1_T3.js
index 66cacbf89c..518d4a923a 100644
--- a/test/suite/converted/10_Execution_Contexts/10.1_Definitions/S10.1.6_A1_T3.js
+++ b/test/suite/converted/10_Execution_Contexts/10.1_Definitions/S10.1.6_A1_T3.js
@@ -7,6 +7,7 @@
  * @section 10.1.6
  * @path 10_Execution_Contexts/10.1_Definitions/S10.1.6_A1_T3.js
  * @description Checking function which returns "this"
+ * @non_strict_only
  */
 
 function f1() {
diff --git a/test/suite/converted/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.1_Global_Code/S10.2.1_A1_T1.js b/test/suite/converted/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.1_Global_Code/S10.2.1_A1_T1.js
index 4c54bb83e8..b649af3550 100644
--- a/test/suite/converted/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.1_Global_Code/S10.2.1_A1_T1.js
+++ b/test/suite/converted/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.1_Global_Code/S10.2.1_A1_T1.js
@@ -8,6 +8,7 @@
  * @section 10.2.1
  * @path 10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.1_Global_Code/S10.2.1_A1_T1.js
  * @description Checking if deleting variable x, that is defined as var x = 1, fails
+ * @non_strict_only
  */
 
 var x = 1;
diff --git a/test/suite/converted/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.1_Global_Code/S10.2.1_A1_T2.js b/test/suite/converted/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.1_Global_Code/S10.2.1_A1_T2.js
index b7529f1849..85b2449dd3 100644
--- a/test/suite/converted/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.1_Global_Code/S10.2.1_A1_T2.js
+++ b/test/suite/converted/10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.1_Global_Code/S10.2.1_A1_T2.js
@@ -8,6 +8,7 @@
  * @section 10.2.1
  * @path 10_Execution_Contexts/10.2_Entering_An_Execution_Context/10.2.1_Global_Code/S10.2.1_A1_T2.js
  * @description Checking if deleting variable x, that is defined as x = 1, fails
+ * @non_strict_only
  */
 
 x = 1;
diff --git a/test/suite/converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.1_AND_Operator/S11.10.1_A2.4_T3.js b/test/suite/converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.1_AND_Operator/S11.10.1_A2.4_T3.js
index 923ab52edb..b695ef8bdd 100644
--- a/test/suite/converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.1_AND_Operator/S11.10.1_A2.4_T3.js
+++ b/test/suite/converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.1_AND_Operator/S11.10.1_A2.4_T3.js
@@ -7,16 +7,17 @@
  * @section 11.10.1
  * @path 11_Expressions/11.10_Binary_Bitwise_Operators/11.10.1_AND_Operator/S11.10.1_A2.4_T3.js
  * @description Checking with undeclarated variables
+ * @non_strict_only
  */
 
 //CHECK#1
 try {
   x & (x = 1);
-  $ERROR('#1.1: x & (x = 1) throw ReferenceError. Actual: ' + (x & (x = 1)));  
+  $ERROR('#1.1: x & (x = 1) throw ReferenceError. Actual: ' + (x & (x = 1)));
 }
 catch (e) {
   if ((e instanceof ReferenceError) !== true) {
-    $ERROR('#1.2: x & (x = 1) throw ReferenceError. Actual: ' + (e));  
+    $ERROR('#1.2: x & (x = 1) throw ReferenceError. Actual: ' + (e));
   }
 }
 
diff --git a/test/suite/converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.2_XOR_Operator/S11.10.2_A2.4_T3.js b/test/suite/converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.2_XOR_Operator/S11.10.2_A2.4_T3.js
index fe00a0fb5a..f9ef660f69 100644
--- a/test/suite/converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.2_XOR_Operator/S11.10.2_A2.4_T3.js
+++ b/test/suite/converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.2_XOR_Operator/S11.10.2_A2.4_T3.js
@@ -7,16 +7,17 @@
  * @section 11.10.2
  * @path 11_Expressions/11.10_Binary_Bitwise_Operators/11.10.2_XOR_Operator/S11.10.2_A2.4_T3.js
  * @description Checking with undeclarated variables
+ * @non_strict_only
  */
 
 //CHECK#1
 try {
   x ^ (x = 1);
-  $ERROR('#1.1: x ^ (x = 1) throw ReferenceError. Actual: ' + (x ^ (x = 1)));  
+  $ERROR('#1.1: x ^ (x = 1) throw ReferenceError. Actual: ' + (x ^ (x = 1)));
 }
 catch (e) {
   if ((e instanceof ReferenceError) !== true) {
-    $ERROR('#1.2: x ^ (x = 1) throw ReferenceError. Actual: ' + (e));  
+    $ERROR('#1.2: x ^ (x = 1) throw ReferenceError. Actual: ' + (e));
   }
 }
 
diff --git a/test/suite/converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.3_OR_Operator/S11.10.3_A2.4_T3.js b/test/suite/converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.3_OR_Operator/S11.10.3_A2.4_T3.js
index 8b299bcae0..346972e7fc 100644
--- a/test/suite/converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.3_OR_Operator/S11.10.3_A2.4_T3.js
+++ b/test/suite/converted/11_Expressions/11.10_Binary_Bitwise_Operators/11.10.3_OR_Operator/S11.10.3_A2.4_T3.js
@@ -7,16 +7,17 @@
  * @section 11.10.3
  * @path 11_Expressions/11.10_Binary_Bitwise_Operators/11.10.3_OR_Operator/S11.10.3_A2.4_T3.js
  * @description Checking with undeclarated variables
+ * @non_strict_only
  */
 
 //CHECK#1
 try {
   x | (x = 1);
-  $ERROR('#1.1: x | (x = 1) throw ReferenceError. Actual: ' + (x | (x = 1)));  
+  $ERROR('#1.1: x | (x = 1) throw ReferenceError. Actual: ' + (x | (x = 1)));
 }
 catch (e) {
   if ((e instanceof ReferenceError) !== true) {
-    $ERROR('#1.2: x | (x = 1) throw ReferenceError. Actual: ' + (e));  
+    $ERROR('#1.2: x | (x = 1) throw ReferenceError. Actual: ' + (e));
   }
 }
 
diff --git a/test/suite/converted/11_Expressions/11.11_Binary_Logical_Operators/11.11.1_Logical_AND_Operator/S11.11.1_A2.4_T3.js b/test/suite/converted/11_Expressions/11.11_Binary_Logical_Operators/11.11.1_Logical_AND_Operator/S11.11.1_A2.4_T3.js
index db9da54cb9..71b4b1cfae 100644
--- a/test/suite/converted/11_Expressions/11.11_Binary_Logical_Operators/11.11.1_Logical_AND_Operator/S11.11.1_A2.4_T3.js
+++ b/test/suite/converted/11_Expressions/11.11_Binary_Logical_Operators/11.11.1_Logical_AND_Operator/S11.11.1_A2.4_T3.js
@@ -7,16 +7,17 @@
  * @section 11.11.1
  * @path 11_Expressions/11.11_Binary_Logical_Operators/11.11.1_Logical_AND_Operator/S11.11.1_A2.4_T3.js
  * @description Checking with undeclarated variables
+ * @non_strict_only
  */
 
 //CHECK#1
 try {
   x && (x = true);
-  $ERROR('#1.1: x && (x = true) throw ReferenceError. Actual: ' + (x && (x = true)));  
+  $ERROR('#1.1: x && (x = true) throw ReferenceError. Actual: ' + (x && (x = true)));
 }
 catch (e) {
   if ((e instanceof ReferenceError) !== true) {
-    $ERROR('#1.2: x && (x = true) throw ReferenceError. Actual: ' + (e));  
+    $ERROR('#1.2: x && (x = true) throw ReferenceError. Actual: ' + (e));
   }
 }
 
diff --git a/test/suite/converted/11_Expressions/11.11_Binary_Logical_Operators/11.11.2_Logical_OR_Operator/S11.11.2_A2.4_T3.js b/test/suite/converted/11_Expressions/11.11_Binary_Logical_Operators/11.11.2_Logical_OR_Operator/S11.11.2_A2.4_T3.js
index 6c39582160..aea2cec753 100644
--- a/test/suite/converted/11_Expressions/11.11_Binary_Logical_Operators/11.11.2_Logical_OR_Operator/S11.11.2_A2.4_T3.js
+++ b/test/suite/converted/11_Expressions/11.11_Binary_Logical_Operators/11.11.2_Logical_OR_Operator/S11.11.2_A2.4_T3.js
@@ -7,16 +7,17 @@
  * @section 11.11.2
  * @path 11_Expressions/11.11_Binary_Logical_Operators/11.11.2_Logical_OR_Operator/S11.11.2_A2.4_T3.js
  * @description Checking with undeclarated variables
+ * @non_strict_only
  */
 
 //CHECK#1
 try {
   x || (x = true);
-  $ERROR('#1.1: x || (x = true) throw ReferenceError. Actual: ' + (x || (x = true)));  
+  $ERROR('#1.1: x || (x = true) throw ReferenceError. Actual: ' + (x || (x = true)));
 }
 catch (e) {
   if ((e instanceof ReferenceError) !== true) {
-    $ERROR('#1.2: x || (x = true) throw ReferenceError. Actual: ' + (e));  
+    $ERROR('#1.2: x || (x = true) throw ReferenceError. Actual: ' + (e));
   }
 }
 
diff --git a/test/suite/converted/11_Expressions/11.13_Assignment_Operators/11.13.1_Simple_Assignment/S11.13.1_A1.js b/test/suite/converted/11_Expressions/11.13_Assignment_Operators/11.13.1_Simple_Assignment/S11.13.1_A1.js
index e5c7e7a917..d7d62ae80c 100644
--- a/test/suite/converted/11_Expressions/11.13_Assignment_Operators/11.13.1_Simple_Assignment/S11.13.1_A1.js
+++ b/test/suite/converted/11_Expressions/11.13_Assignment_Operators/11.13.1_Simple_Assignment/S11.13.1_A1.js
@@ -7,6 +7,7 @@
  * @section 11.13.1
  * @path 11_Expressions/11.13_Assignment_Operators/11.13.1_Simple_Assignment/S11.13.1_A1.js
  * @description Checking by using eval
+ * @non_strict_only
  */
 
 //CHECK#1
@@ -16,7 +17,7 @@ if ((eval("x\u0009=\u0009true")) !== true) {
 
 //CHECK#2
 if ((eval("x\u000B=\u000Btrue")) !== true) {
-  $ERROR('#2: (x\\u000B=\\u000Btrue) === true');  
+  $ERROR('#2: (x\\u000B=\\u000Btrue) === true');
 }
 
 //CHECK#3
@@ -36,7 +37,7 @@ if ((eval("x\u00A0=\u00A0true")) !== true) {
 
 //CHECK#6
 if ((eval("x\u000A=\u000Atrue")) !== true) {
-  $ERROR('#6: (x\\u000A=\\u000Atrue) === true');  
+  $ERROR('#6: (x\\u000A=\\u000Atrue) === true');
 }
 
 //CHECK#7
diff --git a/test/suite/converted/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A2.js b/test/suite/converted/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A2.js
index 8dc95acbea..7bdb9ac61e 100644
--- a/test/suite/converted/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A2.js
+++ b/test/suite/converted/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A2.js
@@ -7,15 +7,16 @@
  * @section 11.1.1
  * @path 11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A2.js
  * @description Checking if execution of "this" and eval("this"), which are in global code, return the global object by using toString function
+ * @non_strict_only
  */
 
 //CHECK#1
 if (this.toString() !== toString()) {
-  $ERROR('#1: this.toString() === toString(). Actual: ' + (this.toString()));  
+  $ERROR('#1: this.toString() === toString(). Actual: ' + (this.toString()));
 }
 
 //CHECK#2
 if (eval("this").toString() !== toString()) {
-  $ERROR('#2: eval("this").toString() === toString(). Actual: ' + (this.toString()));  
+  $ERROR('#2: eval("this").toString() === toString(). Actual: ' + (this.toString()));
 }
 
diff --git a/test/suite/converted/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A3.1.js b/test/suite/converted/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A3.1.js
index f694610f31..265ba48890 100644
--- a/test/suite/converted/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A3.1.js
+++ b/test/suite/converted/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A3.1.js
@@ -7,18 +7,19 @@
  * @section 11.1.1
  * @path 11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A3.1.js
  * @description Creating function which returns "this" or eval("this")
+ * @non_strict_only
  */
 
 //CHECK#1
 function MyFunction() {return this}
 if (MyFunction() !== this) {
-  $ERROR('#1: function MyFunction() {return this} MyFunction() === this. Actual: ' + (MyFunction()));  
+  $ERROR('#1: function MyFunction() {return this} MyFunction() === this. Actual: ' + (MyFunction()));
 }
 
 //CHECK#2
 function MyFunction() {return eval("this")}
 if (MyFunction() !== this) {
-  $ERROR('#2: function MyFunction() {return eval("this")} MyFunction() === this. Actual: ' + (MyFunction()));  
+  $ERROR('#2: function MyFunction() {return eval("this")} MyFunction() === this. Actual: ' + (MyFunction()));
 }
 
 
diff --git a/test/suite/converted/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A3.2.js b/test/suite/converted/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A3.2.js
index 91e01afa19..324f2853da 100644
--- a/test/suite/converted/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A3.2.js
+++ b/test/suite/converted/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A3.2.js
@@ -7,18 +7,19 @@
  * @section 11.1.1
  * @path 11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A3.2.js
  * @description Create function. It have property, that returned "this"
+ * @non_strict_only
  */
 
 //CHECK#1
 function MyFunction() {this.THIS = this}
 if ((new MyFunction()).THIS.toString() !== "[object Object]") {
-  $ERROR('#1: function MyFunction() {this.THIS = this} (new MyFunction()).THIS.toString() !== "[object Object]". Actual: ' + ((new MyFunction()).THIS.toString()));  
+  $ERROR('#1: function MyFunction() {this.THIS = this} (new MyFunction()).THIS.toString() !== "[object Object]". Actual: ' + ((new MyFunction()).THIS.toString()));
 }
 
 //CHECK#2
 function MyFunction() {this.THIS = eval("this")}
 if ((new MyFunction()).THIS.toString() !== "[object Object]") {
-  $ERROR('#2: function MyFunction() {this.THIS = eval("this")} (new MyFunction()).THIS.toString() !== "[object Object]". Actual: ' + ((new MyFunction()).THIS.toString()));  
+  $ERROR('#2: function MyFunction() {this.THIS = eval("this")} (new MyFunction()).THIS.toString() !== "[object Object]". Actual: ' + ((new MyFunction()).THIS.toString()));
 }
 
 
diff --git a/test/suite/converted/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A4.1.js b/test/suite/converted/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A4.1.js
index fe1e39199e..af827cc8dc 100644
--- a/test/suite/converted/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A4.1.js
+++ b/test/suite/converted/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A4.1.js
@@ -12,13 +12,13 @@
 //CHECK#1
 var MyFunction = new Function("return this");
 if (MyFunction() !== this) {
-  $ERROR('#1: var MyFunction = new Function("return this"); MyFunction() === this. Actual: ' + (MyFunction()));  
+  $ERROR('#1: var MyFunction = new Function("return this"); MyFunction() === this. Actual: ' + (MyFunction()));
 }
 
 //CHECK#2
-var MyFunction = new Function("return eval(\'this\')");
+MyFunction = new Function("return eval(\'this\')");
 if (MyFunction() !== this) {
-  $ERROR('#2: var MyFunction = new Function("return eval(\'this\')"); MyFunction() === this. Actual: ' + (MyFunction()));  
+  $ERROR('#2: var MyFunction = new Function("return eval(\'this\')"); MyFunction() === this. Actual: ' + (MyFunction()));
 }
 
 
diff --git a/test/suite/converted/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A4.2.js b/test/suite/converted/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A4.2.js
index 6bb55accad..762191b3fc 100644
--- a/test/suite/converted/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A4.2.js
+++ b/test/suite/converted/11_Expressions/11.1_Primary_Expressions/11.1.1_The_this_Keyword/S11.1.1_A4.2.js
@@ -13,14 +13,14 @@
 var MyFunction = new Function("this.THIS = this");
 var MyObject = new MyFunction();
 if (MyObject.THIS.toString() !== "[object Object]") {
-  $ERROR('#1: var MyFunction = new Function("this.THIS = this"); var MyObject = new MyFunction(); MyObject.THIS.toString() === "[object Object]". Actual: ' + (MyObject.THIS.toString()));  
+  $ERROR('#1: var MyFunction = new Function("this.THIS = this"); var MyObject = new MyFunction(); MyObject.THIS.toString() === "[object Object]". Actual: ' + (MyObject.THIS.toString()));
 }
 
 //CHECK#2
-var MyFunction = new Function("this.THIS = eval(\'this\')");
-var MyObject = new MyFunction();
+MyFunction = new Function("this.THIS = eval(\'this\')");
+MyObject = new MyFunction();
 if (MyObject.THIS.toString() !== "[object Object]") {
-  $ERROR('#2: var MyFunction = new Function("this.THIS = eval(\'this\')"); var MyObject = new MyFunction(); MyObject.THIS.toString() === "[object Object]". Actual: ' + (MyObject.THIS.toString()));  
+  $ERROR('#2: var MyFunction = new Function("this.THIS = eval(\'this\')"); var MyObject = new MyFunction(); MyObject.THIS.toString() === "[object Object]". Actual: ' + (MyObject.THIS.toString()));
 }
 
 
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.10_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.10_T1.js
index e352126c36..c342c7baaf 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.10_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.10_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.10_T1.js
  * @description Using interation statement within "with" statement leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.10_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.10_T2.js
index 825be60cbc..9a422e6a94 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.10_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.10_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.10_T2.js
  * @description Using iteration statement within "with" statement leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.10_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.10_T3.js
index f32986d595..0c42ad2652 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.10_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.10_T3.js
@@ -10,7 +10,7 @@
  * @description Using iteration statment withing "with" statement leading to completion by exception
  * iteration statement inside with statement - exception completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.10_T4.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.10_T4.js
index a9079d2c35..9f70178fe2 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.10_T4.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.10_T4.js
@@ -10,7 +10,7 @@
  * @description Using iteration statement witthin "with" staement leading to completion by break
  * iteration statement inside with statement - break completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.10_T5.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.10_T5.js
index 45d12529cd..a2072c1936 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.10_T5.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.10_T5.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.10_T5.js
  * @description Using iteration statement within "with" statement leading to completion by break
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.11_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.11_T1.js
index 9b926f00ec..8a4c441a6c 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.11_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.11_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.11_T1.js
  * @description Calling a function within "with" statement declared without the statement, leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.11_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.11_T2.js
index ea240a8b75..6c0c8b0984 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.11_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.11_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.11_T2.js
  * @description Calling a function within "with" statement declared without the statement, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.11_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.11_T3.js
index 3b2232575c..e5f20bb91e 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.11_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.11_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.11_T3.js
  * @description Calling a function within "with" statement declared without the statement, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.11_T4.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.11_T4.js
index b9677149da..d644df7439 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.11_T4.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.11_T4.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.11_T4.js
  * @description Calling a function within "with" statement declared without the statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.11_T5.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.11_T5.js
index 12071bcd88..9ff510d284 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.11_T5.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.11_T5.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.11_T5.js
  * @description Calling a function within "with" statement declared without the statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.12_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.12_T1.js
index 9e0f8d9638..0be6454ef6 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.12_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.12_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.12_T1.js
  * @description Calling a function without "with" statement declared within the statement, leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.12_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.12_T2.js
index 19d21cd224..464da55e94 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.12_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.12_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.12_T2.js
  * @description Calling a function without "with" statement declared within the statement, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.12_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.12_T3.js
index 2bdf047b00..86efdeca01 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.12_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.12_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.12_T3.js
  * @description Calling a function without "with" statement declared within the statement, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.12_T4.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.12_T4.js
index 0d9f16bdf1..720f547231 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.12_T4.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.12_T4.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.12_T4.js
  * @description Calling a function without "with" statement declared within the statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.12_T5.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.12_T5.js
index e91f53a8fe..700f012dea 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.12_T5.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.12_T5.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.12_T5.js
  * @description Calling a function without "with" statement declared within the statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.1_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.1_T1.js
index 060cca2ad5..01416d2e72 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.1_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.1_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.1_T1.js
  * @description Using "with" inside of global context leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.1_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.1_T2.js
index ebf1fa4a73..943aa58bf3 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.1_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.1_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.1_T2.js
  * @description Using "with" inside of global context leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.1_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.1_T3.js
index 38253d3294..030f1bbf3e 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.1_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.1_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.1_T3.js
  * @description Using "with" inside of global context leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.2_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.2_T1.js
index 873e1de1c1..550875d1bb 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.2_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.2_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.2_T1.js
  * @description Calling a function without "with" statement when the statement itself is declared within the function declaration, leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.2_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.2_T2.js
index 5744cea851..4587ecff83 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.2_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.2_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.2_T2.js
  * @description Calling a function without "with" statement when the statement itself is declared within the function declaration, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.2_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.2_T3.js
index 97e1fc0d1b..1b21425f7e 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.2_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.2_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.2_T3.js
  * @description Calling a function without "with" statement when the statement itself is declared within the function declaration, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.2_T4.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.2_T4.js
index c2f1c0240f..7d7578614e 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.2_T4.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.2_T4.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.2_T4.js
  * @description Calling a function without "with" statement when the statement itself is declared within the function declaration, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.2_T5.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.2_T5.js
index 26147ed047..6954cdc556 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.2_T5.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.2_T5.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.2_T5.js
  * @description Calling a function without "with" statement when the statement itself is declared within the function declaration, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.3_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.3_T1.js
index af663954a8..dc05ad77a5 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.3_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.3_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.3_T1.js
  * @description Using "with" statement within function constructor, leading to normal completition
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.3_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.3_T2.js
index f86a8f1e59..e851f999c1 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.3_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.3_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.3_T2.js
  * @description Using "with" statement within function constructor, leading to normal completition by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.3_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.3_T3.js
index 77df3171b2..a966732e37 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.3_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.3_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.3_T3.js
  * @description Using "with" statement within function constructor, leading to normal completition by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.3_T4.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.3_T4.js
index f07167b59a..34e06c1bae 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.3_T4.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.3_T4.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.3_T4.js
  * @description Using "with" statement within function constructor, leading to completition by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.3_T5.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.3_T5.js
index f3ef79feda..29975b82c8 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.3_T5.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.3_T5.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.3_T5.js
  * @description Using "with" statement within function constructor, leading to completition by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.4_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.4_T1.js
index 9d62120619..6ee3c57756 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.4_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.4_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.4_T1.js
  * @description Using "with" statement within iteration statement, leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.4_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.4_T2.js
index b3d7431205..58ac84285a 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.4_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.4_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.4_T2.js
  * @description Using "with" statement within iteration statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.4_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.4_T3.js
index 7035d7760b..f71578f2be 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.4_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.4_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.4_T3.js
  * @description Using "with" statement within iteration statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.4_T4.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.4_T4.js
index 0e1490e9d4..1c2a7a7684 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.4_T4.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.4_T4.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.4_T4.js
  * @description Using "with" statement within iteration statement, leading to completion by break
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.4_T5.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.4_T5.js
index c812a2607d..3d3288c4df 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.4_T5.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.4_T5.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.4_T5.js
  * @description Using "with" statement within iteration statement, leading to completion by break
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.5_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.5_T1.js
index d1290d424d..b7d7774868 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.5_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.5_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.5_T1.js
  * @description Using "with" statement within "for-in" statement, leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.5_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.5_T2.js
index ad241d81d5..c72baf7dd2 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.5_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.5_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.5_T2.js
  * @description Using "with" statement within "for-in" statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.5_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.5_T3.js
index 2907b16899..25cc7fa0f1 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.5_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.5_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.5_T3.js
  * @description Using "with" statement within "for-in" statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.5_T4.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.5_T4.js
index 4c9d62265e..2416ffd9c2 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.5_T4.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.5_T4.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.5_T4.js
  * @description Using "with" statement within "for-in" statement, leading to completion by break
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.5_T5.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.5_T5.js
index 5a56b67553..bd2a2ea1b5 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.5_T5.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.5_T5.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.5_T5.js
  * @description Using "with" statement within "for-in" statement, leading to completion by break
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.6_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.6_T1.js
index 11ada524ab..b037ea6345 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.6_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.6_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.6_T1.js
  * @description Using "with" statement within another "with" statement, leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.6_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.6_T2.js
index 8aa1438a93..b0c4379485 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.6_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.6_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.6_T2.js
  * @description Using "with" statement within another "with" statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.6_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.6_T3.js
index c869bca1ae..0504a8e730 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.6_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.6_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.6_T3.js
  * @description Using "with" statement within another "with" statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.7_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.7_T1.js
index 44b4161988..5e89592060 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.7_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.7_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.7_T1.js
  * @description Calling a function within "with" statement declared within the statement, leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.7_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.7_T2.js
index b9c0b11648..4454de23c9 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.7_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.7_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.7_T2.js
  * @description Calling a function within "with" statement declared within the statement, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.7_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.7_T3.js
index 2ff3f2079f..d37ddbcbac 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.7_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.7_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.7_T3.js
  * @description Calling a function within "with" statement declared within the statement, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.7_T4.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.7_T4.js
index 2e8b7abcf5..bce1d1f69f 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.7_T4.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.7_T4.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.7_T4.js
  * @description Calling a function within "with" statement declared within the statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.7_T5.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.7_T5.js
index 9d2dd3d387..0e672c5dc4 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.7_T5.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.7_T5.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.7_T5.js
  * @description Calling a function within "with" statement declared within the statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.8_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.8_T1.js
index 1f850bd971..bd2e2a1879 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.8_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.8_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.8_T1.js
  * @description Declaring function constructor within "with" statement, leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.8_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.8_T2.js
index b1ad958231..ee5479b0e9 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.8_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.8_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.8_T2.js
  * @description Declaring function constructor within "with" statement, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.8_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.8_T3.js
index a40683c33c..ec40311117 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.8_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.8_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.8_T3.js
  * @description Declaring function constructor within "with" statement, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.8_T4.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.8_T4.js
index d083102969..ded3ca0a78 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.8_T4.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.8_T4.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.8_T4.js
  * @description Declaring function constructor within "with" statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.8_T5.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.8_T5.js
index cabc54261f..0863a1c94a 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.8_T5.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.8_T5.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.8_T5.js
  * @description Declaring function constructor within "with" statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.9_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.9_T1.js
index 6dc5772401..7d8f0960cb 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.9_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.9_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.9_T1.js
  * @description Using "for-in" statement within "with" statement, leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.9_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.9_T2.js
index a2b76aec3a..47e29e7f7b 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.9_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.9_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.9_T2.js
  * @description Using "for-in" statement within "with" statement, leading to completion by break
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.9_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.9_T3.js
index 52310c1ff4..6453a769e0 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.9_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A1.9_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A1.9_T3.js
  * @description Using "for-in" statement within "with" statement, leading to completion by break
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.10_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.10_T1.js
index 888058b17d..4959237285 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.10_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.10_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.10_T1.js
  * @description Using iteration statement within "with" statement, leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.10_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.10_T2.js
index 9f488bd9e5..71e79b8428 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.10_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.10_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.10_T2.js
  * @description Using iteration statement within "with" statement, leading completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.10_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.10_T3.js
index 4baa109e22..6363456677 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.10_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.10_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.10_T3.js
  * @description Using iteration statement within "with" statement, leading completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.10_T4.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.10_T4.js
index 035b5f3145..0b16d5d4b6 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.10_T4.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.10_T4.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.10_T4.js
  * @description Using iteration statement within "with" statement, leading completion be break
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.10_T5.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.10_T5.js
index f157de430f..019419f4ab 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.10_T5.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.10_T5.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.10_T5.js
  * @description Using iteration statement within "with" statement, leading completion be break
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.11_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.11_T1.js
index da03344914..1f0c999bdb 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.11_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.11_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.11_T1.js
  * @description Calling a function within "with" statement declared without the statement, leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.11_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.11_T2.js
index 3542d81c23..5ca97394c8 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.11_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.11_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.11_T2.js
  * @description Calling a function within "with" statement declared without the statement, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.11_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.11_T3.js
index 721feb167a..b9ee8d92ef 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.11_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.11_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.11_T3.js
  * @description Calling a function within "with" statement declared without the statement, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.11_T4.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.11_T4.js
index 7ab96e31f0..566c910924 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.11_T4.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.11_T4.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.11_T4.js
  * @description Calling a function within "with" statement declared without the statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.11_T5.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.11_T5.js
index 00fbea1767..44f650ab86 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.11_T5.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.11_T5.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.11_T5.js
  * @description Calling a function within "with" statement declared without the statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.12_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.12_T1.js
index 1b529a4474..9270c901da 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.12_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.12_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.12_T1.js
  * @description Calling a function without "with" statement declared within the statement, leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.12_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.12_T2.js
index 4e5b5c454a..13795508ce 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.12_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.12_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.12_T2.js
  * @description Calling a function without "with" statement declared within the statement, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.12_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.12_T3.js
index c361c2efba..d214f8cbcd 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.12_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.12_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.12_T3.js
  * @description Calling a function without "with" statement declared within the statement, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.12_T4.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.12_T4.js
index bac83e84b5..ebb2306eea 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.12_T4.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.12_T4.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.12_T4.js
  * @description Calling a function without "with" statement declared within the statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.12_T5.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.12_T5.js
index d571edbdf9..6b3f42b8ba 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.12_T5.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.12_T5.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.12_T5.js
  * @description Calling a function without "with" statement declared within the statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.1_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.1_T1.js
index d63d89349a..974a29048b 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.1_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.1_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.1_T1.js
  * @description Using "with" statement within global context - normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.1_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.1_T2.js
index 0b9f6104a2..489f211953 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.1_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.1_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.1_T2.js
  * @description Using "with" statement within global context, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.1_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.1_T3.js
index e00a35346c..3c9752e33e 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.1_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.1_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.1_T3.js
  * @description Using "with" statement within global context, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.2_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.2_T1.js
index 57eacefc1a..18b42f133c 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.2_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.2_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.2_T1.js
  * @description Declaring "with" statement within a function body, leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.2_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.2_T2.js
index 588df705a4..532d897249 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.2_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.2_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.2_T2.js
  * @description Declaring "with" statement within a function body, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.2_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.2_T3.js
index 8235a131db..e6290cb687 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.2_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.2_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.2_T3.js
  * @description Declaring "with" statement within a function body, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.2_T4.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.2_T4.js
index 9345894d74..e39838b209 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.2_T4.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.2_T4.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.2_T4.js
  * @description Declaring "with" statement within a function body, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.2_T5.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.2_T5.js
index 717d8d9ed5..bf858adc1c 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.2_T5.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.2_T5.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.2_T5.js
  * @description Declaring "with" statement within a function body, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.3_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.3_T1.js
index e7bbf403f1..609391d95e 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.3_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.3_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.3_T1.js
  * @description Declaring "with" statement within a function constructor, leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.3_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.3_T2.js
index a27eff8db8..81c941af81 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.3_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.3_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.3_T2.js
  * @description Declaring "with" statement within a function constructor, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.3_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.3_T3.js
index cf8bb7b115..9ebf940801 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.3_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.3_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.3_T3.js
  * @description Declaring "with" statement within a function constructor, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.3_T4.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.3_T4.js
index 635af05cdc..350999bc3b 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.3_T4.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.3_T4.js
@@ -8,7 +8,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.3_T4.js
  * @description Declaring "with" statement within a function constructor, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.3_T5.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.3_T5.js
index fffb0dc29e..e1c9400477 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.3_T5.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.3_T5.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.3_T5.js
  * @description Declaring "with" statement within a function constructor, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.4_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.4_T1.js
index 62c6750193..ab37c1d499 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.4_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.4_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.4_T1.js
  * @description Using "with" statement within iteration statement, leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.4_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.4_T2.js
index b5a527be55..0ca21037b2 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.4_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.4_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.4_T2.js
  * @description Using "with" statement within iteration statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.4_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.4_T3.js
index 83215f20fb..cb2f4bfb22 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.4_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.4_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.4_T3.js
  * @description Using "with" statement within iteration statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.4_T4.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.4_T4.js
index 2a1568c26e..5f438e5d80 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.4_T4.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.4_T4.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.4_T4.js
  * @description Using "with" statement within iteration statement, leading to completion by break
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.4_T5.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.4_T5.js
index 2bc805bcda..3e3b3c41f9 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.4_T5.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.4_T5.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.4_T5.js
  * @description Using "with" statement within iteration statement, leading to completion by break
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.5_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.5_T1.js
index 5811b352f4..c82b7e0494 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.5_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.5_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.5_T1.js
  * @description Using "with" statement within "for-in" statement, leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.5_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.5_T2.js
index 126742bb3d..78f8bd2fc6 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.5_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.5_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.5_T2.js
  * @description Using "with" statement within "for-in" statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.5_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.5_T3.js
index fe00883aae..6376af576d 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.5_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.5_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.5_T3.js
  * @description Using "with" statement within "for-in" statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.5_T4.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.5_T4.js
index 7e3d7c8a33..9bb279f253 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.5_T4.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.5_T4.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.5_T4.js
  * @description Using "with" statement within "for-in" statement, leading to completion by break
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.5_T5.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.5_T5.js
index 9428c503c2..52e48b8d26 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.5_T5.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.5_T5.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.5_T5.js
  * @description Using "with" statement within "for-in" statement, leading to completion by break
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.6_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.6_T1.js
index a5d2e0ecdf..58d204cfc2 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.6_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.6_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.6_T1.js
  * @description Using "with" statement within another "with" statement, leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.6_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.6_T2.js
index 17835d96f1..01e4433e16 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.6_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.6_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.6_T2.js
  * @description Using "with" statement within another "with" statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.6_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.6_T3.js
index 276e294837..1b4e3d5123 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.6_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.6_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.6_T3.js
  * @description Using "with" statement within another "with" statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.7_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.7_T1.js
index 041a895888..bd42c39614 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.7_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.7_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.7_T1.js
  * @description Declaring and calling a function within "with" statement, leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.7_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.7_T2.js
index 089a0841f4..a0d7521d83 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.7_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.7_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.7_T2.js
  * @description Declaring and calling a function within "with" statement, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.7_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.7_T3.js
index 7bc3b3de74..76faa8018c 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.7_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.7_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.7_T3.js
  * @description Declaring and calling a function within "with" statement, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.7_T4.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.7_T4.js
index 2af4b567cf..f114abab33 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.7_T4.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.7_T4.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.7_T4.js
  * @description Declaring and calling a function within "with" statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.7_T5.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.7_T5.js
index 5153f8a844..e9a496692f 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.7_T5.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.7_T5.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.7_T5.js
  * @description Declaring and calling a function within "with" statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.8_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.8_T1.js
index 3ac51ef7b3..1b32c437cb 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.8_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.8_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.8_T1.js
  * @description Declaring function constructor within "with" statement, leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.8_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.8_T2.js
index 81bad164e7..c7c6784676 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.8_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.8_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.8_T2.js
  * @description Declaring function constructor within "with" statement, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.8_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.8_T3.js
index 3f681750a2..67c5d8f133 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.8_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.8_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.8_T3.js
  * @description Declaring function constructor within "with" statement, leading to normal completion by "return"
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.8_T4.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.8_T4.js
index cc21bc6a16..09f061b323 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.8_T4.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.8_T4.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.8_T4.js
  * @description Declaring function constructor within "with" statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.8_T5.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.8_T5.js
index 2aad84f89e..3a2022e6da 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.8_T5.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.8_T5.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.8_T5.js
  * @description Declaring function constructor within "with" statement, leading to completion by exception
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.9_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.9_T1.js
index 28f04018f6..6d47b35fc3 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.9_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.9_T1.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.9_T1.js
  * @description Using "for-in" statement within "with" statement, leading to normal completion
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.9_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.9_T2.js
index 27b4f366d2..470d1c637e 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.9_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.9_T2.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.9_T2.js
  * @description Using "for-in" statement within "with" statement, leading to completion by break
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.9_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.9_T3.js
index 97a533e0a7..6a8881ffcf 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.9_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A3.9_T3.js
@@ -9,7 +9,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A3.9_T3.js
  * @description Using "for-in" statement within "with" statement, leading to completion by break
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T1.js
index 1baaaeaaf8..61b6cc971e 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T1.js
@@ -8,7 +8,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A4_T1.js
  * @description Changing string property
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T2.js
index 7ee31e8306..7ef9a23dd0 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T2.js
@@ -8,7 +8,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A4_T2.js
  * @description Changing number property
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 'a';
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T3.js
index fe9fe375ae..7098ecdfe4 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T3.js
@@ -8,7 +8,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A4_T3.js
  * @description Changing boolean property
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 'a';
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T4.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T4.js
index ef5a5e44f4..f1dea9c1db 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T4.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T4.js
@@ -8,7 +8,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A4_T4.js
  * @description Changing object property
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 'a';
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T5.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T5.js
index c7269bf15a..2cf4e724f6 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T5.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T5.js
@@ -8,7 +8,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A4_T5.js
  * @description Changing array property
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 'a';
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T6.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T6.js
index 18757e2300..467d411dd9 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T6.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A4_T6.js
@@ -8,7 +8,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A4_T6.js
  * @description Changing function property
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 'a';
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T1.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T1.js
index c42b676d7e..5c037ebc28 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T1.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T1.js
@@ -8,7 +8,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A5_T1.js
  * @description Deleting string property
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 1;
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T2.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T2.js
index c8160dbb85..67516333cd 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T2.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T2.js
@@ -8,7 +8,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A5_T2.js
  * @description Deleting number property
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 'a';
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T3.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T3.js
index 05a7d0bd5e..10321fbd10 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T3.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T3.js
@@ -8,7 +8,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A5_T3.js
  * @description Deleting boolean property
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 'a';
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T4.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T4.js
index 2095d9e616..ecdaf30afb 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T4.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T4.js
@@ -8,7 +8,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A5_T4.js
  * @description Deleting object property
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 'a';
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T5.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T5.js
index 83806c1002..3012638a8d 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T5.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T5.js
@@ -8,7 +8,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A5_T5.js
  * @description Deleting array property
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 'a';
diff --git a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T6.js b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T6.js
index 9cda49045e..3dade7ec4a 100644
--- a/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T6.js
+++ b/test/suite/converted/12_Statement/12.10_The_with_Statement/S12.10_A5_T6.js
@@ -8,7 +8,7 @@
  * @path 12_Statement/12.10_The_with_Statement/S12.10_A5_T6.js
  * @description Deleting function property
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 this.p1 = 'a';
diff --git a/test/suite/converted/12_Statement/12.14_The_try_Statement/S12.14_A14.js b/test/suite/converted/12_Statement/12.14_The_try_Statement/S12.14_A14.js
index 30b448a5e3..a5fb367aa4 100644
--- a/test/suite/converted/12_Statement/12.14_The_try_Statement/S12.14_A14.js
+++ b/test/suite/converted/12_Statement/12.14_The_try_Statement/S12.14_A14.js
@@ -8,7 +8,7 @@
  * @path 12_Statement/12.14_The_try_Statement/S12.14_A14.js
  * @description Using try/catch/finally in With and With in try/catch/finally
  * @strict_only
- * @strict_mode_negative SyntaxError
+ * @negative SyntaxError
  */
 
 var myObj = {p1: 'a',
diff --git a/test/suite/converted/12_Statement/12.14_The_try_Statement/S12.14_A4.js b/test/suite/converted/12_Statement/12.14_The_try_Statement/S12.14_A4.js
index 93f1de860b..608e4c0427 100644
--- a/test/suite/converted/12_Statement/12.14_The_try_Statement/S12.14_A4.js
+++ b/test/suite/converted/12_Statement/12.14_The_try_Statement/S12.14_A4.js
@@ -8,7 +8,7 @@
  * @path 12_Statement/12.14_The_try_Statement/S12.14_A4.js
  * @description Checking if deleting an exception fails
  * @strict_only
- * @strict_mode_negative SyntaxError
+ * @negative SyntaxError
  */
 
 // CHECK#1
diff --git a/test/suite/converted/12_Statement/12.1_Block/S12.1_A1.js b/test/suite/converted/12_Statement/12.1_Block/S12.1_A1.js
index bc078b6f60..514864f684 100644
--- a/test/suite/converted/12_Statement/12.1_Block/S12.1_A1.js
+++ b/test/suite/converted/12_Statement/12.1_Block/S12.1_A1.js
@@ -7,10 +7,11 @@
  * @section 12.1
  * @path 12_Statement/12.1_Block/S12.1_A1.js
  * @description Trying to declare function at the Block statement
+ * @strict_only
  * @negative SyntaxError
  */
 
-"use strict";
+
 {
     function __func(){}
 }
diff --git a/test/suite/converted/12_Statement/12.5_The_if_Statement/S12.5_A9_T1.js b/test/suite/converted/12_Statement/12.5_The_if_Statement/S12.5_A9_T1.js
index eacc40922b..e51f913c22 100644
--- a/test/suite/converted/12_Statement/12.5_The_if_Statement/S12.5_A9_T1.js
+++ b/test/suite/converted/12_Statement/12.5_The_if_Statement/S12.5_A9_T1.js
@@ -7,10 +7,11 @@
  * @section 12.5
  * @path 12_Statement/12.5_The_if_Statement/S12.5_A9_T1.js
  * @description Declaring function within an "if" statement
+ * @strict_only
  * @negative SyntaxError
  */
 
-"use strict";
+
 if (true) {
     function __func(){};
 } else {
diff --git a/test/suite/converted/12_Statement/12.6_Iteration_Statements/12.6.1_The_do_while_Statement/S12.6.1_A13_T1.js b/test/suite/converted/12_Statement/12.6_Iteration_Statements/12.6.1_The_do_while_Statement/S12.6.1_A13_T1.js
index b2aff5c1ba..e9c5b5055d 100644
--- a/test/suite/converted/12_Statement/12.6_Iteration_Statements/12.6.1_The_do_while_Statement/S12.6.1_A13_T1.js
+++ b/test/suite/converted/12_Statement/12.6_Iteration_Statements/12.6.1_The_do_while_Statement/S12.6.1_A13_T1.js
@@ -7,10 +7,11 @@
  * @section 12.6.1, 13
  * @path 12_Statement/12.6_Iteration_Statements/12.6.1_The_do_while_Statement/S12.6.1_A13_T1.js
  * @description Declaring function within a "do-while" loop
+ * @strict_only
  * @negative SyntaxError
  */
 
-"use strict";
+
 do{
     function __func(){};
 } while(0);
diff --git a/test/suite/converted/12_Statement/12.7_The_continue_Statement/S12.7_A3.js b/test/suite/converted/12_Statement/12.7_The_continue_Statement/S12.7_A3.js
index 50b656b538..d2681e1fb0 100644
--- a/test/suite/converted/12_Statement/12.7_The_continue_Statement/S12.7_A3.js
+++ b/test/suite/converted/12_Statement/12.7_The_continue_Statement/S12.7_A3.js
@@ -15,7 +15,7 @@ LABEL_DO_LOOP : do {
     LABEL_IN : x=2;
     continue ;
     LABEL_IN_2 : var y=2;
-    
+
     function IN_DO_FUNC(){}
 } while(0);
 
diff --git a/test/suite/converted/13_Function_Definition/13.2_Creating_Function_Objects/S13.2.1_A7_T3.js b/test/suite/converted/13_Function_Definition/13.2_Creating_Function_Objects/S13.2.1_A7_T3.js
index 416ae8c408..c3b2fb0d74 100644
--- a/test/suite/converted/13_Function_Definition/13.2_Creating_Function_Objects/S13.2.1_A7_T3.js
+++ b/test/suite/converted/13_Function_Definition/13.2_Creating_Function_Objects/S13.2.1_A7_T3.js
@@ -12,7 +12,7 @@
  */
 
 function __func(){
-    x = 1;
+    var x = 1;
     return x;
 }
 
diff --git a/test/suite/converted/13_Function_Definition/13.2_Creating_Function_Objects/S13.2.2_A14.js b/test/suite/converted/13_Function_Definition/13.2_Creating_Function_Objects/S13.2.2_A14.js
index 884aea630d..8cbd625e71 100644
--- a/test/suite/converted/13_Function_Definition/13.2_Creating_Function_Objects/S13.2.2_A14.js
+++ b/test/suite/converted/13_Function_Definition/13.2_Creating_Function_Objects/S13.2.2_A14.js
@@ -7,15 +7,16 @@
  * @section 13.2.2
  * @path 13_Function_Definition/13.2_Creating_Function_Objects/S13.2.2_A14.js
  * @description Calling a function as a constructor after it has been declared by eval
+ * @non_strict_only
  */
 
 function FACTORY(){
    this.id = 0;
-   
+
    eval("function func(){return \"id_string\";}");
-      
+
    this.id = func();
-     
+
 }
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.1_NaN/S15.1.1.1_A2_T1.js b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.1_NaN/S15.1.1.1_A2_T1.js
index a3b0d495aa..f130426d44 100644
--- a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.1_NaN/S15.1.1.1_A2_T1.js
+++ b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.1_NaN/S15.1.1.1_A2_T1.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.1_NaN/S15.1.1.1_A2_T1.js
  * @description Checking Boolean, Number, String Functions
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.1_NaN/S15.1.1.1_A3.1.js b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.1_NaN/S15.1.1.1_A3.1.js
index 197d7524eb..3487a3d470 100644
--- a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.1_NaN/S15.1.1.1_A3.1.js
+++ b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.1_NaN/S15.1.1.1_A3.1.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.1_NaN/S15.1.1.1_A3.1.js
  * @description Use delete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.2_Infinity/S15.1.1.2_A2_T1.js b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.2_Infinity/S15.1.1.2_A2_T1.js
index 8b3af44f5b..8559c3e7f0 100644
--- a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.2_Infinity/S15.1.1.2_A2_T1.js
+++ b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.2_Infinity/S15.1.1.2_A2_T1.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.2_Infinity/S15.1.1.2_A2_T1.js
  * @description Checking Boolean, Number, String Functions
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.2_Infinity/S15.1.1.2_A3.1.js b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.2_Infinity/S15.1.1.2_A3.1.js
index cb8aad92e7..d7c0929989 100644
--- a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.2_Infinity/S15.1.1.2_A3.1.js
+++ b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.2_Infinity/S15.1.1.2_A3.1.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.2_Infinity/S15.1.1.2_A3.1.js
  * @description Use delete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.3_undefined/S15.1.1.3_A2_T1.js b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.3_undefined/S15.1.1.3_A2_T1.js
index dd434c0772..68c32406f8 100644
--- a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.3_undefined/S15.1.1.3_A2_T1.js
+++ b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.3_undefined/S15.1.1.3_A2_T1.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.3_undefined/S15.1.1.3_A2_T1.js
  * @description Checking Boolean, Number, String Functions
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.3_undefined/S15.1.1.3_A2_T2.js b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.3_undefined/S15.1.1.3_A2_T2.js
index 4dbad2f132..8cb2d4cf9a 100644
--- a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.3_undefined/S15.1.1.3_A2_T2.js
+++ b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.3_undefined/S15.1.1.3_A2_T2.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.3_undefined/S15.1.1.3_A2_T2.js
  * @description Checking typeof Operator
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.3_undefined/S15.1.1.3_A3.1.js b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.3_undefined/S15.1.1.3_A3.1.js
index 39a1286caa..bc10271c67 100644
--- a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.3_undefined/S15.1.1.3_A3.1.js
+++ b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.3_undefined/S15.1.1.3_A3.1.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.1_The_Global_Object/15.1.1_Value_Properties_of_the_Global_Object/15.1.1.3_undefined/S15.1.1.3_A3.1.js
  * @description Use delete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.1_eval/S15.1.2.1_A4.3.js b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.1_eval/S15.1.2.1_A4.3.js
index 6800e2430a..8e396845a2 100644
--- a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.1_eval/S15.1.2.1_A4.3.js
+++ b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.1_eval/S15.1.2.1_A4.3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.1_eval/S15.1.2.1_A4.3.js
  * @description Checking if varying the length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.2_parseInt/S15.1.2.2_A9.2.js b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.2_parseInt/S15.1.2.2_A9.2.js
index 1dfdea9111..3383f3b6a7 100644
--- a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.2_parseInt/S15.1.2.2_A9.2.js
+++ b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.2_parseInt/S15.1.2.2_A9.2.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.2_parseInt/S15.1.2.2_A9.2.js
  * @description Checking use hasOwnProperty, delete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.2_parseInt/S15.1.2.2_A9.3.js b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.2_parseInt/S15.1.2.2_A9.3.js
index 2f5cff3bbc..34a343446f 100644
--- a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.2_parseInt/S15.1.2.2_A9.3.js
+++ b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.2_parseInt/S15.1.2.2_A9.3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.2_parseInt/S15.1.2.2_A9.3.js
  * @description Checking if varying the length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.3_parseFloat/S15.1.2.3_A7.2.js b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.3_parseFloat/S15.1.2.3_A7.2.js
index 1b231f3c0c..db74bb2e7b 100644
--- a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.3_parseFloat/S15.1.2.3_A7.2.js
+++ b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.3_parseFloat/S15.1.2.3_A7.2.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.3_parseFloat/S15.1.2.3_A7.2.js
  * @description Checking use hasOwnProperty, delete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.3_parseFloat/S15.1.2.3_A7.3.js b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.3_parseFloat/S15.1.2.3_A7.3.js
index 5df4c08021..4f3188d663 100644
--- a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.3_parseFloat/S15.1.2.3_A7.3.js
+++ b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.3_parseFloat/S15.1.2.3_A7.3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.3_parseFloat/S15.1.2.3_A7.3.js
  * @description Checking if varying the length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.4_isNaN/S15.1.2.4_A2.2.js b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.4_isNaN/S15.1.2.4_A2.2.js
index c50b2ef63b..02cb230ede 100644
--- a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.4_isNaN/S15.1.2.4_A2.2.js
+++ b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.4_isNaN/S15.1.2.4_A2.2.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.4_isNaN/S15.1.2.4_A2.2.js
  * @description Checking use hasOwnProperty, delete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.4_isNaN/S15.1.2.4_A2.3.js b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.4_isNaN/S15.1.2.4_A2.3.js
index a47d3d777e..5a5c5abf08 100644
--- a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.4_isNaN/S15.1.2.4_A2.3.js
+++ b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.4_isNaN/S15.1.2.4_A2.3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.4_isNaN/S15.1.2.4_A2.3.js
  * @description Checking if varying the length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.5_isFinite/S15.1.2.5_A2.2.js b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.5_isFinite/S15.1.2.5_A2.2.js
index 066730b45f..a61686cef2 100644
--- a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.5_isFinite/S15.1.2.5_A2.2.js
+++ b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.5_isFinite/S15.1.2.5_A2.2.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.5_isFinite/S15.1.2.5_A2.2.js
  * @description Checking use hasOwnProperty, delete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.5_isFinite/S15.1.2.5_A2.3.js b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.5_isFinite/S15.1.2.5_A2.3.js
index bb51eac1f8..15ccdf0f3b 100644
--- a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.5_isFinite/S15.1.2.5_A2.3.js
+++ b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.5_isFinite/S15.1.2.5_A2.3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.1_The_Global_Object/15.1.2_Function_Properties_of_the_Global_Object/15.1.2.5_isFinite/S15.1.2.5_A2.3.js
  * @description Checking if varying the length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.3_URI_Handling_Function_Properties/15.1.3.1_decodeURI/S15.1.3.1_A5.2.js b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.3_URI_Handling_Function_Properties/15.1.3.1_decodeURI/S15.1.3.1_A5.2.js
index a4a8461939..8868f858b9 100644
--- a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.3_URI_Handling_Function_Properties/15.1.3.1_decodeURI/S15.1.3.1_A5.2.js
+++ b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.3_URI_Handling_Function_Properties/15.1.3.1_decodeURI/S15.1.3.1_A5.2.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.1_The_Global_Object/15.1.3_URI_Handling_Function_Properties/15.1.3.1_decodeURI/S15.1.3.1_A5.2.js
  * @description Checking use hasOwnProperty, delete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.3_URI_Handling_Function_Properties/15.1.3.1_decodeURI/S15.1.3.1_A5.3.js b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.3_URI_Handling_Function_Properties/15.1.3.1_decodeURI/S15.1.3.1_A5.3.js
index d06cd95775..62ba736bef 100644
--- a/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.3_URI_Handling_Function_Properties/15.1.3.1_decodeURI/S15.1.3.1_A5.3.js
+++ b/test/suite/converted/15_Native/15.1_The_Global_Object/15.1.3_URI_Handling_Function_Properties/15.1.3.1_decodeURI/S15.1.3.1_A5.3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.1_The_Global_Object/15.1.3_URI_Handling_Function_Properties/15.1.3.1_decodeURI/S15.1.3.1_A5.3.js
  * @description Checking if varying the length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.2_Object.prototype.toString/S15.2.4.2_A10.js b/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.2_Object.prototype.toString/S15.2.4.2_A10.js
index c3c9d1f5c5..8526d1a63a 100644
--- a/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.2_Object.prototype.toString/S15.2.4.2_A10.js
+++ b/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.2_Object.prototype.toString/S15.2.4.2_A10.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.2_Object.prototype.toString/S15.2.4.2_A10.js
  * @description Checking if varying the Object.prototype.toString.length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.2_Object.prototype.toString/S15.2.4.2_A9.js b/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.2_Object.prototype.toString/S15.2.4.2_A9.js
index 708528080b..b3ef84681f 100644
--- a/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.2_Object.prototype.toString/S15.2.4.2_A9.js
+++ b/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.2_Object.prototype.toString/S15.2.4.2_A9.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.2_Object.prototype.toString/S15.2.4.2_A9.js
  * @description Checknig if deleting of the Object.prototype.toString.length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#0
diff --git a/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.3_Object.prototype.toLocaleString/S15.2.4.3_A9.js b/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.3_Object.prototype.toLocaleString/S15.2.4.3_A9.js
index 51b645ddb5..8a610fd4bc 100644
--- a/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.3_Object.prototype.toLocaleString/S15.2.4.3_A9.js
+++ b/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.3_Object.prototype.toLocaleString/S15.2.4.3_A9.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.3_Object.prototype.toLocaleString/S15.2.4.3_A9.js
  * @description Checknig if deleting of the Object.prototype.toLocaleString.length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#0
diff --git a/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.4_Object.prototype.valueOf/S15.2.4.4_A9.js b/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.4_Object.prototype.valueOf/S15.2.4.4_A9.js
index 14c5117b65..a98194fa5c 100644
--- a/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.4_Object.prototype.valueOf/S15.2.4.4_A9.js
+++ b/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.4_Object.prototype.valueOf/S15.2.4.4_A9.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.4_Object.prototype.valueOf/S15.2.4.4_A9.js
  * @description Checknig if deleting of the Object.prototype.valueOf.length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#0
diff --git a/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.6_Object.prototype.isPrototypeOf/S15.2.4.6_A10.js b/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.6_Object.prototype.isPrototypeOf/S15.2.4.6_A10.js
index ab237adf2a..26471335a5 100644
--- a/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.6_Object.prototype.isPrototypeOf/S15.2.4.6_A10.js
+++ b/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.6_Object.prototype.isPrototypeOf/S15.2.4.6_A10.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.6_Object.prototype.isPrototypeOf/S15.2.4.6_A10.js
  * @description Checking if varying the Object.prototype.isPrototypeOf.length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.7_Object.prototype.propertyIsEnumerable/S15.2.4.7_A10.js b/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.7_Object.prototype.propertyIsEnumerable/S15.2.4.7_A10.js
index 386fcfe9a0..5066f578f1 100644
--- a/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.7_Object.prototype.propertyIsEnumerable/S15.2.4.7_A10.js
+++ b/test/suite/converted/15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.7_Object.prototype.propertyIsEnumerable/S15.2.4.7_A10.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.2_Object_Objects/15.2.4_Properties_of_the_Object_Prototype_Object/15.2.4.7_Object.prototype.propertyIsEnumerable/S15.2.4.7_A10.js
  * @description Checking if varying the Object.prototype.propertyIsEnumerable.length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.3_Properties_of_the_Array_Constructor/15.4.3.1_Array_prototype/S15.4.3.1_A3.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.3_Properties_of_the_Array_Constructor/15.4.3.1_Array_prototype/S15.4.3.1_A3.js
index c4b1a9abba..583b116f98 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.3_Properties_of_the_Array_Constructor/15.4.3.1_Array_prototype/S15.4.3.1_A3.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.3_Properties_of_the_Array_Constructor/15.4.3.1_Array_prototype/S15.4.3.1_A3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.3_Properties_of_the_Array_Constructor/15.4.3.1_Array_prototype/S15.4.3.1_A3.js
  * @description Checking if deleting the Array.prototype property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.3_Properties_of_the_Array_Constructor/15.4.3.1_Array_prototype/S15.4.3.1_A4.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.3_Properties_of_the_Array_Constructor/15.4.3.1_Array_prototype/S15.4.3.1_A4.js
index 1a9fb1d549..9fbd6efa13 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.3_Properties_of_the_Array_Constructor/15.4.3.1_Array_prototype/S15.4.3.1_A4.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.3_Properties_of_the_Array_Constructor/15.4.3.1_Array_prototype/S15.4.3.1_A4.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.3_Properties_of_the_Array_Constructor/15.4.3.1_Array_prototype/S15.4.3.1_A4.js
  * @description Checking if varying the Array.prototype property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.10_Array_prototype_slice/S15.4.4.10_A5.3.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.10_Array_prototype_slice/S15.4.4.10_A5.3.js
index 43409ef111..362d5d5c15 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.10_Array_prototype_slice/S15.4.4.10_A5.3.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.10_Array_prototype_slice/S15.4.4.10_A5.3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.10_Array_prototype_slice/S15.4.4.10_A5.3.js
  * @description Checking if varying the length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.11_Array_prototype_sort/S15.4.4.11_A7.2.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.11_Array_prototype_sort/S15.4.4.11_A7.2.js
index 7c492a4719..87023bbb63 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.11_Array_prototype_sort/S15.4.4.11_A7.2.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.11_Array_prototype_sort/S15.4.4.11_A7.2.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.11_Array_prototype_sort/S15.4.4.11_A7.2.js
  * @description Checking use hasOwnProperty, delete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.11_Array_prototype_sort/S15.4.4.11_A7.3.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.11_Array_prototype_sort/S15.4.4.11_A7.3.js
index 5ab8ddc8c1..7598e96051 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.11_Array_prototype_sort/S15.4.4.11_A7.3.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.11_Array_prototype_sort/S15.4.4.11_A7.3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.11_Array_prototype_sort/S15.4.4.11_A7.3.js
  * @description Checking if varying the length fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.12_Array_prototype_splice/S15.4.4.12_A5.2.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.12_Array_prototype_splice/S15.4.4.12_A5.2.js
index 32cb885108..06018eed7c 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.12_Array_prototype_splice/S15.4.4.12_A5.2.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.12_Array_prototype_splice/S15.4.4.12_A5.2.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.12_Array_prototype_splice/S15.4.4.12_A5.2.js
  * @description Checking use hasOwnProperty, delete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.12_Array_prototype_splice/S15.4.4.12_A5.3.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.12_Array_prototype_splice/S15.4.4.12_A5.3.js
index f5db9749e5..6a4675976b 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.12_Array_prototype_splice/S15.4.4.12_A5.3.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.12_Array_prototype_splice/S15.4.4.12_A5.3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.12_Array_prototype_splice/S15.4.4.12_A5.3.js
  * @description Checking if varying the length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.13_Array_prototype_unshift/S15.4.4.13_A5.2.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.13_Array_prototype_unshift/S15.4.4.13_A5.2.js
index 1ce082beaf..9a25e15c17 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.13_Array_prototype_unshift/S15.4.4.13_A5.2.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.13_Array_prototype_unshift/S15.4.4.13_A5.2.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.13_Array_prototype_unshift/S15.4.4.13_A5.2.js
  * @description Checking use hasOwnProperty, delete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.13_Array_prototype_unshift/S15.4.4.13_A5.3.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.13_Array_prototype_unshift/S15.4.4.13_A5.3.js
index 3b90124838..d63b10b5cd 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.13_Array_prototype_unshift/S15.4.4.13_A5.3.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.13_Array_prototype_unshift/S15.4.4.13_A5.3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.13_Array_prototype_unshift/S15.4.4.13_A5.3.js
  * @description Checking if varying the length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.2_Array_prototype_toString/S15.4.4.2_A4.2.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.2_Array_prototype_toString/S15.4.4.2_A4.2.js
index 0327278f57..b4a0f7ae75 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.2_Array_prototype_toString/S15.4.4.2_A4.2.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.2_Array_prototype_toString/S15.4.4.2_A4.2.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.2_Array_prototype_toString/S15.4.4.2_A4.2.js
  * @description Checking use hasOwnProperty, delete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.2_Array_prototype_toString/S15.4.4.2_A4.3.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.2_Array_prototype_toString/S15.4.4.2_A4.3.js
index 29d870c204..8491bc59f8 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.2_Array_prototype_toString/S15.4.4.2_A4.3.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.2_Array_prototype_toString/S15.4.4.2_A4.3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.2_Array_prototype_toString/S15.4.4.2_A4.3.js
  * @description Checking if varying the length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.3_Array_prototype_toLocaleString/S15.4.4.3_A4.3.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.3_Array_prototype_toLocaleString/S15.4.4.3_A4.3.js
index d4f7f1461f..dc031c57fe 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.3_Array_prototype_toLocaleString/S15.4.4.3_A4.3.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.3_Array_prototype_toLocaleString/S15.4.4.3_A4.3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.3_Array_prototype_toLocaleString/S15.4.4.3_A4.3.js
  * @description Checking if varying the length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.4_Array_prototype_concat/S15.4.4.4_A4.2.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.4_Array_prototype_concat/S15.4.4.4_A4.2.js
index f35b887c5a..17dba8a6b4 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.4_Array_prototype_concat/S15.4.4.4_A4.2.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.4_Array_prototype_concat/S15.4.4.4_A4.2.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.4_Array_prototype_concat/S15.4.4.4_A4.2.js
  * @description Checking use hasOwnProperty, delete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.4_Array_prototype_concat/S15.4.4.4_A4.3.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.4_Array_prototype_concat/S15.4.4.4_A4.3.js
index 3024617667..26765e2d17 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.4_Array_prototype_concat/S15.4.4.4_A4.3.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.4_Array_prototype_concat/S15.4.4.4_A4.3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.4_Array_prototype_concat/S15.4.4.4_A4.3.js
  * @description Checking if varying the length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.5_Array_prototype_join/S15.4.4.5_A6.2.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.5_Array_prototype_join/S15.4.4.5_A6.2.js
index e1b2f7dd5d..0925fe5b2e 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.5_Array_prototype_join/S15.4.4.5_A6.2.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.5_Array_prototype_join/S15.4.4.5_A6.2.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.5_Array_prototype_join/S15.4.4.5_A6.2.js
  * @description Checking use hasOwnProperty, delete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.5_Array_prototype_join/S15.4.4.5_A6.3.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.5_Array_prototype_join/S15.4.4.5_A6.3.js
index 9c7c51219a..5e95202de7 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.5_Array_prototype_join/S15.4.4.5_A6.3.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.5_Array_prototype_join/S15.4.4.5_A6.3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.5_Array_prototype_join/S15.4.4.5_A6.3.js
  * @description Checking if varying the length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.6_Array_prototype_pop/S15.4.4.6_A5.2.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.6_Array_prototype_pop/S15.4.4.6_A5.2.js
index 70bf8d1692..ecb22021df 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.6_Array_prototype_pop/S15.4.4.6_A5.2.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.6_Array_prototype_pop/S15.4.4.6_A5.2.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.6_Array_prototype_pop/S15.4.4.6_A5.2.js
  * @description Checking use hasOwnProperty, delete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.6_Array_prototype_pop/S15.4.4.6_A5.3.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.6_Array_prototype_pop/S15.4.4.6_A5.3.js
index bcb261875c..cedd7696d0 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.6_Array_prototype_pop/S15.4.4.6_A5.3.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.6_Array_prototype_pop/S15.4.4.6_A5.3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.6_Array_prototype_pop/S15.4.4.6_A5.3.js
  * @description Checking if varying the length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.7_Array_prototype_push/S15.4.4.7_A6.2.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.7_Array_prototype_push/S15.4.4.7_A6.2.js
index 1d1bb7aaf4..862daa49d2 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.7_Array_prototype_push/S15.4.4.7_A6.2.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.7_Array_prototype_push/S15.4.4.7_A6.2.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.7_Array_prototype_push/S15.4.4.7_A6.2.js
  * @description Checking use hasOwnProperty, delete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.7_Array_prototype_push/S15.4.4.7_A6.3.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.7_Array_prototype_push/S15.4.4.7_A6.3.js
index 7a59d800b0..02cd2126ec 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.7_Array_prototype_push/S15.4.4.7_A6.3.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.7_Array_prototype_push/S15.4.4.7_A6.3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.7_Array_prototype_push/S15.4.4.7_A6.3.js
  * @description Checking if varying the length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.8_Array_prototype_reverse/S15.4.4.8_A5.2.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.8_Array_prototype_reverse/S15.4.4.8_A5.2.js
index cdf888c38c..39fd39819d 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.8_Array_prototype_reverse/S15.4.4.8_A5.2.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.8_Array_prototype_reverse/S15.4.4.8_A5.2.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.8_Array_prototype_reverse/S15.4.4.8_A5.2.js
  * @description Checking use hasOwnProperty, delete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.8_Array_prototype_reverse/S15.4.4.8_A5.3.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.8_Array_prototype_reverse/S15.4.4.8_A5.3.js
index a036a4bdbd..fea4ea46af 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.8_Array_prototype_reverse/S15.4.4.8_A5.3.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.8_Array_prototype_reverse/S15.4.4.8_A5.3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.8_Array_prototype_reverse/S15.4.4.8_A5.3.js
  * @description Checking if varying the length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.9_Array_prototype_shift/S15.4.4.9_A5.3.js b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.9_Array_prototype_shift/S15.4.4.9_A5.3.js
index 9df88f1c67..b28e9fe83b 100644
--- a/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.9_Array_prototype_shift/S15.4.4.9_A5.3.js
+++ b/test/suite/converted/15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.9_Array_prototype_shift/S15.4.4.9_A5.3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.4_Array_Objects/15.4.4_Properties_of_the_Array_Prototype_Object/15.4.4.9_Array_prototype_shift/S15.4.4.9_A5.3.js
  * @description Checking if varying the length property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.1_Number.prototype/S15.7.3.1_A1_T2.js b/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.1_Number.prototype/S15.7.3.1_A1_T2.js
index b6816ae9d6..65b2522029 100644
--- a/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.1_Number.prototype/S15.7.3.1_A1_T2.js
+++ b/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.1_Number.prototype/S15.7.3.1_A1_T2.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.1_Number.prototype/S15.7.3.1_A1_T2.js
  * @description Checking if deleting the Number.prototype property fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.2_Number.MAX_VALUE/S15.7.3.2_A3.js b/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.2_Number.MAX_VALUE/S15.7.3.2_A3.js
index 7520bfa6d8..d283e9048a 100644
--- a/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.2_Number.MAX_VALUE/S15.7.3.2_A3.js
+++ b/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.2_Number.MAX_VALUE/S15.7.3.2_A3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.2_Number.MAX_VALUE/S15.7.3.2_A3.js
  * @description Checking if deleting Number.MAX_VALUE fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.3_Number.MIN_VALUE/S15.7.3.3_A3.js b/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.3_Number.MIN_VALUE/S15.7.3.3_A3.js
index 81c87996fe..bd1c9f5251 100644
--- a/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.3_Number.MIN_VALUE/S15.7.3.3_A3.js
+++ b/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.3_Number.MIN_VALUE/S15.7.3.3_A3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.3_Number.MIN_VALUE/S15.7.3.3_A3.js
  * @description Checking if deleting Number.MIN_VALUE fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 //CHECK#1
diff --git a/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.4_Number.NaN/S15.7.3.4_A3.js b/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.4_Number.NaN/S15.7.3.4_A3.js
index 64ba338395..be86d644b6 100644
--- a/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.4_Number.NaN/S15.7.3.4_A3.js
+++ b/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.4_Number.NaN/S15.7.3.4_A3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.4_Number.NaN/S15.7.3.4_A3.js
  * @description Checking if deleting Number.NaN fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.5_Number.NEGATIVE_INFINITY/S15.7.3.5_A3.js b/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.5_Number.NEGATIVE_INFINITY/S15.7.3.5_A3.js
index 4343739c52..17826505e2 100644
--- a/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.5_Number.NEGATIVE_INFINITY/S15.7.3.5_A3.js
+++ b/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.5_Number.NEGATIVE_INFINITY/S15.7.3.5_A3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.5_Number.NEGATIVE_INFINITY/S15.7.3.5_A3.js
  * @description Checking if deleting Number.NEGATIVE_INFINITY fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.6_Number.POSITIVE_INFINITY/S15.7.3.6_A3.js b/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.6_Number.POSITIVE_INFINITY/S15.7.3.6_A3.js
index 1c5bb08e25..0550ee0320 100644
--- a/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.6_Number.POSITIVE_INFINITY/S15.7.3.6_A3.js
+++ b/test/suite/converted/15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.6_Number.POSITIVE_INFINITY/S15.7.3.6_A3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.7_Number_Objects/15.7.3_Properties_of_Number_Constructor/15.7.3.6_Number.POSITIVE_INFINITY/S15.7.3.6_A3.js
  * @description Checking if deleting Number.POSITIVE_INFINITY fails
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.1_E/S15.8.1.1_A3.js b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.1_E/S15.8.1.1_A3.js
index 1129576150..f03087b243 100644
--- a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.1_E/S15.8.1.1_A3.js
+++ b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.1_E/S15.8.1.1_A3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.1_E/S15.8.1.1_A3.js
  * @description Checking if Math.E property has the attribute DontDelete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.1_E/S15.8.1.1_A4.js b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.1_E/S15.8.1.1_A4.js
index 5145283429..1c876f596d 100644
--- a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.1_E/S15.8.1.1_A4.js
+++ b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.1_E/S15.8.1.1_A4.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.1_E/S15.8.1.1_A4.js
  * @description Checking if Math.E property has the attribute ReadOnly
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.2_LN10/S15.8.1.2_A3.js b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.2_LN10/S15.8.1.2_A3.js
index 44cff8ca83..c46fab89a6 100644
--- a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.2_LN10/S15.8.1.2_A3.js
+++ b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.2_LN10/S15.8.1.2_A3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.2_LN10/S15.8.1.2_A3.js
  * @description Checking if Math.LN10 property has the attribute DontDelete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.2_LN10/S15.8.1.2_A4.js b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.2_LN10/S15.8.1.2_A4.js
index 6061901a18..09835727f8 100644
--- a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.2_LN10/S15.8.1.2_A4.js
+++ b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.2_LN10/S15.8.1.2_A4.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.2_LN10/S15.8.1.2_A4.js
  * @description Checking if Math.LN10 property has the attribute ReadOnly
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.3_LN2/S15.8.1.3_A3.js b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.3_LN2/S15.8.1.3_A3.js
index db5bcff1d1..77bfca97d3 100644
--- a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.3_LN2/S15.8.1.3_A3.js
+++ b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.3_LN2/S15.8.1.3_A3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.3_LN2/S15.8.1.3_A3.js
  * @description Checking if Math.LN2 property has the attribute DontDelete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.3_LN2/S15.8.1.3_A4.js b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.3_LN2/S15.8.1.3_A4.js
index 54213f9de8..9021de30de 100644
--- a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.3_LN2/S15.8.1.3_A4.js
+++ b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.3_LN2/S15.8.1.3_A4.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.3_LN2/S15.8.1.3_A4.js
  * @description Checking if Math.LN2 property has the attribute DontDelete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.4_LOG2E/S15.8.1.4_A3.js b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.4_LOG2E/S15.8.1.4_A3.js
index 92c221ecd5..ba6fa7db07 100644
--- a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.4_LOG2E/S15.8.1.4_A3.js
+++ b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.4_LOG2E/S15.8.1.4_A3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.4_LOG2E/S15.8.1.4_A3.js
  * @description Checking if Math.LOG2E property has the attribute DontDelete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.4_LOG2E/S15.8.1.4_A4.js b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.4_LOG2E/S15.8.1.4_A4.js
index 4d826ac43b..c4075edc8c 100644
--- a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.4_LOG2E/S15.8.1.4_A4.js
+++ b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.4_LOG2E/S15.8.1.4_A4.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.4_LOG2E/S15.8.1.4_A4.js
  * @description Checking if Math.LOG2E property has the attribute ReadOnly
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.5_LOG10E/S15.8.1.5_A3.js b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.5_LOG10E/S15.8.1.5_A3.js
index 82ea7307d4..43879ddd39 100644
--- a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.5_LOG10E/S15.8.1.5_A3.js
+++ b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.5_LOG10E/S15.8.1.5_A3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.5_LOG10E/S15.8.1.5_A3.js
  * @description Checking if Math.LOG10E property has the attribute DontDelete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.5_LOG10E/S15.8.1.5_A4.js b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.5_LOG10E/S15.8.1.5_A4.js
index 0282893432..67fe80925d 100644
--- a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.5_LOG10E/S15.8.1.5_A4.js
+++ b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.5_LOG10E/S15.8.1.5_A4.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.5_LOG10E/S15.8.1.5_A4.js
  * @description Checking if Math.LOG10E property has the attribute ReadOnly
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.6_PI/S15.8.1.6_A3.js b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.6_PI/S15.8.1.6_A3.js
index abaa96fb95..42ad18cf14 100644
--- a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.6_PI/S15.8.1.6_A3.js
+++ b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.6_PI/S15.8.1.6_A3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.6_PI/S15.8.1.6_A3.js
  * @description Checking if Math.PI property has the attribute DontDelete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.6_PI/S15.8.1.6_A4.js b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.6_PI/S15.8.1.6_A4.js
index 511e31b538..832b8e0012 100644
--- a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.6_PI/S15.8.1.6_A4.js
+++ b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.6_PI/S15.8.1.6_A4.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.6_PI/S15.8.1.6_A4.js
  * @description Checking if Math.PI property has the attribute ReadOnly
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.7_SQRT1_2/S15.8.1.7_A3.js b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.7_SQRT1_2/S15.8.1.7_A3.js
index bb3dfdf55a..c20d7fe878 100644
--- a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.7_SQRT1_2/S15.8.1.7_A3.js
+++ b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.7_SQRT1_2/S15.8.1.7_A3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.7_SQRT1_2/S15.8.1.7_A3.js
  * @description Checking if Math.SQRT1_2 property has the attribute DontDelete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.7_SQRT1_2/S15.8.1.7_A4.js b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.7_SQRT1_2/S15.8.1.7_A4.js
index 85b57bd358..29153f8dc6 100644
--- a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.7_SQRT1_2/S15.8.1.7_A4.js
+++ b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.7_SQRT1_2/S15.8.1.7_A4.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.7_SQRT1_2/S15.8.1.7_A4.js
  * @description Checking if Math.SQRT1_2 property has the attribute ReadOnly
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.8_SQRT2/S15.8.1.8_A3.js b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.8_SQRT2/S15.8.1.8_A3.js
index 254f3e53b0..a5f0516971 100644
--- a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.8_SQRT2/S15.8.1.8_A3.js
+++ b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.8_SQRT2/S15.8.1.8_A3.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.8_SQRT2/S15.8.1.8_A3.js
  * @description Checking if Math.SQRT2 property has the attribute DontDelete
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1
diff --git a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.8_SQRT2/S15.8.1.8_A4.js b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.8_SQRT2/S15.8.1.8_A4.js
index 87aedbba50..1674fb5c30 100644
--- a/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.8_SQRT2/S15.8.1.8_A4.js
+++ b/test/suite/converted/15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.8_SQRT2/S15.8.1.8_A4.js
@@ -8,7 +8,7 @@
  * @path 15_Native/15.8_The_Math_Object/15.8.1_Value_Properties_of_the_Math_Object/15.8.1.8_SQRT2/S15.8.1.8_A4.js
  * @description Checking if Math.SQRT2 property has the attribute ReadOnly
  * @strict_only
- * @strict_mode_negative
+ * @negative
  */
 
 // CHECK#1

From fd40a156e4739ebc4b8cd6eb34e04c00c9cf5033 Mon Sep 17 00:00:00 2001
From: Mark Miller <erights@gmail.com>
Date: Tue, 13 Sep 2011 23:21:43 -0700
Subject: [PATCH 4/4] minor

---
 .../13.2_Creating_Function_Objects/S13.2.1_A7_T3.js          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/suite/sputnik/Conformance/13_Function_Definition/13.2_Creating_Function_Objects/S13.2.1_A7_T3.js b/test/suite/sputnik/Conformance/13_Function_Definition/13.2_Creating_Function_Objects/S13.2.1_A7_T3.js
index a75a414f0e..59a14970c7 100644
--- a/test/suite/sputnik/Conformance/13_Function_Definition/13.2_Creating_Function_Objects/S13.2.1_A7_T3.js
+++ b/test/suite/sputnik/Conformance/13_Function_Definition/13.2_Creating_Function_Objects/S13.2.1_A7_T3.js
@@ -10,8 +10,9 @@
 * @description: Returning number. Declaring a function with "function __func()";
 */
 
+var x;
 function __func(){
-    var x = 1;
+    x = 1;
     return x;
 }
 
@@ -27,7 +28,7 @@ try {
 //////////////////////////////////////////////////////////////////////////////
 //CHECK#1
 try{
-    var __x=__func()
+    var __x=__func();
 } catch(e){
     $ERROR('#1: var __x=__func() does not lead to throwing exception. Actual: exception is '+e);
 }