diff --git a/src/Microsoft.AspNetCore.Razor.Evolution/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Razor.Evolution/Properties/AssemblyInfo.cs
index 4a6e69c6aa..c2bb4a169f 100644
--- a/src/Microsoft.AspNetCore.Razor.Evolution/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.AspNetCore.Razor.Evolution/Properties/AssemblyInfo.cs
@@ -7,6 +7,7 @@ using System.Runtime.CompilerServices;
 
 [assembly: AssemblyMetadata("Serviceable", "True")]
 [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Evolution.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
 [assembly: NeutralResourcesLanguage("en-us")]
 [assembly: AssemblyCompany("Microsoft Corporation.")]
 [assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/BlockTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/BlockTest.cs
index afbf9e8e7c..423f50fa71 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/BlockTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/BlockTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class BlockTest
+    public class BlockTest
     {
         [Fact]
         public void ConstructorWithBlockBuilderSetsParent()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpAutoCompleteTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpAutoCompleteTest.cs
index cb9ab28a40..5ec29dcaa7 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpAutoCompleteTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpAutoCompleteTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class CSharpAutoCompleteTest : CsHtmlCodeParserTestBase
+    public class CSharpAutoCompleteTest : CsHtmlCodeParserTestBase
     {
         [Fact]
         public void FunctionsDirectiveAutoCompleteAtEOF()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpBlockTest.cs
index ea9d24ad1a..fdc6ca3d72 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpBlockTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpBlockTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class CSharpBlockTest : CsHtmlCodeParserTestBase
+    public class CSharpBlockTest : CsHtmlCodeParserTestBase
     {
         [Fact]
         public void ParseBlock_NestedCodeBlockWithCSharpAt()
@@ -1113,10 +1113,10 @@ catch(bar) { baz(); }", BlockType.Statement, SpanKind.Code);
 
         [Theory]
         [MemberData(nameof(BlockWithEscapedTransitionData))]
-        public void ParseBlock_WithDoubleTransition_DoesNotThrow(string input, Block expected)
+        public void ParseBlock_WithDoubleTransition_DoesNotThrow(string input, object expected)
         {
             // Act & Assert
-            ParseBlockTest(input, expected);
+            ParseBlockTest(input, (Block)expected);
         }
 
         [Fact]
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpDirectivesTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpDirectivesTest.cs
index ba1e002c5a..237c62cbed 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpDirectivesTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpDirectivesTest.cs
@@ -5,7 +5,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class CSharpDirectivesTest : CsHtmlCodeParserTestBase
+    public class CSharpDirectivesTest : CsHtmlCodeParserTestBase
     {
         [Fact]
         public void TagHelperPrefixDirective_NoValueSucceeds()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpErrorTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpErrorTest.cs
index a79556c0fd..07182d5d90 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpErrorTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpErrorTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class CSharpErrorTest : CsHtmlCodeParserTestBase
+    public class CSharpErrorTest : CsHtmlCodeParserTestBase
     {
         [Fact]
         public void ParseBlockHandlesQuotesAfterTransition()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpExplicitExpressionTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpExplicitExpressionTest.cs
index 1d05b53729..1f19962a93 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpExplicitExpressionTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpExplicitExpressionTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class CSharpExplicitExpressionTest : CsHtmlCodeParserTestBase
+    public class CSharpExplicitExpressionTest : CsHtmlCodeParserTestBase
     {
         [Fact]
         public void ParseBlockShouldOutputZeroLengthCodeSpanIfExplicitExpressionIsEmpty()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpImplicitExpressionTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpImplicitExpressionTest.cs
index 4608d2b1e5..b5ccb3f897 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpImplicitExpressionTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpImplicitExpressionTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class CSharpImplicitExpressionTest : CsHtmlCodeParserTestBase
+    public class CSharpImplicitExpressionTest : CsHtmlCodeParserTestBase
     {
         private const string TestExtraKeyword = "model";
 
@@ -60,15 +60,15 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
         public void ParseBlockMethodParsesNullConditionalOperatorImplicitExpression_Bracket(
             string implicitExpresison,
             string expectedImplicitExpression,
-            AcceptedCharacters acceptedCharacters,
-            RazorError[] expectedErrors)
+            object acceptedCharacters,
+            object expectedErrors)
         {
             // Act & Assert
             ImplicitExpressionTest(
                 implicitExpresison,
                 expectedImplicitExpression,
-                acceptedCharacters,
-                expectedErrors);
+                (AcceptedCharacters)acceptedCharacters,
+                (RazorError[])expectedErrors);
         }
 
         public static TheoryData NullConditionalOperatorData_Dot
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpNestedStatementsTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpNestedStatementsTest.cs
index 84530f04ab..6731a6b75a 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpNestedStatementsTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpNestedStatementsTest.cs
@@ -5,7 +5,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class CSharpNestedStatementsTest : CsHtmlCodeParserTestBase
+    public class CSharpNestedStatementsTest : CsHtmlCodeParserTestBase
     {
         [Fact]
         public void NestedSimpleStatement()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpRazorCommentsTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpRazorCommentsTest.cs
index 36a546b1b7..f83f61df05 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpRazorCommentsTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpRazorCommentsTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class CSharpRazorCommentsTest : CsHtmlMarkupParserTestBase
+    public class CSharpRazorCommentsTest : CsHtmlMarkupParserTestBase
     {
         [Fact]
         public void UnterminatedRazorComment()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpReservedWordsTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpReservedWordsTest.cs
index 8815d18ebb..1f89a9b66e 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpReservedWordsTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpReservedWordsTest.cs
@@ -5,7 +5,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class CSharpReservedWordsTest : CsHtmlCodeParserTestBase
+    public class CSharpReservedWordsTest : CsHtmlCodeParserTestBase
     {
         [Theory]
         [InlineData("namespace")]
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpSectionTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpSectionTest.cs
index 85ff3f178b..e6085fe97f 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpSectionTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpSectionTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class CSharpSectionTest : CsHtmlMarkupParserTestBase
+    public class CSharpSectionTest : CsHtmlMarkupParserTestBase
     {
         [Fact]
         public void ParseSectionBlockCapturesNewlineImmediatelyFollowing()
@@ -580,9 +580,9 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 
         [Theory]
         [MemberData(nameof(SectionWithEscapedTransitionData))]
-        public void ParseSectionBlock_WithDoubleTransition_DoesNotThrow(string input, Block expected)
+        public void ParseSectionBlock_WithDoubleTransition_DoesNotThrow(string input, object expected)
         {
-            ParseDocumentTest(input, expected);
+            ParseDocumentTest(input, (Block)expected);
         }
     }
 }
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpSpecialBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpSpecialBlockTest.cs
index 859f7de659..4677a1381f 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpSpecialBlockTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpSpecialBlockTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class CSharpSpecialBlockTest : CsHtmlCodeParserTestBase
+    public class CSharpSpecialBlockTest : CsHtmlCodeParserTestBase
     {
         [Fact]
         public void ParseInheritsStatementMarksInheritsSpanAsCanGrowIfMissingTrailingSpace()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpStatementTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpStatementTest.cs
index a6726ce429..997439e4f9 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpStatementTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpStatementTest.cs
@@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
     //  * Tests for various types of nested statements
     //  * Comment tests
 
-    internal class CSharpStatementTest : CsHtmlCodeParserTestBase
+    public class CSharpStatementTest : CsHtmlCodeParserTestBase
     {
         [Fact]
         public void ForStatement()
@@ -235,10 +235,10 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 
         [Theory]
         [MemberData(nameof(ExceptionFilterData))]
-        public void ExceptionFilters(string document, StatementBlock expectedStatement)
+        public void ExceptionFilters(string document, object expectedStatement)
         {
             // Act & Assert
-            ParseBlockTest(document, expectedStatement);
+            ParseBlockTest(document, (StatementBlock)expectedStatement);
         }
 
         public static TheoryData ExceptionFilterErrorData
@@ -289,11 +289,11 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
         [MemberData(nameof(ExceptionFilterErrorData))]
         public void ExceptionFilterErrors(
             string document,
-            StatementBlock expectedStatement,
-            RazorError[] expectedErrors)
+            object expectedStatement,
+            object expectedErrors)
         {
             // Act & Assert
-            ParseBlockTest(document, expectedStatement, expectedErrors);
+            ParseBlockTest(document, (StatementBlock)expectedStatement, (RazorError[])expectedErrors);
         }
 
         [Fact]
@@ -349,10 +349,10 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 
         [Theory]
         [MemberData(nameof(StaticUsingData))]
-        public void StaticUsingImport(string document, DirectiveBlock expectedResult)
+        public void StaticUsingImport(string document, object expectedResult)
         {
             // Act & Assert
-            ParseBlockTest(document, expectedResult);
+            ParseBlockTest(document, (DirectiveBlock)expectedResult);
         }
 
         [Fact]
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTemplateTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTemplateTest.cs
index 3cce547916..42ae3b76f5 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTemplateTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTemplateTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class CSharpTemplateTest : CsHtmlCodeParserTestBase
+    public class CSharpTemplateTest : CsHtmlCodeParserTestBase
     {
         private const string TestTemplateCode = " @<p>Foo #@item</p>";
 
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpToMarkupSwitchTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpToMarkupSwitchTest.cs
index afdd73662e..fd61aeee13 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpToMarkupSwitchTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpToMarkupSwitchTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class CSharpToMarkupSwitchTest : CsHtmlCodeParserTestBase
+    public class CSharpToMarkupSwitchTest : CsHtmlCodeParserTestBase
     {
         [Fact]
         public void SingleAngleBracketDoesNotCauseSwitchIfOuterBlockIsTerminated()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerCommentTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerCommentTest.cs
index 1b33fc7b69..2eb353b3a7 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerCommentTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerCommentTest.cs
@@ -5,8 +5,10 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class CSharpTokenizerCommentTest : CSharpTokenizerTestBase
+    public class CSharpTokenizerCommentTest : CSharpTokenizerTestBase
     {
+        private new CSharpSymbol IgnoreRemaining => (CSharpSymbol)base.IgnoreRemaining;
+
         [Fact]
         public void Next_Ignores_Star_At_EOF_In_RazorComment()
         {
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerIdentifierTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerIdentifierTest.cs
index 8b2e2718da..03327b58ee 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerIdentifierTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerIdentifierTest.cs
@@ -5,7 +5,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class CSharpTokenizerIdentifierTest : CSharpTokenizerTestBase
+    public class CSharpTokenizerIdentifierTest : CSharpTokenizerTestBase
     {
         [Fact]
         public void Simple_Identifier_Is_Recognized()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerLiteralTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerLiteralTest.cs
index 7565fad137..b40d88a73e 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerLiteralTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerLiteralTest.cs
@@ -6,8 +6,10 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class CSharpTokenizerLiteralTest : CSharpTokenizerTestBase
+    public class CSharpTokenizerLiteralTest : CSharpTokenizerTestBase
     {
+        private new CSharpSymbol IgnoreRemaining => (CSharpSymbol)base.IgnoreRemaining;
+
         [Fact]
         public void Simple_Integer_Literal_Is_Recognized()
         {
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerOperatorsTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerOperatorsTest.cs
index 468aae09b3..477bf26c06 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerOperatorsTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerOperatorsTest.cs
@@ -5,7 +5,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class CSharpTokenizerOperatorsTest : CSharpTokenizerTestBase
+    public class CSharpTokenizerOperatorsTest : CSharpTokenizerTestBase
     {
         [Fact]
         public void LeftBrace_Is_Recognized()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerTest.cs
index e5e09daddf..49b321d2df 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerTest.cs
@@ -5,8 +5,10 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class CSharpTokenizerTest : CSharpTokenizerTestBase
+    public class CSharpTokenizerTest : CSharpTokenizerTestBase
     {
+        private new CSharpSymbol IgnoreRemaining => (CSharpSymbol)base.IgnoreRemaining;
+
         [Fact]
         public void Next_Returns_Null_When_EOF_Reached()
         {
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerTestBase.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerTestBase.cs
index 7c7743dbcc..913bda63f7 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpTokenizerTestBase.cs
@@ -3,23 +3,28 @@
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal abstract class CSharpTokenizerTestBase : TokenizerTestBase<CSharpSymbol, CSharpSymbolType>
+    public abstract class CSharpTokenizerTestBase : TokenizerTestBase
     {
         private static CSharpSymbol _ignoreRemaining = new CSharpSymbol(0, 0, 0, string.Empty, CSharpSymbolType.Unknown);
 
-        protected override CSharpSymbol IgnoreRemaining
+        internal override object IgnoreRemaining
         {
             get { return _ignoreRemaining; }
         }
 
-        protected override Tokenizer<CSharpSymbol, CSharpSymbolType> CreateTokenizer(ITextDocument source)
+        internal override object CreateTokenizer(ITextDocument source)
         {
             return new CSharpTokenizer(source);
         }
 
-        protected void TestSingleToken(string text, CSharpSymbolType expectedSymbolType)
+        internal void TestSingleToken(string text, CSharpSymbolType expectedSymbolType)
         {
             TestTokenizer(text, new CSharpSymbol(0, 0, 0, text, expectedSymbolType));
         }
+
+        internal void TestTokenizer(string input, params CSharpSymbol[] expectedSymbols)
+        {
+            base.TestTokenizer<CSharpSymbol, CSharpSymbolType>(input, expectedSymbols);
+        }
     }
 }
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpVerbatimBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpVerbatimBlockTest.cs
index 62d363a51f..e1dedcf3b3 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpVerbatimBlockTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpVerbatimBlockTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class CSharpVerbatimBlockTest : CsHtmlCodeParserTestBase
+    public class CSharpVerbatimBlockTest : CsHtmlCodeParserTestBase
     {
         private const string TestExtraKeyword = "model";
 
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpWhitespaceHandlingTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpWhitespaceHandlingTest.cs
index 718436c3f6..26aedff677 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpWhitespaceHandlingTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CSharpWhitespaceHandlingTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class CSharpWhitespaceHandlingTest : CsHtmlMarkupParserTestBase
+    public class CSharpWhitespaceHandlingTest : CsHtmlMarkupParserTestBase
     {
         [Fact]
         public void StatementBlockDoesNotAcceptTrailingNewlineIfNewlinesAreSignificantToAncestor()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CodeParserTestBase.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CodeParserTestBase.cs
index 34650fc33b..f86c603ae6 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CodeParserTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CodeParserTestBase.cs
@@ -5,62 +5,62 @@ using System.Collections.Generic;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal abstract class CodeParserTestBase : ParserTestBase
+    public abstract class CodeParserTestBase : ParserTestBase
     {
-        protected abstract ISet<string> KeywordSet { get; }
+        internal abstract ISet<string> KeywordSet { get; }
 
-        protected override RazorSyntaxTree ParseBlock(string document, bool designTime)
+        internal override RazorSyntaxTree ParseBlock(string document, bool designTime)
         {
             return ParseCodeBlock(document, designTime);
         }
 
-        protected void ImplicitExpressionTest(string input, params RazorError[] errors)
+        internal void ImplicitExpressionTest(string input, params RazorError[] errors)
         {
             ImplicitExpressionTest(input, AcceptedCharacters.NonWhiteSpace, errors);
         }
 
-        protected void ImplicitExpressionTest(string input, AcceptedCharacters acceptedCharacters, params RazorError[] errors)
+        internal void ImplicitExpressionTest(string input, AcceptedCharacters acceptedCharacters, params RazorError[] errors)
         {
             ImplicitExpressionTest(input, input, acceptedCharacters, errors);
         }
 
-        protected void ImplicitExpressionTest(string input, string expected, params RazorError[] errors)
+        internal void ImplicitExpressionTest(string input, string expected, params RazorError[] errors)
         {
             ImplicitExpressionTest(input, expected, AcceptedCharacters.NonWhiteSpace, errors);
         }
 
-        protected override void SingleSpanBlockTest(string document, BlockType blockType, SpanKind spanType, AcceptedCharacters acceptedCharacters = AcceptedCharacters.Any)
+        internal override void SingleSpanBlockTest(string document, BlockType blockType, SpanKind spanType, AcceptedCharacters acceptedCharacters = AcceptedCharacters.Any)
         {
             SingleSpanBlockTest(document, blockType, spanType, acceptedCharacters, expectedError: null);
         }
 
-        protected override void SingleSpanBlockTest(string document, string spanContent, BlockType blockType, SpanKind spanType, AcceptedCharacters acceptedCharacters = AcceptedCharacters.Any)
+        internal override void SingleSpanBlockTest(string document, string spanContent, BlockType blockType, SpanKind spanType, AcceptedCharacters acceptedCharacters = AcceptedCharacters.Any)
         {
             SingleSpanBlockTest(document, spanContent, blockType, spanType, acceptedCharacters, expectedErrors: null);
         }
 
-        protected override void SingleSpanBlockTest(string document, BlockType blockType, SpanKind spanType, params RazorError[] expectedError)
+        internal override void SingleSpanBlockTest(string document, BlockType blockType, SpanKind spanType, params RazorError[] expectedError)
         {
             SingleSpanBlockTest(document, document, blockType, spanType, expectedError);
         }
 
-        protected override void SingleSpanBlockTest(string document, string spanContent, BlockType blockType, SpanKind spanType, params RazorError[] expectedErrors)
+        internal override void SingleSpanBlockTest(string document, string spanContent, BlockType blockType, SpanKind spanType, params RazorError[] expectedErrors)
         {
             SingleSpanBlockTest(document, spanContent, blockType, spanType, AcceptedCharacters.Any, expectedErrors ?? new RazorError[0]);
         }
 
-        protected override void SingleSpanBlockTest(string document, BlockType blockType, SpanKind spanType, AcceptedCharacters acceptedCharacters, params RazorError[] expectedError)
+        internal override void SingleSpanBlockTest(string document, BlockType blockType, SpanKind spanType, AcceptedCharacters acceptedCharacters, params RazorError[] expectedError)
         {
             SingleSpanBlockTest(document, document, blockType, spanType, acceptedCharacters, expectedError);
         }
 
-        protected override void SingleSpanBlockTest(string document, string spanContent, BlockType blockType, SpanKind spanType, AcceptedCharacters acceptedCharacters, params RazorError[] expectedErrors)
+        internal override void SingleSpanBlockTest(string document, string spanContent, BlockType blockType, SpanKind spanType, AcceptedCharacters acceptedCharacters, params RazorError[] expectedErrors)
         {
             var b = CreateSimpleBlockAndSpan(spanContent, blockType, spanType, acceptedCharacters);
             ParseBlockTest(document, b, expectedErrors ?? new RazorError[0]);
         }
 
-        protected void ImplicitExpressionTest(string input, string expected, AcceptedCharacters acceptedCharacters, params RazorError[] errors)
+        internal void ImplicitExpressionTest(string input, string expected, AcceptedCharacters acceptedCharacters, params RazorError[] errors)
         {
             var factory = CreateSpanFactory();
             ParseBlockTest(SyntaxConstants.TransitionString + input,
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CsHtmlCodeParserTestBase.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CsHtmlCodeParserTestBase.cs
index 0e7586ed6c..fe4b89832b 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CsHtmlCodeParserTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CsHtmlCodeParserTestBase.cs
@@ -5,14 +5,14 @@ using System.Collections.Generic;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal abstract class CsHtmlCodeParserTestBase : CodeParserTestBase
+    public abstract class CsHtmlCodeParserTestBase : CodeParserTestBase
     {
-        protected override ISet<string> KeywordSet
+        internal override ISet<string> KeywordSet
         {
             get { return CSharpCodeParser.DefaultKeywords; }
         }
 
-        protected override BlockFactory CreateBlockFactory()
+        internal override BlockFactory CreateBlockFactory()
         {
             return new BlockFactory(Factory ?? CreateSpanFactory());
         }
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CsHtmlMarkupParserTestBase.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CsHtmlMarkupParserTestBase.cs
index e92ea0a374..da1b17f39e 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CsHtmlMarkupParserTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/CsHtmlMarkupParserTestBase.cs
@@ -5,14 +5,14 @@ using System.Collections.Generic;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal abstract class CsHtmlMarkupParserTestBase : MarkupParserTestBase
+    public abstract class CsHtmlMarkupParserTestBase : MarkupParserTestBase
     {
-        protected override ISet<string> KeywordSet
+        internal override ISet<string> KeywordSet
         {
             get { return CSharpCodeParser.DefaultKeywords; }
         }
 
-        protected override BlockFactory CreateBlockFactory()
+        internal override BlockFactory CreateBlockFactory()
         {
             return new BlockFactory(Factory ?? CreateSpanFactory());
         }
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/DisposableActionTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/DisposableActionTest.cs
index 6044b34568..c2bf47ad25 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/DisposableActionTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/DisposableActionTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class DisposableActionTest
+    public class DisposableActionTest
     {
         [Fact]
         public void ActionIsExecutedOnDispose()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/ErrorCollector.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/ErrorCollector.cs
index 31cc9afd0a..44307bbfc3 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/ErrorCollector.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/ErrorCollector.cs
@@ -6,7 +6,7 @@ using System.Text;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class ErrorCollector
+    public class ErrorCollector
     {
         private StringBuilder _message = new StringBuilder();
         private int _indent = 0;
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlBlockTest.cs
index 638b5f754f..e1392fcca6 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlBlockTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlBlockTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class HtmlBlockTest : CsHtmlMarkupParserTestBase
+    public class HtmlBlockTest : CsHtmlMarkupParserTestBase
     {
         [Fact]
         public void ParseBlockHandlesOpenAngleAtEof()
@@ -388,12 +388,11 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 
         [Theory]
         [MemberData(nameof(HtmlCommentSupportsMultipleDashesData))]
-        public void HtmlCommentSupportsMultipleDashes(string documentContent, MarkupBlock expectedOutput)
+        public void HtmlCommentSupportsMultipleDashes(string documentContent, object expectedOutput)
         {
-            ParseBlockTest(documentContent, expectedOutput);
+            ParseBlockTest(documentContent, (MarkupBlock)expectedOutput);
         }
 
-
         [Fact]
         public void ParseBlockProperlyBalancesCommentStartAndEndTags()
         {
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlDocumentTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlDocumentTest.cs
index e36ad1fead..8f352580c7 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlDocumentTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlDocumentTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class HtmlDocumentTest : CsHtmlMarkupParserTestBase
+    public class HtmlDocumentTest : CsHtmlMarkupParserTestBase
     {
         private static readonly TestFile Nested1000 = TestFile.Create("TestFiles/nested-1000.html");
 
@@ -744,10 +744,10 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 
         [Theory]
         [MemberData(nameof(BlockWithEscapedTransitionData))]
-        public void ParseBlock_WithDoubleTransition_DoesNotThrow(string input, Block expected)
+        public void ParseBlock_WithDoubleTransition_DoesNotThrow(string input, object expected)
         {
             // Act & Assert
-            ParseDocumentTest(input, expected);
+            ParseDocumentTest(input, (Block)expected);
         }
 
         [Fact]
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlErrorTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlErrorTest.cs
index 6673d533ed..33e48fc966 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlErrorTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlErrorTest.cs
@@ -5,7 +5,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class HtmlErrorTest : CsHtmlMarkupParserTestBase
+    public class HtmlErrorTest : CsHtmlMarkupParserTestBase
     {
         [Fact]
         public void ParseBlockAllowsInvalidTagNamesAsLongAsParserCanIdentifyEndTag()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlTagsTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlTagsTest.cs
index a9d8355ed6..c72d0049d2 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlTagsTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlTagsTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class HtmlTagsTest : CsHtmlMarkupParserTestBase
+    public class HtmlTagsTest : CsHtmlMarkupParserTestBase
     {
         public static IEnumerable<string[]> VoidElementNames
         {
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlToCodeSwitchTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlToCodeSwitchTest.cs
index f701c483fe..5299f0c573 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlToCodeSwitchTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlToCodeSwitchTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class HtmlToCodeSwitchTest : CsHtmlMarkupParserTestBase
+    public class HtmlToCodeSwitchTest : CsHtmlMarkupParserTestBase
     {
         [Fact]
         public void ParseBlockSwitchesWhenCharacterBeforeSwapIsNonAlphanumeric()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlTokenizerTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlTokenizerTest.cs
index a9872bdcd1..67b1c3e292 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlTokenizerTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlTokenizerTest.cs
@@ -5,7 +5,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class HtmlTokenizerTest : HtmlTokenizerTestBase
+    public class HtmlTokenizerTest : HtmlTokenizerTestBase
     {
         [Fact]
         public void Next_Returns_Null_When_EOF_Reached()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlTokenizerTestBase.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlTokenizerTestBase.cs
index 57e86e6250..fcc30a8749 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlTokenizerTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/HtmlTokenizerTestBase.cs
@@ -3,23 +3,28 @@
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal abstract class HtmlTokenizerTestBase : TokenizerTestBase<HtmlSymbol, HtmlSymbolType>
+    public abstract class HtmlTokenizerTestBase : TokenizerTestBase
     {
         private static HtmlSymbol _ignoreRemaining = new HtmlSymbol(0, 0, 0, string.Empty, HtmlSymbolType.Unknown);
 
-        protected override HtmlSymbol IgnoreRemaining
+        internal override object IgnoreRemaining
         {
             get { return _ignoreRemaining; }
         }
 
-        protected override Tokenizer<HtmlSymbol, HtmlSymbolType> CreateTokenizer(ITextDocument source)
+        internal override object CreateTokenizer(ITextDocument source)
         {
             return new HtmlTokenizer(source);
         }
 
-        protected void TestSingleToken(string text, HtmlSymbolType expectedSymbolType)
+        internal void TestSingleToken(string text, HtmlSymbolType expectedSymbolType)
         {
             TestTokenizer(text, new HtmlSymbol(0, 0, 0, text, expectedSymbolType));
         }
+
+        internal void TestTokenizer(string input, params HtmlSymbol[] expectedSymbols)
+        {
+            base.TestTokenizer<HtmlSymbol, HtmlSymbolType>(input, expectedSymbols);
+        }
     }
 }
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/LineTrackingStringBufferTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/LineTrackingStringBufferTest.cs
index 7c0aa66fad..8809cc182c 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/LineTrackingStringBufferTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/LineTrackingStringBufferTest.cs
@@ -5,7 +5,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class LineTrackingStringBufferTest
+    public class LineTrackingStringBufferTest
     {
         [Fact]
         public void CtorInitializesProperties()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/MarkupParserTestBase.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/MarkupParserTestBase.cs
index b58b7e8ad4..69dd3382da 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/MarkupParserTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/MarkupParserTestBase.cs
@@ -4,14 +4,14 @@
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal abstract class MarkupParserTestBase : CodeParserTestBase
+    public abstract class MarkupParserTestBase : CodeParserTestBase
     {
-        protected override RazorSyntaxTree ParseBlock(string document, bool designTime)
+        internal override RazorSyntaxTree ParseBlock(string document, bool designTime)
         {
             return ParseHtmlBlock(document, designTime);
         }
 
-        protected virtual void SingleSpanDocumentTest(string document, BlockType blockType, SpanKind spanType)
+        internal virtual void SingleSpanDocumentTest(string document, BlockType blockType, SpanKind spanType)
         {
             var b = CreateSimpleBlockAndSpan(document, blockType, spanType);
             ParseDocumentTest(document, b);
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/ParserTestBase.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/ParserTestBase.cs
index 4d5ecff4d1..d530f10811 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/ParserTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/ParserTestBase.cs
@@ -10,22 +10,22 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal abstract class ParserTestBase
+    public abstract class ParserTestBase
     {
-        protected static Block IgnoreOutput = new IgnoreOutputBlock();
+        internal static Block IgnoreOutput = new IgnoreOutputBlock();
 
-        public SpanFactory Factory { get; private set; }
-        public BlockFactory BlockFactory { get; private set; }
+        internal SpanFactory Factory { get; private set; }
+        internal BlockFactory BlockFactory { get; private set; }
 
-        protected ParserTestBase()
+        internal ParserTestBase()
         {
             Factory = CreateSpanFactory();
             BlockFactory = CreateBlockFactory();
         }
 
-        protected abstract RazorSyntaxTree ParseBlock(string document, bool designTime);
+        internal abstract RazorSyntaxTree ParseBlock(string document, bool designTime);
 
-        protected virtual RazorSyntaxTree ParseDocument(string document, bool designTime = false)
+        internal virtual RazorSyntaxTree ParseDocument(string document, bool designTime = false)
         {
             using (var reader = new SeekableTextReader(document))
             {
@@ -38,7 +38,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
             }
         }
 
-        protected virtual RazorSyntaxTree ParseHtmlBlock(string document, bool designTime = false)
+        internal virtual RazorSyntaxTree ParseHtmlBlock(string document, bool designTime = false)
         {
             using (var reader = new SeekableTextReader(document))
             {
@@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
             }
         }
 
-        protected virtual RazorSyntaxTree ParseCodeBlock(string document, bool designTime = false)
+        internal virtual RazorSyntaxTree ParseCodeBlock(string document, bool designTime = false)
         {
             using (var reader = new SeekableTextReader(document))
             {
@@ -78,49 +78,49 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
             }
         }
 
-        protected SpanFactory CreateSpanFactory()
+        internal SpanFactory CreateSpanFactory()
         {
             return new SpanFactory();
         }
 
-        protected abstract BlockFactory CreateBlockFactory();
+        internal abstract BlockFactory CreateBlockFactory();
 
-        protected virtual void ParseBlockTest(string document)
+        internal virtual void ParseBlockTest(string document)
         {
             ParseBlockTest(document, null, false, new RazorError[0]);
         }
 
-        protected virtual void ParseBlockTest(string document, bool designTime)
+        internal virtual void ParseBlockTest(string document, bool designTime)
         {
             ParseBlockTest(document, null, designTime, new RazorError[0]);
         }
 
-        protected virtual void ParseBlockTest(string document, params RazorError[] expectedErrors)
+        internal virtual void ParseBlockTest(string document, params RazorError[] expectedErrors)
         {
             ParseBlockTest(document, false, expectedErrors);
         }
 
-        protected virtual void ParseBlockTest(string document, bool designTime, params RazorError[] expectedErrors)
+        internal virtual void ParseBlockTest(string document, bool designTime, params RazorError[] expectedErrors)
         {
             ParseBlockTest(document, null, designTime, expectedErrors);
         }
 
-        protected virtual void ParseBlockTest(string document, Block expectedRoot)
+        internal virtual void ParseBlockTest(string document, Block expectedRoot)
         {
             ParseBlockTest(document, expectedRoot, false, null);
         }
 
-        protected virtual void ParseBlockTest(string document, Block expectedRoot, bool designTime)
+        internal virtual void ParseBlockTest(string document, Block expectedRoot, bool designTime)
         {
             ParseBlockTest(document, expectedRoot, designTime, null);
         }
 
-        protected virtual void ParseBlockTest(string document, Block expectedRoot, params RazorError[] expectedErrors)
+        internal virtual void ParseBlockTest(string document, Block expectedRoot, params RazorError[] expectedErrors)
         {
             ParseBlockTest(document, expectedRoot, false, expectedErrors);
         }
 
-        protected virtual void ParseBlockTest(string document, Block expected, bool designTime, params RazorError[] expectedErrors)
+        internal virtual void ParseBlockTest(string document, Block expected, bool designTime, params RazorError[] expectedErrors)
         {
             var result = ParseBlock(document, designTime);
 
@@ -130,32 +130,32 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
             }
         }
 
-        protected virtual void SingleSpanBlockTest(string document, BlockType blockType, SpanKind spanType, AcceptedCharacters acceptedCharacters = AcceptedCharacters.Any)
+        internal virtual void SingleSpanBlockTest(string document, BlockType blockType, SpanKind spanType, AcceptedCharacters acceptedCharacters = AcceptedCharacters.Any)
         {
             SingleSpanBlockTest(document, blockType, spanType, acceptedCharacters, expectedError: null);
         }
 
-        protected virtual void SingleSpanBlockTest(string document, string spanContent, BlockType blockType, SpanKind spanType, AcceptedCharacters acceptedCharacters = AcceptedCharacters.Any)
+        internal virtual void SingleSpanBlockTest(string document, string spanContent, BlockType blockType, SpanKind spanType, AcceptedCharacters acceptedCharacters = AcceptedCharacters.Any)
         {
             SingleSpanBlockTest(document, spanContent, blockType, spanType, acceptedCharacters, expectedErrors: null);
         }
 
-        protected virtual void SingleSpanBlockTest(string document, BlockType blockType, SpanKind spanType, params RazorError[] expectedError)
+        internal virtual void SingleSpanBlockTest(string document, BlockType blockType, SpanKind spanType, params RazorError[] expectedError)
         {
             SingleSpanBlockTest(document, document, blockType, spanType, expectedError);
         }
 
-        protected virtual void SingleSpanBlockTest(string document, string spanContent, BlockType blockType, SpanKind spanType, params RazorError[] expectedErrors)
+        internal virtual void SingleSpanBlockTest(string document, string spanContent, BlockType blockType, SpanKind spanType, params RazorError[] expectedErrors)
         {
             SingleSpanBlockTest(document, spanContent, blockType, spanType, AcceptedCharacters.Any, expectedErrors ?? new RazorError[0]);
         }
 
-        protected virtual void SingleSpanBlockTest(string document, BlockType blockType, SpanKind spanType, AcceptedCharacters acceptedCharacters, params RazorError[] expectedError)
+        internal virtual void SingleSpanBlockTest(string document, BlockType blockType, SpanKind spanType, AcceptedCharacters acceptedCharacters, params RazorError[] expectedError)
         {
             SingleSpanBlockTest(document, document, blockType, spanType, acceptedCharacters, expectedError);
         }
 
-        protected virtual void SingleSpanBlockTest(string document, string spanContent, BlockType blockType, SpanKind spanType, AcceptedCharacters acceptedCharacters, params RazorError[] expectedErrors)
+        internal virtual void SingleSpanBlockTest(string document, string spanContent, BlockType blockType, SpanKind spanType, AcceptedCharacters acceptedCharacters, params RazorError[] expectedErrors)
         {
             var result = ParseBlock(document, designTime: false);
 
@@ -169,32 +169,32 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
             }
         }
 
-        protected virtual void ParseDocumentTest(string document)
+        internal virtual void ParseDocumentTest(string document)
         {
             ParseDocumentTest(document, null, false);
         }
 
-        protected virtual void ParseDocumentTest(string document, Block expectedRoot)
+        internal virtual void ParseDocumentTest(string document, Block expectedRoot)
         {
             ParseDocumentTest(document, expectedRoot, false, null);
         }
 
-        protected virtual void ParseDocumentTest(string document, Block expectedRoot, params RazorError[] expectedErrors)
+        internal virtual void ParseDocumentTest(string document, Block expectedRoot, params RazorError[] expectedErrors)
         {
             ParseDocumentTest(document, expectedRoot, false, expectedErrors);
         }
 
-        protected virtual void ParseDocumentTest(string document, bool designTime)
+        internal virtual void ParseDocumentTest(string document, bool designTime)
         {
             ParseDocumentTest(document, null, designTime);
         }
 
-        protected virtual void ParseDocumentTest(string document, Block expectedRoot, bool designTime)
+        internal virtual void ParseDocumentTest(string document, Block expectedRoot, bool designTime)
         {
             ParseDocumentTest(document, expectedRoot, designTime, null);
         }
 
-        protected virtual void ParseDocumentTest(string document, Block expectedRoot, bool designTime, params RazorError[] expectedErrors)
+        internal virtual void ParseDocumentTest(string document, Block expectedRoot, bool designTime, params RazorError[] expectedErrors)
         {
             var result = ParseDocument(document, designTime);
 
@@ -204,7 +204,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
             }
         }
 
-        protected virtual RazorSyntaxTree RunParse(
+        internal virtual RazorSyntaxTree RunParse(
             string document,
             Func<ParserBase, Action> parserActionSelector,
             bool designTimeParser,
@@ -214,7 +214,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
             throw null;
         }
 
-        protected virtual void RunParseTest(
+        internal virtual void RunParseTest(
             string document,
             Func<ParserBase, Action> parserActionSelector,
             Block expectedRoot, IList<RazorError> expectedErrors,
@@ -245,18 +245,18 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
             }
         }
 
-        public static void EvaluateResults(RazorSyntaxTree result, Block expectedRoot)
+        internal static void EvaluateResults(RazorSyntaxTree result, Block expectedRoot)
         {
             EvaluateResults(result, expectedRoot, null);
         }
 
-        public static void EvaluateResults(RazorSyntaxTree result, Block expectedRoot, IList<RazorError> expectedErrors)
+        internal static void EvaluateResults(RazorSyntaxTree result, Block expectedRoot, IList<RazorError> expectedErrors)
         {
             EvaluateParseTree(result.Root, expectedRoot);
             EvaluateRazorErrors(result.Diagnostics, expectedErrors);
         }
 
-        public static void EvaluateParseTree(Block actualRoot, Block expectedRoot)
+        internal static void EvaluateParseTree(Block actualRoot, Block expectedRoot)
         {
             // Evaluate the result
             var collector = new ErrorCollector();
@@ -366,7 +366,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
             collector.AddError("{0} - FAILED :: Actual: << Null >>", expected);
         }
 
-        public static void EvaluateRazorErrors(IEnumerable<RazorError> actualErrors, IList<RazorError> expectedErrors)
+        internal static void EvaluateRazorErrors(IEnumerable<RazorError> actualErrors, IList<RazorError> expectedErrors)
         {
             var realCount = actualErrors.Count();
 
@@ -389,7 +389,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
             WriteTraceLine("Expected Errors were raised:" + Environment.NewLine + FormatErrors(expectedErrors));
         }
 
-        public static string FormatErrors(IEnumerable<RazorError> errors)
+        internal static string FormatErrors(IEnumerable<RazorError> errors)
         {
             if (errors == null)
             {
@@ -411,7 +411,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
             Trace.WriteLine(string.Format(format, args));
         }
 
-        protected virtual Block CreateSimpleBlockAndSpan(string spanContent, BlockType blockType, SpanKind spanType, AcceptedCharacters acceptedCharacters = AcceptedCharacters.Any)
+        internal virtual Block CreateSimpleBlockAndSpan(string spanContent, BlockType blockType, SpanKind spanType, AcceptedCharacters acceptedCharacters = AcceptedCharacters.Any)
         {
             var span = Factory.Span(spanType, spanContent, spanType == SpanKind.Markup).Accepts(acceptedCharacters);
             var b = new BlockBuilder()
@@ -421,7 +421,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
             return ConfigureAndAddSpanToBlock(b, span);
         }
 
-        protected virtual Block ConfigureAndAddSpanToBlock(BlockBuilder block, SpanConstructor span)
+        internal virtual Block ConfigureAndAddSpanToBlock(BlockBuilder block, SpanConstructor span)
         {
             switch (block.Type)
             {
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/RazorErrorTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/RazorErrorTest.cs
index 5667f8e1d9..463386e2b5 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/RazorErrorTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/RazorErrorTest.cs
@@ -7,7 +7,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class RazorErrorTest
+    public class RazorErrorTest
     {
         [Fact]
         public void RazorError_CanBeSerialized()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/RazorParserTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/RazorParserTest.cs
index 0bf60e5563..399bd50fdf 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/RazorParserTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/RazorParserTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class RazorParserTest
+    public class RazorParserTest
     {
         [Fact]
         public void CanParseStuff()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/SourceLocationTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/SourceLocationTest.cs
index 65dddb8d32..0721b2a43e 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/SourceLocationTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/SourceLocationTest.cs
@@ -6,7 +6,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class SourceLocationTest
+    public class SourceLocationTest
     {
         [Fact]
         public void ConstructorWithLineAndCharacterIndexSetsAssociatedProperties()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/SourceLocationTrackerTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/SourceLocationTrackerTest.cs
index 5b68c1f1c3..4cb97b9b5d 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/SourceLocationTrackerTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/SourceLocationTrackerTest.cs
@@ -5,7 +5,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class SourceLocationTrackerTest
+    public class SourceLocationTrackerTest
     {
         private static readonly SourceLocation TestStartLocation = new SourceLocation(10, 42, 45);
 
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/StringTextBuffer.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/StringTextBuffer.cs
index 5bf91b962f..9e12974a6d 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/StringTextBuffer.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/StringTextBuffer.cs
@@ -5,7 +5,7 @@ using System;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class StringTextBuffer : ITextBuffer, IDisposable
+    public class StringTextBuffer : ITextBuffer, IDisposable
     {
         private string _buffer;
         public bool Disposed { get; set; }
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/TestFile.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/TestFile.cs
index 72153403e4..8fe8710bb7 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/TestFile.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/TestFile.cs
@@ -8,7 +8,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class TestFile
+    public class TestFile
     {
         public TestFile(string resourceName, Assembly assembly)
         {
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/TextChangeTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/TextChangeTest.cs
index 506aa74810..cbfa5ac4a4 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/TextChangeTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/TextChangeTest.cs
@@ -7,7 +7,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class TextChangeTest
+    public class TextChangeTest
     {
         [Fact]
         public void ConstructorRequiresNonNegativeOldPosition()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/TextReaderExtensionsTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/TextReaderExtensionsTest.cs
index 51a3d241a9..207029f3be 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/TextReaderExtensionsTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/TextReaderExtensionsTest.cs
@@ -7,7 +7,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class TextReaderExtensionsTest
+    public class TextReaderExtensionsTest
     {
         [Fact]
         public void ReadUntilWithCharReadsAllTextUpToSpecifiedCharacterButNotPast()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/TokenizerLookaheadTest.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/TokenizerLookaheadTest.cs
index 16662cdbdb..2ce0cd1960 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/TokenizerLookaheadTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/TokenizerLookaheadTest.cs
@@ -9,7 +9,7 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal class TokenizerLookaheadTest : HtmlTokenizerTestBase
+    public class TokenizerLookaheadTest : HtmlTokenizerTestBase
     {
         [Fact]
         public void Lookahead_MaintainsExistingBufferWhenRejected()
diff --git a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/TokenizerTestBase.cs b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/TokenizerTestBase.cs
index 14896c4562..22c75f9773 100644
--- a/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/TokenizerTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Evolution.Test/Legacy/TokenizerTestBase.cs
@@ -9,14 +9,14 @@ using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
 {
-    internal abstract class TokenizerTestBase<TSymbol, TSymbolType>
-        where TSymbolType : struct
-        where TSymbol : SymbolBase<TSymbolType>
+    public abstract class TokenizerTestBase
     {
-        protected abstract TSymbol IgnoreRemaining { get; }
-        protected abstract Tokenizer<TSymbol, TSymbolType> CreateTokenizer(ITextDocument source);
+        internal abstract object IgnoreRemaining { get; }
+        internal abstract object CreateTokenizer(ITextDocument source);
 
-        protected void TestTokenizer(string input, params TSymbol[] expectedSymbols)
+        internal void TestTokenizer<TSymbol, TSymbolType>(string input, params TSymbol[] expectedSymbols)
+            where TSymbolType : struct
+            where TSymbol : SymbolBase<TSymbolType>
         {
             // Arrange
             var success = true;
@@ -25,7 +25,7 @@ namespace Microsoft.AspNetCore.Razor.Evolution.Legacy
             {
                 using (SeekableTextReader source = new SeekableTextReader(reader))
                 {
-                    Tokenizer<TSymbol, TSymbolType> tokenizer = CreateTokenizer(source);
+                    var tokenizer = (Tokenizer<TSymbol, TSymbolType>)CreateTokenizer(source);
                     var counter = 0;
                     TSymbol current = null;
                     while ((current = tokenizer.NextSymbol()) != null)