Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveGrebbedijkTest.cs
===================================================================
diff -u -r3401 -r3977
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveGrebbedijkTest.cs	(.../DamLiveGrebbedijkTest.cs)	(revision 3401)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveGrebbedijkTest.cs	(.../DamLiveGrebbedijkTest.cs)	(revision 3977)
@@ -53,14 +53,14 @@
 
         private DamEngineRunner runner;
 
-        [TestFixtureSetUp]
+        [SetUp]
         public void SetupFixture()
         {
             IoHelper.RemoveTestWorkingDirectory(testWorkingFolder); // to be sure no test directory exist from previous tests
             Directory.CreateDirectory(testWorkingFolder);
         }
 
-        [TestFixtureTearDown]
+        [TearDown]
         public void TearDownFixture()
         {
             IoHelper.RemoveTestWorkingDirectory(testWorkingFolder);
@@ -158,8 +158,8 @@
         ///   (location/monitoring point) 
         /// 
         /// See setup method
-        ///  </summary>        
-        [Test, Ignore]
+        ///  </summary>
+        [Test, Ignore("")]
         [Category("Integration")]
         [Category("Work_In_Progress")]
         public void CalculateStabilityUsingTestFilesHasExpectedResultsInOutputFile()
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/ModelRunnerTest.cs
===================================================================
diff -u -r2650 -r3977
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/ModelRunnerTest.cs	(.../ModelRunnerTest.cs)	(revision 2650)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/ModelRunnerTest.cs	(.../ModelRunnerTest.cs)	(revision 3977)
@@ -42,7 +42,7 @@
         private ModelRunner runner;
         private DamProjectData damProjectData;
        
-        [TestFixtureSetUp]
+        [SetUp]
         public void SetupFixture()
         {
             paramFile = Path.Combine(TestDataFolder, "Deltares.Dam.Application.Live.Tests.ParametersFile.xml");
@@ -54,7 +54,7 @@
             Directory.CreateDirectory(TestWorkingFolder);               
         }
 
-        [TestFixtureTearDown]
+        [TearDown]
         public void TearDownFixture()
         {
             RemoveTestWorkingDirectory();
@@ -191,24 +191,29 @@
         }
 
         [Test]
-        [ExpectedException(typeof(InvalidOperationException), ExpectedMessage = ModelRunner.NoDamxFile)]
         public void Run_NoDamXFile_Throws()
         {
-            (new ModelRunner()).Run();
+            Assert.That(() => new ModelRunner().Run(), Throws.InvalidOperationException.With.Message.EqualTo(ModelRunner.NoDamxFile));
         }
 
         [Test]
-        [ExpectedException(typeof(InvalidOperationException), ExpectedMessage = ModelRunner.NoFewsOutputFileAvailable)]
         public void Run_NoOutputFile_Throws()
         {
-            (new ModelRunner() { DamXFile = new FileInfo(projectFile), FewsInputFile = new FileInfo(inputFile) }).Run();
+            Assert.That(() => new ModelRunner
+            {
+                DamXFile = new FileInfo(projectFile), FewsInputFile = new FileInfo(inputFile)
+            }.Run(), 
+                Throws.InvalidOperationException.With.Message.EqualTo(ModelRunner.NoFewsOutputFileAvailable));
         }
 
         [Test]
-        [ExpectedException(typeof(InvalidOperationException), ExpectedMessage = ModelRunner.NoFewsInputFileAvailable)]
         public void Run_NoInputFile_Throws()
         {
-            (new ModelRunner() { DamXFile = new FileInfo(projectFile), FewsOutputFile = new FileInfo(outputFile) }).Run();
+            Assert.That(() => new ModelRunner
+            {
+                DamXFile = new FileInfo(projectFile), FewsOutputFile = new FileInfo(outputFile)
+            }.Run(), 
+                Throws.InvalidOperationException.With.Message.EqualTo(ModelRunner.NoFewsInputFileAvailable));
         }
 
         [Test, Ignore("Under construction")]
Index: DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/app.config
===================================================================
diff -u -r2090 -r3977
--- DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/app.config	(.../app.config)	(revision 2090)
+++ DamClients/DamLive/trunk/src/Deltares.Dam.Application.Live/app.config	(.../app.config)	(revision 3977)
@@ -128,6 +128,18 @@
         <assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral"/>
         <bindingRedirect oldVersion="0.0.0.0-1.0.89.0" newVersion="1.0.89.0"/>
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="mscorlib" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/App.config
===================================================================
diff -u
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/App.config	(revision 0)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/App.config	(revision 3977)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?><configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="mscorlib" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System" publicKeyToken="b77a5c561934e089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.0.0.0" newVersion="5.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
\ No newline at end of file
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs
===================================================================
diff -u -r3401 -r3977
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs	(.../DamLiveIntegrationTest.cs)	(revision 3401)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveIntegrationTest.cs	(.../DamLiveIntegrationTest.cs)	(revision 3977)
@@ -48,14 +48,14 @@
         private DamEngineRunner runner;
         private DamProjectData damProjectData;
 
-        [TestFixtureSetUp]
+        [SetUp]
         public void SetupFixture()
         {
             IoHelper.RemoveTestWorkingDirectory(testWorkingFolder); // to be sure no test directory exist from previous tests
             Directory.CreateDirectory(testWorkingFolder);
         }
 
-        [TestFixtureTearDown]
+        [TearDown]
         public void TearDownFixture()
         {
             IoHelper.RemoveTestWorkingDirectory(testWorkingFolder);
@@ -385,8 +385,8 @@
         ///   (location/monitoring point) 
         /// 
         /// See setup method
-        ///  </summary>        
-        [Test, Ignore]
+        ///  </summary>
+        [Test, Ignore("")]
         [Category("Integration")]
         [Category("Work_In_Progress")]
         public void Run_UsingTestFiles_HasExpectedResultsInOutputFile()
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongMissingValuesTest.cs
===================================================================
diff -u -r3401 -r3977
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongMissingValuesTest.cs	(.../DamLivePulauTekongMissingValuesTest.cs)	(revision 3401)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongMissingValuesTest.cs	(.../DamLivePulauTekongMissingValuesTest.cs)	(revision 3977)
@@ -57,14 +57,14 @@
 
         private DamEngineRunner runner;
 
-        [TestFixtureSetUp]
+        [SetUp]
         public void SetupFixture()
         {
             IoHelper.RemoveTestWorkingDirectory(testWorkingFolder); // to be sure no test directory exist from previous tests
             Directory.CreateDirectory(testWorkingFolder);
         }
 
-        [TestFixtureTearDown]
+        [TearDown]
         public void TearDownFixture()
         {
             IoHelper.RemoveTestWorkingDirectory(testWorkingFolder);
@@ -166,8 +166,8 @@
         ///   (location/monitoring point) 
         /// 
         /// See setup method
-        ///  </summary>        
-        [Test, Ignore]
+        ///  </summary>
+        [Test, Ignore("")]
         [Category("Integration")]
         [Category("Work_In_Progress")]
         [TestCase(inputFilenameWithValues, 2.486106, 2.114159)]
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/Deltares.DamLive.Tests.csproj
===================================================================
diff -u -r3697 -r3977
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/Deltares.DamLive.Tests.csproj	(.../Deltares.DamLive.Tests.csproj)	(revision 3697)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/Deltares.DamLive.Tests.csproj	(.../Deltares.DamLive.Tests.csproj)	(revision 3977)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.3.13.3\build\NUnit.props" Condition="Exists('..\packages\NUnit.3.13.3\build\NUnit.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -39,9 +40,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\DSL-Geographic\Deltares.Standard.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="nunit.framework, Version=3.13.3.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -67,6 +67,8 @@
     <None Include="..\Copying.GPL.licenseheader">
       <Link>Copying.GPL.licenseheader</Link>
     </None>
+    <None Include="App.config" />
+    <None Include="packages.config" />
     <None Include="TestData\DamLive\Grebbedijk\input.damx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -79,7 +81,6 @@
     <None Include="TestData\DamLive\Set1\Deltares.Dam.Application.Live.Tests.ProjectFile.damx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="packages.config" />
     <None Include="TestData\DamLive\Set2\output.damx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -189,6 +190,12 @@
     </Content>
   </ItemGroup>
   <Import Project="$(ProjectDir)..\build\Deltares.DamLive.Version.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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.13.3\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.3.13.3\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">
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/packages.config
===================================================================
diff -u -r2090 -r3977
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/packages.config	(.../packages.config)	(revision 2090)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/packages.config	(.../packages.config)	(revision 3977)
@@ -22,5 +22,5 @@
 All rights reserved.
 -->
 <packages>
-  <package id="NUnit" version="2.6.2" targetFramework="net45" />
+  <package id="NUnit" version="3.13.3" targetFramework="net461" />
 </packages>
\ No newline at end of file
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/CalculationParametersAssemblerTest.cs
===================================================================
diff -u -r3697 -r3977
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/CalculationParametersAssemblerTest.cs	(.../CalculationParametersAssemblerTest.cs)	(revision 3697)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/CalculationParametersAssemblerTest.cs	(.../CalculationParametersAssemblerTest.cs)	(revision 3977)
@@ -50,7 +50,7 @@
 
         #endregion
 
-        [TestFixtureSetUp]
+        [SetUp]
         public void TestFixtureSetup()
         {
             this.testDoc = XDocument.Load(testFileName);
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongStabilityOutwardTest.cs
===================================================================
diff -u -r3401 -r3977
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongStabilityOutwardTest.cs	(.../DamLivePulauTekongStabilityOutwardTest.cs)	(revision 3401)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLivePulauTekongStabilityOutwardTest.cs	(.../DamLivePulauTekongStabilityOutwardTest.cs)	(revision 3977)
@@ -55,14 +55,14 @@
 
         private DamEngineRunner runner;
 
-        [TestFixtureSetUp]
+        [SetUp]
         public void SetupFixture()
         {
             IoHelper.RemoveTestWorkingDirectory(testWorkingFolder); // to be sure no test directory exist from previous tests
             Directory.CreateDirectory(testWorkingFolder);
         }
 
-        [TestFixtureTearDown]
+        [TearDown]
         public void TearDownFixture()
         {
             IoHelper.RemoveTestWorkingDirectory(testWorkingFolder);
@@ -167,8 +167,8 @@
         ///   (location/monitoring point) 
         /// 
         /// See setup method
-        ///  </summary>        
-        [Test, Ignore]
+        ///  </summary>
+        [Test, Ignore("")]
         [Category("Integration")]
         [Category("Work_In_Progress")]
         [TestCase(inputFilenameWithValues, 0.813953, 1.175137)]
Index: DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveUsingCompleteDataSetTest.cs
===================================================================
diff -u -r2250 -r3977
--- DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveUsingCompleteDataSetTest.cs	(.../DamLiveUsingCompleteDataSetTest.cs)	(revision 2250)
+++ DamClients/DamLive/trunk/src/Deltares.DamLive.Tests/DamLiveUsingCompleteDataSetTest.cs	(.../DamLiveUsingCompleteDataSetTest.cs)	(revision 3977)
@@ -51,14 +51,14 @@
 
         private TestModelRunner runner;
 
-        [TestFixtureSetUp]
+        [SetUp]
         public void SetupFixture()
         {
             IoHelper.RemoveTestWorkingDirectory(TestWorkingFolder); // to be sure no test directory exist from previous tests
             Directory.CreateDirectory(TestWorkingFolder);
         }
 
-        [TestFixtureTearDown]
+        [TearDown]
         public void TearDownFixture()
         {
             //IOHelper.RemoveTestWorkingDirectory(TestWorkingFolder);
Index: DamClients/DamLive/trunk/src/packages/NUnit.2.6.2/lib/nunit.framework.dll
===================================================================
diff -u -r1549 -r3977
Binary files differ
Fisheye: Tag 3977 refers to a dead (removed) revision in file `DamClients/DamLive/trunk/src/packages/NUnit.2.6.2/lib/nunit.framework.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: DamClients/DamLive/trunk/src/packages/NUnit.2.6.2/NUnit.2.6.2.nupkg
===================================================================
diff -u -r1549 -r3977
Binary files differ
Fisheye: Tag 3977 refers to a dead (removed) revision in file `DamClients/DamLive/trunk/src/packages/NUnit.2.6.2/license.txt'.
Fisheye: No comparison available.  Pass `N' to diff?