diff --git a/src/Microsoft.AspNet.Mvc.Core/ActionContext.cs b/src/Microsoft.AspNet.Mvc.Core/ActionContext.cs
index 1cd298c758..b76135615c 100644
--- a/src/Microsoft.AspNet.Mvc.Core/ActionContext.cs
+++ b/src/Microsoft.AspNet.Mvc.Core/ActionContext.cs
@@ -1,42 +1,78 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.Collections.Generic;
 using Microsoft.AspNet.Http;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Routing;
 
 namespace Microsoft.AspNet.Mvc
 {
+    /// <summary>
+    /// Context object for execution of action which has been selected as part of an HTTP request.
+    /// </summary>
     public class ActionContext
     {
+        /// <summary>
+        /// Creates a new <see cref="ActionContext"/>.
+        /// </summary>
+        /// <param name="actionContext">The <see cref="ActionContext"/> to copy.</param>
         public ActionContext([NotNull] ActionContext actionContext)
             : this(actionContext.HttpContext, actionContext.RouteData, actionContext.ActionDescriptor)
         {
             ModelState = actionContext.ModelState;
         }
 
-        public ActionContext([NotNull] RouteContext routeContext, [NotNull] ActionDescriptor actionDescriptor)
-            : this(routeContext.HttpContext, routeContext.RouteData, actionDescriptor)
+        /// <summary>
+        /// Creates a new <see cref="ActionContext"/>.
+        /// </summary>
+        /// <param name="httpContext">The <see cref="Http.HttpContext"/> for the current request.</param>
+        /// <param name="routeData">The <see cref="AspNet.Routing.RouteData"/> for the current request.</param>
+        /// <param name="actionDescriptor">The <see cref="Mvc.ActionDescriptor"/> for the selected action.</param>
+        public ActionContext(
+            [NotNull] HttpContext httpContext,
+            [NotNull] RouteData routeData,
+            [NotNull] ActionDescriptor actionDescriptor)
+            : this(httpContext, routeData, actionDescriptor, new ModelStateDictionary())
         {
         }
 
-        public ActionContext([NotNull] HttpContext httpContext,
+        /// <summary>
+        /// Creates a new <see cref="ActionContext"/>.
+        /// </summary>
+        /// <param name="httpContext">The <see cref="Http.HttpContext"/> for the current request.</param>
+        /// <param name="routeData">The <see cref="AspNet.Routing.RouteData"/> for the current request.</param>
+        /// <param name="actionDescriptor">The <see cref="Mvc.ActionDescriptor"/> for the selected action.</param>
+        /// <param name="modelState">The <see cref="ModelStateDictionary"/>.</param>
+        public ActionContext(
+            [NotNull] HttpContext httpContext,
             [NotNull] RouteData routeData,
-            [NotNull] ActionDescriptor actionDescriptor)
+            [NotNull] ActionDescriptor actionDescriptor,
+            [NotNull] ModelStateDictionary modelState)
         {
             HttpContext = httpContext;
             RouteData = routeData;
             ActionDescriptor = actionDescriptor;
-            ModelState = new ModelStateDictionary();
+            ModelState = modelState;
         }
 
-        public HttpContext HttpContext { get; private set; }
+        /// <summary>
+        /// Gets the <see cref="Mvc.ActionDescriptor"/> for the selected action.
+        /// </summary>
+        public ActionDescriptor ActionDescriptor { get; }
 
-        public RouteData RouteData { get; private set; }
+        /// <summary>
+        /// Gets the <see cref="Http.HttpContext"/> for the current request.
+        /// </summary>
+        public HttpContext HttpContext { get; }
 
-        public ModelStateDictionary ModelState { get; private set; }
+        /// <summary>
+        /// Gets the <see cref="ModelStateDictionary"/>.
+        /// </summary>
+        public ModelStateDictionary ModelState { get; }
 
-        public ActionDescriptor ActionDescriptor { get; private set; }
+        /// <summary>
+        /// Gets the <see cref="AspNet.Routing.RouteData"/> for the current request.
+        /// </summary>
+        public RouteData RouteData { get; }
     }
 }
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionInvokerTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionInvokerTest.cs
index c10fb36c67..a6fdf39d44 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionInvokerTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ControllerActionInvokerTest.cs
@@ -2027,9 +2027,8 @@ namespace Microsoft.AspNet.Mvc
             var context = new Mock<HttpContext>();
             context.SetupGet(c => c.Items)
                    .Returns(new Dictionary<object, object>());
