diff --git a/test/Microsoft.AspNet.Razor.Test/Generator/CSharpRazorCodeGeneratorTest.cs b/test/Microsoft.AspNet.Razor.Test/Generator/CSharpRazorCodeGeneratorTest.cs
index 08734660cc..51898afc29 100644
--- a/test/Microsoft.AspNet.Razor.Test/Generator/CSharpRazorCodeGeneratorTest.cs
+++ b/test/Microsoft.AspNet.Razor.Test/Generator/CSharpRazorCodeGeneratorTest.cs
@@ -261,18 +261,18 @@ namespace Microsoft.AspNet.Razor.Test.Generator
                 tabTest: TabTest.NoTabs,
                 expectedDesignTimePragmas: new List<LineMapping>()
             {
-                BuildLineMapping(222, 16, 8, 182, 9, 0, 7),
-                BuildLineMapping(229, 16, 323, 14, 15, 26),
-                BuildLineMapping(265, 18, 430, 21, 18, 9),
-                BuildLineMapping(274, 20, 523, 29, 0, 1),
-                BuildLineMapping(20, 1, 881, 46, 13, 36),
-                BuildLineMapping(74, 2, 1021, 53, 22, 1),
-                BuildLineMapping(79, 2, 1124, 58, 27, 15),
-                BuildLineMapping(113, 7, 1223, 65, 2, 12),
-                BuildLineMapping(129, 8, 1331, 71, 1, 4),
-                BuildLineMapping(142, 8, 1498, 77, 14, 3),
-                BuildLineMapping(153, 8, 1635, 84, 25, 1),
-                BuildLineMapping(204, 13, 1786, 91, 5, 3)
+                BuildLineMapping(222, 16, 8, 174, 9, 0, 7),
+                BuildLineMapping(229, 16, 315, 14, 15, 26),
+                BuildLineMapping(265, 18, 422, 21, 18, 9),
+                BuildLineMapping(274, 20, 515, 29, 0, 1),
+                BuildLineMapping(20, 1, 873, 46, 13, 36),
+                BuildLineMapping(74, 2, 1013, 53, 22, 1),
+                BuildLineMapping(79, 2, 1116, 58, 27, 15),
+                BuildLineMapping(113, 7, 1215, 65, 2, 12),
+                BuildLineMapping(129, 8, 1323, 71, 1, 4),
+                BuildLineMapping(142, 8, 1490, 77, 14, 3),
+                BuildLineMapping(153, 8, 1627, 84, 25, 1),
+                BuildLineMapping(204, 13, 1778, 91, 5, 3)
             });
         }
 
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/DesignTime.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/DesignTime.cs
index 18f2cf4e13..cec55a4bf7 100644
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/DesignTime.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/DesignTime.cs
@@ -5,7 +5,7 @@ namespace TestOutput
     public class DesignTime
     {
         private static object @__o;
-        public static Template 
+public static Template 
 #line 17 "DesignTime.cshtml"
 Foo() {
 #line default
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Helpers.Instance.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Helpers.Instance.cs
index 229b4fb9d2..c7835894cd 100644
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Helpers.Instance.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Helpers.Instance.cs
@@ -4,7 +4,7 @@ namespace TestOutput
 
     public class Helpers
     {
-        public  Template 
+public  Template 
 #line 1 "Helpers.cshtml"
 Bold(string s) {
 #line default
@@ -35,7 +35,7 @@ Bold(string s) {
 #line default
 #line hidden
 
-        public  Template 
+public  Template 
 #line 6 "Helpers.cshtml"
 Italic(string s) {
 #line default
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Helpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Helpers.cs
index ba1d40df50..c5762d35ed 100644
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Helpers.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/Helpers.cs
@@ -4,7 +4,7 @@ namespace TestOutput
 
     public class Helpers
     {
-        public static Template 
+public static Template 
 #line 1 "Helpers.cshtml"
 Bold(string s) {
 #line default
@@ -35,7 +35,7 @@ Bold(string s) {
 #line default
 #line hidden
 
-        public static Template 
+public static Template 
 #line 6 "Helpers.cshtml"
 Italic(string s) {
 #line default
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingCloseParen.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingCloseParen.cs
index 7a5547bfb2..e7ef5fae51 100644
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingCloseParen.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingCloseParen.cs
@@ -4,7 +4,7 @@ namespace TestOutput
 
     public class HelpersMissingCloseParen
     {
-        public static Template 
+public static Template 
 #line 1 "HelpersMissingCloseParen.cshtml"
 Bold(string s) {
 #line default
@@ -35,7 +35,7 @@ Bold(string s) {
 #line default
 #line hidden
 
-        public static Template 
+public static Template 
 #line 6 "HelpersMissingCloseParen.cshtml"
 Italic(string s
 @Bold("Hello")
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingOpenBrace.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingOpenBrace.cs
index 08920d1b6b..7c1bd23093 100644
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingOpenBrace.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingOpenBrace.cs
@@ -4,7 +4,7 @@ namespace TestOutput
 
     public class HelpersMissingOpenBrace
     {
-        public static Template 
+public static Template 
 #line 1 "HelpersMissingOpenBrace.cshtml"
 Bold(string s) {
 #line default
@@ -35,7 +35,7 @@ Bold(string s) {
 #line default
 #line hidden
 
-        public static Template 
+public static Template 
 #line 6 "HelpersMissingOpenBrace.cshtml"
 Italic(string s) 
 #line default
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingOpenParen.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingOpenParen.cs
index 0519b52e7a..f966a586ae 100644
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingOpenParen.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/HelpersMissingOpenParen.cs
@@ -4,7 +4,7 @@ namespace TestOutput
 
     public class HelpersMissingOpenParen
     {
-        public static Template 
+public static Template 
 #line 1 "HelpersMissingOpenParen.cshtml"
 Bold(string s) {
 #line default
@@ -35,7 +35,7 @@ Bold(string s) {
 #line default
 #line hidden
 
-        public static Template 
+public static Template 
 #line 6 "HelpersMissingOpenParen.cshtml"
 Italic
 #line default
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/InlineBlocks.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/InlineBlocks.cs
index b21b59f216..b0b5aeddb1 100644
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/InlineBlocks.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/InlineBlocks.cs
@@ -4,7 +4,7 @@ namespace TestOutput
 
     public class InlineBlocks
     {
-        public static Template 
+public static Template 
 #line 1 "InlineBlocks.cshtml"
 Link(string link) {
 #line default
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/NestedHelpers.cs b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/NestedHelpers.cs
index a610506368..b55921b43f 100644
--- a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/NestedHelpers.cs
+++ b/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/CS/Output/NestedHelpers.cs
@@ -4,7 +4,7 @@ namespace TestOutput
 
     public class NestedHelpers
     {
-        public static Template 
+public static Template 
 #line 1 "NestedHelpers.cshtml"
 Italic(string s) {
 #line default
@@ -41,7 +41,7 @@ Italic(string s) {
 #line default
 #line hidden
 
-        public static Template 
+public static Template 
 #line 3 "NestedHelpers.cshtml"
 Bold(string s) {
 #line default