diff --git a/test/compiler/prepare_grammar/flatten_grammar_test.cc b/test/compiler/prepare_grammar/flatten_grammar_test.cc
index d8f6c804..5cd52d5c 100644
--- a/test/compiler/prepare_grammar/flatten_grammar_test.cc
+++ b/test/compiler/prepare_grammar/flatten_grammar_test.cc
@@ -35,19 +35,19 @@ describe("flatten_grammar", []() {
     AssertThat(result.type, Equals(VariableTypeNamed));
     AssertThat(result.productions, Equals(vector<Production>({
       Production{{
-        {Symbol::non_terminal(1), 0, AssociativityNone, ""},
-        {Symbol::non_terminal(2), 101, AssociativityLeft, ""},
-        {Symbol::non_terminal(3), 102, AssociativityRight, ""},
-        {Symbol::non_terminal(4), 101, AssociativityLeft, ""},
-        {Symbol::non_terminal(6), 0, AssociativityNone, ""},
-        {Symbol::non_terminal(7), 0, AssociativityNone, ""},
+        {Symbol::non_terminal(1), 0, AssociativityNone, Alias{}},
+        {Symbol::non_terminal(2), 101, AssociativityLeft, Alias{}},
+        {Symbol::non_terminal(3), 102, AssociativityRight, Alias{}},
+        {Symbol::non_terminal(4), 101, AssociativityLeft, Alias{}},
+        {Symbol::non_terminal(6), 0, AssociativityNone, Alias{}},
+        {Symbol::non_terminal(7), 0, AssociativityNone, Alias{}},
       }, 0},
       Production{{
-        {Symbol::non_terminal(1), 0, AssociativityNone, ""},
-        {Symbol::non_terminal(2), 101, AssociativityLeft, ""},
-        {Symbol::non_terminal(5), 101, AssociativityLeft, ""},
-        {Symbol::non_terminal(6), 0, AssociativityNone, ""},
-        {Symbol::non_terminal(7), 0, AssociativityNone, ""},
+        {Symbol::non_terminal(1), 0, AssociativityNone, Alias{}},
+        {Symbol::non_terminal(2), 101, AssociativityLeft, Alias{}},
+        {Symbol::non_terminal(5), 101, AssociativityLeft, Alias{}},
+        {Symbol::non_terminal(6), 0, AssociativityNone, Alias{}},
+        {Symbol::non_terminal(7), 0, AssociativityNone, Alias{}},
       }, 0}
     })));
   });
@@ -77,19 +77,19 @@ describe("flatten_grammar", []() {
     AssertThat(result.type, Equals(VariableTypeNamed));
     AssertThat(result.productions, Equals(vector<Production>({
       Production{{
-        {Symbol::non_terminal(1), 0, AssociativityNone, ""},
-        {Symbol::non_terminal(2), 0, AssociativityNone, ""},
-        {Symbol::non_terminal(3), 0, AssociativityNone, ""},
-        {Symbol::non_terminal(4), 0, AssociativityNone, ""},
-        {Symbol::non_terminal(6), 0, AssociativityNone, ""},
-        {Symbol::non_terminal(7), 0, AssociativityNone, ""},
+        {Symbol::non_terminal(1), 0, AssociativityNone, Alias{}},
+        {Symbol::non_terminal(2), 0, AssociativityNone, Alias{}},
+        {Symbol::non_terminal(3), 0, AssociativityNone, Alias{}},
+        {Symbol::non_terminal(4), 0, AssociativityNone, Alias{}},
+        {Symbol::non_terminal(6), 0, AssociativityNone, Alias{}},
+        {Symbol::non_terminal(7), 0, AssociativityNone, Alias{}},
       }, 102},
       Production{{
-        {Symbol::non_terminal(1), 0, AssociativityNone, ""},
-        {Symbol::non_terminal(2), 0, AssociativityNone, ""},
-        {Symbol::non_terminal(5), 0, AssociativityNone, ""},
-        {Symbol::non_terminal(6), 0, AssociativityNone, ""},
-        {Symbol::non_terminal(7), 0, AssociativityNone, ""},
+        {Symbol::non_terminal(1), 0, AssociativityNone, Alias{}},
+        {Symbol::non_terminal(2), 0, AssociativityNone, Alias{}},
+        {Symbol::non_terminal(5), 0, AssociativityNone, Alias{}},
+        {Symbol::non_terminal(6), 0, AssociativityNone, Alias{}},
+        {Symbol::non_terminal(7), 0, AssociativityNone, Alias{}},
       }, 101}
     })));
   });
@@ -106,8 +106,8 @@ describe("flatten_grammar", []() {
 
     AssertThat(result.productions, Equals(vector<Production>({
       Production{{
-        {Symbol::non_terminal(1), 101, AssociativityLeft, ""},
-        {Symbol::non_terminal(2), 101,  AssociativityLeft, ""},
+        {Symbol::non_terminal(1), 101, AssociativityLeft, Alias{}},
+        {Symbol::non_terminal(2), 101,  AssociativityLeft, Alias{}},
       }, 0}
     })));
 
@@ -121,7 +121,7 @@ describe("flatten_grammar", []() {
 
     AssertThat(result.productions, Equals(vector<Production>({
       Production{{
-        {Symbol::non_terminal(1), 101, AssociativityLeft, ""},
+        {Symbol::non_terminal(1), 101, AssociativityLeft, Alias{}},
       }, 0}
     })));
   });
diff --git a/test/helpers/spy_input.cc b/test/helpers/spy_input.cc
index ec370b80..ae7e9c1f 100644
--- a/test/helpers/spy_input.cc
+++ b/test/helpers/spy_input.cc
@@ -8,8 +8,6 @@ using std::pair;
 using std::string;
 using std::vector;
 
-static const size_t UTF8_MAX_CHAR_SIZE = 4;
-
 SpyInput::SpyInput(string content, size_t chars_per_chunk) :
   chars_per_chunk(chars_per_chunk),
   buffer(nullptr),