-            var routeContext = new RouteContext(context.Object);
 
-            var actionContext = new ActionContext(routeContext, actionDescriptor);
+            var actionContext = new ActionContext(context.Object, new RouteData(), actionDescriptor);
 
             var controllerFactory = new Mock<IControllerFactory>();
             controllerFactory.Setup(c => c.CreateController(It.IsAny<ActionContext>()))
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerActivatorTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerActivatorTest.cs
index 094194172e..03d9400313 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerActivatorTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultControllerActivatorTest.cs
@@ -27,9 +27,9 @@ namespace Microsoft.AspNet.Mvc.Core.Test
                        .Returns(httpRequest);
             httpContext.SetupGet(c => c.RequestServices)
                        .Returns(services);
-            var routeContext = new RouteContext(httpContext.Object);
+
             var controller = new TestController();
-            var context = new ActionContext(routeContext, new ActionDescriptor());
+            var context = new ActionContext(httpContext.Object, new RouteData(), new ActionDescriptor());
             var activator = new DefaultControllerActivator();
 
             // Act
@@ -50,9 +50,9 @@ namespace Microsoft.AspNet.Mvc.Core.Test
             var httpContext = new Mock<HttpContext>();
             httpContext.SetupGet(c => c.RequestServices)
                        .Returns(services);
-            var routeContext = new RouteContext(httpContext.Object);
+
             var controller = new TestController();
-            var context = new ActionContext(routeContext, new ActionDescriptor());
+            var context = new ActionContext(httpContext.Object, new RouteData(), new ActionDescriptor());
             var activator = new DefaultControllerActivator();
 
             // Act
@@ -74,10 +74,9 @@ namespace Microsoft.AspNet.Mvc.Core.Test
             var httpContext = new Mock<HttpContext>();
             httpContext.SetupGet(c => c.RequestServices)
                        .Returns(services);
-            var routeContext = new RouteContext(httpContext.Object);
 
             var controller = new TestController();
-            var context = new ActionContext(routeContext, new ActionDescriptor());
+            var context = new ActionContext(httpContext.Object, new RouteData(), new ActionDescriptor());
 
             var activator = new DefaultControllerActivator();
 
@@ -98,9 +97,9 @@ namespace Microsoft.AspNet.Mvc.Core.Test
             var httpContext = new Mock<HttpContext>();
             httpContext.SetupGet(c => c.RequestServices)
                        .Returns(services);
-            var routeContext = new RouteContext(httpContext.Object);
+
             var controller = new TestController();
-            var context = new ActionContext(routeContext, new ActionDescriptor());
+            var context = new ActionContext(httpContext.Object, new RouteData(), new ActionDescriptor());
             var activator = new DefaultControllerActivator();
 
             // Act
@@ -121,9 +120,9 @@ namespace Microsoft.AspNet.Mvc.Core.Test
                        .Returns(Mock.Of<HttpResponse>());
             httpContext.SetupGet(c => c.RequestServices)
                        .Returns(services);
-            var routeContext = new RouteContext(httpContext.Object);
+
             var controller = new TestController();
-            var context = new ActionContext(routeContext, new ActionDescriptor());
+            var context = new ActionContext(httpContext.Object, new RouteData(), new ActionDescriptor());
             var activator = new DefaultControllerActivator();
 
             // Act
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultViewComponentActivatorTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultViewComponentActivatorTests.cs
index 93f54e321a..d8447b0fc1 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/DefaultViewComponentActivatorTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/DefaultViewComponentActivatorTests.cs
@@ -104,8 +104,8 @@ namespace Microsoft.AspNet.Mvc
             var httpContext = new Mock<DefaultHttpContext>();
             httpContext.SetupGet(c => c.RequestServices)
                        .Returns(serviceProvider);
