From c6601cb3183b73e82550dc57463520b3147b7d90 Mon Sep 17 00:00:00 2001
From: Michael Whelan <mjmwdev@gmail.com>
Date: Sun, 17 May 2015 17:42:49 +0100
Subject: [PATCH 1/6] Initial implementation of WithMvcPipelineTo

---
 .../TestStack.FluentMVCTesting.Tests.csproj   |  1 +
 TestStack.FluentMVCTesting.Tests/app.config   | 11 ++++++
 .../ControllerExtensions.cs                   | 37 ++++++++++++++++++-
 .../TestStack.FluentMVCTesting.csproj         |  6 ++-
 TestStack.FluentMvcTesting/app.config         | 11 ++++++
 TestStack.FluentMvcTesting/packages.config    |  1 +
 6 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 TestStack.FluentMVCTesting.Tests/app.config
 create mode 100644 TestStack.FluentMvcTesting/app.config

diff --git a/TestStack.FluentMVCTesting.Tests/TestStack.FluentMVCTesting.Tests.csproj b/TestStack.FluentMVCTesting.Tests/TestStack.FluentMVCTesting.Tests.csproj
index 5129022..73b5bf7 100644
--- a/TestStack.FluentMVCTesting.Tests/TestStack.FluentMVCTesting.Tests.csproj
+++ b/TestStack.FluentMVCTesting.Tests/TestStack.FluentMVCTesting.Tests.csproj
@@ -108,6 +108,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/TestStack.FluentMVCTesting.Tests/app.config b/TestStack.FluentMVCTesting.Tests/app.config
new file mode 100644
index 0000000..451c829
--- /dev/null
+++ b/TestStack.FluentMVCTesting.Tests/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/TestStack.FluentMvcTesting/ControllerExtensions.cs b/TestStack.FluentMvcTesting/ControllerExtensions.cs
index 4c377c8..eb54fe0 100644
--- a/TestStack.FluentMvcTesting/ControllerExtensions.cs
+++ b/TestStack.FluentMvcTesting/ControllerExtensions.cs
@@ -3,11 +3,14 @@
 using System.Threading.Tasks;
 using System.Web.Mvc;
 
