diff --git a/ets2panda/test/ast/parser/ets/FixedArray/StringFasta.ets b/ets2panda/test/ast/parser/ets/FixedArray/StringFasta.ets
index 2e97dc534fe0317facd43b8aed3af4047205ca5d..2efed536a19703607ef06fecca2ab44ceceb79f0 100644
--- a/ets2panda/test/ast/parser/ets/FixedArray/StringFasta.ets
+++ b/ets2panda/test/ast/parser/ets/FixedArray/StringFasta.ets
@@ -169,12 +169,11 @@ function main(): void {
 /* @@? 95:65 Error TypeError: 'For-of' statement source expression is not of iterable type. */
 /* @@? 103:20 Error TypeError: Type 'double' has no call signatures. */
 /* @@? 112:16 Error TypeError: Static property 'fastaRepeat' must be accessed through it's class 'StringFasta' */
-/* @@? 112:28 Error TypeError: Bad operand type, the types of the operands must be numeric type. */
-/* @@? 112:48 Error TypeError: Static property 'ALU' must be accessed through it's class 'StringFasta' */
+/* @@? 112:32 Error TypeError: Property 'count' must be accessed through 'this' */
 /* @@? 113:16 Error TypeError: Static property 'fastaRandom' must be accessed through it's class 'StringFasta' */
-/* @@? 113:28 Error TypeError: Bad operand type, the types of the operands must be numeric type. */
+/* @@? 113:32 Error TypeError: Property 'count' must be accessed through 'this' */
 /* @@? 113:46 Error TypeError: Static property 'IUB' must be accessed through it's class 'StringFasta' */
 /* @@? 114:16 Error TypeError: Static property 'fastaRandom' must be accessed through it's class 'StringFasta' */
-/* @@? 114:28 Error TypeError: Bad operand type, the types of the operands must be numeric type. */
+/* @@? 114:32 Error TypeError: Property 'count' must be accessed through 'this' */
 /* @@? 114:46 Error TypeError: Static property 'HomoSap' must be accessed through it's class 'StringFasta' */
 /* @@? 116:28 Error TypeError: 'expected' is a static property of 'StringFasta' */
diff --git a/ets2panda/test/ast/parser/ets/StringFasta.ets b/ets2panda/test/ast/parser/ets/StringFasta.ets
index f36d7cbf6bdd0c6374125f6b9e0be8129c99ec14..9191ca5fda3ad962f5f807ba5bc4b2686ad338de 100644
--- a/ets2panda/test/ast/parser/ets/StringFasta.ets
+++ b/ets2panda/test/ast/parser/ets/StringFasta.ets
@@ -169,12 +169,11 @@ function main(): void {
 /* @@? 95:65 Error TypeError: 'For-of' statement source expression is not of iterable type. */
 /* @@? 103:20 Error TypeError: Type 'double' has no call signatures. */
 /* @@? 112:16 Error TypeError: Static property 'fastaRepeat' must be accessed through it's class 'StringFasta' */
-/* @@? 112:28 Error TypeError: Bad operand type, the types of the operands must be numeric type. */
-/* @@? 112:48 Error TypeError: Static property 'ALU' must be accessed through it's class 'StringFasta' */
+/* @@? 112:32 Error TypeError: Property 'count' must be accessed through 'this' */
 /* @@? 113:16 Error TypeError: Static property 'fastaRandom' must be accessed through it's class 'StringFasta' */
-/* @@? 113:28 Error TypeError: Bad operand type, the types of the operands must be numeric type. */
+/* @@? 113:32 Error TypeError: Property 'count' must be accessed through 'this' */
 /* @@? 113:46 Error TypeError: Static property 'IUB' must be accessed through it's class 'StringFasta' */
 /* @@? 114:16 Error TypeError: Static property 'fastaRandom' must be accessed through it's class 'StringFasta' */
-/* @@? 114:28 Error TypeError: Bad operand type, the types of the operands must be numeric type. */
+/* @@? 114:32 Error TypeError: Property 'count' must be accessed through 'this' */
 /* @@? 114:46 Error TypeError: Static property 'HomoSap' must be accessed through it's class 'StringFasta' */
 /* @@? 116:28 Error TypeError: 'expected' is a static property of 'StringFasta' */
diff --git a/ets2panda/test/ast/parser/ets/missing_in_for_statement_1.ets b/ets2panda/test/ast/parser/ets/missing_in_for_statement_1.ets
index 05cbe6e2fd350a675a9e60dcd52ff8c1a9ae2b7f..88b0f45e72ce723f258eddb38b5a49290db90dd0 100644
--- a/ets2panda/test/ast/parser/ets/missing_in_for_statement_1.ets
+++ b/ets2panda/test/ast/parser/ets/missing_in_for_statement_1.ets
@@ -18,7 +18,7 @@ for /* @@ label */let i = 0; i < count; ++i) {
 }
 
 /* @@@ label Error SyntaxError: Expected '(', got 'let'. */
-/* @@? 16:30 Error TypeError: Bad operand type, the types of the operands must be numeric, same enumeration, or boolean type. */
+/* @@? 16:34 Error TypeError: Unresolved reference count */
 /* @@? 17:5 Error TypeError: Unresolved reference result */
 /* @@? 17:23 Error TypeError: Unresolved reference p */
 /* @@? 17:23 Error TypeError: Indexed access is not supported for such expression type. */
diff --git a/ets2panda/test/ast/parser/ets/missing_in_for_statement_2.ets b/ets2panda/test/ast/parser/ets/missing_in_for_statement_2.ets
index ca20535a7b90357d5c501c6ff3a6bcbc4bf5c0c2..a290ef8d7d4adfc1ae456c352bc5deac651335f1 100644
--- a/ets2panda/test/ast/parser/ets/missing_in_for_statement_2.ets
+++ b/ets2panda/test/ast/parser/ets/missing_in_for_statement_2.ets
@@ -17,7 +17,7 @@ for (let i = 0; i < count; ++i /* @@ label */{
     result = result + p[i]!.awaitResolution() * /* @@label1 */a[i];
 }
 
-/* @@? 16:17 Error TypeError: Bad operand type, the types of the operands must be numeric, same enumeration, or boolean type. */
+/* @@? 16:21 Error TypeError: Unresolved reference count */
 /* @@@ label Error SyntaxError: Expected ')', got '{'. */
 /* @@? 17:5 Error TypeError: Unresolved reference result */
 /* @@? 17:23 Error TypeError: Unresolved reference p */
diff --git a/ets2panda/test/ast/parser/ets/unexpected_token_56.ets b/ets2panda/test/ast/parser/ets/unexpected_token_56.ets
index 2042f939a6f673e5499374ad98fe928062a5456a..17149e2ccae3233447018ceb0d2cb14bcb701958 100644
--- a/ets2panda/test/ast/parser/ets/unexpected_token_56.ets
+++ b/ets2panda/test/ast/parser/ets/unexpected_token_56.ets
@@ -21,7 +21,7 @@ for (let i?: Number = 1;;)  { break; }
 /* @@@ label1 Error SyntaxError: Unexpected token ';'. */
 /* @@@ label2 Error SyntaxError: Unexpected token ';'. */
 /* @@@ label3 Error TypeError: Unresolved reference i */
-/* @@@ label3 Error TypeError: Bad operand type, the types of the operands must be numeric, same enumeration, or boolean type. */
+/* @@@ label4 Error TypeError: Unresolved reference count */
 /* @@@ label5 Error SyntaxError: Expected ')', got ';'. */
 /* @@@ label6 Error SyntaxError: Unexpected token ')'. */
 /* @@@ label7 Error SyntaxError: Unexpected token '{'. */