-            var routeContext = new RouteContext(httpContext.Object);
-            var actionContext = new ActionContext(routeContext, new ActionDescriptor());
+
+            var actionContext = new ActionContext(httpContext.Object, new RouteData(), new ActionDescriptor());
             return new ViewContext(actionContext,
                                               Mock.Of<IView>(),
                                               new ViewDataDictionary(new EmptyModelMetadataProvider()),
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ParameterBinding/ControllerActionArgumentBinderTests.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ParameterBinding/ControllerActionArgumentBinderTests.cs
index 739913a204..342dc17525 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ParameterBinding/ControllerActionArgumentBinderTests.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ParameterBinding/ControllerActionArgumentBinderTests.cs
@@ -3,9 +3,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Reflection;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Http;
+using Microsoft.AspNet.Http.Core;
 using Microsoft.AspNet.Mvc.ModelBinding;
 using Microsoft.AspNet.Routing;
 using Moq;
@@ -53,8 +52,9 @@ namespace Microsoft.AspNet.Mvc.Core.Test
         {
             // Arrange
             var actionContext = new ActionContext(
-                new RouteContext(Mock.Of<HttpContext>()),
-                Mock.Of<ActionDescriptor>());
+                new DefaultHttpContext(),
+                new RouteData(),
+                new ControllerActionDescriptor());
 
             var metadataProvider = new DataAnnotationsModelMetadataProvider();
             var modelMetadata = metadataProvider.GetMetadataForType(
@@ -81,8 +81,9 @@ namespace Microsoft.AspNet.Mvc.Core.Test
             var methodInfo = type.GetMethod("ParameterWithNoBindAttribute");
 
             var actionContext = new ActionContext(
-                new RouteContext(Mock.Of<HttpContext>()),
-                Mock.Of<ActionDescriptor>());
+                new DefaultHttpContext(),
+                new RouteData(),
+                Mock.Of<ControllerActionDescriptor>());
 
             var metadataProvider = new DataAnnotationsModelMetadataProvider();
             var modelMetadata = metadataProvider.GetMetadataForParameter(modelAccessor: null,
@@ -112,8 +113,9 @@ namespace Microsoft.AspNet.Mvc.Core.Test
             var methodInfo = type.GetMethod(actionMethodName);
 
             var actionContext = new ActionContext(
-                new RouteContext(Mock.Of<HttpContext>()),
-                Mock.Of<ActionDescriptor>());
+                new DefaultHttpContext(),
+                new RouteData(),
+                Mock.Of<ControllerActionDescriptor>());
 
             var metadataProvider = new DataAnnotationsModelMetadataProvider();
             var modelMetadata = metadataProvider.GetMetadataForParameter(modelAccessor: null,
@@ -143,8 +145,9 @@ namespace Microsoft.AspNet.Mvc.Core.Test
             var methodInfo = type.GetMethod(actionMethodName);
 
             var actionContext = new ActionContext(
-                new RouteContext(Mock.Of<HttpContext>()),
-                Mock.Of<ActionDescriptor>());
+                new DefaultHttpContext(),
+                new RouteData(),
+                Mock.Of<ControllerActionDescriptor>());
 
             var metadataProvider = new DataAnnotationsModelMetadataProvider();
             var modelMetadata = metadataProvider.GetMetadataForParameter(modelAccessor: null,
@@ -190,7 +193,10 @@ namespace Microsoft.AspNet.Mvc.Core.Test
                 })
                 .Returns(Task.FromResult(result: false));
 
-            var actionContext = new ActionContext(new RouteContext(Mock.Of<HttpContext>()), actionDescriptor);
+            var actionContext = new ActionContext(
+                new DefaultHttpContext(),
+                new RouteData(),
+                actionDescriptor);
 
             var actionBindingContext = new ActionBindingContext()
             {
@@ -238,7 +244,10 @@ namespace Microsoft.AspNet.Mvc.Core.Test
                 })
                 .Returns(Task.FromResult(result: true));
 
-            var actionContext = new ActionContext(new RouteContext(Mock.Of<HttpContext>()), actionDescriptor);
+            var actionContext = new ActionContext(
+                new DefaultHttpContext(),
+                new RouteData(),
+                actionDescriptor);
 
             var actionBindingContext = new ActionBindingContext()
             {
@@ -293,7 +302,10 @@ namespace Microsoft.AspNet.Mvc.Core.Test
                 })
                 .Returns(Task.FromResult(result: true));
 