+#if NET45
+using Xania.AspNet.Simulator;
+#endif
+
 namespace TestStack.FluentMVCTesting
 {
     public static class ControllerExtensions
     {
-
         public static T WithModelErrors<T>(this T controller) where T : Controller
         {
             controller.ModelState.AddModelError("Key", "Value");
@@ -18,11 +21,19 @@ public static ControllerResultTest<T> WithCallTo<T, TAction>(this T controller,
             where T : Controller
             where TAction : ActionResult
         {
+#if NET45
+            var expression = Expression.Lambda<Func<T, object>>(Expression.Convert(actionCall.Body, typeof(object)), actionCall.Parameters);
+            var action = controller.Action(expression);
+            var result = action.Execute();
+
+            return new ControllerResultTest<T>(controller, action.ActionDescriptor.ActionName, result.ActionResult);
+#else
             var actionName = ((MethodCallExpression)actionCall.Body).Method.Name;
 
             var actionResult = actionCall.Compile().Invoke(controller);
 
             return new ControllerResultTest<T>(controller, actionName, actionResult);
+#endif
         }
 
         public static ControllerResultTest<T> WithCallTo<T, TAction>(this T controller, Expression<Func<T, Task<TAction>>> actionCall)
@@ -36,6 +47,30 @@ public static ControllerResultTest<T> WithCallTo<T, TAction>(this T controller,
             return new ControllerResultTest<T>(controller, actionName, actionResult);
         }
 
+#if NET45
+        public static ControllerResultTest<T> WithMvcPipelineTo<T, TAction>(this T controller, Expression<Func<T, TAction>> actionCall)
+            where T : Controller
+            where TAction : ActionResult
+        {
+            var expression = Expression.Lambda<Func<T, object>>(Expression.Convert(actionCall.Body, typeof (object)), actionCall.Parameters);
+            var action = controller.Action(expression);
+            var result = action.Execute();
+
+            return new ControllerResultTest<T>(controller, action.ActionDescriptor.ActionName, result.ActionResult);
+        }
+
+        public static ControllerResultTest<T> WithMvcPipelineTo<T, TAction>(this T controller, Expression<Func<T, Task<TAction>>> actionCall)
+            where T : Controller
+            where TAction : ActionResult
+        {
+            var expression = Expression.Lambda<Func<T, object>>(Expression.Convert(actionCall.Body, typeof(object)), actionCall.Parameters);
+            var action = controller.Action(expression);
+            var result = action.Execute();
+
+            return new ControllerResultTest<T>(controller, action.ActionDescriptor.ActionName, result.ActionResult);
+        }
+#endif
+
         public static ControllerResultTest<T> WithCallToChild<T, TAction>(this T controller, Expression<Func<T, TAction>> actionCall)
             where T : Controller
             where TAction : ActionResult
diff --git a/TestStack.FluentMvcTesting/TestStack.FluentMVCTesting.csproj b/TestStack.FluentMvcTesting/TestStack.FluentMVCTesting.csproj
index b9925ec..7ca4a4b 100644
--- a/TestStack.FluentMvcTesting/TestStack.FluentMVCTesting.csproj
+++ b/TestStack.FluentMvcTesting/TestStack.FluentMVCTesting.csproj
@@ -20,7 +20,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -74,6 +74,9 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
+    <Reference Include="Xania.AspNet.Simulator">
+      <HintPath>..\packages\Xania.AspNet.Simulator.1.2.11\lib\net45\Xania.AspNet.Simulator.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App_Packages\ExpressionStringBuilder.0.9.2\ExpressionStringBuilder.cs" />
@@ -95,6 +98,7 @@
     <Compile Include="ViewResultTest.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="TestStack.FluentMVCTesting.nuspec" />
   </ItemGroup>
diff --git a/TestStack.FluentMvcTesting/app.config b/TestStack.FluentMvcTesting/app.config
new file mode 100644
index 0000000..451c829
--- /dev/null
+++ b/TestStack.FluentMvcTesting/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/TestStack.FluentMvcTesting/packages.config b/TestStack.FluentMvcTesting/packages.config
index fbce3fe..79d6758 100644
--- a/TestStack.FluentMvcTesting/packages.config
+++ b/TestStack.FluentMvcTesting/packages.config
@@ -5,4 +5,5 @@
   <package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
+  <package id="Xania.AspNet.Simulator" version="1.2.11" targetFramework="net45" />
 </packages>
\ No newline at end of file

From 432ff3f64fafada6a3d61b5294c6780793dac6df Mon Sep 17 00:00:00 2001
From: Michael Whelan <mjmwdev@gmail.com>
Date: Mon, 18 May 2015 12:59:58 +0100
Subject: [PATCH 2/6] Temporarily disabled mvcpipeline in WithCallTo

---
 TestStack.FluentMvcTesting/ControllerExtensions.cs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/TestStack.FluentMvcTesting/ControllerExtensions.cs b/TestStack.FluentMvcTesting/ControllerExtensions.cs
index eb54fe0..e891232 100644
--- a/TestStack.FluentMvcTesting/ControllerExtensions.cs
+++ b/TestStack.FluentMvcTesting/ControllerExtensions.cs
@@ -21,19 +21,19 @@ public static ControllerResultTest<T> WithCallTo<T, TAction>(this T controller,
             where T : Controller
             where TAction : ActionResult
         {
-#if NET45
-            var expression = Expression.Lambda<Func<T, object>>(Expression.Convert(actionCall.Body, typeof(object)), actionCall.Parameters);
-            var action = controller.Action(expression);
-            var result = action.Execute();
+//#if NET45
+//            var expression = Expression.Lambda<Func<T, object>>(Expression.Convert(actionCall.Body, typeof(object)), actionCall.Parameters);
+//            var action = controller.Action(expression);
+//            var result = action.Execute();
 
-            return new ControllerResultTest<T>(controller, action.ActionDescriptor.ActionName, result.ActionResult);
-#else
+//            return new ControllerResultTest<T>(controller, action.ActionDescriptor.ActionName, result.ActionResult);
+//#else
             var actionName = ((MethodCallExpression)actionCall.Body).Method.Name;
 
             var actionResult = actionCall.Compile().Invoke(controller);
 
             return new ControllerResultTest<T>(controller, actionName, actionResult);
-#endif
+//#endif
         }
 
         public static ControllerResultTest<T> WithCallTo<T, TAction>(this T controller, Expression<Func<T, Task<TAction>>> actionCall)

From 968dd11cf18d898628193f48cc910ed5d143a030 Mon Sep 17 00:00:00 2001
From: Michael Whelan <mjmwdev@gmail.com>
Date: Mon, 18 May 2015 13:55:52 +0100
Subject: [PATCH 3/6] Re-enabled pipeline in WithCallTo

All FluentMvc.Tests passing but sample tests failing with type
constraint error VerificationException
---
 .../ControllerExtensions.cs                      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/TestStack.FluentMvcTesting/ControllerExtensions.cs b/TestStack.FluentMvcTesting/ControllerExtensions.cs
index e891232..2f32dcd 100644
--- a/TestStack.FluentMvcTesting/ControllerExtensions.cs
+++ b/TestStack.FluentMvcTesting/ControllerExtensions.cs
@@ -21,19 +21,19 @@ public static ControllerResultTest<T> WithCallTo<T, TAction>(this T controller,
             where T : Controller
             where TAction : ActionResult
         {
-//#if NET45
-//            var expression = Expression.Lambda<Func<T, object>>(Expression.Convert(actionCall.Body, typeof(object)), actionCall.Parameters);
-//            var action = controller.Action(expression);
-//            var result = action.Execute();
+#if NET45
+            var expression = Expression.Lambda<Func<T, object>>(Expression.Convert(actionCall.Body, typeof(object)), actionCall.Parameters);
+            var action = controller.Action(expression);
+            var result = action.Execute();
 
-//            return new ControllerResultTest<T>(controller, action.ActionDescriptor.ActionName, result.ActionResult);
-//#else
+            return new ControllerResultTest<T>(controller, action.ActionDescriptor.ActionName, result.ActionResult);
+#else
             var actionName = ((MethodCallExpression)actionCall.Body).Method.Name;
 
             var actionResult = actionCall.Compile().Invoke(controller);
 
             return new ControllerResultTest<T>(controller, actionName, actionResult);
-//#endif
+#endif
         }
 
         public static ControllerResultTest<T> WithCallTo<T, TAction>(this T controller, Expression<Func<T, Task<TAction>>> actionCall)
@@ -63,7 +63,7 @@ public static ControllerResultTest<T> WithMvcPipelineTo<T, TAction>(this T contr
             where T : Controller
             where TAction : ActionResult
         {
-            var expression = Expression.Lambda<Func<T, object>>(Expression.Convert(actionCall.Body, typeof(object)), actionCall.Parameters);
+            var expression = Expression.Lambda<Func<T, object>>(Expression.Convert(actionCall.Body, typeof(Task<object>)), actionCall.Parameters);
             var action = controller.Action(expression);
             var result = action.Execute();
 

From eda51c09aacb2739cd77e1300a48a3233fa69e84 Mon Sep 17 00:00:00 2001
From: Michael Whelan <mjmwdev@gmail.com>
Date: Tue, 19 May 2015 08:03:05 +0100
Subject: [PATCH 4/6] Added Xania.AspNet.Simulator as Assembly

---
 ...Stack.FluentMVCTesting.Sample.Tests.csproj |  36 +--
 .../packages.config                           |   6 +-
 .../TestStack.FluentMVCTesting.Sample.csproj  |  36 +--
 .../Web.config                                |   2 +-
 .../packages.config                           |   6 +-
 Settings.StyleCop                             |   5 +
 .../TestStack.FluentMVCTesting.Tests.csproj   |  36 +--
 TestStack.FluentMVCTesting.Tests/app.config   |   2 +-
 .../packages.config                           |   6 +-
 TestStack.FluentMVCTesting.sln                |   8 +-
 .../ControllerExtensions.cs                   |   5 +-
 .../TestStack.FluentMVCTesting.csproj         |  45 ++--
 TestStack.FluentMvcTesting/app.config         |   2 +-
 TestStack.FluentMvcTesting/packages.config    |   7 +-
 Xania.AspNet.Simulator/ActionContext.cs       |  10 +
 .../ActionRequestExtensions.cs                |  43 ++++
 .../ActionRequestWrapper.cs                   | 114 +++++++++
 .../ActionRouterPathProvider.cs               |  12 +
 Xania.AspNet.Simulator/AspNetUtility.cs       |  62 +++++
 Xania.AspNet.Simulator/ControllerAction.cs    | 107 +++++++++
 .../ControllerActionResult.cs                 |  47 ++++
 .../DirectControllerAction.cs                 |  99 ++++++++
 .../HttpContextSimulator.cs                   |  58 +++++
 .../HttpListenerRequestWrapper.cs             |  69 ++++++
 .../HttpListenerResponseWrapper.cs            | 107 +++++++++
 .../HttpServerExtensions.cs                   |  24 ++
 Xania.AspNet.Simulator/HttpServerSimulator.cs |  85 +++++++
 Xania.AspNet.Simulator/IControllerAction.cs   |  21 ++
 .../LinqActionDescriptor.cs                   |  49 ++++
 .../Properties/AssemblyInfo.cs                |  36 +++
 Xania.AspNet.Simulator/Router.cs              |  65 ++++++
 Xania.AspNet.Simulator/RouterAction.cs        |  94 ++++++++
 Xania.AspNet.Simulator/RouterExtensions.cs    |  26 +++
 Xania.AspNet.Simulator/SimpleHttpRequest.cs   |  12 +
 Xania.AspNet.Simulator/SimpleSessionState.cs  |  31 +++
 .../SimulatorActionInvoker.cs                 | 117 ++++++++++
 Xania.AspNet.Simulator/SimulatorExtensions.cs | 219 ++++++++++++++++++
 .../Xania.AspNet.Simulator.csproj             | 110 +++++++++
 Xania.AspNet.Simulator/app.config             |  11 +
 Xania.AspNet.Simulator/packages.config        |   8 +
 40 files changed, 1744 insertions(+), 94 deletions(-)
 create mode 100644 Settings.StyleCop
 create mode 100644 Xania.AspNet.Simulator/ActionContext.cs
 create mode 100644 Xania.AspNet.Simulator/ActionRequestExtensions.cs
 create mode 100644 Xania.AspNet.Simulator/ActionRequestWrapper.cs
 create mode 100644 Xania.AspNet.Simulator/ActionRouterPathProvider.cs
 create mode 100644 Xania.AspNet.Simulator/AspNetUtility.cs
 create mode 100644 Xania.AspNet.Simulator/ControllerAction.cs
 create mode 100644 Xania.AspNet.Simulator/ControllerActionResult.cs
 create mode 100644 Xania.AspNet.Simulator/DirectControllerAction.cs
 create mode 100644 Xania.AspNet.Simulator/HttpContextSimulator.cs
 create mode 100644 Xania.AspNet.Simulator/HttpListenerRequestWrapper.cs
 create mode 100644 Xania.AspNet.Simulator/HttpListenerResponseWrapper.cs
 create mode 100644 Xania.AspNet.Simulator/HttpServerExtensions.cs
 create mode 100644 Xania.AspNet.Simulator/HttpServerSimulator.cs
 create mode 100644 Xania.AspNet.Simulator/IControllerAction.cs
 create mode 100644 Xania.AspNet.Simulator/LinqActionDescriptor.cs
 create mode 100644 Xania.AspNet.Simulator/Properties/AssemblyInfo.cs
 create mode 100644 Xania.AspNet.Simulator/Router.cs
 create mode 100644 Xania.AspNet.Simulator/RouterAction.cs
 create mode 100644 Xania.AspNet.Simulator/RouterExtensions.cs
 create mode 100644 Xania.AspNet.Simulator/SimpleHttpRequest.cs
 create mode 100644 Xania.AspNet.Simulator/SimpleSessionState.cs
 create mode 100644 Xania.AspNet.Simulator/SimulatorActionInvoker.cs
 create mode 100644 Xania.AspNet.Simulator/SimulatorExtensions.cs
 create mode 100644 Xania.AspNet.Simulator/Xania.AspNet.Simulator.csproj
 create mode 100644 Xania.AspNet.Simulator/app.config
 create mode 100644 Xania.AspNet.Simulator/packages.config

diff --git a/Samples/TestStack.FluentMVCTesting.Sample.Tests/TestStack.FluentMVCTesting.Sample.Tests.csproj b/Samples/TestStack.FluentMVCTesting.Sample.Tests/TestStack.FluentMVCTesting.Sample.Tests.csproj
index 3f1a983..858864c 100644
--- a/Samples/TestStack.FluentMVCTesting.Sample.Tests/TestStack.FluentMVCTesting.Sample.Tests.csproj
+++ b/Samples/TestStack.FluentMVCTesting.Sample.Tests/TestStack.FluentMVCTesting.Sample.Tests.csproj
@@ -49,29 +49,29 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Helpers">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Mvc">
-      <HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Razor">
-      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages.Deployment">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages.Razor">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
diff --git a/Samples/TestStack.FluentMVCTesting.Sample.Tests/packages.config b/Samples/TestStack.FluentMVCTesting.Sample.Tests/packages.config
index 9757012..756879d 100644
--- a/Samples/TestStack.FluentMVCTesting.Sample.Tests/packages.config
+++ b/Samples/TestStack.FluentMVCTesting.Sample.Tests/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.AspNet.Mvc" version="5.2.2" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="NSubstitute" version="1.7.2.0" targetFramework="net45" />
   <package id="NUnit" version="2.6.3" targetFramework="net45" />
diff --git a/Samples/TestStack.FluentMVCTesting.Sample/TestStack.FluentMVCTesting.Sample.csproj b/Samples/TestStack.FluentMVCTesting.Sample/TestStack.FluentMVCTesting.Sample.csproj
index 525a4b7..9d208d7 100644
--- a/Samples/TestStack.FluentMVCTesting.Sample/TestStack.FluentMVCTesting.Sample.csproj
+++ b/Samples/TestStack.FluentMVCTesting.Sample/TestStack.FluentMVCTesting.Sample.csproj
@@ -53,29 +53,29 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Web.Helpers">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Mvc">
-      <HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Razor">
-      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages.Deployment">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages.Razor">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Web" />
diff --git a/Samples/TestStack.FluentMVCTesting.Sample/Web.config b/Samples/TestStack.FluentMVCTesting.Sample/Web.config
index 5766172..73d58b9 100644
--- a/Samples/TestStack.FluentMVCTesting.Sample/Web.config
+++ b/Samples/TestStack.FluentMVCTesting.Sample/Web.config
@@ -47,7 +47,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
-        <bindingRedirect oldVersion="1.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
+        <bindingRedirect oldVersion="1.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/Samples/TestStack.FluentMVCTesting.Sample/packages.config b/Samples/TestStack.FluentMVCTesting.Sample/packages.config
index 96d2cec..df7e914 100644
--- a/Samples/TestStack.FluentMVCTesting.Sample/packages.config
+++ b/Samples/TestStack.FluentMVCTesting.Sample/packages.config
@@ -8,10 +8,10 @@
   <package id="Microsoft.AspNet.Identity.Core" version="2.0.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.Identity.EntityFramework" version="2.0.0" targetFramework="net45" />
   <package id="Microsoft.AspNet.Identity.Owin" version="2.0.0" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc" version="5.2.2" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
   <package id="Microsoft.jQuery.Unobtrusive.Validation" version="3.1.2" targetFramework="net45" />
   <package id="Microsoft.Owin" version="2.1.0" targetFramework="net45" />
   <package id="Microsoft.Owin.Host.SystemWeb" version="2.1.0" targetFramework="net45" />
diff --git a/Settings.StyleCop b/Settings.StyleCop
new file mode 100644
index 0000000..b8dcb05
--- /dev/null
+++ b/Settings.StyleCop
@@ -0,0 +1,5 @@
+<StyleCopSettings Version="105">
+  <GlobalSettings>
+    <BooleanProperty Name="RulesEnabledByDefault">False</BooleanProperty>
+  </GlobalSettings>
+</StyleCopSettings>
\ No newline at end of file
diff --git a/TestStack.FluentMVCTesting.Tests/TestStack.FluentMVCTesting.Tests.csproj b/TestStack.FluentMVCTesting.Tests/TestStack.FluentMVCTesting.Tests.csproj
index 73b5bf7..c2d8ab9 100644
--- a/TestStack.FluentMVCTesting.Tests/TestStack.FluentMVCTesting.Tests.csproj
+++ b/TestStack.FluentMVCTesting.Tests/TestStack.FluentMVCTesting.Tests.csproj
@@ -50,29 +50,29 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Helpers">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Mvc">
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Razor">
-      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages.Deployment">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages.Razor">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
diff --git a/TestStack.FluentMVCTesting.Tests/app.config b/TestStack.FluentMVCTesting.Tests/app.config
index 451c829..d7256aa 100644
--- a/TestStack.FluentMVCTesting.Tests/app.config
+++ b/TestStack.FluentMVCTesting.Tests/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/TestStack.FluentMVCTesting.Tests/packages.config b/TestStack.FluentMVCTesting.Tests/packages.config
index 9757012..756879d 100644
--- a/TestStack.FluentMVCTesting.Tests/packages.config
+++ b/TestStack.FluentMVCTesting.Tests/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.AspNet.Mvc" version="5.2.2" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="NSubstitute" version="1.7.2.0" targetFramework="net45" />
   <package id="NUnit" version="2.6.3" targetFramework="net45" />
diff --git a/TestStack.FluentMVCTesting.sln b/TestStack.FluentMVCTesting.sln
index e772e1f..9f158f0 100644
--- a/TestStack.FluentMVCTesting.sln
+++ b/TestStack.FluentMVCTesting.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30501.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.FluentMVCTesting", "TestStack.FluentMVCTesting\TestStack.FluentMVCTesting.csproj", "{152CA00F-18D3-4CF5-8CA0-2C5B70CBEA19}"
 EndProject
@@ -30,6 +30,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.FluentMVCTesting.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestStack.FluentMVCTesting.Sample", "Samples\TestStack.FluentMVCTesting.Sample\TestStack.FluentMVCTesting.Sample.csproj", "{FD292B9E-1493-428F-8AF6-F7CF9CF463C5}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xania.AspNet.Simulator", "Xania.AspNet.Simulator\Xania.AspNet.Simulator.csproj", "{04B8C6C8-D531-468D-B07B-C2EBF9BF13E8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -68,6 +70,10 @@ Global
 		{FD292B9E-1493-428F-8AF6-F7CF9CF463C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FD292B9E-1493-428F-8AF6-F7CF9CF463C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FD292B9E-1493-428F-8AF6-F7CF9CF463C5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{04B8C6C8-D531-468D-B07B-C2EBF9BF13E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{04B8C6C8-D531-468D-B07B-C2EBF9BF13E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{04B8C6C8-D531-468D-B07B-C2EBF9BF13E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{04B8C6C8-D531-468D-B07B-C2EBF9BF13E8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/TestStack.FluentMvcTesting/ControllerExtensions.cs b/TestStack.FluentMvcTesting/ControllerExtensions.cs
index 2f32dcd..e931e76 100644
--- a/TestStack.FluentMvcTesting/ControllerExtensions.cs
+++ b/TestStack.FluentMvcTesting/ControllerExtensions.cs
@@ -22,18 +22,19 @@ public static ControllerResultTest<T> WithCallTo<T, TAction>(this T controller,
             where TAction : ActionResult
         {
 #if NET45
-            var expression = Expression.Lambda<Func<T, object>>(Expression.Convert(actionCall.Body, typeof(object)), actionCall.Parameters);
+            var expression = Expression.Lambda<Func<T, object>>(Expression.Convert(actionCall.Body, typeof (object)), actionCall.Parameters);
             var action = controller.Action(expression);
             var result = action.Execute();
 
             return new ControllerResultTest<T>(controller, action.ActionDescriptor.ActionName, result.ActionResult);
+
 #else
             var actionName = ((MethodCallExpression)actionCall.Body).Method.Name;
 
             var actionResult = actionCall.Compile().Invoke(controller);
 
             return new ControllerResultTest<T>(controller, actionName, actionResult);
-#endif
+#endif        
         }
 
         public static ControllerResultTest<T> WithCallTo<T, TAction>(this T controller, Expression<Func<T, Task<TAction>>> actionCall)
diff --git a/TestStack.FluentMvcTesting/TestStack.FluentMVCTesting.csproj b/TestStack.FluentMvcTesting/TestStack.FluentMVCTesting.csproj
index 7ca4a4b..69d81ed 100644
--- a/TestStack.FluentMvcTesting/TestStack.FluentMVCTesting.csproj
+++ b/TestStack.FluentMvcTesting/TestStack.FluentMVCTesting.csproj
@@ -45,38 +45,35 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Helpers">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.Helpers.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Mvc">
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.2\lib\net45\System.Web.Mvc.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Razor">
-      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.2\lib\net45\System.Web.Razor.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages.Deployment">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages.Razor">
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.2\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="Xania.AspNet.Simulator">
-      <HintPath>..\packages\Xania.AspNet.Simulator.1.2.11\lib\net45\Xania.AspNet.Simulator.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App_Packages\ExpressionStringBuilder.0.9.2\ExpressionStringBuilder.cs" />
@@ -105,6 +102,12 @@
   <ItemGroup>
     <Content Include="readme.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Xania.AspNet.Simulator\Xania.AspNet.Simulator.csproj">
+      <Project>{04b8c6c8-d531-468d-b07b-c2ebf9bf13e8}</Project>
+      <Name>Xania.AspNet.Simulator</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/TestStack.FluentMvcTesting/app.config b/TestStack.FluentMvcTesting/app.config
index 451c829..d7256aa 100644
--- a/TestStack.FluentMvcTesting/app.config
+++ b/TestStack.FluentMvcTesting/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.3.0" newVersion="5.2.3.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/TestStack.FluentMvcTesting/packages.config b/TestStack.FluentMvcTesting/packages.config
index 79d6758..83adb21 100644
--- a/TestStack.FluentMvcTesting/packages.config
+++ b/TestStack.FluentMvcTesting/packages.config
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="ExpressionToString" version="0.9.2" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Mvc" version="5.2.2" targetFramework="net45" />
-  <package id="Microsoft.AspNet.Razor" version="3.2.2" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebPages" version="3.2.2" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="Xania.AspNet.Simulator" version="1.2.11" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/Xania.AspNet.Simulator/ActionContext.cs b/Xania.AspNet.Simulator/ActionContext.cs
new file mode 100644
index 0000000..e6beaf2
--- /dev/null
+++ b/Xania.AspNet.Simulator/ActionContext.cs
@@ -0,0 +1,10 @@
+using System.Web.Mvc;
+
+namespace Xania.AspNet.Simulator
+{
+    public class ActionContext
+    {
+        public ControllerContext ControllerContext { get; set; }
+        public ActionDescriptor ActionDescriptor { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Xania.AspNet.Simulator/ActionRequestExtensions.cs b/Xania.AspNet.Simulator/ActionRequestExtensions.cs
new file mode 100644
index 0000000..254b9bb
--- /dev/null
+++ b/Xania.AspNet.Simulator/ActionRequestExtensions.cs
@@ -0,0 +1,43 @@
+using System.Globalization;
+using System.Security.Principal;
+using System.Web.Mvc;
+
+namespace Xania.AspNet.Simulator
+{
+    public static class ActionRequestExtensions
+    {
+
+        public static TActionRequest Get<TActionRequest>(this TActionRequest actionRequest)
+            where TActionRequest : IControllerAction
+        {
+            actionRequest.HttpMethod = "GET";
+            return actionRequest;
+        }
+
+        public static TActionRequest Post<TActionRequest>(this TActionRequest actionRequest)
+            where TActionRequest : IControllerAction
+        {
+            actionRequest.HttpMethod = "POST";
+            return actionRequest;
+        }
+
+        public static TActionRequest Authenticate<TActionRequest>(this TActionRequest actionRequest, string userName,
+            string[] roles, string identityType = "Simulator")
+            where TActionRequest : IControllerAction
+        {
+            actionRequest.User = new GenericPrincipal(new GenericIdentity(userName, identityType),
+                roles ?? new string[] {});
+            return actionRequest;
+        }
+
+        public static TActionRequest Data<TActionRequest>(this TActionRequest actionRequest, object values)
+            where TActionRequest : ControllerAction
+        {
+            {
+                actionRequest.ValueProvider = new DictionaryValueProvider<object>(values.ToDictionary(),
+                    CultureInfo.CurrentCulture);
+                return actionRequest;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Xania.AspNet.Simulator/ActionRequestWrapper.cs b/Xania.AspNet.Simulator/ActionRequestWrapper.cs
new file mode 100644
index 0000000..98315db
--- /dev/null
+++ b/Xania.AspNet.Simulator/ActionRequestWrapper.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Collections.Generic;
+using System.Security.Principal;
+using System.Web;
+using System.Web.Mvc;
+
+namespace Xania.AspNet.Simulator
+{
+    public class ActionRequestWrapper : HttpWorkerRequest
+    {
+        private readonly IHttpRequest _httpRequest;
+
+        public ActionRequestWrapper(IHttpRequest httpRequest)
+        {
+            _httpRequest = httpRequest;
+        }
+
+        public override string GetUriPath()
+        {
+            var path = _httpRequest.UriPath;
+            if (path.StartsWith("~"))
+                path = path.Substring(1);
+            return path;
+        }
+        
+        public override string GetQueryString()
+        {
+            return String.Empty;
+        }
+
+        public override string GetRawUrl()
+        {
+            return GetUriPath();
+        }
+
+        public override string GetHttpVerbName()
+        {
+            return _httpRequest.HttpMethod;
+        }
+
+        public override string GetHttpVersion()
+        {
+            return "HTTP/1.1";
+        }
+
+        public override string GetRemoteAddress()
+        {
+            return "localhost";
+        }
+
+        public override int GetRemotePort()
+        {
+            throw new NotImplementedException();
+        }
+
+        public override string GetLocalAddress()
+        {
+            return "127.0.0.1";
+        }
+
+        public override int GetLocalPort()
+        {
+            return 80;
+        }
+
+        public override void SendStatus(int statusCode, string statusDescription)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override void SendKnownResponseHeader(int index, string value)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override void SendUnknownResponseHeader(string name, string value)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override void SendResponseFromMemory(byte[] data, int length)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override void SendResponseFromFile(string filename, long offset, long length)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override void SendResponseFromFile(IntPtr handle, long offset, long length)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override void FlushResponse(bool finalFlush)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override void EndOfRequest()
+        {
+            throw new NotImplementedException();
+        }
+
+    }
+
+    public interface IHttpRequest
+    {
+        string UriPath { get; }
+        string HttpMethod { get; }
+        IPrincipal User { get; }
+    }
+}
diff --git a/Xania.AspNet.Simulator/ActionRouterPathProvider.cs b/Xania.AspNet.Simulator/ActionRouterPathProvider.cs
new file mode 100644
index 0000000..1e6104d
--- /dev/null
+++ b/Xania.AspNet.Simulator/ActionRouterPathProvider.cs
@@ -0,0 +1,12 @@
+using System.Web.Hosting;
+
+namespace Xania.AspNet.Simulator
+{
+    internal class ActionRouterPathProvider : VirtualPathProvider
+    {
+        public override bool FileExists(string virtualPath)
+        {
+            return false;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Xania.AspNet.Simulator/AspNetUtility.cs b/Xania.AspNet.Simulator/AspNetUtility.cs
new file mode 100644
index 0000000..1394852
--- /dev/null
+++ b/Xania.AspNet.Simulator/AspNetUtility.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Security.Principal;
+using System.Web;
+using System.Web.Routing;
+
+namespace Xania.AspNet.Simulator
+{
+    public class AspNetUtility
+    {
+        internal static RequestContext CreateRequestContext(string actionName, string controllerName, string httpMethod, IPrincipal user)
+        {
+            var httpContext = GetContext(String.Format("/{0}/{1}", controllerName, actionName), httpMethod, user);
+            return CreateRequestContext(httpContext, controllerName, actionName);
+        }
+
+        internal static RequestContext CreateRequestContext(HttpContextBase httpContext, string controllerName, string actionName)
+        {
+            var routeData = new RouteData {Values = {{"controller", controllerName}, {"action", actionName}}};
+            return new RequestContext(httpContext, routeData);
+        }
+
+        internal static HttpContextBase GetContext(string url, string method, IPrincipal user)
+        {
+            return GetContext(new SimpleHttpRequest
+            {
+                UriPath = url,
+                User = user,
+                HttpMethod = method
+            });
+        }
+
+        internal static HttpContextBase GetContext(IHttpRequest httpRequest)
+        {
+            var worker = new ActionRequestWrapper(httpRequest);
+            var httpContext = new HttpContext(worker)
+            {
+                User = httpRequest.User ?? CreateAnonymousUser(),
+            };
+
+            return new HttpContextSimulator(httpContext);
+        }
+
+        public static IPrincipal CreateAnonymousUser()
+        {
+            return new GenericPrincipal(new GenericIdentity(String.Empty), new string[] { });
+        }
+
+    }
+
+    internal class HttpRequestSimulator: HttpRequestWrapper
+    {
+        public HttpRequestSimulator(HttpRequest httpRequest) : base(httpRequest)
+        {
+        }
+
+        public override string AppRelativeCurrentExecutionFilePath
+        {
+            get { return "~" + Url.AbsolutePath; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Xania.AspNet.Simulator/ControllerAction.cs b/Xania.AspNet.Simulator/ControllerAction.cs
new file mode 100644
index 0000000..c7ab1a2
--- /dev/null
+++ b/Xania.AspNet.Simulator/ControllerAction.cs
@@ -0,0 +1,107 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Security.Principal;
+using System.Web;
+using System.Web.Mvc;
+
+namespace Xania.AspNet.Simulator
+{
+    public abstract class ControllerAction: IHttpRequest, IControllerAction
+    {
+        protected ControllerAction()
+        {
+            FilterProviders = new FilterProviderCollection(System.Web.Mvc.FilterProviders.Providers);
+            Cookies = new Collection<HttpCookie>();
+            Session = new Dictionary<string, object>();
+            Files = new Dictionary<string, Stream>();
+            Resolve = DependencyResolver.Current.GetService;
+        }
+
+        public FilterProviderCollection FilterProviders { get; private set; }
+
+        public IPrincipal User { get; set; }
+
+        public IValueProvider ValueProvider { get; set; }
+
+        public ICollection<HttpCookie> Cookies { get; private set; }
+        public IDictionary<string, object> Session { get; private set; }
+        public IDictionary<string, Stream> Files { get; private set; }
+        public IDictionary<string, string> Form { get; private set; }
+        public Func<Type, object> Resolve { get; set; }
+
+        public string HttpMethod { get; set; }
+
+        public string UriPath { get; set; }
+
+        public abstract ActionContext GetActionContext(HttpContextBase httpContext = null);
+
+        public virtual ControllerActionResult Execute(HttpContextBase httpContext = null)
+        {
+            var actionContext = GetActionContext(httpContext ?? CreateHttpContext());
+            return Execute(actionContext.ControllerContext, actionContext.ActionDescriptor);
+        }
+
+        protected virtual ControllerActionResult Execute(ControllerContext controllerContext, ActionDescriptor actionDescriptor)
+        {
+            var invoker = GetActionInvoker(controllerContext, actionDescriptor);
+            return new ControllerActionResult
+            {
+                ControllerContext = controllerContext,
+                ActionResult = invoker.InvokeAction()
+            };
+        }
+
+        internal virtual SimulatorActionInvoker GetActionInvoker(ControllerContext controllerContext,
+            ActionDescriptor actionDescriptor)
+        {
+            var filters = FilterProviders.GetFilters(controllerContext, actionDescriptor).Select(BuildUp);
+
+            return new SimulatorActionInvoker(controllerContext, actionDescriptor, filters);
+        }
+
+        protected virtual Filter BuildUp(Filter filter)
+        {
+            if (Resolve == null)
+                return filter;
+
+            foreach (PropertyDescriptor propertyDesc in TypeDescriptor.GetProperties(filter.Instance))
+            {
+                var typeNames = propertyDesc.Attributes.OfType<Attribute>().Select(e => e.GetType().ToString());
+                if (typeNames.Contains("Microsoft.Practices.Unity.DependencyAttribute"))
+                {
+                    var service = Resolve(propertyDesc.PropertyType);
+                    if (service != null)
+                        propertyDesc.SetValue(filter.Instance, service);
+                }
+            }
+
+            return filter;
+        }
+
+        public virtual ActionResult Authorize()
+        {
+            var actionContext = GetActionContext(CreateHttpContext());
+            return Authorize(actionContext.ControllerContext, actionContext.ActionDescriptor);
+        }
+
+        protected virtual ActionResult Authorize(ControllerContext controllerContext, ActionDescriptor actionDescriptor)
+        {
+            return GetActionInvoker(controllerContext, actionDescriptor).AuthorizeAction();
+        }
+
+        public abstract HttpContextBase CreateHttpContext();
+    }
+
+    [Serializable]
+    public class ControllerActionException : Exception
+    {
+        public ControllerActionException(string message)
+            : base(message)
+        {
+        }
+    }
+}
\ No newline at end of file
diff --git a/Xania.AspNet.Simulator/ControllerActionResult.cs b/Xania.AspNet.Simulator/ControllerActionResult.cs
new file mode 100644
index 0000000..c107e8f
--- /dev/null
+++ b/Xania.AspNet.Simulator/ControllerActionResult.cs
@@ -0,0 +1,47 @@
+using System.Web;
+using System.Web.Hosting;
+using System.Web.Mvc;
+
+namespace Xania.AspNet.Simulator
+{
+    public class ControllerActionResult
+    {
+        public ControllerContext ControllerContext { get; set; }
+        public ActionResult ActionResult { get; set; }
+
+        public dynamic ViewBag
+        {
+            get { return ControllerContext.Controller.ViewBag; }
+        }
+
+        public ViewDataDictionary ViewData
+        {
+            get { return ControllerContext.Controller.ViewData; }
+        }
+
+        public ModelStateDictionary ModelState
+        {
+            get { return ControllerContext.Controller.ViewData.ModelState; }
+        }
+
+        public HttpResponseBase Response
+        {
+            get { return ControllerContext.HttpContext.Response; }
+        }
+
+        public ControllerBase Controller
+        {
+            get { return ControllerContext.Controller; }
+        }
+
+        public HttpRequestBase Request
+        {
+            get { return ControllerContext.HttpContext.Request; }
+        }
+
+        public void ExecuteResult()
+        {
+            ActionResult.ExecuteResult(ControllerContext);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Xania.AspNet.Simulator/DirectControllerAction.cs b/Xania.AspNet.Simulator/DirectControllerAction.cs
new file mode 100644
index 0000000..206f5e1
--- /dev/null
+++ b/Xania.AspNet.Simulator/DirectControllerAction.cs
@@ -0,0 +1,99 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+using System.Web.Routing;
+
+namespace Xania.AspNet.Simulator
+{
+    public class DirectControllerAction : ControllerAction
+    {
+        public DirectControllerAction(ControllerBase controller, ActionDescriptor actionDescriptor, RouteCollection routes)
+        {
+            Controller = controller;
+            ActionDescriptor = actionDescriptor;
+            Routes = routes;
+        }
+
+        public virtual RouteCollection Routes { get; private set; }
+
+        public virtual ControllerBase Controller { get; private set; }
+
+        public virtual ActionDescriptor ActionDescriptor { get; private set; }
+
+        public override ActionContext GetActionContext(HttpContextBase httpContext = null)
+        {
+            InitializeController(httpContext);
+
+            return new ActionContext
+            {
+                ControllerContext = Controller.ControllerContext,
+                ActionDescriptor = ActionDescriptor
+            };
+        }
+
+        protected virtual void InitializeController(HttpContextBase httpContext)
+        {
+            var controllerContext = CreateControllerContext(httpContext ?? CreateHttpContext(), Controller,
+                ActionDescriptor);
+
+            // Use empty value provider by default to prevent use of ASP.NET MVC default value providers
+            // Its not the purpose of this simulator framework to validate the ASP.NET MVC default value 
+            // providers. Either a value provider is not need in case model values are predefined or a 
+            // custom implementation is provided.
+            Controller.ValueProvider = ValueProvider ?? new ValueProviderCollection();
+            Controller.ControllerContext = controllerContext;
+            var controller = Controller as Controller;
+            if (controller != null)
+            {
+                controller.Url = new UrlHelper(controllerContext.RequestContext, Routes);
+            }
+        }
+
+        public override HttpContextBase CreateHttpContext()
+        {
+            return CreateHttpContext(this, ActionDescriptor);
+        }
+
+        public virtual ControllerContext CreateControllerContext(HttpContextBase httpContext, ControllerBase controller, ActionDescriptor actionDescriptor)
+        {
+            var requestContext = GetRequestContext(httpContext, actionDescriptor);
+            var controllerContext = new ControllerContext(requestContext, controller);
+
+            if (actionDescriptor.GetSelectors().Any(selector => !selector.Invoke(controllerContext)))
+            {
+                throw new ControllerActionException(String.Format("Http method '{0}' is not allowed", controllerContext.HttpContext.Request.HttpMethod));
+            }
+
+            return controllerContext;
+        }
+
+        public HttpContextBase CreateHttpContext(IControllerAction actionRequest, ActionDescriptor actionDescriptor)
+        {
+            var controllerDescriptor = actionDescriptor.ControllerDescriptor;
+            var controllerName = controllerDescriptor.ControllerName;
+
+            var user = actionRequest.User ?? AspNetUtility.CreateAnonymousUser();
+            var httpContext =
+                AspNetUtility.GetContext(String.Format("/{0}/{1}", controllerName, actionDescriptor.ActionName),
+                    actionRequest.HttpMethod, user);
+            return httpContext;
+        }
+
+        protected virtual RequestContext GetRequestContext(HttpContextBase httpContext, ActionDescriptor actionDescriptor)
+        {
+            var requestContext = AspNetUtility.CreateRequestContext(httpContext,
+                actionDescriptor.ControllerDescriptor.ControllerName,
+                actionDescriptor.ActionName);
+
+            foreach (var cookie in Cookies)
+                requestContext.HttpContext.Request.Cookies.Add(cookie);
+
+            foreach (var kvp in Session)
+                // ReSharper disable once PossibleNullReferenceException
+                requestContext.HttpContext.Session[kvp.Key] = kvp.Value;
+            return requestContext;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Xania.AspNet.Simulator/HttpContextSimulator.cs b/Xania.AspNet.Simulator/HttpContextSimulator.cs
new file mode 100644
index 0000000..e87bd6b
--- /dev/null
+++ b/Xania.AspNet.Simulator/HttpContextSimulator.cs
@@ -0,0 +1,58 @@
+using System.Net;
+using System.Web;
+
+namespace Xania.AspNet.Simulator
+{
+    internal class HttpContextSimulator : HttpContextWrapper
+    {
+        private readonly HttpRequestSimulator _request;
+        private readonly HttpResponseWrapper _response;
+        private readonly SimpleSessionState _session;
+
+        public HttpContextSimulator(HttpContext httpContext) : base(httpContext)
+        {
+            _request = new HttpRequestSimulator(httpContext.Request);
+            _response = new HttpResponseWrapper(httpContext.Response);
+            _session = new SimpleSessionState();
+        }
+
+        public override HttpRequestBase Request
+        {
+            get { return _request; }
+        }
+
+        public override HttpResponseBase Response
+        {
+            get { return _response; }
+        }
+
+        public override HttpSessionStateBase Session
+        {
+            get { return _session; }
+        }
+    }
+
+    public class HttpListenerContextSimulator : HttpContextBase
+    {
+        private readonly HttpListenerContext _listenerContext;
+        private readonly HttpListenerResponseWrapper _response;
+        private readonly HttpListenerRequestWrapper _request;
+
+        public HttpListenerContextSimulator(HttpListenerContext listenerContext)
+        {
+            _listenerContext = listenerContext;
+            _response = new HttpListenerResponseWrapper(listenerContext.Response);
+            _request = new HttpListenerRequestWrapper(listenerContext.Request);
+        }
+
+        public override HttpRequestBase Request
+        {
+            get { return _request; }
+        }
+
+        public override HttpResponseBase Response
+        {
+            get { return _response; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Xania.AspNet.Simulator/HttpListenerRequestWrapper.cs b/Xania.AspNet.Simulator/HttpListenerRequestWrapper.cs
new file mode 100644
index 0000000..50f7305
--- /dev/null
+++ b/Xania.AspNet.Simulator/HttpListenerRequestWrapper.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Specialized;
+using System.Net;
+using System.Web;
+
+namespace Xania.AspNet.Simulator
+{
+    internal class HttpListenerRequestWrapper: HttpRequestBase
+    {
+        private readonly HttpListenerRequest _request;
+        private NameValueCollection _params;
+        private NameValueCollection _serverVariables;
+
+        public HttpListenerRequestWrapper(HttpListenerRequest request)
+        {
+            _request = request;
+        }
+
+        public override NameValueCollection Params
+        {
+            get
+            {
+                if (_params == null)
+                {
+                    _params = new NameValueCollection(_request.QueryString);
+                }
+                return _params;
+            }
+        }
+
+        public override NameValueCollection ServerVariables
+        {
+            get
+            {
+                if (_serverVariables == null)
+                {
+                    _serverVariables = new NameValueCollection();
+                }
+                return _serverVariables;
+            }
+        }
+
+        public override Uri Url
+        {
+            get { return _request.Url; }
+        }
+
+        public override string AppRelativeCurrentExecutionFilePath
+        {
+            get { return "~" + _request.RawUrl; }
+        }
+
+        public override string ApplicationPath
+        {
+            get
+            {
+                return "/";
+            }
+        }
+
+        public override string PathInfo
+        {
+            get
+            {
+                return null;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Xania.AspNet.Simulator/HttpListenerResponseWrapper.cs b/Xania.AspNet.Simulator/HttpListenerResponseWrapper.cs
new file mode 100644
index 0000000..d9016fb
--- /dev/null
+++ b/Xania.AspNet.Simulator/HttpListenerResponseWrapper.cs
@@ -0,0 +1,107 @@
+using System;
+using System.Globalization;
+using System.IO;
+using System.Net;
+using System.Text;
+using System.Web;
+
+namespace Xania.AspNet.Simulator
+{
+    internal class HttpListenerResponseWrapper : HttpResponseBase, IDisposable
+    {
+        private readonly HttpListenerResponse _listenerResponse;
+        private TextWriter _output;
+        private readonly MemoryStream _outputStream;
+        private bool _closed = false;
+
+        public HttpListenerResponseWrapper(HttpListenerResponse listenerResponse)
+        {
+            _listenerResponse = listenerResponse;
+            _outputStream = new MemoryStream();
+            _output = new StreamWriter(_outputStream);
+        }
+
+        public override string ContentType { get; set; }
+
+        public override Encoding ContentEncoding { get; set; }
+
+        public override int StatusCode
+        {
+            get { return _listenerResponse.StatusCode; }
+            set { _listenerResponse.StatusCode = value; }
+        }
+
+        public override string Status
+        {
+            get 
+            {
+                return this.StatusCode.ToString(NumberFormatInfo.InvariantInfo) + " " + this.StatusDescription;
+            }
+            set
+            {
+                int i = value.IndexOf(' ');
+                StatusCode = Int32.Parse(value.Substring(0, i), CultureInfo.InvariantCulture);
+                StatusDescription = value.Substring(i + 1);
+            }
+        }
+
+        public override string StatusDescription
+        {
+            get { return _listenerResponse.StatusDescription; }
+            set { _listenerResponse.StatusDescription = value; }
+        }
+
+        public override TextWriter Output
+        {
+            get { return _output; }
+            set { _output = value; }
+        }
+
+        public override Stream OutputStream
+        {
+            get { return _outputStream; }
+        }
+
+        public override string ApplyAppPathModifier(string virtualPath)
+        {
+            return virtualPath;
+        }
+
+        public override void Flush()
+        {
+        }
+
+        public override void Write(char ch)
+        {
+            Output.Write(ch);
+        }
+
+        public override void Write(string s)
+        {
+            Output.Write(s);
+        }
+
+        public override void Close()
+        {
+            if (!_closed)
+            {
+                _closed = true;
+                _output.Flush();
+
+                var buffer = _outputStream.ToArray();
+                _listenerResponse.ContentLength64 = buffer.Length;
+                var output = _listenerResponse.OutputStream;
+                output.Write(buffer, 0, buffer.Length);
+                output.Close();
+            }
+        }
+
+        public void Dispose()
+        {
+            if (_outputStream != null)
+            {
+                _outputStream.Dispose();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Xania.AspNet.Simulator/HttpServerExtensions.cs b/Xania.AspNet.Simulator/HttpServerExtensions.cs
new file mode 100644
index 0000000..7fd9c8e
--- /dev/null
+++ b/Xania.AspNet.Simulator/HttpServerExtensions.cs
@@ -0,0 +1,24 @@
+using System.Web.Mvc;
+
+namespace Xania.AspNet.Simulator
+{
+    public static class HttpServerExtensions
+    {
+        public static void UseMvc(this HttpServerSimulator server, Router router)
+        {
+            server.Use(context =>
+            {
+                if (context.Request.Url == null) 
+                    return;
+
+                var path = context.Request.Url.AbsolutePath;
+                var action = new RouterAction(router)
+                {
+                    UriPath = path
+                };
+                var result = action.Execute(context);
+                result.ExecuteResult();
+            });
+        }
+    }
+}
diff --git a/Xania.AspNet.Simulator/HttpServerSimulator.cs b/Xania.AspNet.Simulator/HttpServerSimulator.cs
new file mode 100644
index 0000000..04eb7a5
--- /dev/null
+++ b/Xania.AspNet.Simulator/HttpServerSimulator.cs
@@ -0,0 +1,85 @@
+using System;
+using System.Diagnostics;
+using System.Net;
+using System.Threading.Tasks;
+using System.Web;
+
+namespace Xania.AspNet.Simulator
+{
+    public class HttpServerSimulator : IDisposable
+    {
+        private readonly HttpListener _listener;
+
+        public HttpServerSimulator(params string[] prefixes)
+        {
+            if (!HttpListener.IsSupported)
+            {
+                throw new NotSupportedException("Windows XP SP2 or Server 2003 is required to use the HttpListener class.");
+            }
+
+            if (prefixes == null || prefixes.Length == 0)
+                throw new ArgumentException("prefixes");
+
+            _listener = new HttpListener();
+
+            foreach (var prefix in prefixes)
+            {
+                _listener.Prefixes.Add(prefix);
+            }
+            _listener.Start();
+        }
+
+        public Task<HttpContextBase> GetContextAsync()
+        {
+            return
+                _listener.GetContextAsync()
+                    .ContinueWith(task =>
+                    {
+                        if (task.IsFaulted)
+                            return null;
+
+                        return (HttpContextBase) new HttpListenerContextSimulator(task.Result);
+                    });
+        }
+
+        public void Dispose()
+        {
+            _listener.Stop();
+        }
+
+        public async void Use(Action<HttpContextBase> handler)
+        {
+            bool running = true;
+
+            while (running)
+            {
+                running = await GetContextAsync().ContinueWith(task =>
+                {
+                    var context = task.Result;
+                    if (context == null)
+                        return false;
+
+                    try
+                    {
+                        handler(context);
+                    }
+                    catch (Exception ex)
+                    {
+                        Debug.WriteLine(ex.ToString());
+
+                        context.Response.StatusCode = (int)HttpStatusCode.InternalServerError;
+                        context.Response.StatusDescription = "Internal Server Error";
+                        context.Response.Write(ex.Message);
+                        context.Response.Write("\n");
+                        context.Response.Write(ex.StackTrace);
+                    }
+                    finally
+                    {
+                        context.Response.Close();
+                    }
+                    return true;
+                });
+            }
+        }
+    }
+}
diff --git a/Xania.AspNet.Simulator/IControllerAction.cs b/Xania.AspNet.Simulator/IControllerAction.cs
new file mode 100644
index 0000000..dcbe9cc
--- /dev/null
+++ b/Xania.AspNet.Simulator/IControllerAction.cs
@@ -0,0 +1,21 @@
+using System.Security.Principal;
+using System.Web;
+using System.Web.Mvc;
+
+namespace Xania.AspNet.Simulator
+{
+    public interface IControllerAction
+    {
+        string HttpMethod { get; set; }
+
+        string UriPath { get; set; }
+
+        IPrincipal User { get; set; }
+
+        FilterProviderCollection FilterProviders { get; }
+
+        IValueProvider ValueProvider { get; }
+
+        ControllerActionResult Execute(HttpContextBase httpContext);
+    }
+}
diff --git a/Xania.AspNet.Simulator/LinqActionDescriptor.cs b/Xania.AspNet.Simulator/LinqActionDescriptor.cs
new file mode 100644
index 0000000..8b0a883
--- /dev/null
+++ b/Xania.AspNet.Simulator/LinqActionDescriptor.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Web.Mvc;
+
+namespace Xania.AspNet.Simulator
+{
+    internal class LinqActionDescriptor : ReflectedActionDescriptor
+    {
+        private LinqActionDescriptor(MethodCallExpression methodCallExpression, ReflectedControllerDescriptor controllerDescriptor)
+            : base(methodCallExpression.Method, methodCallExpression.Method.Name, controllerDescriptor)
+        {
+        }
+
+        public static LinqActionDescriptor Create<TController>(Expression<Func<TController, object>> actionExpression)
+            where TController: ControllerBase
+        {
+            var methodCallExpression = GetMethodCallExpression(actionExpression.Body);
+
+            return new LinqActionDescriptor(methodCallExpression, new ReflectedControllerDescriptor(typeof(TController)));
+        }
+
+        private static MethodCallExpression GetMethodCallExpression(Expression actionBody)
+        {
+            var methodCallExpression = actionBody as MethodCallExpression;
+            if (methodCallExpression != null)
+                return methodCallExpression;
+            
+            if (!(actionBody is UnaryExpression))
+                throw new InvalidOperationException("Unable to reduce expression to MethodCallExpression");
+
+            var unaryExpr = actionBody as UnaryExpression;
+            if (unaryExpr.NodeType == ExpressionType.Convert)
+                return GetMethodCallExpression(unaryExpr.Operand);
+
+            throw new InvalidOperationException("Unable to reduce expression to MethodCallExpression");
+        }
+
+        public static LinqActionDescriptor Create<TController>(Expression<Action<TController>> actionExpression)
+            where TController: ControllerBase
+        {
+            var methodCallExpression = (MethodCallExpression)actionExpression.Body;
+
+            return new LinqActionDescriptor(methodCallExpression, new ReflectedControllerDescriptor(typeof(TController)));
+        }
+    }
+}
\ No newline at end of file
diff --git a/Xania.AspNet.Simulator/Properties/AssemblyInfo.cs b/Xania.AspNet.Simulator/Properties/AssemblyInfo.cs
new file mode 100644
index 0000000..8d5727a
--- /dev/null
+++ b/Xania.AspNet.Simulator/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Xania.AspNet.Simulator")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Xania.AspNet.Simulator")]
+[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("91f63573-2942-4387-aec5-7cb92aab5201")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Xania.AspNet.Simulator/Router.cs b/Xania.AspNet.Simulator/Router.cs
new file mode 100644
index 0000000..8ad4f41
--- /dev/null
+++ b/Xania.AspNet.Simulator/Router.cs
@@ -0,0 +1,65 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+using System.Web.Routing;
+
+namespace Xania.AspNet.Simulator
+{
+    public class Router
+    {
+        private readonly Dictionary<string, ControllerBase> _controllerMap;
+
+        public RouteCollection Routes { get; private set; }
+
+        public Router()
+        {
+            _controllerMap = new Dictionary<String, ControllerBase>();
+            Routes = new RouteCollection(new ActionRouterPathProvider());
+            if (RouteTable.Routes.Any())
+                foreach (var r in RouteTable.Routes)
+                    Routes.Add(r);
+            else
+                foreach (var r in DefaultRoutes)
+                    Routes.Add(r);
+        }
+
+        public virtual Router RegisterController(string name, ControllerBase controller)
+        {
+            if (name == null)
+                throw new ArgumentNullException("name");
+
+            _controllerMap.Add(name.ToLower(CultureInfo.InvariantCulture), controller);
+
+            return this;
+        }
+
+        protected internal virtual ControllerBase CreateController(string controllerName)
+        {
+            ControllerBase controller;
+            if (_controllerMap.TryGetValue(controllerName.ToLower(CultureInfo.InvariantCulture), out controller))
+                return controller;
+
+            throw new KeyNotFoundException(controllerName);
+        }
+
+        public RouteData GetRouteData(HttpContextBase context)
+        {
+            return Routes.GetRouteData(context);
+        }
+
+        public static RouteCollection DefaultRoutes { get; set; }
+
+        static Router ()
+        {
+            DefaultRoutes = new RouteCollection();
+            DefaultRoutes.MapRoute(
+                "Default",
+                "{controller}/{action}/{id}",
+                new { controller = "Home", action = "Index", id = UrlParameter.Optional }
+                );
+        }
+    }
+}
diff --git a/Xania.AspNet.Simulator/RouterAction.cs b/Xania.AspNet.Simulator/RouterAction.cs
new file mode 100644
index 0000000..df634f0
--- /dev/null
+++ b/Xania.AspNet.Simulator/RouterAction.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Globalization;
+using System.Web;
+using System.Web.Mvc;
+using System.Web.Routing;
+
+namespace Xania.AspNet.Simulator
+{
+    public class RouterAction : ControllerAction
+    {
+        private readonly Router _router;
+
+        public RouterAction(Router router)
+        {
+            _router = router;
+        }
+
+        public override ControllerActionResult Execute(HttpContextBase httpContext)
+        {
+            var actionContext = GetActionContext(httpContext);
+            var actionDescriptor = actionContext.ActionDescriptor;
+
+            if (actionDescriptor == null)
+                return null;
+
+            return Execute(actionContext.ControllerContext, actionDescriptor);
+        }
+
+        public override ActionContext GetActionContext(HttpContextBase httpContext1)
+        {
+            var context = httpContext1 ?? AspNetUtility.GetContext(this);
+            var routeData = _router.GetRouteData(context);
+
+            if (routeData == null)
+                return null;
+
+            var controllerName = routeData.GetRequiredString("controller");
+            var controller = _router.CreateController(controllerName);
+            var controllerDescriptor = new ReflectedControllerDescriptor(controller.GetType());
+
+            var valueProviders = new ValueProviderCollection();
+            if (ValueProvider != null)
+                valueProviders.Add(ValueProvider);
+            valueProviders.Add(new RouterActionValueProvider(routeData, new CultureInfo("nl-NL")));
+            controller.ValueProvider = valueProviders;
+
+            var actionName = routeData.GetRequiredString("action");
+            var httpContext = httpContext1 ?? AspNetUtility.GetContext(String.Format("/{0}/{1}", controllerName, actionName), HttpMethod, User ?? AspNetUtility.CreateAnonymousUser());
+
+            var requestContext = new RequestContext(httpContext, routeData);
+
+            controller.ControllerContext = new ControllerContext(requestContext, controller);
+            if (controller is Controller)
+            {
+                (controller as Controller).Url = new UrlHelper(requestContext, _router.Routes);
+            }
+
+
+            return new ActionContext
+            {
+                ControllerContext = controller.ControllerContext,
+                ActionDescriptor = controllerDescriptor.FindAction(controller.ControllerContext, actionName)
+            };
+        }
+
+        public override HttpContextBase CreateHttpContext()
+        {
+            return AspNetUtility.GetContext(this);
+        }
+    }
+
+    public class RouterActionValueProvider : IValueProvider
+    {
+        private readonly RouteData _routeData;
+        private readonly CultureInfo _culture;
+
+        public RouterActionValueProvider(RouteData routeData, CultureInfo culture)
+        {
+            _routeData = routeData;
+            _culture = culture;
+        }
+
+        public bool ContainsPrefix(string prefix)
+        {
+            return _routeData.Values.ContainsKey(prefix);
+        }
+
+        public ValueProviderResult GetValue(string key)
+        {
+            var value = _routeData.Values[key];
+            return new ValueProviderResult(value, value.ToString(), _culture);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Xania.AspNet.Simulator/RouterExtensions.cs b/Xania.AspNet.Simulator/RouterExtensions.cs
new file mode 100644
index 0000000..8ef05b1
--- /dev/null
+++ b/Xania.AspNet.Simulator/RouterExtensions.cs
@@ -0,0 +1,26 @@
+using System.Linq;
+using System.Web;
+
+namespace Xania.AspNet.Simulator
+{
+    public static class RouterExtensions
+    {
+        public static RouterAction Action(this Router router, string url)
+        {
+            return new RouterAction(router) { UriPath = url };
+        }
+
+        public static RouterAction ParseAction(this Router router, string rawHttpRequest)
+        {
+            var lines = rawHttpRequest.Split('\n');
+            var first = lines.First();
+
+            var parts = first.Split(' ');
+            return new RouterAction(router)
+            {
+                HttpMethod = parts[0],
+                UriPath = parts[1]
+            };
+        }
+    }
+}
diff --git a/Xania.AspNet.Simulator/SimpleHttpRequest.cs b/Xania.AspNet.Simulator/SimpleHttpRequest.cs
new file mode 100644
index 0000000..cb4eb1d
--- /dev/null
+++ b/Xania.AspNet.Simulator/SimpleHttpRequest.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using System.Security.Principal;
+
+namespace Xania.AspNet.Simulator
+{
+    internal class SimpleHttpRequest : IHttpRequest
+    {
+        public string UriPath { get; set; }
+        public string HttpMethod { get; set; }
+        public IPrincipal User { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Xania.AspNet.Simulator/SimpleSessionState.cs b/Xania.AspNet.Simulator/SimpleSessionState.cs
new file mode 100644
index 0000000..95ceb8c
--- /dev/null
+++ b/Xania.AspNet.Simulator/SimpleSessionState.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.Linq;
+using System.Runtime.Remoting.Messaging;
+using System.Web;
+using System.Web.SessionState;
+
+namespace Xania.AspNet.Simulator
+{
+    internal class SimpleSessionState : HttpSessionStateBase
+    {
+        private readonly IDictionary<string, object> _values;
+
+        public SimpleSessionState()
+        {
+            _values = new Dictionary<string, object>();
+        }
+
+        public override void Add(string name, object value)
+        {
+            _values.Add(name, value);
+        }
+
+        public override object this[string name]
+        {
+            get { return _values[name]; }
+            set { _values[name] = value; }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Xania.AspNet.Simulator/SimulatorActionInvoker.cs b/Xania.AspNet.Simulator/SimulatorActionInvoker.cs
new file mode 100644
index 0000000..8a43ad6
--- /dev/null
+++ b/Xania.AspNet.Simulator/SimulatorActionInvoker.cs
@@ -0,0 +1,117 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Web.Mvc;
+using RazorEngine;
+
+namespace Xania.AspNet.Simulator
+{
+    internal class SimulatorActionInvoker : ControllerActionInvoker
+    {
+        private readonly ControllerContext _controllerContext;
+        private readonly ActionDescriptor _actionDescriptor;
+        private readonly FilterInfo _filterInfo;
+
+        public SimulatorActionInvoker(ControllerContext controllerContext, ActionDescriptor actionDescriptor, IEnumerable<Filter> filters)
+        {
+            _controllerContext = controllerContext;
+            _actionDescriptor = actionDescriptor;
+            _filterInfo = new FilterInfo(filters);
+        }
+
+        public virtual ActionResult AuthorizeAction()
+        {
+            var authorizationContext = InvokeAuthorizationFilters(_controllerContext,
+                _filterInfo.AuthorizationFilters, _actionDescriptor);
+
+            return authorizationContext.Result;
+        }
+
+        public virtual ActionResult InvokeAction()
+        {
+            return AuthorizeAction() ?? InvokeActionMethodWithFilters();
+        }
+
+        private ActionResult InvokeActionMethodWithFilters()
+        {
+            var controller = _controllerContext.Controller as Controller;
+            if (controller != null)
+            {
+                controller.ViewEngineCollection = new ViewEngineCollection(new IViewEngine[]{ new RazorViewEngineSimulator() });
+            }
+
+            var parameters = GetParameterValues(_controllerContext, _actionDescriptor);
+            var actionExecutedContext = InvokeActionMethodWithFilters(_controllerContext,
+                _filterInfo.ActionFilters, _actionDescriptor, parameters);
+
+            if (actionExecutedContext == null)
+                throw new Exception("InvokeActionMethodWithFilters returned null");
+
+            return actionExecutedContext.Result;
+        }
+
+        protected override object GetParameterValue(ControllerContext controllerContext, ParameterDescriptor parameterDescriptor)
+        {
+            var parameterName = parameterDescriptor.ParameterName;
+            var value = base.GetParameterValue(controllerContext, parameterDescriptor);
+
+            if (value == null)
+                return null;
+
+            var validationResults = ValidateModel(parameterDescriptor.ParameterType, value, controllerContext);
+
+            var modelState = controllerContext.Controller.ViewData.ModelState;
+            Func<ModelValidationResult, bool> isValidField = res => modelState.IsValidField(String.Format("{0}.{1}", parameterName, res.MemberName));
+
+            foreach (var validationResult in validationResults.Where(isValidField).ToArray())
+            {
+                var subPropertyName = String.Format("{0}.{1}", parameterDescriptor.ParameterName, validationResult.MemberName);
+                modelState.AddModelError(subPropertyName, validationResult.Message);
+            }
+
+            return value;
+        }
+
+        protected virtual IEnumerable<ModelValidationResult> ValidateModel(Type modelType, object modelValue, ControllerContext controllerContext)
+        {
+            var modelMetadata = ModelMetadataProviders.Current.GetMetadataForType(() => modelValue, modelType);
+            return ModelValidator.GetModelValidator(modelMetadata, controllerContext).Validate(null);
+        }
+    }
+
+    internal class RazorViewEngineSimulator : IViewEngine
+    {
+        public ViewEngineResult FindPartialView(ControllerContext controllerContext, string partialViewName, bool useCache)
+        {
+            throw new NotImplementedException();
+        }
+
+        public ViewEngineResult FindView(ControllerContext controllerContext, string viewName, string masterName, bool useCache)
+        {
+            return new ViewEngineResult(new ViewSimulator(viewName), this);
+        }
+
+        public void ReleaseView(ControllerContext controllerContext, IView view)
+        {
+        }
+    }
+
+    internal class ViewSimulator : IView
+    {
+        private readonly string _viewName;
+
+        public ViewSimulator(string viewName)
+        {
+            _viewName = viewName;
+        }
+
+        public void Render(ViewContext viewContext, TextWriter writer)
+        {
+            var model = viewContext.ViewData.Model;
+            var html = Razor.Parse<string>("<h1>hello @Model</h1>", "simulator");
+
+            writer.Write(html);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Xania.AspNet.Simulator/SimulatorExtensions.cs b/Xania.AspNet.Simulator/SimulatorExtensions.cs
new file mode 100644
index 0000000..2738adb
--- /dev/null
+++ b/Xania.AspNet.Simulator/SimulatorExtensions.cs
@@ -0,0 +1,219 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Web;
+using System.Web.Mvc;
+using System.Web.Routing;
+
+namespace Xania.AspNet.Simulator
+{
+    public static class ControlllerActionExtensions
+    {
+        //public static IAction Authenticate(this IAction action, string userName,
+        //    string[] roles, string identityType = "simulator")
+        //{
+        //    var user = new GenericPrincipal(new GenericIdentity(userName, identityType), roles ?? new string[] {});
+        //    action.Authenticate(user);
+        //    return action;
+        //}
+
+        public static DirectControllerAction PostAction<TController>(this TController controller,
+            Expression<Func<TController, object>> actionExpression)
+            where TController : ControllerBase
+        {
+            return Action(controller, actionExpression).Post();
+        }
+
+        public static DirectControllerAction GetAction<TController>(this TController controller,
+            Expression<Func<TController, object>> actionExpression)
+            where TController : ControllerBase
+        {
+            return Action(controller, actionExpression).Get();
+        }
+
+        public static DirectControllerAction Action<TController>(this TController controller,
+            Expression<Func<TController, object>> actionExpression, string httpMethod = "GET")
+            where TController : ControllerBase
+        {
+            return new DirectControllerAction(controller, LinqActionDescriptor.Create(actionExpression), GetDefaultRoutes())
+            {
+                ValueProvider = new LinqActionValueProvider(actionExpression.Body),
+                HttpMethod = httpMethod
+            };
+        }
+
+
+        public static RouteCollection GetDefaultRoutes()
+        {
+            var routes = new RouteCollection();
+            if (RouteTable.Routes.Count == 0)
+                routes.MapRoute(
+                    "Default",
+                    "{controller}/{action}/{id}",
+                    new { controller = "Home", action = "Index", id = UrlParameter.Optional }
+                    );
+            else
+                foreach (var route in RouteTable.Routes)
+                    routes.Add(route);
+
+            return routes;
+        }
+
+        public static DirectControllerAction Action<TController>(this TController controller,
+            Expression<Action<TController>> actionExpression, String httpMethod = "GET")
+            where TController : ControllerBase
+        {
+            return new DirectControllerAction(controller, LinqActionDescriptor.Create(actionExpression), GetDefaultRoutes())
+            {
+                ValueProvider = new LinqActionValueProvider(actionExpression.Body),
+                HttpMethod = httpMethod
+            };
+        }
+
+        public static ControllerActionResult Execute<TController>(this TController controller,
+            Expression<Func<TController, object>> actionExpression)
+            where TController : ControllerBase
+        {
+            var action = Action(controller, actionExpression);
+            var httpContext = action.CreateHttpContext();
+            return action.Execute(httpContext);
+        }
+
+        public static ControllerActionResult Execute(this ControllerAction action, HttpContextBase httpContext = null)
+        {
+            return action.Execute(httpContext ?? action.CreateHttpContext());
+        }
+
+        public static TControllerAction AddCookie<TControllerAction>(this TControllerAction controllerAction, string name, string value)
+            where TControllerAction: ControllerAction
+        {
+            controllerAction.Cookies.Add(new HttpCookie(name, value));
+            return controllerAction;
+        }
+
+        public static TControllerAction AddSession<TControllerAction>(this TControllerAction controllerAction, string name, string value)
+            where TControllerAction : ControllerAction
+        {
+            controllerAction.Session[name] = value;
+            return controllerAction;
+        }
+
+        public static TControllerAction AddForm<TControllerAction>(this TControllerAction controllerAction, string name, string value)
+            where TControllerAction : ControllerAction
+        {
+            controllerAction.Form[name] = value;
+            return controllerAction;
+        }
+
+        public static TControllerAction AddFile<TControllerAction>(this TControllerAction controllerAction, string name,
+            Stream stream) where TControllerAction: ControllerAction
+        {
+            controllerAction.Files[name] = stream;
+            return controllerAction;
+        }
+
+        public static TService GetService<TService>(this IServiceProvider serviceProvider)
+        {
+            var service = serviceProvider.GetService(typeof (TService));
+            if (service is TService)
+                return (TService) service;
+
+            return Activator.CreateInstance<TService>();
+        }
+
+        public static ControllerActionResult Execute<TController>(this IDependencyResolver resolver,
+            Expression<Func<TController, object>> actionExpression)
+            where TController : ControllerBase
+        {
+            return resolver.GetService<TController>().Execute(actionExpression);
+        }
+
+        public static Router RegisterControllers(this Router application, params Assembly[] assemblies)
+        {
+            return RegisterControllers(application, null, assemblies);
+        }
+
+        public static Router RegisterControllers(this Router application,
+            IDependencyResolver dependencyResolver, params Assembly[] assemblies)
+        {
+            const string controllerPostFix = "Controller";
+            var controllerTypes =
+                from t in ScanTypes(assemblies)
+                where
+                    typeof (ControllerBase).IsAssignableFrom(t) &&
+                    t.Name.EndsWith(controllerPostFix, StringComparison.Ordinal)
+                select t;
+
+            foreach (var type in controllerTypes)
+            {
+                var name = type.Name.Substring(0, type.Name.Length - controllerPostFix.Length);
+                var instance = (dependencyResolver == null)
+                    ? Activator.CreateInstance(type)
+                    : dependencyResolver.GetService(type);
+
+                application.RegisterController(name, (ControllerBase) instance);
+            }
+
+            return application;
+        }
+
+        private static IEnumerable<Type> ScanTypes(params Assembly[] assemblies)
+        {
+            return assemblies.SelectMany(a => a.GetLoadedModules()).SelectMany(m => m.GetTypes())
+                .Where(t =>
+                    t.IsClass &&
+                    !t.IsAbstract &&
+                    !t.IsGenericTypeDefinition &&
+                    !typeof (Delegate).IsAssignableFrom(t));
+        }
+
+        public static Router RegisterRoutes(this Router router, Action<RouteCollection> configAction)
+        {
+            configAction(router.Routes);
+            return router;
+        }
+
+        public static IDictionary<string, object> ToDictionary(this object values)
+        {
+            return new RouteValueDictionary(values);
+        } 
+    }
+
+    public class LinqActionValueProvider : IValueProvider
+    {
+        private readonly Dictionary<string, object> _values;
+
+        public LinqActionValueProvider(Expression body)
+        {
+            _values = new Dictionary<String, object>();
+
+            var methodCallExpression = (MethodCallExpression)body;
+            var methodParameters = methodCallExpression.Method.GetParameters();
+            for (int i=0 ; i < methodCallExpression.Arguments.Count ; i++)
+            {
+                var arg = methodCallExpression.Arguments[i];
+                var par = methodParameters[i];
+                _values.Add(par.Name, Invoke(arg));
+            }
+        }
+        private static object Invoke(Expression valueExpression)
+        {
+            var convertExpression = Expression.Convert(valueExpression, typeof(object));
+            var express = Expression.Lambda<Func<object>>(convertExpression).Compile();
+            return express.Invoke();
+        }
+        public bool ContainsPrefix(string prefix)
+        {
+            return _values.ContainsKey(prefix);
+        }
+
+        public ValueProviderResult GetValue(string key)
+        {
+            return new ValueProviderResult(_values[key], null, CultureInfo.InvariantCulture);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Xania.AspNet.Simulator/Xania.AspNet.Simulator.csproj b/Xania.AspNet.Simulator/Xania.AspNet.Simulator.csproj
new file mode 100644
index 0000000..55468a5
--- /dev/null
+++ b/Xania.AspNet.Simulator/Xania.AspNet.Simulator.csproj
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{04B8C6C8-D531-468D-B07B-C2EBF9BF13E8}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Xania.AspNet.Simulator</RootNamespace>
+    <AssemblyName>Xania.AspNet.Simulator</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <Private>True</Private>
+      <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
+    </Reference>
+    <Reference Include="RazorEngine">
+      <HintPath>..\packages\RazorEngine.3.3.0\lib\net40\RazorEngine.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Web" />
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Mvc, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ActionContext.cs" />
+    <Compile Include="ActionRequestExtensions.cs" />
+    <Compile Include="ActionRequestWrapper.cs" />
+    <Compile Include="ActionRouterPathProvider.cs" />
+    <Compile Include="AspNetUtility.cs" />
+    <Compile Include="ControllerAction.cs" />
+    <Compile Include="ControllerActionResult.cs" />
+    <Compile Include="DirectControllerAction.cs" />
+    <Compile Include="HttpContextSimulator.cs" />
+    <Compile Include="HttpListenerRequestWrapper.cs" />
+    <Compile Include="HttpListenerResponseWrapper.cs" />
+    <Compile Include="HttpServerExtensions.cs" />
+    <Compile Include="HttpServerSimulator.cs" />
+    <Compile Include="IControllerAction.cs" />
+    <Compile Include="LinqActionDescriptor.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Router.cs" />
+    <Compile Include="RouterAction.cs" />
+    <Compile Include="RouterExtensions.cs" />
+    <Compile Include="SimpleHttpRequest.cs" />
+    <Compile Include="SimpleSessionState.cs" />
+    <Compile Include="SimulatorActionInvoker.cs" />
+    <Compile Include="SimulatorExtensions.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/Xania.AspNet.Simulator/app.config b/Xania.AspNet.Simulator/app.config
new file mode 100644
index 0000000..e2e0187
--- /dev/null
+++ b/Xania.AspNet.Simulator/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
diff --git a/Xania.AspNet.Simulator/packages.config b/Xania.AspNet.Simulator/packages.config
new file mode 100644
index 0000000..60d6113
--- /dev/null
+++ b/Xania.AspNet.Simulator/packages.config
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
+  <package id="RazorEngine" version="3.3.0" targetFramework="net45" />
+</packages>
\ No newline at end of file

From 31a211aa6938b84fa6c53a8f603af846ee2b577e Mon Sep 17 00:00:00 2001
From: Michael Whelan <mjmwdev@gmail.com>
Date: Tue, 19 May 2015 15:47:22 +0100
Subject: [PATCH 5/6] Got MvcPipeline working

---
 .../MvcPipeline/WithMvcPipelineShould.cs      | 36 +++++++++++++++++++
 .../TestStack.FluentMVCTesting.Tests.csproj   |  3 +-
 .../ControllerExtensions.cs                   | 16 ++-------
 3 files changed, 41 insertions(+), 14 deletions(-)
 create mode 100644 TestStack.FluentMVCTesting.Tests/MvcPipeline/WithMvcPipelineShould.cs

diff --git a/TestStack.FluentMVCTesting.Tests/MvcPipeline/WithMvcPipelineShould.cs b/TestStack.FluentMVCTesting.Tests/MvcPipeline/WithMvcPipelineShould.cs
new file mode 100644
index 0000000..5074b3f
--- /dev/null
+++ b/TestStack.FluentMVCTesting.Tests/MvcPipeline/WithMvcPipelineShould.cs
@@ -0,0 +1,36 @@
+namespace TestStack.FluentMVCTesting.Tests.MvcPipeline
+{
+    using NUnit.Framework;
+    using TestStack.FluentMVCTesting.Tests.TestControllers;
+
+#if NET45
+    [TestFixture]
+    class WithMvcPipelineShould
+    {
+        [Test]
+        public void Call_action()
+        {
+            var controller = new ControllerExtensionsController();
+            controller.WithMvcPipelineTo(c => c.SomeAction());
+            Assert.That(controller.SomeActionCalled);
+        }
+
+        [Test]
+        public void Work_correctly_for_valid_check()
+        {
+            new AsyncController()
+                .WithMvcPipelineTo(c => c.AsyncViewAction())
+                .ShouldRenderDefaultView();
+        }
+
+        [Test]
+        public void Work_correctly_for_invalid_check()
+        {
+            var controller = new AsyncController();
+            Assert.Throws<ActionResultAssertionException>(
+                () => controller.WithMvcPipelineTo(c => c.AsyncViewAction()).ShouldGiveHttpStatus()
+            );
+        }
+    }
+#endif
+}
diff --git a/TestStack.FluentMVCTesting.Tests/TestStack.FluentMVCTesting.Tests.csproj b/TestStack.FluentMVCTesting.Tests/TestStack.FluentMVCTesting.Tests.csproj
index c2d8ab9..53f307d 100644
--- a/TestStack.FluentMVCTesting.Tests/TestStack.FluentMVCTesting.Tests.csproj
+++ b/TestStack.FluentMVCTesting.Tests/TestStack.FluentMVCTesting.Tests.csproj
@@ -20,7 +20,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
@@ -89,6 +89,7 @@
     <Compile Include="ControllerResultTestTests\ShouldReturnEmptyResultTests.cs" />
     <Compile Include="ControllerResultTestTests\ShouldReturnJsonTests.cs" />
     <Compile Include="ControllerResultTestTests\ShouldReturnContentTests.cs" />
+    <Compile Include="MvcPipeline\WithMvcPipelineShould.cs" />
     <Compile Include="RouteValueDictionaryExtensionsTests.cs" />
     <Compile Include="TempDataResultTest.cs" />
     <Compile Include="TestControllers\AsyncController.cs" />
diff --git a/TestStack.FluentMvcTesting/ControllerExtensions.cs b/TestStack.FluentMvcTesting/ControllerExtensions.cs
index e931e76..bdf4aeb 100644
--- a/TestStack.FluentMvcTesting/ControllerExtensions.cs
+++ b/TestStack.FluentMvcTesting/ControllerExtensions.cs
@@ -17,24 +17,14 @@ public static T WithModelErrors<T>(this T controller) where T : Controller
             return controller;
         }
 
-        public static ControllerResultTest<T> WithCallTo<T, TAction>(this T controller, Expression<Func<T, TAction>> actionCall)
-            where T : Controller
+        public static ControllerResultTest<T> WithCallTo<T, TAction>(this T controller, Expression<Func<T, TAction>> actionCall)       where T : Controller 
             where TAction : ActionResult
         {
-#if NET45
-            var expression = Expression.Lambda<Func<T, object>>(Expression.Convert(actionCall.Body, typeof (object)), actionCall.Parameters);
-            var action = controller.Action(expression);
-            var result = action.Execute();
-
-            return new ControllerResultTest<T>(controller, action.ActionDescriptor.ActionName, result.ActionResult);
-
-#else
             var actionName = ((MethodCallExpression)actionCall.Body).Method.Name;
 
             var actionResult = actionCall.Compile().Invoke(controller);
 
             return new ControllerResultTest<T>(controller, actionName, actionResult);
-#endif        
         }
 
         public static ControllerResultTest<T> WithCallTo<T, TAction>(this T controller, Expression<Func<T, Task<TAction>>> actionCall)
@@ -53,7 +43,7 @@ public static ControllerResultTest<T> WithMvcPipelineTo<T, TAction>(this T contr
             where T : Controller
             where TAction : ActionResult
         {
-            var expression = Expression.Lambda<Func<T, object>>(Expression.Convert(actionCall.Body, typeof (object)), actionCall.Parameters);
+            var expression = Expression.Lambda<Func<T, object>>(actionCall.Body, actionCall.Parameters);
             var action = controller.Action(expression);
             var result = action.Execute();
 
@@ -64,7 +54,7 @@ public static ControllerResultTest<T> WithMvcPipelineTo<T, TAction>(this T contr
             where T : Controller
             where TAction : ActionResult
         {
-            var expression = Expression.Lambda<Func<T, object>>(Expression.Convert(actionCall.Body, typeof(Task<object>)), actionCall.Parameters);
+            var expression = Expression.Lambda<Func<T, object>>(actionCall.Body, actionCall.Parameters);
             var action = controller.Action(expression);
             var result = action.Execute();
 

From 93f72354c6452e1d3f618798726d5c1390522e80 Mon Sep 17 00:00:00 2001
From: Michael Whelan <mjmwdev@gmail.com>
Date: Wed, 20 May 2015 15:06:08 +0100
Subject: [PATCH 6/6] Added test to verify that filters run using
 WithMvcPipelineTo

---
 .../MvcPipeline/WithMvcPipelineShould.cs      | 43 +++++++++++++------
 1 file changed, 30 insertions(+), 13 deletions(-)

diff --git a/TestStack.FluentMVCTesting.Tests/MvcPipeline/WithMvcPipelineShould.cs b/TestStack.FluentMVCTesting.Tests/MvcPipeline/WithMvcPipelineShould.cs
index 5074b3f..025f354 100644
--- a/TestStack.FluentMVCTesting.Tests/MvcPipeline/WithMvcPipelineShould.cs
+++ b/TestStack.FluentMVCTesting.Tests/MvcPipeline/WithMvcPipelineShould.cs
@@ -1,8 +1,9 @@
+using System.Web.Mvc;
+using NUnit.Framework;
+using TestStack.FluentMVCTesting.Tests.TestControllers;
+
 namespace TestStack.FluentMVCTesting.Tests.MvcPipeline
 {
-    using NUnit.Framework;
-    using TestStack.FluentMVCTesting.Tests.TestControllers;
-
 #if NET45
     [TestFixture]
     class WithMvcPipelineShould
@@ -16,20 +17,36 @@ public void Call_action()
         }
 
         [Test]
-        public void Work_correctly_for_valid_check()
+        public void Can_exercise_filters()
         {
-            new AsyncController()
-                .WithMvcPipelineTo(c => c.AsyncViewAction())
-                .ShouldRenderDefaultView();
+            GlobalFilters.Filters.Add(new LoggingFilter());
+            var controller = new ControllerExtensionsController();
+            
+            controller.WithMvcPipelineTo(c => c.SomeAction());
+            
+            Assert.That(LoggingFilter.OnActionExecutingRan);
+            Assert.That(LoggingFilter.OnActionExecutedRan);
         }
 
-        [Test]
-        public void Work_correctly_for_invalid_check()
+        private class LoggingFilter : ActionFilterAttribute, IActionFilter
         {
-            var controller = new AsyncController();
-            Assert.Throws<ActionResultAssertionException>(
-                () => controller.WithMvcPipelineTo(c => c.AsyncViewAction()).ShouldGiveHttpStatus()
-            );
+            public static bool OnActionExecutingRan;
+            public static bool OnActionExecutedRan;
+
+            public LoggingFilter()
+            {
+                OnActionExecutingRan = false;
+                OnActionExecutedRan = false;
+            }
+            public override void OnActionExecuting(ActionExecutingContext filterContext)
+            {
+                OnActionExecutingRan = true;
+            }
+
+            public override void OnActionExecuted(ActionExecutedContext filterContext)
+            {
+                OnActionExecutedRan = true;
+            }
         }
     }
 #endif