diff --git a/test/suite/converted/07_Lexical_Conventions/.DS_Store b/test/suite/converted/07_Lexical_Conventions/.DS_Store
deleted file mode 100644
index 16658debdea073b929994da67e4734a110e081ac..0000000000000000000000000000000000000000
Binary files a/test/suite/converted/07_Lexical_Conventions/.DS_Store and /dev/null differ
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 ba2359dc962ee2b7c418c8164cb1c990a9fec39d..9149a58521c8b73c0682568f828c8196b52a1bf3 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
@@ -6,26 +6,26 @@
*
* @path 08_Types/8.6_The_Object_Type/8.6.2_Internal_Properties_and_Methods/S8.6.2_A5_T1.js
* @description Call function-property of object, property defined
- * as screen = {touch:function(){count++}}
+ * as testScreen = {touch:function(){count++}}
*/
this.count=0;
-var screen = {touch:function(){count++}};
+var testScreen = {touch:function(){count++}};
//////////////////////////////////////////////////////////////////////////////
//CHECK#1
-screen.touch();
+testScreen.touch();
if (count !==1) {
- $ERROR('#1: this.count=0; screen = {touch:function(){count++}}; screen.touch(); count === 1. Actual: ' + (count));
+ $ERROR('#1: this.count=0; testScreen = {touch:function(){count++}}; testScreen.touch(); count === 1. Actual: ' + (count));
}
//
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
//CHECK#2
-screen['touch']();
+testScreen['touch']();
if (count !==2) {
- $ERROR('#2: this.count=0; screen = {touch:function(){count++}}; screen.touch(); screen[\'touch\'](); count === 2. Actual: ' + (count));
+ $ERROR('#2: this.count=0; testScreen = {touch:function(){count++}}; testScreen.touch(); testScreen[\'touch\'](); count === 2. Actual: ' + (count));
}
//
//////////////////////////////////////////////////////////////////////////////
diff --git a/test/suite/converted/10_Execution_Contexts/.DS_Store b/test/suite/converted/10_Execution_Contexts/.DS_Store
deleted file mode 100644
index a3c95a299f32317cdcc91352e2cfd8badfd5c4b0..0000000000000000000000000000000000000000
Binary files a/test/suite/converted/10_Execution_Contexts/.DS_Store and /dev/null differ
diff --git a/test/suite/converted/10_Execution_Contexts/10.2_Lexical_Environments/.DS_Store b/test/suite/converted/10_Execution_Contexts/10.2_Lexical_Environments/.DS_Store
deleted file mode 100644
index 19bbcd5ae921c50d83362325c5d1e0479a7a313b..0000000000000000000000000000000000000000
Binary files a/test/suite/converted/10_Execution_Contexts/10.2_Lexical_Environments/.DS_Store and /dev/null differ
diff --git a/test/suite/converted/10_Execution_Contexts/10.4_Establishing_An_Execution_Context/.DS_Store b/test/suite/converted/10_Execution_Contexts/10.4_Establishing_An_Execution_Context/.DS_Store
deleted file mode 100644
index defcffe04fce036aac99ec75c838276d9ae8341c..0000000000000000000000000000000000000000
Binary files a/test/suite/converted/10_Execution_Contexts/10.4_Establishing_An_Execution_Context/.DS_Store and /dev/null differ
diff --git a/test/suite/converted/12_Statement/12.6_Iteration_Statements/12.6.4_The_for_in_Statement/S12.6.4_A14_T1.js b/test/suite/converted/12_Statement/12.6_Iteration_Statements/12.6.4_The_for_in_Statement/S12.6.4_A14_T1.js
deleted file mode 100644
index cc7d2eca0471dcec65b41fefdd084f37bf4eddc8..0000000000000000000000000000000000000000
--- a/test/suite/converted/12_Statement/12.6_Iteration_Statements/12.6.4_The_for_in_Statement/S12.6.4_A14_T1.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2009 the Sputnik authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/**
- * FunctionExpession within a "for-in" Expression is allowed
- *
- * @path 12_Statement/12.6_Iteration_Statements/12.6.4_The_for_in_Statement/S12.6.4_A14_T1.js
- * @description Using "function __func(){return 0;}" as Expession
- */
-
-//////////////////////////////////////////////////////////////////////////////
-//CHECK#
-for(x in function __func(){return 0;}){
- if (x=="prototype")
- var __reached = 1;
-};
-//
-//////////////////////////////////////////////////////////////////////////////
-
-//////////////////////////////////////////////////////////////////////////////
-//CHECK#2
-if (__reached !== 1) {
- $ERROR('#2: function expession inside of for-in expression is allowed');
-}
-//
-//////////////////////////////////////////////////////////////////////////////
-
diff --git a/test/suite/converted/15_Native/15.10_RegExp_Objects/15.10.2_Pattern_Semantics/15.10.2.11_DecimalEscape/S15.10.2.11_A1_T2.js b/test/suite/converted/15_Native/15.10_RegExp_Objects/15.10.2_Pattern_Semantics/15.10.2.11_DecimalEscape/S15.10.2.11_A1_T2.js
deleted file mode 100644
index d72087e540a1addf6f0fa9d3fec6944be23e0da6..0000000000000000000000000000000000000000
--- a/test/suite/converted/15_Native/15.10_RegExp_Objects/15.10.2_Pattern_Semantics/15.10.2.11_DecimalEscape/S15.10.2.11_A1_T2.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2009 the Sputnik authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/**
- * DecimalEscape :: DecimalIntegerLiteral [lookahead not in DecimalDigit]
- *
- * @path 15_Native/15.10_RegExp_Objects/15.10.2_Pattern_Semantics/15.10.2.11_DecimalEscape/S15.10.2.11_A1_T2.js
- * @description It is an error if n is greater than the total number of left capturing parentheses in the entire regular expression
- * @negative
- */
-
-/\1/.exec("");
-/\2/.exec("");
-/\3/.exec("");
-/\4/.exec("");
-/\5/.exec("");
-/\6/.exec("");
-/\7/.exec("");
-/\8/.exec("");
-/\9/.exec("");
-/\10/.exec("");
-
diff --git a/test/suite/converted/15_Native/15.10_RegExp_Objects/15.10.2_Pattern_Semantics/15.10.2.11_DecimalEscape/S15.10.2.11_A1_T3.js b/test/suite/converted/15_Native/15.10_RegExp_Objects/15.10.2_Pattern_Semantics/15.10.2.11_DecimalEscape/S15.10.2.11_A1_T3.js
deleted file mode 100644
index e2b1eebe6583b22ea89234483761c00f05077704..0000000000000000000000000000000000000000
--- a/test/suite/converted/15_Native/15.10_RegExp_Objects/15.10.2_Pattern_Semantics/15.10.2.11_DecimalEscape/S15.10.2.11_A1_T3.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2009 the Sputnik authors. All rights reserved.
-// This code is governed by the BSD license found in the LICENSE file.
-
-/**
- * DecimalEscape :: DecimalIntegerLiteral [lookahead not in DecimalDigit]
- *
- * @path 15_Native/15.10_RegExp_Objects/15.10.2_Pattern_Semantics/15.10.2.11_DecimalEscape/S15.10.2.11_A1_T3.js
- * @description It is an error if n is greater than the total number of left capturing parentheses in the entire regular expression
- * @negative
- */
-
-/(?:A)\2/.exec("AA");
-
diff --git a/test/suite/converted/bestPractice/Sbp_A1_T1.js b/test/suite/converted/bestPractice/Sbp_A1_T1.js
new file mode 100644
index 0000000000000000000000000000000000000000..ff41177c5ddb15f61e1a193031eaa3ee171ce977
--- /dev/null
+++ b/test/suite/converted/bestPractice/Sbp_A1_T1.js
@@ -0,0 +1,19 @@
+// Copyright 2009 the Sputnik authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * The production Block { } in strict code can't contain function
+ * declaration;
+ *
+ * @path bestPractice/Sbp_A1_T1.js
+ * @description Trying to declare function at the Block statement
+ * @onlyStrict
+ * @negative SyntaxError
+ * @bestPractice http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls
+ */
+
+"use strict";
+{
+ function __func(){}
+}
+
diff --git a/test/suite/converted/bestPractice/Sbp_A2_T1.js b/test/suite/converted/bestPractice/Sbp_A2_T1.js
new file mode 100644
index 0000000000000000000000000000000000000000..52d28970d932bc6dbaffa5db623634f095072245
--- /dev/null
+++ b/test/suite/converted/bestPractice/Sbp_A2_T1.js
@@ -0,0 +1,21 @@
+// Copyright 2009 the Sputnik authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * Function declaration within an "if" statement in strict code is not
+ * allowed
+ *
+ * @path bestPractice/Sbp_A2_T1.js
+ * @description Declaring function within a strict "if" statement
+ * @onlyStrict
+ * @negative SyntaxError
+ * @bestPractice http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls
+ */
+
+"use strict";
+if (true) {
+ function __func(){};
+} else {
+ function __func(){};
+}
+
diff --git a/test/suite/converted/bestPractice/Sbp_A2_T2.js b/test/suite/converted/bestPractice/Sbp_A2_T2.js
new file mode 100644
index 0000000000000000000000000000000000000000..8fedbf1ceb9d5d482ec7e88cc4e145b0573d95dc
--- /dev/null
+++ b/test/suite/converted/bestPractice/Sbp_A2_T2.js
@@ -0,0 +1,23 @@
+// Copyright 2009 the Sputnik authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * Function declaration within an "if" statement in strict code is not allowed;
+ *
+ * @path bestPractice/Sbp_A2_T2.js
+ * @description Declaring function within an "if" that is declared
+ * within the strict function
+ * @onlyStrict
+ * @negative SyntaxError
+ * @bestPractice http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls
+ */
+
+"use strict";
+(function(){
+ if (true) {
+ function __func(){};
+ } else {
+ function __func(){};
+ }
+});
+
diff --git a/test/suite/converted/bestPractice/Sbp_A3_T1.js b/test/suite/converted/bestPractice/Sbp_A3_T1.js
new file mode 100644
index 0000000000000000000000000000000000000000..e73dd940d58cc64f6e44c17d37af38bc8f5058c7
--- /dev/null
+++ b/test/suite/converted/bestPractice/Sbp_A3_T1.js
@@ -0,0 +1,19 @@
+// Copyright 2009 the Sputnik authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * FunctionDeclaration within a "do-while" Block in strict code is not
+ * allowed
+ *
+ * @path bestPractice/Sbp_A3_T1.js
+ * @description Declaring function within a "do-while" loop
+ * @onlyStrict
+ * @negative SyntaxError
+ * @bestPractice http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls
+ */
+
+"use strict";
+do {
+ function __func(){};
+} while(0);
+
diff --git a/test/suite/converted/bestPractice/Sbp_A3_T2.js b/test/suite/converted/bestPractice/Sbp_A3_T2.js
new file mode 100644
index 0000000000000000000000000000000000000000..9d6c6a7de006d3cbedf4f7848a6d2de35ee47db2
--- /dev/null
+++ b/test/suite/converted/bestPractice/Sbp_A3_T2.js
@@ -0,0 +1,21 @@
+// Copyright 2009 the Sputnik authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * FunctionDeclaration within a "do-while" Block in strict code is not allowed
+ *
+ * @path bestPractice/Sbp_A3_T2.js
+ * @description Declaring a function within a "do-while" loop that is
+ * within a strict function
+ * @onlyStrict
+ * @negative SyntaxError
+ * @bestPractice http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls
+ */
+
+"use strict";
+(function(){
+ do {
+ function __func(){};
+ } while(0);
+});
+
diff --git a/test/suite/converted/bestPractice/Sbp_A4_T1.js b/test/suite/converted/bestPractice/Sbp_A4_T1.js
new file mode 100644
index 0000000000000000000000000000000000000000..0fdb43897a3d44cbdd5d606a92a6aa806b4beb8d
--- /dev/null
+++ b/test/suite/converted/bestPractice/Sbp_A4_T1.js
@@ -0,0 +1,19 @@
+// Copyright 2009 the Sputnik authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * FunctionDeclaration within a "while" Statement is not allowed
+ *
+ * @path bestPractice/Sbp_A4_T1.js
+ * @description Checking if declaring a function within a "while"
+ * Statement leads to an exception
+ * @onlyStrict
+ * @negative SyntaxError
+ * @bestPractice http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls
+ */
+
+"use strict";
+while (0) {
+ function __func(){};
+};
+
diff --git a/test/suite/converted/bestPractice/Sbp_A4_T2.js b/test/suite/converted/bestPractice/Sbp_A4_T2.js
new file mode 100644
index 0000000000000000000000000000000000000000..c9145fcc47a2b97471a7f8fb259f6e253e67f3e5
--- /dev/null
+++ b/test/suite/converted/bestPractice/Sbp_A4_T2.js
@@ -0,0 +1,21 @@
+// Copyright 2009 the Sputnik authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * FunctionDeclaration within a "while" Statement is not allowed
+ *
+ * @path bestPractice/Sbp_A4_T2.js
+ * @description Checking if declaring a function within a "while"
+ * Statement that is in a function call leads to an exception
+ * @onlyStrict
+ * @negative SyntaxError
+ * @bestPractice http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls
+ */
+
+"use strict";
+(function(){
+ while (0) {
+ function __func(){};
+ };
+})();
+
diff --git a/test/suite/converted/bestPractice/Sbp_A5_T1.js b/test/suite/converted/bestPractice/Sbp_A5_T1.js
new file mode 100644
index 0000000000000000000000000000000000000000..b9cf110802fdf935d4d6f99d4df74cf9e8c1934b
--- /dev/null
+++ b/test/suite/converted/bestPractice/Sbp_A5_T1.js
@@ -0,0 +1,18 @@
+// Copyright 2009 the Sputnik authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * FunctionDeclaration within a "for-in" Statement is not allowed
+ *
+ * @path bestPractice/Sbp_A5_T1.js
+ * @description Declaring function within a "for-in" Statement
+ * @onlyStrict
+ * @negative SyntaxError
+ * @bestPractice http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls
+ */
+
+"use strict";
+for (x in this) {
+ function __func(){};
+}
+
diff --git a/test/suite/converted/bestPractice/Sbp_A5_T2.js b/test/suite/converted/bestPractice/Sbp_A5_T2.js
new file mode 100644
index 0000000000000000000000000000000000000000..208be598f67fc9cfff10496473c9d3cd3d9a4532
--- /dev/null
+++ b/test/suite/converted/bestPractice/Sbp_A5_T2.js
@@ -0,0 +1,21 @@
+// Copyright 2009 the Sputnik authors. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/**
+ * FunctionDeclaration within a "for-in" Statement is not allowed
+ *
+ * @path bestPractice/Sbp_A5_T2.js
+ * @description Declaring function within a "for-in" Statement that is
+ * within a function call
+ * @onlyStrict
+ * @negative SyntaxError
+ * @bestPractice http://wiki.ecmascript.org/doku.php?id=conventions:no_non_standard_strict_decls
+ */
+
+"use strict";
+(function(){
+ for (x in this) {
+ function __func(){};
+ }
+})();
+
diff --git a/test/suite/converted/chapter07/.DS_Store b/test/suite/converted/chapter07/.DS_Store
deleted file mode 100644
index 68ff27b4643e5000368466f20856b2eaa433943e..0000000000000000000000000000000000000000
Binary files a/test/suite/converted/chapter07/.DS_Store and /dev/null differ
diff --git a/test/suite/converted/chapter08/8.7/8.7.2/8.7.2-3-a-2gs.js b/test/suite/converted/chapter08/8.7/8.7.2/8.7.2-3-a-2gs.js
index 41c7cf94d24fcc8a1ee25ef927ab508a8c0a1c44..0c96f289b1125708f13b0e4629c6641f2a443200 100644
--- a/test/suite/converted/chapter08/8.7/8.7.2/8.7.2-3-a-2gs.js
+++ b/test/suite/converted/chapter08/8.7/8.7.2/8.7.2-3-a-2gs.js
@@ -4,7 +4,7 @@
* @path chapter08/8.7/8.7.2/8.7.2-3-a-2gs.js
* @description Strict Mode - 'runtime' error is thrown before LeftHandSide evaluates to an unresolvable Reference
* @onlyStrict
- * @negative NotEarlyErrorString
+ * @negative NotEarlyError
*/
"use strict";
diff --git a/test/suite/converted/chapter13/13.0/13_4-17gs.js b/test/suite/converted/chapter13/13.0/13_4-17gs.js
index be51e4a7345462205498e09bf6f42062b8cfdbf0..df91858b542c053e71cab982934628dd481a0772 100644
--- a/test/suite/converted/chapter13/13.0/13_4-17gs.js
+++ b/test/suite/converted/chapter13/13.0/13_4-17gs.js
@@ -4,7 +4,7 @@
* @path chapter13/13.0/13_4-17gs.js
* @description Strict Mode - SourceElements is evaluated as strict mode code when a Function constructor is contained in strict mode code
* @onlyStrict
- * @negative NotEarlyErrorString
+ * @negative NotEarlyError
*/
"use strict";
diff --git a/test/suite/converted/chapter15/.DS_Store b/test/suite/converted/chapter15/.DS_Store
deleted file mode 100644
index d14f2a095f93f7f4def0a10475d05b6642227821..0000000000000000000000000000000000000000
Binary files a/test/suite/converted/chapter15/.DS_Store and /dev/null differ
diff --git a/test/suite/converted/chapter15/15.1/.DS_Store b/test/suite/converted/chapter15/15.1/.DS_Store
deleted file mode 100644
index d1216095bf1956b63ef6627ce4480cd60e9d2574..0000000000000000000000000000000000000000
Binary files a/test/suite/converted/chapter15/15.1/.DS_Store and /dev/null differ
diff --git a/test/suite/converted/chapter15/15.1/15.1.1/.DS_Store b/test/suite/converted/chapter15/15.1/15.1.1/.DS_Store
deleted file mode 100644
index 42cad22c3839649679bdf9952bb24488133b946f..0000000000000000000000000000000000000000
Binary files a/test/suite/converted/chapter15/15.1/15.1.1/.DS_Store and /dev/null differ
diff --git a/test/suite/converted/chapter15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-4gs.js b/test/suite/converted/chapter15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-4gs.js
index 5d592f2ed5b13a1a1d477a8988e6fcfca86f9a73..7928bdac2ae9cf75e86ba9efe399be99cce83c6d 100644
--- a/test/suite/converted/chapter15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-4gs.js
+++ b/test/suite/converted/chapter15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-4gs.js
@@ -4,7 +4,7 @@
* @path chapter15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-4gs.js
* @description Strict Mode - SyntaxError is thrown if a function using the Function constructor has two identical parameters in (global) strict mode
* @onlyStrict
- * @negative NotEarlyErrorString
+ * @negative NotEarlyError
*/
"use strict";
diff --git a/test/suite/converted/chapter15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-6gs.js b/test/suite/converted/chapter15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-6gs.js
index ac66b7856c1673964daf86a0ec6239d256f0aa88..33bbbc55d194d35b2872bde9a89a6a054ac8a73a 100644
--- a/test/suite/converted/chapter15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-6gs.js
+++ b/test/suite/converted/chapter15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-6gs.js
@@ -4,7 +4,7 @@
* @path chapter15/15.3/15.3.2/15.3.2.1/15.3.2.1-10-6gs.js
* @description Strict Mode - SyntaxError is thrown if a function using the Function constructor has two identical parameters in (local) strict mode
* @onlyStrict
- * @negative NotEarlyErrorString
+ * @negative NotEarlyError
*/
throw NotEarlyError;
diff --git a/test/suite/converted/chapter15/15.3/15.3.5/15.3.5-1gs.js b/test/suite/converted/chapter15/15.3/15.3.5/15.3.5-1gs.js
index fe686a6fbbd0199bb17335addbdcdec9d9d9dbdd..dfdb33e70288bd89ba8122db3f9007aba441fad6 100644
--- a/test/suite/converted/chapter15/15.3/15.3.5/15.3.5-1gs.js
+++ b/test/suite/converted/chapter15/15.3/15.3.5/15.3.5-1gs.js
@@ -4,7 +4,7 @@
* @path chapter15/15.3/15.3.5/15.3.5-1gs.js
* @description StrictMode - error is thrown when reading the 'caller' property of a function object
* @onlyStrict
- * @negative NotEarlyErrorString
+ * @negative NotEarlyError
*/
"use strict";