diff --git a/src/TestStack.Seleno.AcceptanceTests/App.config b/src/TestStack.Seleno.AcceptanceTests/App.config
index ff929dfa..a8f14c76 100644
--- a/src/TestStack.Seleno.AcceptanceTests/App.config
+++ b/src/TestStack.Seleno.AcceptanceTests/App.config
@@ -24,7 +24,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="NSubstitute" publicKeyToken="92dd2e9066daa5ca" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.7.2.0" newVersion="1.7.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
diff --git a/src/TestStack.Seleno.Tests/Configuration/WebServers/WebApplicationTests.cs b/src/TestStack.Seleno.Tests/Configuration/WebServers/WebApplicationTests.cs
index 85b5d242..04a8bc8b 100644
--- a/src/TestStack.Seleno.Tests/Configuration/WebServers/WebApplicationTests.cs
+++ b/src/TestStack.Seleno.Tests/Configuration/WebServers/WebApplicationTests.cs
@@ -13,7 +13,7 @@ public class WebApplicationTests
         public void WebApplication_should_have_PortNumber()
         {
             Action action = () =>  new WebApplication(Substitute.For<IProjectLocation>(), 0);
-            action.ShouldThrow<ArgumentException>()
+            action.Should().Throw<ArgumentException>()
                 .Where(exception => exception.Message.StartsWith("portNumber must be greater than zero"));
         }
 
@@ -21,7 +21,7 @@ public void WebApplication_should_have_PortNumber()
         public void WebApplication_should_have_Location()
         {
             Action action = () =>  new WebApplication(null, 1000);
-            action.ShouldThrow<ArgumentException>()
+            action.Should().Throw<ArgumentException>()
                 .Where(exception => exception.Message.StartsWith("You must specify a location"));
         }
 
diff --git a/src/TestStack.Seleno.Tests/PageObjects/Actions/Controls/When_attempting_to_retrieve_selected_button_from_radio_group_with_none_selected.cs b/src/TestStack.Seleno.Tests/PageObjects/Actions/Controls/When_attempting_to_retrieve_selected_button_from_radio_group_with_none_selected.cs
index f8e630d8..971d3eb8 100644
--- a/src/TestStack.Seleno.Tests/PageObjects/Actions/Controls/When_attempting_to_retrieve_selected_button_from_radio_group_with_none_selected.cs
+++ b/src/TestStack.Seleno.Tests/PageObjects/Actions/Controls/When_attempting_to_retrieve_selected_button_from_radio_group_with_none_selected.cs
@@ -32,7 +32,7 @@ public void When_getting_selected_radio_button()
 
         public void Then_it_should_throw_NoSuchElementException()
         {
-            _exceptionThrown = _selectedButtonInRadioGroupAction.ShouldThrow<NoSuchElementException>();
+            _exceptionThrown = _selectedButtonInRadioGroupAction.Should().Throw<NoSuchElementException>();
         }
 
         public void AndThen_exception_message_should_be_No_selected_radio_button_has_been_found()
diff --git a/src/TestStack.Seleno.Tests/PageObjects/Actions/Executor/When_executing_predicate_script_timing_out_before_it_completes.cs b/src/TestStack.Seleno.Tests/PageObjects/Actions/Executor/When_executing_predicate_script_timing_out_before_it_completes.cs
index ec5a7172..5544f87e 100644
--- a/src/TestStack.Seleno.Tests/PageObjects/Actions/Executor/When_executing_predicate_script_timing_out_before_it_completes.cs
+++ b/src/TestStack.Seleno.Tests/PageObjects/Actions/Executor/When_executing_predicate_script_timing_out_before_it_completes.cs
@@ -28,8 +28,9 @@ public void When_executing_predicate_script()
         public void Then_it_should_throw_a_TimeOut_Exception()
         {
             var timing = 0.001d.ToString(CultureInfo.CurrentCulture);
+
             _executeTimingOutScriptAction
-                .ShouldThrow<TimeoutException>()
+                .Should().Throw<TimeoutException>()
                 .WithMessage(string.Format("The predicate script took longer than {0} seconds to verify statement", timing));
         }
     }
diff --git a/src/TestStack.Seleno.Tests/TestStack.Seleno.Tests.csproj b/src/TestStack.Seleno.Tests/TestStack.Seleno.Tests.csproj
index a8f0fc60..755c2a78 100644
--- a/src/TestStack.Seleno.Tests/TestStack.Seleno.Tests.csproj
+++ b/src/TestStack.Seleno.Tests/TestStack.Seleno.Tests.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.3.11.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,9 +11,12 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TestStack.Seleno.Tests</RootNamespace>
     <AssemblyName>TestStack.Seleno.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -23,6 +27,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -31,88 +36,75 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Autofac.3.5.2\lib\net40\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=4.9.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.4.9.1\lib\net45\Autofac.dll</HintPath>
     </Reference>
-    <Reference Include="AutofacContrib.NSubstitute, Version=3.3.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\AutofacContrib.NSubstitute.3.3.2\lib\NET40\AutofacContrib.NSubstitute.dll</HintPath>
+    <Reference Include="AutofacContrib.NSubstitute, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\AutofacContrib.NSubstitute.4.0.1\lib\NET45\AutofacContrib.NSubstitute.dll</HintPath>
     </Reference>
