diff --git a/.gitignore b/.gitignore
index c35faf5..1effeac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ _ReSharper*
 */NhibernateProfiler*/tools
 packages
 /TestStack.FluentMVCTesting.Example/App_Data
+/TestStack.FluentMVCTesting.sln.ide
\ No newline at end of file
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..f0552dc 100644
--- a/Samples/TestStack.FluentMVCTesting.Sample.Tests/TestStack.FluentMVCTesting.Sample.Tests.csproj
+++ b/Samples/TestStack.FluentMVCTesting.Sample.Tests/TestStack.FluentMVCTesting.Sample.Tests.csproj
@@ -96,6 +96,9 @@
       <Name>TestStack.FluentMVCTesting.Sample</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </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.Mvc3.Tests/TestStack.FluentMVCTesting.Mvc3.Tests.csproj b/TestStack.FluentMVCTesting.Mvc3.Tests/TestStack.FluentMVCTesting.Mvc3.Tests.csproj
index 877fb4c..7bc30dd 100644
--- a/TestStack.FluentMVCTesting.Mvc3.Tests/TestStack.FluentMVCTesting.Mvc3.Tests.csproj
+++ b/TestStack.FluentMVCTesting.Mvc3.Tests/TestStack.FluentMVCTesting.Mvc3.Tests.csproj
@@ -90,6 +90,9 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </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.Mvc4.Tests/TestStack.FluentMVCTesting.Mvc4.Tests.csproj b/TestStack.FluentMVCTesting.Mvc4.Tests/TestStack.FluentMVCTesting.Mvc4.Tests.csproj
index d934e7a..8929ec6 100644
--- a/TestStack.FluentMVCTesting.Mvc4.Tests/TestStack.FluentMVCTesting.Mvc4.Tests.csproj
+++ b/TestStack.FluentMVCTesting.Mvc4.Tests/TestStack.FluentMVCTesting.Mvc4.Tests.csproj
@@ -91,5 +91,8 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/TestStack.FluentMVCTesting.Tests/ControllerResultTestTests/ControllerResultTestTests.cs b/TestStack.FluentMVCTesting.Tests/ControllerResultTestTests/ControllerResultTestTests.cs
index eb42c3a..00ce689 100644
--- a/TestStack.FluentMVCTesting.Tests/ControllerResultTestTests/ControllerResultTestTests.cs
+++ b/TestStack.FluentMVCTesting.Tests/ControllerResultTestTests/ControllerResultTestTests.cs
@@ -14,10 +14,7 @@ partial class ControllerResultTestShould
         private ControllerResultTestController _controller;
 
         [SetUp]
-        public void Setup()
-        {
-            _controller = new ControllerResultTestController();
-        }
+        public void Setup() => _controller = new ControllerResultTestController();
 
         #region General Tests
         // Expected action return types for the different types of assertions
