diff --git a/tests/expectations/parser/parser/expression/literal/char_fail.leo.out b/tests/expectations/parser/parser/expression/literal/char_fail.leo.out
index 6b1e104d08..be3fa5fdee 100644
--- a/tests/expectations/parser/parser/expression/literal/char_fail.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/char_fail.leo.out
@@ -2,40 +2,40 @@
 namespace: Token
 expectation: Fail
 outputs:
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | 'a\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | ''\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\x9A'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\x7'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\x7g'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\xz'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\x80'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\xc1'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\xc2'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\xDF'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\xC0'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\xe0'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\x9f'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | 'abcdefg'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\t\\t'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\a'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\z'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\A'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\Z'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\1'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\9'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\*'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\x'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\u'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\u{bbbbb}\\u{aaaa}'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\uz'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\u1'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\u123'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\u{2764z'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\u{276g}'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\u00000000'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\u01000000'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\u9999999'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '\\u{110000}'\n     | ^"
-  - "Error [EPAR0370000]: '\n    --> test:1:1\n     |\n   1 | '😭😂😘'\n     | ^"
+  - "Error [EPAR0370028]: Expected a closed char but found '\\'."
+  - "Error [EPAR0370028]: Expected a closed char but found 'a."
+  - "Error [EPAR0370029]: Expected valid character but found ."
+  - "Error [EPAR0370028]: Expected a closed char but found '\\."
+  - "Error [EPAR0370029]: Expected valid character but found '\\x9."
+  - "Error [EPAR0370029]: Expected valid character but found '\\x."
+  - "Error [EPAR0370029]: Expected valid character but found '\\x7."
+  - "Error [EPAR0370029]: Expected valid character but found '\\x."
+  - "Error [EPAR0370029]: Expected valid character but found '\\x8."
+  - "Error [EPAR0370029]: Expected valid character but found '\\xc."
+  - "Error [EPAR0370029]: Expected valid character but found '\\xc."
+  - "Error [EPAR0370029]: Expected valid character but found '\\xD."
+  - "Error [EPAR0370029]: Expected valid character but found '\\xC."
+  - "Error [EPAR0370029]: Expected valid character but found '\\xe."
+  - "Error [EPAR0370029]: Expected valid character but found '\\x9."
+  - "Error [EPAR0370029]: Expected valid character but found 'abcdef."
+  - "Error [EPAR0370029]: Expected valid character but found '\\t\\."
+  - "Error [EPAR0370029]: Expected valid character but found '\\."
+  - "Error [EPAR0370029]: Expected valid character but found '\\."
+  - "Error [EPAR0370029]: Expected valid character but found '\\."
+  - "Error [EPAR0370029]: Expected valid character but found '\\."
+  - "Error [EPAR0370029]: Expected valid character but found '\\."
+  - "Error [EPAR0370029]: Expected valid character but found '\\."
+  - "Error [EPAR0370029]: Expected valid character but found '\\."
+  - "Error [EPAR0370029]: Expected valid character but found '\\."
+  - "Error [EPAR0370026]: Expected a valid escape character but found 117."
+  - "Error [EPAR0370029]: Expected valid character but found '\\u{bbbbb}\\u{aaaa."
+  - "Error [EPAR0370026]: Expected a valid escape character but found 117."
+  - "Error [EPAR0370026]: Expected a valid escape character but found 117."
+  - "Error [EPAR0370026]: Expected a valid escape character but found 117."
+  - "Error [EPAR0370029]: Expected valid character but found '\\u{2764."
+  - "Error [EPAR0370029]: Expected valid character but found '\\u{276g."
+  - "Error [EPAR0370026]: Expected a valid escape character but found 117."
+  - "Error [EPAR0370026]: Expected a valid escape character but found 117."
+  - "Error [EPAR0370026]: Expected a valid escape character but found 117."
+  - "Error [EPAR0370029]: Expected valid character but found '\\u{110000."
+  - "Error [EPAR0370029]: Expected valid character but found '😭😂�."
diff --git a/tests/expectations/parser/parser/expression/literal/string_fail.leo.out b/tests/expectations/parser/parser/expression/literal/string_fail.leo.out
index 331c4df2bc..9b42287840 100644
--- a/tests/expectations/parser/parser/expression/literal/string_fail.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/string_fail.leo.out
@@ -2,11 +2,11 @@
 namespace: Token
 expectation: Fail
 outputs:
-  - "Error [EPAR0370000]: \"\n    --> test:1:1\n     |\n   1 | \"Hello world!\n     | ^"
-  - "Error [EPAR0370000]: \"\n    --> test:1:1\n     |\n   1 | \"\\\"\n     | ^"
-  - "Error [EPAR0370000]: \"\n    --> test:1:1\n     |\n   1 | \"\\\n     | ^"
-  - "Error [EPAR0370000]: \"\n    --> test:1:1\n     |\n   1 | \"\\l\"\n     | ^"
-  - "Error [EPAR0370000]: \"\n    --> test:1:1\n     |\n   1 | \"\\uaaa\"\n     | ^"
-  - "Error [EPAR0370000]: \"\n    --> test:1:1\n     |\n   1 | \"\\u\"\n     | ^"
-  - "Error [EPAR0370000]: \"\n    --> test:1:1\n     |\n   1 | \"\\xFF\"\n     | ^"
-  - "Error [EPAR0370000]: \"\n    --> test:1:1\n     |\n   1 | \"\\x\"\n     | ^"
+  - "Error [EPAR0370027]: Expected a closed string but found \"Hello world!."
+  - "Error [EPAR0370027]: Expected a closed string but found \"\\\"."
+  - "Error [EPAR0370027]: Expected a closed string but found \"\\."
+  - "Error [EPAR0370026]: Expected a valid escape character but found \\l."
+  - "Error [EPAR0370027]: Expected a closed string but found \"\\uaaa\"."
+  - "Error [EPAR0370027]: Expected a closed string but found \"\\u\"."
+  - "Error [EPAR0370026]: Expected a valid escape character but found \\xFF."
+  - "Error [EPAR0370027]: Expected a closed string but found \"\\x\"."
diff --git a/tests/expectations/parser/parser/statement/expression_fail.leo.out b/tests/expectations/parser/parser/statement/expression_fail.leo.out
index 4142d0155e..25eb94e985 100644
--- a/tests/expectations/parser/parser/statement/expression_fail.leo.out
+++ b/tests/expectations/parser/parser/statement/expression_fail.leo.out
@@ -4,7 +4,7 @@ expectation: Fail
 outputs:
   - "Error [EPAR0370009]: unexpected string: expected 'expression', got ']'\n    --> test:1:2\n     |\n   1 | (];\n     |  ^"
   - "Error [EPAR0370009]: unexpected string: expected 'expression', got ')'\n    --> test:1:2\n     |\n   1 | [);\n     |  ^"
-  - "Error [EPAR0370000]: \\\n    --> test:1:2\n     |\n   1 | x\\y;\n     |  ^"
-  - "Error [EPAR0370000]: |\n    --> test:1:5\n     |\n   1 | (x,y|;\n     |     ^"
+  - "Error [EPAR0370032]: Could not lex the following content: \\y;."
+  - "Error [EPAR0370032]: Could not lex the following content: |;."
   - "Error [EPAR0370009]: unexpected string: expected 'expression', got '}'\n    --> test:1:3\n     |\n   1 | x[};\n     |   ^"
   - "Error [EPAR0370005]: expected ) -- got ']'\n    --> test:1:6\n     |\n   1 | (x, y];\n     |      ^"