-            var actionContext = new ActionContext(new RouteContext(Mock.Of<HttpContext>()), actionDescriptor);
+            var actionContext = new ActionContext(
+                new DefaultHttpContext(),
+                new RouteData(),
+                actionDescriptor);
 
             var actionBindingContext = new ActionBindingContext()
             {
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ViewComponents/ContentViewComponentResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ViewComponents/ContentViewComponentResultTest.cs
index 28ea709f7c..e8def7c0f2 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ViewComponents/ContentViewComponentResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ViewComponents/ContentViewComponentResultTest.cs
@@ -52,7 +52,7 @@ namespace Microsoft.AspNet.Mvc
 
         private static ViewComponentContext GetViewComponentContext(IView view, Stream stream)
         {
-            var actionContext = new ActionContext(new RouteContext(new DefaultHttpContext()), new ActionDescriptor());
+            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
             var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
             var viewContext = new ViewContext(actionContext, view, viewData, TextWriter.Null);
             var writer = new StreamWriter(stream) { AutoFlush = true };
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ViewComponents/JsonViewComponentResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ViewComponents/JsonViewComponentResultTest.cs
index b075c48886..02b93766ae 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ViewComponents/JsonViewComponentResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ViewComponents/JsonViewComponentResultTest.cs
@@ -91,7 +91,7 @@ namespace Microsoft.AspNet.Mvc
 
         private static ViewComponentContext GetViewComponentContext(IView view, Stream stream)
         {
-            var actionContext = new ActionContext(new RouteContext(new DefaultHttpContext()), new ActionDescriptor());
+            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
             var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
             var viewContext = new ViewContext(actionContext, view, viewData, TextWriter.Null);
             var writer = new StreamWriter(stream) { AutoFlush = true };
diff --git a/test/Microsoft.AspNet.Mvc.Core.Test/ViewComponents/ViewViewComponentResultTest.cs b/test/Microsoft.AspNet.Mvc.Core.Test/ViewComponents/ViewViewComponentResultTest.cs
index f0c893a6fb..1bb59376bb 100644
--- a/test/Microsoft.AspNet.Mvc.Core.Test/ViewComponents/ViewViewComponentResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Core.Test/ViewComponents/ViewViewComponentResultTest.cs
@@ -300,7 +300,7 @@ namespace Microsoft.AspNet.Mvc
 
         private static ViewComponentContext GetViewComponentContext(IView view, ViewDataDictionary viewData)
         {
-            var actionContext = new ActionContext(new RouteContext(new DefaultHttpContext()), new ActionDescriptor());
+            var actionContext = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
             var viewContext = new ViewContext(actionContext, view, viewData, TextWriter.Null);
             var viewComponentContext = new ViewComponentContext(typeof(object).GetTypeInfo(), viewContext, TextWriter.Null);
             return viewComponentContext;
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageActivatorTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageActivatorTest.cs
index cece80ea40..a2c9d81ce6 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageActivatorTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageActivatorTest.cs
@@ -34,8 +34,8 @@ namespace Microsoft.AspNet.Mvc.Razor
             var httpContext = new Mock<HttpContext>();
             httpContext.SetupGet(c => c.RequestServices)
                        .Returns(serviceProvider.Object);
-            var routeContext = new RouteContext(httpContext.Object);
-            var actionContext = new ActionContext(routeContext, new ActionDescriptor());
+
+            var actionContext = new ActionContext(httpContext.Object, new RouteData(), new ActionDescriptor());
             var viewContext = new ViewContext(actionContext,
                                               Mock.Of<IView>(),
                                               new ViewDataDictionary(new EmptyModelMetadataProvider()),
@@ -64,8 +64,8 @@ namespace Microsoft.AspNet.Mvc.Razor
             var httpContext = new Mock<HttpContext>();
             httpContext.SetupGet(c => c.RequestServices)
                        .Returns(serviceProvider.Object);
-            var routeContext = new RouteContext(httpContext.Object);
-            var actionContext = new ActionContext(routeContext, new ActionDescriptor());
+
+            var actionContext = new ActionContext(httpContext.Object, new RouteData(), new ActionDescriptor());
             var viewContext = new ViewContext(actionContext,
                                               Mock.Of<IView>(),
                                               new ViewDataDictionary(new EmptyModelMetadataProvider()),
@@ -99,8 +99,8 @@ namespace Microsoft.AspNet.Mvc.Razor
             var httpContext = new Mock<HttpContext>();
             httpContext.SetupGet(c => c.RequestServices)
                        .Returns(serviceProvider.Object);
-            var routeContext = new RouteContext(httpContext.Object);
-            var actionContext = new ActionContext(routeContext, new ActionDescriptor());
+
+            var actionContext = new ActionContext(httpContext.Object, new RouteData(), new ActionDescriptor());
             var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider())
             {
                 Model = new MyModel()
@@ -134,8 +134,8 @@ namespace Microsoft.AspNet.Mvc.Razor
             var httpContext = new Mock<HttpContext>();
             httpContext.SetupGet(c => c.RequestServices)
                        .Returns(serviceProvider.Object);
-            var routeContext = new RouteContext(httpContext.Object);
-            var actionContext = new ActionContext(routeContext, new ActionDescriptor());
+
+            var actionContext = new ActionContext(httpContext.Object, new RouteData(), new ActionDescriptor());
             var viewData = new ViewDataDictionary<MyModel>(new EmptyModelMetadataProvider())
             {
                 Model = new MyModel()
@@ -169,8 +169,8 @@ namespace Microsoft.AspNet.Mvc.Razor
             var httpContext = new Mock<HttpContext>();
             httpContext.SetupGet(c => c.RequestServices)
                        .Returns(serviceProvider.Object);
-            var routeContext = new RouteContext(httpContext.Object);
-            var actionContext = new ActionContext(routeContext, new ActionDescriptor());
+
+            var actionContext = new ActionContext(httpContext.Object, new RouteData(), new ActionDescriptor());
             var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
             var viewContext = new ViewContext(actionContext,
                                               Mock.Of<IView>(),
@@ -235,8 +235,6 @@ namespace Microsoft.AspNet.Mvc.Razor
             }
         }
 
-
-
         private class MyModel
         {
         }
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs
index b87ac108b2..f56db5aa50 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs
@@ -85,8 +85,8 @@ namespace Microsoft.AspNet.Mvc.Razor
             var httpContext = new Mock<HttpContext>();
             httpContext.SetupGet(c => c.RequestServices)
                        .Returns(serviceProvider.Object);
-            var routeContext = new RouteContext(httpContext.Object);
-            var actionContext = new ActionContext(routeContext, new ActionDescriptor());
+
+            var actionContext = new ActionContext(httpContext.Object, new RouteData(), new ActionDescriptor());
             var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
             var viewContext = new ViewContext(actionContext,
                                               Mock.Of<IView>(),
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs
index cb4cee8672..e43adb6db3 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/BadRequestErrorMessageResultTest.cs
@@ -26,7 +26,7 @@ namespace System.Web.Http
             var stream = new MemoryStream();
             httpContext.Response.Body = stream;
 
-            var context = new ActionContext(new RouteContext(httpContext), new ActionDescriptor());
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
             var result = new BadRequestErrorMessageResult("Error");
 
             // Act
@@ -46,7 +46,7 @@ namespace System.Web.Http
             var stream = new MemoryStream();
             httpContext.Response.Body = stream;
 
-            var context = new ActionContext(new RouteContext(httpContext), new ActionDescriptor());
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
             var result = new BadRequestErrorMessageResult("Error");
 
             // Act
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ConflictResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ConflictResultTest.cs
index 26b0f54d40..dfb0d37986 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ConflictResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ConflictResultTest.cs
@@ -15,7 +15,7 @@ namespace System.Web.Http
         public async Task ConflictResult_SetsStatusCode()
         {
             // Arrange
-            var context = new ActionContext(new RouteContext(new DefaultHttpContext()), new ActionDescriptor());
+            var context = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
             var result = new ConflictResult();
 
             // Act
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs
index a394eb1943..9724f802ae 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/ExceptionResultTest.cs
@@ -26,7 +26,7 @@ namespace System.Web.Http
             var stream = new MemoryStream();
             httpContext.Response.Body = stream;
 
-            var context = new ActionContext(new RouteContext(httpContext), new ActionDescriptor());
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
             var result = new ExceptionResult(new Exception("hello, world!"), includeErrorDetail: false);
 
             // Act
@@ -46,7 +46,7 @@ namespace System.Web.Http
             var stream = new MemoryStream();
             httpContext.Response.Body = stream;
 
-            var context = new ActionContext(new RouteContext(httpContext), new ActionDescriptor());
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
             var result = new ExceptionResult(new Exception("hello, world!"), includeErrorDetail: false);
 
             // Act
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InternalServerErrorResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InternalServerErrorResultTest.cs
index 67c636e5ad..31b5c7f740 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InternalServerErrorResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InternalServerErrorResultTest.cs
@@ -15,7 +15,7 @@ namespace System.Web.Http
         public async Task InternalServerErrorResult_SetsStatusCode()
         {
             // Arrange
-            var context = new ActionContext(new RouteContext(new DefaultHttpContext()), new ActionDescriptor());
+            var context = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
             var result = new InternalServerErrorResult();
 
             // Act
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs
index 6f4425bd89..4bd875fd4a 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/InvalidModelStateResultTest.cs
@@ -27,7 +27,7 @@ namespace System.Web.Http
             var stream = new MemoryStream();
             httpContext.Response.Body = stream;
 
-            var context = new ActionContext(new RouteContext(httpContext), new ActionDescriptor());
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
 
             var modelState = new ModelStateDictionary();
             modelState.AddModelError("product.Name", "Name is required.");
@@ -51,7 +51,7 @@ namespace System.Web.Http
             var stream = new MemoryStream();
             httpContext.Response.Body = stream;
 
-            var context = new ActionContext(new RouteContext(httpContext), new ActionDescriptor());
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
 
             var modelState = new ModelStateDictionary();
             modelState.AddModelError("product.Name", "Name is required.");
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/NegotiatedContentResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/NegotiatedContentResultTest.cs
index 4074de2317..b57226aa0e 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/NegotiatedContentResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/NegotiatedContentResultTest.cs
@@ -27,7 +27,7 @@ namespace System.Web.Http
             var stream = new MemoryStream();
             httpContext.Response.Body = stream;
 
-            var context = new ActionContext(new RouteContext(httpContext), new ActionDescriptor());
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
             var result = new NegotiatedContentResult<Product>(HttpStatusCode.Ambiguous, new Product());
 
             // Act
@@ -47,7 +47,7 @@ namespace System.Web.Http
             var stream = new MemoryStream();
             httpContext.Response.Body = stream;
 
-            var context = new ActionContext(new RouteContext(httpContext), new ActionDescriptor());
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
             var result = new NegotiatedContentResult<Product>(HttpStatusCode.Ambiguous, new Product());
 
             // Act
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkNegotiatedContentResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkNegotiatedContentResultTest.cs
index c04eb12f1f..84a39093df 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkNegotiatedContentResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkNegotiatedContentResultTest.cs
@@ -26,7 +26,7 @@ namespace System.Web.Http
             var stream = new MemoryStream();
             httpContext.Response.Body = stream;
 
-            var context = new ActionContext(new RouteContext(httpContext), new ActionDescriptor());
+            var context = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
             var result = new OkNegotiatedContentResult<Product>(new Product());
 
             // Act
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkResultTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkResultTest.cs
index c6ed8e58f1..4ffbdf2af4 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ActionResults/OkResultTest.cs
@@ -15,7 +15,7 @@ namespace System.Web.Http
         public async Task OkResult_SetsStatusCode()
         {
             // Arrange
-            var context = new ActionContext(new RouteContext(new DefaultHttpContext()), new ActionDescriptor());
+            var context = new ActionContext(new DefaultHttpContext(), new RouteData(), new ActionDescriptor());
             var result = new OkResult();
 
             // Act
diff --git a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerTest.cs b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerTest.cs
index 498c494134..b58a9bf562 100644
--- a/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerTest.cs
+++ b/test/Microsoft.AspNet.Mvc.WebApiCompatShimTest/ApiControllerTest.cs
@@ -27,7 +27,7 @@ namespace System.Web.Http
             httpContext.User = new ClaimsPrincipal();
 
             var routeContext = new RouteContext(httpContext);
-            var actionContext = new ActionContext(routeContext, new ActionDescriptor());
+            var actionContext = new ActionContext(httpContext, new RouteData(), new ActionDescriptor());
 
             // Act
             controller.ActionContext = actionContext;