diff --git a/TestStack.FluentMVCTesting.Tests/TestStack.FluentMVCTesting.Tests.csproj b/TestStack.FluentMVCTesting.Tests/TestStack.FluentMVCTesting.Tests.csproj
index 2db7429..9e145ee 100644
--- a/TestStack.FluentMVCTesting.Tests/TestStack.FluentMVCTesting.Tests.csproj
+++ b/TestStack.FluentMVCTesting.Tests/TestStack.FluentMVCTesting.Tests.csproj
@@ -24,6 +24,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <LangVersion>6</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -111,6 +112,9 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </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/ControllerExtensions.cs b/TestStack.FluentMvcTesting/ControllerExtensions.cs
index 55835d6..9319b28 100644
--- a/TestStack.FluentMvcTesting/ControllerExtensions.cs
+++ b/TestStack.FluentMvcTesting/ControllerExtensions.cs
@@ -7,7 +7,6 @@ namespace TestStack.FluentMVCTesting
 {
     public static class ControllerExtensions
     {
-
         public static T WithModelErrors<T>(this T controller) where T : Controller
         {
             controller.ModelState.AddModelError("Key", "Value");
@@ -43,7 +42,7 @@ public static ControllerResultTest<T> WithCallToChild<T, TAction>(this T control
             var action = ((MethodCallExpression)actionCall.Body).Method;
 
             if (!action.IsDefined(typeof(ChildActionOnlyAttribute), false))
-                throw new InvalidControllerActionException(string.Format("Expected action {0} of controller {1} to be a child action, but it didn't have the ChildActionOnly attribute.", action.Name, controller.GetType().Name));
+                throw new InvalidControllerActionException("Expected action \{action.Name} of controller \{controller.GetType().Name} to be a child action, but it didn't have the ChildActionOnly attribute.");
 
             return controller.WithCallTo(actionCall);
         }
@@ -55,7 +54,7 @@ public static ControllerResultTest<T> WithCallToChild<T, TAction>(this T control
             var action = ((MethodCallExpression)actionCall.Body).Method;
 
             if (!action.IsDefined(typeof(ChildActionOnlyAttribute), false))
-                throw new InvalidControllerActionException(string.Format("Expected action {0} of controller {1} to be a child action, but it didn't have the ChildActionOnly attribute.", action.Name, controller.GetType().Name));
+                throw new InvalidControllerActionException("Expected action \{action.Name} of controller \{controller.GetType().Name} to be a child action, but it didn't have the ChildActionOnly attribute.");
 
             return controller.WithCallTo(actionCall);
         }
@@ -66,22 +65,17 @@ public static TempDataResultTest ShouldHaveTempDataProperty(this ControllerBase
 
             if (actual == null)
             {
-                throw new TempDataAssertionException(string.Format(
-                    "Expected TempData to have a non-null value with key \"{0}\", but none found.", key));
+                throw new TempDataAssertionException("Expected TempData to have a non-null value with key \"\{key}\", but none found.");
             }
 
             if (value != null && actual.GetType() != value.GetType())
             {
-                throw new TempDataAssertionException(string.Format(
-                    "Expected value to be of type {0}, but instead was {1}.",
-                    value.GetType().FullName,
-                    actual.GetType().FullName));
+                throw new TempDataAssertionException("Expected value to be of type \{value.GetType().FullName}, but instead was \{actual.GetType().FullName}.");
             }
 
             if (value != null && !value.Equals(actual))
             {
-                throw new TempDataAssertionException(string.Format(
-                    "Expected value for key \"{0}\" to be \"{1}\", but instead found \"{2}\"", key, value, actual));
+                throw new TempDataAssertionException("Expected value for key \"\{key}\" to be \"\{value}\", but instead found \"\{actual}\"");
             }
 
             return new TempDataResultTest(controller);
@@ -93,8 +87,7 @@ public static TempDataResultTest ShouldHaveTempDataProperty<TValue>(this Control
 
             if (actual == null)
             {
-                throw new TempDataAssertionException(string.Format(
-                    "Expected TempData to have a non-null value with key \"{0}\", but none found.", key));
+                throw new TempDataAssertionException("Expected TempData to have a non-null value with key \"\{key}\", but none found.");
             }
 
             if (!predicate((TValue)actual))
@@ -111,8 +104,7 @@ public static TempDataResultTest ShouldNotHaveTempDataProperty(this Controller c
 
             if (actual != null)
             {
-                throw new TempDataAssertionException(string.Format(
-                    "Expected TempData to have no value with key \"{0}\", but found one.", key));
+                throw new TempDataAssertionException("Expected TempData to have no value with key \"\{key}\", but found one.");
             }
 
             return new TempDataResultTest(controller);
diff --git a/TestStack.FluentMvcTesting/ControllerResultTest/ControllerResultTest.cs b/TestStack.FluentMvcTesting/ControllerResultTest/ControllerResultTest.cs
index 3961af6..046fb12 100644
--- a/TestStack.FluentMvcTesting/ControllerResultTest/ControllerResultTest.cs
+++ b/TestStack.FluentMvcTesting/ControllerResultTest/ControllerResultTest.cs
@@ -4,23 +4,22 @@ namespace TestStack.FluentMVCTesting
 {
     public partial class ControllerResultTest<T> where T : Controller
     {
-        public T Controller { get; private set; }
-        public string ActionName { get; private set; }
-        public ActionResult ActionResult { get; private set; }
+        public T Controller { get; }
+        public string ActionName { get; }
+        public ActionResult ActionResult { get; }
 
         public void ValidateActionReturnType<TActionResult>() where TActionResult : ActionResult
         {
             var castedActionResult = ActionResult as TActionResult;
 
             if (ActionResult == null)
-                throw new ActionResultAssertionException(string.Format("Received null action result when expecting {0}.", typeof(TActionResult).Name));
+                throw new ActionResultAssertionException(string.Format("Received null action result when expecting {0}.", 
+                    typeof(TActionResult).Name));
 
             if (castedActionResult == null)
-                throw new ActionResultAssertionException(
-                    string.Format("Expected action result to be a {0}, but instead received a {1}.",
-                                  typeof(TActionResult).Name, ActionResult.GetType().Name
-                        )
-                    );
+                throw new ActionResultAssertionException(string.Format("Expected action result to be a {0}, but instead received a {1}.",
+                    typeof(TActionResult).Name, 
+                    ActionResult.GetType().Name));
         }
 
         public ControllerResultTest(T controller, string actionName, ActionResult actionResult)
diff --git a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldGiveHttpStatus.cs b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldGiveHttpStatus.cs
index bf0c37f..61decec 100644
--- a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldGiveHttpStatus.cs
+++ b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldGiveHttpStatus.cs
@@ -5,10 +5,7 @@ namespace TestStack.FluentMVCTesting
 {
     public partial class ControllerResultTest<T>
     {
-        public void ShouldGiveHttpStatus()
-        {
-            ValidateActionReturnType<HttpStatusCodeResult>();
-        }
+        public void ShouldGiveHttpStatus() => ValidateActionReturnType<HttpStatusCodeResult>();
 
         public void ShouldGiveHttpStatus(int status)
         {
@@ -17,12 +14,9 @@ public void ShouldGiveHttpStatus(int status)
             var statusCodeResult = (HttpStatusCodeResult)ActionResult;
 
             if (statusCodeResult.StatusCode != status)
-                throw new ActionResultAssertionException(string.Format("Expected HTTP status code to be '{0}', but instead received a '{1}'.", status, statusCodeResult.StatusCode));
+                throw new ActionResultAssertionException("Expected HTTP status code to be '\{status}', but instead received a '\{statusCodeResult.StatusCode}'.");
         }
 
-        public void ShouldGiveHttpStatus(HttpStatusCode status)
-        {
-            ShouldGiveHttpStatus((int)status);
-        }
+        public void ShouldGiveHttpStatus(HttpStatusCode status) => ShouldGiveHttpStatus((int)status);
     }
 }
\ No newline at end of file
diff --git a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRedirectTo.cs b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRedirectTo.cs
index e435197..91776a8 100644
--- a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRedirectTo.cs
+++ b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRedirectTo.cs
@@ -15,7 +15,7 @@ public void ShouldRedirectTo(string url)
             var redirectResult = (RedirectResult)ActionResult;
 
             if (redirectResult.Url != url)
-                throw new ActionResultAssertionException(string.Format("Expected redirect to URL '{0}', but instead was given a redirect to URL '{1}'.", url, redirectResult.Url));
+                throw new ActionResultAssertionException("Expected redirect to URL '\{url}', but instead was given a redirect to URL '\{redirectResult.Url}'.");
         }
 
         public RouteValueDictionary ShouldRedirectToRoute(string route)
@@ -24,35 +24,25 @@ public RouteValueDictionary ShouldRedirectToRoute(string route)
             var redirectResult = (RedirectToRouteResult)ActionResult;
 
             if (redirectResult.RouteName != route)
-                throw new ActionResultAssertionException(string.Format("Expected redirect to route '{0}', but instead was given a redirect to route '{1}'.", route, redirectResult.RouteName));
+                throw new ActionResultAssertionException("Expected redirect to route '\{route}', but instead was given a redirect to route '\{redirectResult.RouteName}'.");
 
             return redirectResult.RouteValues;
         }
 
-        public RouteValueDictionary ShouldRedirectTo(Func<T, Func<ActionResult>> actionRedirectedTo)
-        {
-            return ShouldRedirectTo(actionRedirectedTo(Controller).Method);
-        }
+        public RouteValueDictionary ShouldRedirectTo(Func<T, Func<ActionResult>> actionRedirectedTo) => 
+            ShouldRedirectTo(actionRedirectedTo(Controller).Method);
 
-        public RouteValueDictionary ShouldRedirectTo(Func<T, Func<int, ActionResult>> actionRedirectedTo)
-        {
-            return ShouldRedirectTo(actionRedirectedTo(Controller).Method);
-        }
+        public RouteValueDictionary ShouldRedirectTo(Func<T, Func<int, ActionResult>> actionRedirectedTo) => 
+            ShouldRedirectTo(actionRedirectedTo(Controller).Method);
 
-        public RouteValueDictionary ShouldRedirectTo<T1>(Func<T, Func<T1, ActionResult>> actionRedirectedTo)
-        {
-            return ShouldRedirectTo(actionRedirectedTo(Controller).Method);
-        }
+        public RouteValueDictionary ShouldRedirectTo<T1>(Func<T, Func<T1, ActionResult>> actionRedirectedTo) => 
+            ShouldRedirectTo(actionRedirectedTo(Controller).Method);
 
-        public RouteValueDictionary ShouldRedirectTo<T1, T2>(Func<T, Func<T1, T2, ActionResult>> actionRedirectedTo)
-        {
-            return ShouldRedirectTo(actionRedirectedTo(Controller).Method);
-        }
+        public RouteValueDictionary ShouldRedirectTo<T1, T2>(Func<T, Func<T1, T2, ActionResult>> actionRedirectedTo) => 
+            ShouldRedirectTo(actionRedirectedTo(Controller).Method);
 
-        public RouteValueDictionary ShouldRedirectTo<T1, T2, T3>(Func<T, Func<T1, T2, T3, ActionResult>> actionRedirectedTo)
-        {
-            return ShouldRedirectTo(actionRedirectedTo(Controller).Method);
-        }
+        public RouteValueDictionary ShouldRedirectTo<T1, T2, T3>(Func<T, Func<T1, T2, T3, ActionResult>> actionRedirectedTo) => 
+            ShouldRedirectTo(actionRedirectedTo(Controller).Method);
 
         public RouteValueDictionary ShouldRedirectTo(Expression<Action<T>> actionRedirectedTo)
         {
@@ -69,13 +59,13 @@ public RouteValueDictionary ShouldRedirectTo(MethodInfo method, RouteValueDictio
             var redirectResult = (RedirectToRouteResult)ActionResult;
 
             if (redirectResult.RouteValues.ContainsKey("Controller") && redirectResult.RouteValues["Controller"].ToString() != controllerName)
-                throw new ActionResultAssertionException(string.Format("Expected redirect to controller '{0}', but instead was given a redirect to controller '{1}'.", controllerName, redirectResult.RouteValues["Controller"]));
+                throw new ActionResultAssertionException("Expected redirect to controller '\{controllerName}', but instead was given a redirect to controller '\{redirectResult.RouteValues["Controller"]}'.");
 
             if (!redirectResult.RouteValues.ContainsKey("Action"))
-                throw new ActionResultAssertionException(string.Format("Expected redirect to action '{0}', but instead was given a redirect without an action.", actionName));
+                throw new ActionResultAssertionException("Expected redirect to action '\{actionName}', but instead was given a redirect without an action.");
 
             if (redirectResult.RouteValues["Action"].ToString() != actionName)
-                throw new ActionResultAssertionException(string.Format("Expected redirect to action '{0}', but instead was given a redirect to action '{1}'.", actionName, redirectResult.RouteValues["Action"]));
+                throw new ActionResultAssertionException("Expected redirect to action '\{actionName}', but instead was given a redirect to action '\{redirectResult.RouteValues["Action"]}'.");
 
             if (expectedValues == null)
                 return redirectResult.RouteValues;
@@ -85,16 +75,11 @@ public RouteValueDictionary ShouldRedirectTo(MethodInfo method, RouteValueDictio
                 object actualValue;
                 if (!redirectResult.RouteValues.TryGetValue(expectedRouteValue.Key, out actualValue))
                 {
-                    throw new ActionResultAssertionException(string.Format("Expected redirect to have parameter '{0}', but it did not.", expectedRouteValue.Key));
+                    throw new ActionResultAssertionException("Expected redirect to have parameter '\{expectedRouteValue.Key}', but it did not.");
                 }
                 if (actualValue.ToString() != expectedRouteValue.Value.ToString())
                 {
-                    throw new ActionResultAssertionException(
-                        string.Format("Expected parameter '{0}' to have value '{1}', but instead was given value '{2}'."
-                                      , expectedRouteValue.Key
-                                      , expectedRouteValue.Value
-                                      , actualValue
-                            ));
+                    throw new ActionResultAssertionException("Expected parameter '\{expectedRouteValue.Key}' to have value '\{expectedRouteValue.Value}', but instead was given value '\{actualValue}'.");
                 }
             }
 
@@ -117,13 +102,13 @@ public RouteValueDictionary ShouldRedirectTo<TController>(MethodInfo methodInfo)
             var redirectResult = (RedirectToRouteResult)ActionResult;
 
             if (redirectResult.RouteValues["Controller"] == null)
-                throw new ActionResultAssertionException(string.Format("Expected redirect to action '{0}' in '{1}' controller, but instead was given redirect to action '{2}' within the same controller.", actionName, controllerName, redirectResult.RouteValues["Action"]));
+                throw new ActionResultAssertionException("Expected redirect to action '\{actionName}' in '\{controllerName}' controller, but instead was given redirect to action '\{redirectResult.RouteValues["Action"]}' within the same controller.");
 
             if (redirectResult.RouteValues["Controller"].ToString() != controllerName)
-                throw new ActionResultAssertionException(string.Format("Expected redirect to controller '{0}', but instead was given a redirect to controller '{1}'.", controllerName, redirectResult.RouteValues["Controller"]));
+                throw new ActionResultAssertionException("Expected redirect to controller '\{controllerName}', but instead was given a redirect to controller '\{redirectResult.RouteValues["Controller"]}'.");
 
             if (redirectResult.RouteValues["Action"].ToString() != actionName)
-                throw new ActionResultAssertionException(string.Format("Expected redirect to action '{0}', but instead was given a redirect to action '{1}'.", actionName, redirectResult.RouteValues["Action"]));
+                throw new ActionResultAssertionException("Expected redirect to action '\{actionName}', but instead was given a redirect to action '\{redirectResult.RouteValues["Action"]}'.");
 
             return redirectResult.RouteValues;
         }
diff --git a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRenderFile.cs b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRenderFile.cs
index b12207b..f2fca0f 100644
--- a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRenderFile.cs
+++ b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRenderFile.cs
@@ -12,8 +12,7 @@ private static void EnsureContentTypeIsSame(string actual, string expected)
             if (expected == null) return;
             if (actual != expected)
             {
-                throw new ActionResultAssertionException(string.Format(
-                    "Expected file to be of content type '{0}', but instead was given '{1}'.", expected, actual));
+                throw new ActionResultAssertionException("Expected file to be of content type '\{expected}', but instead was given '\{actual}'.");
             }
         }
 
@@ -46,8 +45,7 @@ public FileContentResult ShouldRenderFileContents(byte[] contents = null, string
 
             if (contents != null && !fileResult.FileContents.SequenceEqual(contents))
             {
-                throw new ActionResultAssertionException(string.Format(
-                    "Expected file contents to be equal to [{0}], but instead was given [{1}].",
+                throw new ActionResultAssertionException(string.Format("Expected file contents to be equal to [{0}], but instead was given [{1}].",
                     string.Join(", ", contents),
                     string.Join(", ", fileResult.FileContents)));
             }
@@ -68,10 +66,7 @@ public FileContentResult ShouldRenderFileContents(string contents, string conten
             var reconstitutedText = encoding.GetString(fileResult.FileContents);
             if (contents != reconstitutedText)
             {
-                throw new ActionResultAssertionException(string.Format(
-                    "Expected file contents to be \"{0}\", but instead was \"{1}\".",
-                    contents,
-                    reconstitutedText));
+                throw new ActionResultAssertionException("Expected file contents to be \"\{contents}\", but instead was \"\{reconstitutedText}\".");
             }
 
             return fileResult;
@@ -120,10 +115,7 @@ public FileStreamResult ShouldRenderFileStream(string contents, string contentTy
             var reconstitutedText = encoding.GetString(ConvertStreamToArray(fileResult.FileStream));
             if (contents != reconstitutedText)
             {
-                throw new ActionResultAssertionException(string.Format(
-                    "Expected file contents to be \"{0}\", but instead was \"{1}\".",
-                    contents,
-                    reconstitutedText));
+                throw new ActionResultAssertionException("Expected file contents to be \"\{contents}\", but instead was \"\{reconstitutedText}\".");
             }
 
             return fileResult;
@@ -138,10 +130,7 @@ public FilePathResult ShouldRenderFilePath(string fileName = null, string conten
 
             if (fileName != null && fileName != fileResult.FileName)
             {
-                throw new ActionResultAssertionException(string.Format(
-                    "Expected file name to be '{0}', but instead was given '{1}'.",
-                    fileName,
-                    fileResult.FileName));
+                throw new ActionResultAssertionException("Expected file name to be '\{fileName}', but instead was given '\{fileResult.FileName}'.");
             }
 
             return fileResult;
diff --git a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRenderView.cs b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRenderView.cs
index b417095..dced5b6 100644
--- a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRenderView.cs
+++ b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldRenderView.cs
@@ -12,30 +12,16 @@ private ViewResultTest ShouldRenderViewResult<TViewResult>(string viewName) wher
 
             if (viewResult.ViewName != viewName && (viewName != ActionName || viewResult.ViewName != ""))
             {
-                throw new ActionResultAssertionException(string.Format("Expected result view to be '{0}', but instead was given '{1}'.", viewName, viewResult.ViewName == "" ? ActionName : viewResult.ViewName));
+                var actual = viewResult.ViewName == "" ? ActionName : viewResult.ViewName;
+                throw new ActionResultAssertionException("Expected result view to be '\{viewName}', but instead was given '\{actual}'.");
             }
 
             return new ViewResultTest(viewResult, Controller);
         }
 
-        public ViewResultTest ShouldRenderView(string viewName)
-        {
-            return ShouldRenderViewResult<ViewResult>(viewName);
-        }
-
-        public ViewResultTest ShouldRenderPartialView(string viewName)
-        {
-            return ShouldRenderViewResult<PartialViewResult>(viewName);
-        }
-
-        public ViewResultTest ShouldRenderDefaultView()
-        {
-            return ShouldRenderView(ActionName);
-        }
-
-        public ViewResultTest ShouldRenderDefaultPartialView()
-        {
-            return ShouldRenderPartialView(ActionName);
-        }
+        public ViewResultTest ShouldRenderView(string viewName) => ShouldRenderViewResult<ViewResult>(viewName);
+        public ViewResultTest ShouldRenderPartialView(string viewName) => ShouldRenderViewResult<PartialViewResult>(viewName);
+        public ViewResultTest ShouldRenderDefaultView() => ShouldRenderView(ActionName);
+        public ViewResultTest ShouldRenderDefaultPartialView() => ShouldRenderPartialView(ActionName);
     }
 }
\ No newline at end of file
diff --git a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnContent.cs b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnContent.cs
index a8f365e..b386802 100644
--- a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnContent.cs
+++ b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnContent.cs
@@ -12,26 +12,18 @@ public ContentResult ShouldReturnContent(string content = null, string contentTy
 
             if (contentType != null && contentType != contentResult.ContentType)
             {
-                throw new ActionResultAssertionException(string.Format(
-                    "Expected content type to be \"{0}\", but instead was \"{1}\".",
-                    contentType,
-                    contentResult.ContentType));
+                throw new ActionResultAssertionException("Expected content type to be \"\{contentType}\", but instead was \"\{contentResult.ContentType}\".");
             }
 
             if (content != null && content != contentResult.Content)
             {
-                throw new ActionResultAssertionException(string.Format(
-                    "Expected content to be \"{0}\", but instead was \"{1}\".",
-                    content,
-                    contentResult.Content));
+                throw new ActionResultAssertionException("Expected content to be \"\{content}\", but instead was \"\{contentResult.Content}\".");
             }
 
             if (encoding != null && encoding != contentResult.ContentEncoding)
             {
-                throw new ActionResultAssertionException(string.Format(
-                    "Expected encoding to be equal to {0}, but instead was {1}.",
-                    encoding.EncodingName,
-                    contentResult.ContentEncoding != null ? contentResult.ContentEncoding.EncodingName : "null"));
+                var actual = contentResult.ContentEncoding != null ? contentResult.ContentEncoding.EncodingName : "null";
+                throw new ActionResultAssertionException("Expected encoding to be equal to \{encoding.EncodingName}, but instead was \{actual}.");
             }
 
             return contentResult;
diff --git a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnEmptyResult.cs b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnEmptyResult.cs
index 0df9206..daf6688 100644
--- a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnEmptyResult.cs
+++ b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnEmptyResult.cs
@@ -4,9 +4,6 @@ namespace TestStack.FluentMVCTesting
 {
     public partial class ControllerResultTest<T>
     {
-        public void ShouldReturnEmptyResult()
-        {
-            ValidateActionReturnType<EmptyResult>();
-        }
+        public void ShouldReturnEmptyResult() => ValidateActionReturnType<EmptyResult>();
     }
 }
\ No newline at end of file
diff --git a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnJson.cs b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnJson.cs
index 67dcb6d..1b1fb1a 100644
--- a/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnJson.cs
+++ b/TestStack.FluentMvcTesting/ControllerResultTest/ShouldReturnJson.cs
@@ -5,10 +5,7 @@ namespace TestStack.FluentMVCTesting
 {
     public partial class ControllerResultTest<T>
     {
-        public void ShouldReturnJson()
-        {
-            ValidateActionReturnType<JsonResult>();
-        }
+        public void ShouldReturnJson() => ValidateActionReturnType<JsonResult>();
 
         public void ShouldReturnJson(Action<dynamic> assertion)
         {
diff --git a/TestStack.FluentMvcTesting/Internal/ExpressionInspector.cs b/TestStack.FluentMvcTesting/Internal/ExpressionInspector.cs
index 4637792..1a6456d 100644
--- a/TestStack.FluentMvcTesting/Internal/ExpressionInspector.cs
+++ b/TestStack.FluentMvcTesting/Internal/ExpressionInspector.cs
@@ -4,13 +4,11 @@ namespace TestStack.FluentMVCTesting.Internal
 {
     internal class ExpressionInspector
     {
-        internal string Inspect(LambdaExpression expression)
-        {
-            return expression.ToString()
+        internal string Inspect(LambdaExpression expression) => 
+            expression.ToString()
                 .Replace(" OrElse ", " || ")
                 .Replace(" AndAlso ", " && ")
                 .Replace(" Or ", " | ")
                 .Replace(" And ", " & ");
-        }
     }
 }
\ No newline at end of file
diff --git a/TestStack.FluentMvcTesting/ModelErrorTest.cs b/TestStack.FluentMvcTesting/ModelErrorTest.cs
index b8bc717..fc52375 100644
--- a/TestStack.FluentMvcTesting/ModelErrorTest.cs
+++ b/TestStack.FluentMvcTesting/ModelErrorTest.cs
@@ -22,6 +22,7 @@ public class ModelErrorTest<TModel> : IModelErrorTest<TModel>
         private readonly IModelTest<TModel> _modelTest;
         private readonly string _errorKey;
         private readonly List<string> _errors;
+        private string InflectedErrors => string.Join(", ", _errors);
 
         public ModelErrorTest(IModelTest<TModel> modelTest, string errorKey, IEnumerable<ModelError> errors)
         {
@@ -34,7 +35,7 @@ public IModelTest<TModel> ThatEquals(string errorMessage)
         {
             if (!_errors.Any(e => e == errorMessage))
             {
-                throw new ModelErrorAssertionException(string.Format("Expected error message for key '{0}' to be '{1}', but instead found '{2}'.", _errorKey, errorMessage, string.Join(", ", _errors)));
+                throw new ModelErrorAssertionException("Expected error message for key '\{_errorKey}' to be '\{errorMessage}', but instead found '\{InflectedErrors}'.");
             }
             return _modelTest;
         }
@@ -43,7 +44,7 @@ public IModelTest<TModel> BeginningWith(string beginMessage)
         {
             if (!_errors.Any(e => e.StartsWith(beginMessage)))
             {
-                throw new ModelErrorAssertionException(string.Format("Expected error message for key '{0}' to start with '{1}', but instead found '{2}'.", _errorKey, beginMessage, string.Join(", ", _errors)));
+                throw new ModelErrorAssertionException("Expected error message for key '\{_errorKey}' to start with '\{beginMessage}', but instead found '\{InflectedErrors}'.");
             }
             return _modelTest;
         }
@@ -52,7 +53,7 @@ public IModelTest<TModel> EndingWith(string endMessage)
         {
             if (!_errors.Any(e => e.EndsWith(endMessage)))
             {
-                throw new ModelErrorAssertionException(string.Format("Expected error message for key '{0}' to end with '{1}', but instead found '{2}'.", _errorKey, endMessage, string.Join(", ", _errors)));
+                throw new ModelErrorAssertionException("Expected error message for key '\{_errorKey}' to end with '\{endMessage}', but instead found '\{InflectedErrors}'.");
             }
             return _modelTest;
         }
@@ -61,24 +62,18 @@ public IModelTest<TModel> Containing(string containsMessage)
         {
             if (!_errors.Any(e => e.Contains(containsMessage)))
             {
-                throw new ModelErrorAssertionException(string.Format("Expected error message for key '{0}' to contain '{1}', but instead found '{2}'.", _errorKey, containsMessage, string.Join(", ", _errors)));
+                throw new ModelErrorAssertionException("Expected error message for key '\{_errorKey}' to contain '\{containsMessage}', but instead found '\{InflectedErrors}'.");
             }
             return _modelTest;
         }
 
-        public IModelErrorTest<TModel> AndModelErrorFor<TAttribute>(Expression<Func<TModel, TAttribute>> memberWithError)
-        {
-            return _modelTest.AndModelErrorFor(memberWithError);
-        }
+        public IModelErrorTest<TModel> AndModelErrorFor<TAttribute>(Expression<Func<TModel, TAttribute>> memberWithError) => 
+            _modelTest.AndModelErrorFor(memberWithError);
 
-        public IModelErrorTest<TModel> AndModelError(string errorKey)
-        {
-            return _modelTest.AndModelError(errorKey);
-        }
+        public IModelErrorTest<TModel> AndModelError(string errorKey) => 
+            _modelTest.AndModelError(errorKey);
 
-        public IModelTest<TModel> AndNoModelErrorFor<TAttribute>(Expression<Func<TModel, TAttribute>> memberWithNoError)
-        {
-            return _modelTest.AndNoModelErrorFor(memberWithNoError);
-        }
+        public IModelTest<TModel> AndNoModelErrorFor<TAttribute>(Expression<Func<TModel, TAttribute>> memberWithNoError) => 
+            _modelTest.AndNoModelErrorFor(memberWithNoError);
     }
 }
\ No newline at end of file
diff --git a/TestStack.FluentMvcTesting/ModelTest.cs b/TestStack.FluentMvcTesting/ModelTest.cs
index 992ac7c..6f7f831 100644
--- a/TestStack.FluentMvcTesting/ModelTest.cs
+++ b/TestStack.FluentMvcTesting/ModelTest.cs
@@ -15,6 +15,7 @@ public interface IModelTest<TModel>
     public class ModelTest<TModel> : IModelTest<TModel>
     {
         private readonly Controller _controller;
+        private string ControllerName => _controller.GetType().Name;
 
         public ModelTest(Controller controller)
         {
@@ -25,7 +26,7 @@ public IModelErrorTest<TModel> AndModelErrorFor<TAttribute>(Expression<Func<TMod
         {
             var member = ((MemberExpression)memberWithError.Body).Member.Name;
             if (!_controller.ModelState.ContainsKey(member) || _controller.ModelState[member].Errors.Count == 0)
-                throw new ViewResultModelAssertionException(string.Format("Expected controller '{0}' to have a model error for member '{1}', but none found.", _controller.GetType().Name, member));
+                throw new ViewResultModelAssertionException("Expected controller '\{ControllerName}' to have a model error for member '\{member}', but none found.");
             return new ModelErrorTest<TModel>(this, member, _controller.ModelState[member].Errors);
         }
 
@@ -33,21 +34,21 @@ public IModelTest<TModel> AndNoModelErrorFor<TAttribute>(Expression<Func<TModel,
         {
             var member = ((MemberExpression)memberWithNoError.Body).Member.Name;
             if (_controller.ModelState.ContainsKey(member))
-                throw new ViewResultModelAssertionException(string.Format("Expected controller '{0}' to have no model errors for member '{1}', but found some.", _controller.GetType().Name, member));
+                throw new ViewResultModelAssertionException("Expected controller '\{ControllerName}' to have no model errors for member '\{member}', but found some.");
             return this;
         }
 
         public IModelErrorTest<TModel> AndModelError(string errorKey)
         {
             if (!_controller.ModelState.ContainsKey(errorKey) || _controller.ModelState[errorKey].Errors.Count == 0)
-                throw new ViewResultModelAssertionException(string.Format("Expected controller '{0}' to have a model error against key '{1}', but none found.", _controller.GetType().Name, errorKey));
+                throw new ViewResultModelAssertionException("Expected controller '\{ControllerName}' to have a model error against key '\{errorKey}', but none found.");
             return new ModelErrorTest<TModel>(this, errorKey, _controller.ModelState[errorKey].Errors);
         }
 
         public void AndNoModelErrors()
         {
             if (!_controller.ModelState.IsValid)
-                throw new ViewResultModelAssertionException(string.Format("Expected controller '{0}' to have no model errors, but it had some.", _controller.GetType().Name));
+                throw new ViewResultModelAssertionException("Expected controller '\{ControllerName}' to have no model errors, but it had some.");
         }
     }
 }
\ No newline at end of file
diff --git a/TestStack.FluentMvcTesting/RouteValueDictionaryExtension.cs b/TestStack.FluentMvcTesting/RouteValueDictionaryExtension.cs
index d55f0cb..6a664af 100644
--- a/TestStack.FluentMvcTesting/RouteValueDictionaryExtension.cs
+++ b/TestStack.FluentMvcTesting/RouteValueDictionaryExtension.cs
@@ -8,7 +8,7 @@ public static RouteValueDictionary WithRouteValue(this RouteValueDictionary dict
         {
             if (!dict.ContainsKey(key))
             {
-                throw new MissingRouteValueException(string.Format("No value {0} in the route dictionary", key));
+                throw new MissingRouteValueException("No value \{key} in the route dictionary");
             }
 
             return dict;
@@ -22,12 +22,12 @@ public static RouteValueDictionary WithRouteValue<T>(this RouteValueDictionary d
 
             if (!(actualValue is T))
             {
-                throw new ValueTypeMismatchException(string.Format("Invalid type of Value with key {0} \r\n expected {1} \r\n but got {2}", key, value.GetType(), actualValue.GetType()));
+                throw new ValueTypeMismatchException("Invalid type of Value with key \{key} \r\n expected \{value.GetType()} \r\n but got \{actualValue.GetType()}");
             }
 
             if (!Equals(actualValue, value))
             {
-                throw new InvalidRouteValueException(string.Format("Invalid value for key {0} \r\n expected {1} \r\n but got {2} in the route dictionary",key ,value, actualValue));
+                throw new InvalidRouteValueException("Invalid value for key \{key} \r\n expected \{value} \r\n but got \{actualValue} in the route dictionary");
             }
 
             return dict;
diff --git a/TestStack.FluentMvcTesting/TestStack.FluentMVCTesting.csproj b/TestStack.FluentMvcTesting/TestStack.FluentMVCTesting.csproj
index 5789a34..9384cd1 100644
--- a/TestStack.FluentMvcTesting/TestStack.FluentMVCTesting.csproj
+++ b/TestStack.FluentMvcTesting/TestStack.FluentMVCTesting.csproj
@@ -24,6 +24,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <LangVersion>6</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
diff --git a/TestStack.FluentMvcTesting/ViewResultTest.cs b/TestStack.FluentMvcTesting/ViewResultTest.cs
index ab52506..9fb226b 100644
--- a/TestStack.FluentMvcTesting/ViewResultTest.cs
+++ b/TestStack.FluentMvcTesting/ViewResultTest.cs
@@ -25,7 +25,9 @@ public ModelTest<TModel> WithModel<TModel>() where TModel : class
 
             var castedModel = _viewResult.Model as TModel;
             if (castedModel == null)
-                throw new ViewResultModelAssertionException(string.Format("Expected view model to be of type '{0}', but it is actually of type '{1}'.", typeof(TModel).Name, _viewResult.Model.GetType().Name));
+                throw new ViewResultModelAssertionException(string.Format("Expected view model to be of type '{0}', but it is actually of type '{1}'.", 
+                    typeof(TModel).Name, 
+                    _viewResult.Model.GetType().Name));
 
             return new ModelTest<TModel>(_controller);
         }
@@ -53,10 +55,7 @@ public ModelTest<TModel> WithModel<TModel>(Expression<Func<TModel, bool>> predic
             var compiledPredicate = predicate.Compile();
 
             if (!compiledPredicate(model))
-                throw new ViewResultModelAssertionException(string.Format(
-                    "Expected view model {0} to pass the given condition ({1}), but it failed.",
-                    modelLex, 
-                    predicateLex));
+                throw new ViewResultModelAssertionException("Expected view model \{modelLex} to pass the given condition (\{predicateLex}), but it failed.");
 
             return test;
         }
diff --git a/Thumbs.db b/Thumbs.db
new file mode 100644
index 0000000..9e9d743
Binary files /dev/null and b/Thumbs.db differ