Fixes to ActionController::TemplateAssertions