diff --git a/ets2panda/test/ast/parser/ets/FixedArray/StringFasta.ets b/ets2panda/test/ast/parser/ets/FixedArray/StringFasta.ets
index 8e49f9dfe7277035b8f72c820b3bda99c3378020..87b568099bb05661d6a6599a853eb5fa09258647 100644
--- a/ets2panda/test/ast/parser/ets/FixedArray/StringFasta.ets
+++ b/ets2panda/test/ast/parser/ets/FixedArray/StringFasta.ets
@@ -168,14 +168,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:32 Error TypeError: Function name 'count' used in the wrong context */
+/* @@? 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: Function name 'count' used in the wrong context */
+/* @@? 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: Function name 'count' used in the wrong context */
+/* @@? 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:36 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 b1ba2f982aa3e8d55cefb9c0308aba7d828286d9..3292dd0c41902d1c734be12991833b084c986dea 100644
--- a/ets2panda/test/ast/parser/ets/StringFasta.ets
+++ b/ets2panda/test/ast/parser/ets/StringFasta.ets
@@ -168,14 +168,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:32 Error TypeError: Function name 'count' used in the wrong context */
+/* @@? 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: Function name 'count' used in the wrong context */
+/* @@? 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: Function name 'count' used in the wrong context */
+/* @@? 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:36 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 e348adfa0feb8994a6125e8c7a7f5d281cf1bc66..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,8 +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: Function name 'count' used in the wrong context */
+/* @@? 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 b8ba1653ee8cca8f51b788bd45299ad85775ead9..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,8 +17,7 @@ for (let i = 0; i < count; ++i /* @@ label */{
     result = result + p[i]!.awaitResolution() * /* @@label1 */a[i];
 }
 
-/* @@? 16:21 Error TypeError: Function name 'count' used in the wrong context */
-/* @@? 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 e5954717ade1b9c60b6dfdfe8992adf2e7932bd5..7b68324c196dd725b88a8dd4bea2f34043942cf2 100644
--- a/ets2panda/test/ast/parser/ets/unexpected_token_56.ets
+++ b/ets2panda/test/ast/parser/ets/unexpected_token_56.ets
@@ -21,8 +21,7 @@ for (let i? /* @@ label11 */: 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: Function name 'count' used in the wrong context */
+/* @@@ label4 Error TypeError: Unresolved reference count */
 /* @@@ label5 Error SyntaxError: Expected ')', got ';'. */
 /* @@@ label6 Error SyntaxError: Unexpected token ')'. */
 /* @@@ label7 Error SyntaxError: Unexpected token '{'. */