-    <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Castle.Core.3.3.3\lib\net40-client\Castle.Core.dll</HintPath>
+    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="FizzWare.NBuilder">
-      <HintPath>..\packages\NBuilder.3.0.1.1\lib\FizzWare.NBuilder.dll</HintPath>
+    <Reference Include="FizzWare.NBuilder, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5651b03e12e42c12, processorArchitecture=MSIL">
+      <HintPath>..\packages\NBuilder.6.0.0\lib\net40\FizzWare.NBuilder.dll</HintPath>
     </Reference>
-    <Reference Include="FluentAssertions, Version=3.3.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\FluentAssertions.3.3.0\lib\net40\FluentAssertions.dll</HintPath>
+    <Reference Include="FluentAssertions, Version=5.6.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
+      <HintPath>..\packages\FluentAssertions.5.6.0\lib\net47\FluentAssertions.dll</HintPath>
     </Reference>
-    <Reference Include="FluentAssertions.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\FluentAssertions.3.3.0\lib\net40\FluentAssertions.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Humanizer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=979442b78dfc278e, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Humanizer.1.0\lib\NET40\Humanizer.dll</HintPath>
+    <Reference Include="Humanizer, Version=2.5.0.0, Culture=neutral, PublicKeyToken=979442b78dfc278e, processorArchitecture=MSIL">
+      <HintPath>..\packages\Humanizer.Core.2.5.16\lib\netstandard2.0\Humanizer.dll</HintPath>
     </Reference>
     <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="NSubstitute, Version=1.7.2.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NSubstitute.1.7.2.0\lib\NET40\NSubstitute.dll</HintPath>
+    <Reference Include="NSubstitute, Version=4.0.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
+      <HintPath>..\packages\NSubstitute.4.0.0\lib\net46\NSubstitute.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.11.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.11.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.3.0\lib\portable-net45+win8+wp8+wpa81\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Helpers, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.Helpers.dll</HintPath>
+    <Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Mvc, Version=3.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.Mvc.3.0.50813.1\lib\net40\System.Web.Mvc.dll</HintPath>
+    <Reference Include="System.Web.Mvc, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.7\lib\net45\System.Web.Mvc.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.Razor.1.0.20105.408\lib\net40\System.Web.Razor.dll</HintPath>
+    <Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.Razor.3.2.7\lib\net45\System.Web.Razor.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.2.0.30506.0\lib\net40\System.Web.WebPages.dll</HintPath>
+    <Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages.Deployment, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Deployment.dll</HintPath>
+    <Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.WebPages.Razor, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Microsoft.AspNet.WebPages.1.0.20105.408\lib\net40\System.Web.WebPages.Razor.dll</HintPath>
+    <Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.7\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="TestStack.BDDfy, Version=4.2.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\TestStack.BDDfy.4.2.0\lib\net40\TestStack.BDDfy.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="TestStack.BDDfy, Version=4.3.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\TestStack.BDDfy.4.3.2\lib\net40\TestStack.BDDfy.dll</HintPath>
     </Reference>
-    <Reference Include="WebDriver, Version=2.53.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Selenium.WebDriver.2.53.0\lib\net40\WebDriver.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="WebDriver, Version=3.141.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Selenium.WebDriver.3.141.0\lib\net45\WebDriver.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -222,6 +214,12 @@
     <EmbeddedResource Include="Configuration\chromedriver.exe" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\NUnit.3.11.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.11.0\build\NUnit.props'))" />
+  </Target>
   <!-- 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">
