diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.Encoded.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.Encoded.html
index 8a89e575b2..b759d1e5e7 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.Encoded.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.Encoded.html
@@ -27,6 +27,7 @@
         <menuitem icon="HtmlEncode[[/]]Person" />
     </menu>
     <object data="HtmlEncode[[/]]Person" archive="HtmlEncode[[/]]Person/HtmlEncode[[John Doe]]" data="HtmlEncode[[/]]Person" archive="HtmlEncode[[/]]Person/HtmlEncode[[John Doe]]" />
+    <object archive="HtmlEncode[[/]]Person/HtmlEncode[[John Doe]]" />
     <applet archive="HtmlEncode[[/]]A+Really(Crazy),Url.Is:This/HtmlEncode[[John Doe]]/Detail" />
 </body>
 </html>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.html
index 326890c06f..73f9fcdb67 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.html
@@ -27,6 +27,7 @@
         <menuitem icon="/Person" />
     </menu>
     <object data="/Person" archive="/Person/John Doe" data="/Person" archive="/Person/John Doe" />
+    <object archive="/Person/John Doe" />
     <applet archive="/A+Really(Crazy),Url.Is:This/John Doe/Detail" />
 </body>
 </html>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.Encoded.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.Encoded.html
index 1cf31bbfcc..944255327a 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.Encoded.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.Encoded.html
@@ -1,4 +1,6 @@
 
+
+
 <input checked="HtmlEncode[[checked]]" processed />
 <input checked="HtmlEncode[[checked]]" processed />
 <input processed />
@@ -12,4 +14,5 @@
 <input processed />
 <input checked="" processed />
 <input checked="   " processed />
-<input checked=" HtmlEncode[[value]] HtmlEncode[[True]]" processed />
\ No newline at end of file
+<input checked=" HtmlEncode[[value]] HtmlEncode[[True]]" processed />
+<input checked=" True " processed />
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.html b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.html
index 07f535a299..d1a78630dc 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.html
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.html
@@ -1,4 +1,6 @@
 
+
+
 <input checked="checked" processed />
 <input checked="checked" processed />
 <input processed />
@@ -12,4 +14,5 @@
 <input processed />
 <input checked="" processed />
 <input checked="   " processed />
-<input checked=" value True" processed />
\ No newline at end of file
+<input checked=" value True" processed />
+<input checked=" True " processed />
\ No newline at end of file
diff --git a/test/WebSites/RazorWebSite/Views/UrlResolution/Index.cshtml b/test/WebSites/RazorWebSite/Views/UrlResolution/Index.cshtml
index 1e00f4329d..2e9b6d9773 100644
--- a/test/WebSites/RazorWebSite/Views/UrlResolution/Index.cshtml
+++ b/test/WebSites/RazorWebSite/Views/UrlResolution/Index.cshtml
@@ -4,6 +4,13 @@
     var dynamicUrl = "~/SomeUrl";
 }
 
+@functions {
+    public Task DoSomething()
+    {
+        return Task.FromResult(true);
+    }
+}
+
 <html manifest="~/Person">
 <head>
     <base href="~/A+Really(Crazy),Url.Is:This/@Model.Name/Detail" target="_blank">
@@ -33,6 +40,7 @@
         <menuitem icon=~/Person />
     </menu>
     <object data="~/Person" archive="~/Person/@Model.Name" data="~/Person" archive="~/Person/@Model.Name" />
+    <object archive="@if(Model.Name != null) { <text>~/Person/@Model.Name</text> } else { await DoSomething(); <text>~/Person</text>  } " />
     <applet archive="~/A+Really(Crazy),Url.Is:This/@Model.Name/Detail" />
 </body>
 </html>
\ No newline at end of file
diff --git a/test/WebSites/TagHelpersWebSite/Views/Home/UnboundDynamicAttributes.cshtml b/test/WebSites/TagHelpersWebSite/Views/Home/UnboundDynamicAttributes.cshtml
index 0dec871399..109681004f 100644
--- a/test/WebSites/TagHelpersWebSite/Views/Home/UnboundDynamicAttributes.cshtml
+++ b/test/WebSites/TagHelpersWebSite/Views/Home/UnboundDynamicAttributes.cshtml
@@ -7,6 +7,14 @@
     var stringVar = "value";
     string nullVar = null;
 }
+
+@functions {
+    public Task DoSomething()
+    {
+        return Task.FromResult(true);
+    }
+}
+
 <input checked="@true" />
 <input checked="@trueVar" />
 <input checked="@false" />
@@ -20,4 +28,5 @@
 <input checked="@null" />
 <input checked="  @nullVar" />
 <input checked="@nullVar   " />
-<input checked="  @null @stringVar @trueVar" />
\ No newline at end of file
+<input checked="  @null @stringVar @trueVar" />
+<input checked=" @if (trueVar) { <text>True</text> } else { await DoSomething(); <text>False</text> } " />
\ No newline at end of file