diff --git a/src/TestStack.Seleno.Tests/app.config b/src/TestStack.Seleno.Tests/app.config
index 04cfcd10..11253728 100644
--- a/src/TestStack.Seleno.Tests/app.config
+++ b/src/TestStack.Seleno.Tests/app.config
@@ -4,11 +4,11 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.5.0.0" newVersion="3.5.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.9.1.0" newVersion="4.9.1.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
@@ -16,11 +16,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="NSubstitute" publicKeyToken="92dd2e9066daa5ca" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.7.2.0" newVersion="1.7.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.0.0.1" newVersion="3.0.0.1" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Razor" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -32,4 +32,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1" /></startup></configuration>
diff --git a/src/TestStack.Seleno.Tests/packages.config b/src/TestStack.Seleno.Tests/packages.config
index 26f660dc..931e16be 100644
--- a/src/TestStack.Seleno.Tests/packages.config
+++ b/src/TestStack.Seleno.Tests/packages.config
@@ -1,17 +1,61 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="3.5.2" targetFramework="net40" />
-  <package id="AutofacContrib.NSubstitute" version="3.3.2" targetFramework="net40" />
-  <package id="Castle.Core" version="3.3.3" targetFramework="net40" />
-  <package id="FluentAssertions" version="3.3.0" targetFramework="net40" />
-  <package id="Humanizer" version="1.0" targetFramework="net40" />
-  <package id="Microsoft.AspNet.Mvc" version="3.0.50813.1" targetFramework="net40" />
-  <package id="Microsoft.AspNet.Razor" version="1.0.20105.408" targetFramework="net40" />
-  <package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net40" />
+  <package id="Autofac" version="4.9.1" targetFramework="net471" />
+  <package id="AutofacContrib.NSubstitute" version="4.0.1" targetFramework="net471" />
+  <package id="Castle.Core" version="4.3.1" targetFramework="net471" />
+  <package id="FluentAssertions" version="5.6.0" targetFramework="net471" />
+  <package id="Humanizer" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.af" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.ar" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.bg" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.bn-BD" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.cs" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.da" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.de" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.el" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.es" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.fa" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.fi-FI" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.fr" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.fr-BE" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.he" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.hr" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.hu" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.id" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.it" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.ja" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.lv" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.ms-MY" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.mt" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.nb" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.nb-NO" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.nl" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.pl" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.pt" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.ro" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.ru" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.sk" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.sl" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.sr" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.sr-Latn" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.sv" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.tr" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.uk" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.uz-Cyrl-UZ" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.uz-Latn-UZ" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.vi" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.zh-CN" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.zh-Hans" version="2.5.16" targetFramework="net471" />
+  <package id="Humanizer.Core.zh-Hant" version="2.5.16" targetFramework="net471" />
+  <package id="Microsoft.AspNet.Mvc" version="5.2.7" targetFramework="net471" />
+  <package id="Microsoft.AspNet.Razor" version="3.2.7" targetFramework="net471" />
+  <package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net471" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net40" />
-  <package id="NBuilder" version="3.0.1.1" targetFramework="net40" />
-  <package id="NSubstitute" version="1.7.2.0" targetFramework="net40" />
-  <package id="NUnit" version="2.6.4" targetFramework="net40" />
-  <package id="Selenium.WebDriver" version="2.53.0" targetFramework="net40" />
-  <package id="TestStack.BDDfy" version="4.2.0" targetFramework="net40" />
+  <package id="NBuilder" version="6.0.0" targetFramework="net471" />
+  <package id="NSubstitute" version="4.0.0" targetFramework="net471" />
+  <package id="NUnit" version="3.11.0" targetFramework="net471" />
+  <package id="Selenium.WebDriver" version="3.141.0" targetFramework="net471" />
+  <package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net471" />
+  <package id="TestStack.BDDfy" version="4.3.2" targetFramework="net471" />
 </packages>
\ No newline at end of file
diff --git a/src/TestStack.Seleno/TestStack.Seleno.csproj b/src/TestStack.Seleno/TestStack.Seleno.csproj
index 956dac1f..19dc5107 100644
--- a/src/TestStack.Seleno/TestStack.Seleno.csproj
+++ b/src/TestStack.Seleno/TestStack.Seleno.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,9 +10,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TestStack.Seleno</RootNamespace>
     <AssemblyName>TestStack.Seleno</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -24,6 +25,7 @@
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <DocumentationFile>bin\Debug\TestStack.Seleno.XML</DocumentationFile>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -33,6 +35,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Release\TestStack.Seleno.XML</DocumentationFile>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
diff --git a/src/TestStack.Seleno/app.config b/src/TestStack.Seleno/app.config
index b78e3517..15d8f67f 100644
--- a/src/TestStack.Seleno/app.config
+++ b/src/TestStack.Seleno/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?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-3.0.0.1" newVersion="3.0.0.1" />
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-3.0.0.1" newVersion="3.0.0.1"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
\ No newline at end of file
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/></startup></configuration>
diff --git a/src/TestStack.Seleno/packages.config b/src/TestStack.Seleno/packages.config
index 97d3f7b3..ff94414d 100644
--- a/src/TestStack.Seleno/packages.config
+++ b/src/TestStack.Seleno/packages.config
@@ -2,14 +2,14 @@
 <packages>
   <package id="AllForOne" version="1.0.0.27" targetFramework="net40" />
   <package id="Autofac" version="3.5.2" targetFramework="net40" />
-  <package id="Castle.Core" version="3.3.3" targetFramework="net40" />
+  <package id="Castle.Core" version="3.3.3" targetFramework="net40" requireReinstallation="true" />
   <package id="ILMerge" version="2.14.1208" targetFramework="net40" />
   <package id="Microsoft.AspNet.Mvc" version="3.0.50813.1" targetFramework="net40" />
   <package id="Microsoft.AspNet.Razor" version="1.0.20105.408" targetFramework="net40" />
   <package id="Microsoft.AspNet.WebPages" version="1.0.20105.408" targetFramework="net40" />
-  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" />
+  <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" requireReinstallation="true" />
   <package id="Mvc3Futures" version="3.0.20105.0" />
   <package id="Selenium.Support" version="2.53.0" targetFramework="net40" />
   <package id="Selenium.WebDriver" version="2.53.0" targetFramework="net40" />
-  <package id="System.Web.Http.Common" version="4.0.20126.16343" />
+  <package id="System.Web.Http.Common" version="4.0.20126.16343" requireReinstallation="true" />
 </packages>
\ No newline at end of file