Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineHeightAdapterTest.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineHeightAdapterTest.cs	(.../SurfaceLineHeightAdapterTest.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineHeightAdapterTest.cs	(.../SurfaceLineHeightAdapterTest.cs)	(revision 3875)
@@ -984,7 +984,6 @@
         }
 
         [Test]
-        [ExpectedException(typeof(SurfaceLineAdapterException))]
         public void HeightAdaptionThrowsExceptionIfSurfaceLineIsNotLongEnough()
         {
             var surfaceLine = FactoryForSurfaceLines.CreateRealisticSurfaceLineForHeightAdapter();
@@ -993,8 +992,7 @@
             var pointSurfaceLevelInside = new GeometryPoint { X = 40, Z = 12 }; // Set surfacelevelinside just beside ditch to force exception
             surfaceLine.EnsurePointOfType(pointSurfaceLevelInside.X, pointSurfaceLevelInside.Z, CharacteristicPointType.SurfaceLevelInside);
             var surfaceLineAdapter = new SurfaceLineHeightAdapter(surfaceLine, location, 0);
-            var newSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(newDikeHeight);
-            Assert.Null(newSurfaceLine);
+            Assert.That(() => surfaceLineAdapter.ConstructNewSurfaceLine(newDikeHeight), Throws.InstanceOf<SurfaceLineAdapterException>());
         }
 
         /// <summary>
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs	(.../OperationalPulauTekongTests.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalPulauTekongTests.cs	(.../OperationalPulauTekongTests.cs)	(revision 3875)
@@ -39,7 +39,8 @@
         private const double novalue = -999.0;
         private const string stabilityOutsideFactor = "StabilityOutsideFactor";
 
-        [Test, Ignore]
+        [Test]
+        [Ignore("")]
         [Category(Categories.WorkInProgress)]
         [TestCase(@"PulauTekong.InputFile.xml", 2.486106, 2.114159)]
         [TestCase(@"PulauTekong.InputFile-NoValues.xml", novalue, novalue)]
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineShoulderAdapterTest.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineShoulderAdapterTest.cs	(.../SurfaceLineShoulderAdapterTest.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineShoulderAdapterTest.cs	(.../SurfaceLineShoulderAdapterTest.cs)	(revision 3875)
@@ -35,7 +35,6 @@
         const double pointCoordinateTolerance = 0.001;
 
         [Test]
-        [ExpectedException(typeof(SurfaceLineAdapterException))]
         public void ThrowsAnExceptionWhenNoSurfaceLevelPointExist()
         {
             var surfaceLine = new SurfaceLine2
@@ -55,7 +54,7 @@
             surfaceLine.EnsurePointOfType(pointAtTopRiver.X, pointAtTopRiver.Z, CharacteristicPointType.DikeTopAtRiver);
             surfaceLine.EnsurePointOfType(pointAtTopPolder.X, pointAtTopPolder.Z, CharacteristicPointType.DikeTopAtPolder);
             surfaceLine.EnsurePointOfType(pointAtToePolder.X, pointAtToePolder.Z, CharacteristicPointType.DikeToeAtPolder);
-            var surfaceLineAdapter = new SurfaceLineShoulderAdapter(surfaceLine, location, 0);
+            Assert.That(() => new SurfaceLineShoulderAdapter(surfaceLine, location, 0), Throws.InstanceOf<SurfaceLineAdapterException>());
         }
 
         /// <summary>
@@ -962,7 +961,6 @@
         }
 
         [Test]
-        [ExpectedException(typeof(SurfaceLineAdapterException))]
         public void ThrowsAnExceptionWhenNewShoulderDoesNotFit()
         {
             var surfaceLine = new SurfaceLine2
@@ -987,11 +985,10 @@
             surfaceLine.EnsurePointOfType(pointAtToePolder.X, pointAtToePolder.Z, CharacteristicPointType.DikeToeAtPolder);
             surfaceLine.EnsurePointOfType(pointAtSurfaceLevelInside.X, pointAtSurfaceLevelInside.Z, CharacteristicPointType.SurfaceLevelInside);
             var surfaceLineAdapter = new SurfaceLineShoulderAdapter(surfaceLine, location, 0);
-            var line = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false);
+            Assert.That(() => surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false), Throws.InstanceOf<SurfaceLineAdapterException>());
         }
 
         [Test]
-        [ExpectedException(typeof(SurfaceLineAdapterException))]
         public void ThrowsAnExceptionWhenNewShoulderDoesJustNotFit()
         {
             var surfaceLine = new SurfaceLine2
@@ -1017,11 +1014,10 @@
             surfaceLine.EnsurePointOfType(pointAtSurfaceLevelInside.X, pointAtSurfaceLevelInside.Z,
                                           CharacteristicPointType.SurfaceLevelInside);
             var surfaceLineAdapter = new SurfaceLineShoulderAdapter(surfaceLine, location, 0);
-            var line = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false);
+            Assert.That(() => surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false), Throws.InstanceOf<SurfaceLineAdapterException>());
         }
 
         [Test]
-        [ExpectedException(typeof(SurfaceLineAdapterException))]
         public void ThrowsAnExceptionWhenNewShoulderDoesJustNotFitWithDitch()
         {
             var surfaceLine = new SurfaceLine2
@@ -1060,7 +1056,7 @@
             surfaceLine.EnsurePointOfType(apoint3.X, apoint3.Z, null);
             surfaceLine.EnsurePointOfType(pointAtSurfaceLevelInside.X, pointAtSurfaceLevelInside.Z, CharacteristicPointType.SurfaceLevelInside);
             var surfaceLineAdapter = new SurfaceLineShoulderAdapter(surfaceLine, location, 0);
-            var line = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false);
+            Assert.That(() => surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false), Throws.InstanceOf<SurfaceLineAdapterException>());
         }
 
         [Test]
@@ -1213,7 +1209,6 @@
         }
 
         [Test]
-        [ExpectedException(typeof(SurfaceLineAdapterException))]
         public void AdaptedSurfaceLineWithNewVerySteepTopSlopeAngle()
         {
             var surfaceLine = new SurfaceLine2
@@ -1242,7 +1237,7 @@
             var surfaceLineAdapter = new SurfaceLineShoulderAdapter(surfaceLine, location, 0);
             surfaceLineAdapter.MaxShoulderLevel = 0.5 * (surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z -
                                                          surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z) + surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z;
-            var adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false);
+            Assert.That(() => surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false), Throws.InstanceOf<SurfaceLineAdapterException>());
             // TODO (The) what to do with the outcommented code?
             // Dike top polder now coincides with the shoulder base.
             //            var expectedBasePoint = GeometryPoint.CreateNewXZPoint(2, 1);
@@ -1342,7 +1337,6 @@
         }
 
         [Test]
-        [ExpectedException(typeof(SurfaceLineAdapterException))]
         public void AdaptedSurfaceLineWithNewBaseSlopeAngleFarTooShallow()
         {
             var surfaceLine = new SurfaceLine2
@@ -1371,7 +1365,7 @@
             var surfaceLineAdapter = new SurfaceLineShoulderAdapter(surfaceLine, location, 0);
             surfaceLineAdapter.MaxShoulderLevel = 0.5 * (surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z -
                                                          surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z) + surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z;
-            var adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false);
+            Assert.That(() => surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false), Throws.InstanceOf<SurfaceLineAdapterException>());
         }
 
         [Test]
@@ -1505,7 +1499,6 @@
         }
 
         [Test]
-        [ExpectedException(typeof(SurfaceLineAdapterException))]
         public void AdaptedSurfaceLineWithTooLargeNewMinDistanceFromToe()
         {
             var surfaceLine = new SurfaceLine2
@@ -1544,7 +1537,7 @@
             surfaceLine.EnsurePointOfType(apoint2.X, apoint2.Z, null);
             surfaceLine.EnsurePointOfType(pointAtSurfaceLevelInside.X, pointAtSurfaceLevelInside.Z, CharacteristicPointType.SurfaceLevelInside);
             var surfaceLineAdapter = new SurfaceLineShoulderAdapter(surfaceLine, location, 0) { SlopeOfNewShoulder = 2 };
-            var adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false);
+            Assert.That(() => surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false), Throws.InstanceOf<SurfaceLineAdapterException>());
         }
 
         [Test]
@@ -1618,7 +1611,6 @@
         }
 
         [Test]
-        [ExpectedException(typeof(SurfaceLineAdapterException))]
         public void AdaptedSurfaceLineWithNewMinDistanceFromToeAndNewDefinitionFailsBecausePolderLevelIsTooHigh()
         {
             var surfaceLine = new SurfaceLine2
@@ -1662,7 +1654,7 @@
             surfaceLine.EnsurePointOfType(apoint2.X, apoint2.Z, null);
             surfaceLine.EnsurePointOfType(pointAtSurfaceLevelInside.X, pointAtSurfaceLevelInside.Z, CharacteristicPointType.SurfaceLevelInside);
             var surfaceLineAdapter = new SurfaceLineShoulderAdapter(surfaceLine, location, polderLevel) { SlopeOfNewShoulder = 2 };
-            var adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false);
+            Assert.That(() => surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false), Throws.InstanceOf<SurfaceLineAdapterException>());
         }
     }
 }
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/SoilVolumeMassCalculatorEffectiveStressTest.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/SoilVolumeMassCalculatorEffectiveStressTest.cs	(.../SoilVolumeMassCalculatorEffectiveStressTest.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/SoilVolumeMassCalculatorEffectiveStressTest.cs	(.../SoilVolumeMassCalculatorEffectiveStressTest.cs)	(revision 3875)
@@ -148,30 +148,27 @@
         }
 
         [Test]
-        [ExpectedException(typeof(SoilVolumicMassCalculatorException))]
         public void ThrowsExceptionIfSoilProfileHasNoLayers()
         {
             var soilVolumeMassCalculator = new SoilVolumicMassCalculator();
             soilVolumeMassCalculator.MinimumThicknessCoverLayer = 10;
             soilVolumeMassCalculator.SurfaceLevel = 2;
             soilVolumeMassCalculator.TopOfLayerToBeEvaluated = -1;
             soilVolumeMassCalculator.SoilProfile = new SoilProfile1D();
-            soilVolumeMassCalculator.CalculateEffectiveStress();
+            Assert.That(() => soilVolumeMassCalculator.CalculateEffectiveStress(), Throws.InstanceOf<SoilVolumicMassCalculatorException>());
         }
 
         [Test]
-        [ExpectedException(typeof(SoilVolumicMassCalculatorException))]
         public void ThrowsExceptionIfSoilProfileNotAssignedInSoilVolumeMassCalculator()
         {
             var soilVolumeMassCalculator = new SoilVolumicMassCalculator();
             soilVolumeMassCalculator.MinimumThicknessCoverLayer = 10;
             soilVolumeMassCalculator.SurfaceLevel = 2;
             soilVolumeMassCalculator.TopOfLayerToBeEvaluated = -1;
-            soilVolumeMassCalculator.CalculateEffectiveStress();
+            Assert.That(() => soilVolumeMassCalculator.CalculateEffectiveStress(), Throws.InstanceOf<SoilVolumicMassCalculatorException>());
         }
 
         [Test]
-        [ExpectedException(typeof(SoilVolumicMassCalculatorException))]
         public void ThrowsExceptionIfSurfaceLevelNotInsideProfile()
         {
             var soilVolumeMassCalculator = new SoilVolumicMassCalculator();
@@ -180,11 +177,10 @@
             soilVolumeMassCalculator.SurfaceLevel = 2;
             soilVolumeMassCalculator.TopOfLayerToBeEvaluated = -1;
             soilVolumeMassCalculator.SoilProfile = CreateTestProfile();
-            soilVolumeMassCalculator.CalculateEffectiveStress();
+            Assert.That(() => soilVolumeMassCalculator.CalculateEffectiveStress(), Throws.InstanceOf<SoilVolumicMassCalculatorException>());
         }
 
         [Test]
-        [ExpectedException(typeof(SoilVolumicMassCalculatorException))]
         public void ThrowsExceptionIfTopLayerToBeEvaluatedNotInsideProfile()
         {
             var soilVolumeMassCalculator = new SoilVolumicMassCalculator();
@@ -193,7 +189,7 @@
             soilVolumeMassCalculator.SurfaceLevel = 0;
             soilVolumeMassCalculator.TopOfLayerToBeEvaluated = 10;
             soilVolumeMassCalculator.SoilProfile = CreateTestProfile();
-            soilVolumeMassCalculator.CalculateEffectiveStress();
+            Assert.That(() => soilVolumeMassCalculator.CalculateEffectiveStress(), Throws.InstanceOf<SoilVolumicMassCalculatorException>());
         }
 
         public SoilProfile1D CreateTestProfile()
Index: DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/packages.config
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/packages.config	(.../packages.config)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/packages.config	(.../packages.config)	(revision 3875)
@@ -23,4 +23,5 @@
 -->
 <packages>
   <package id="CompareNETObjects" version="3.09.0.0" targetFramework="net45" />
+  <package id="NUnit" version="3.13.3" targetFramework="net461" />
 </packages>
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs	(.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijer4Forces/DamPipingSellmeijer4ForcesKernelWrapperTests.cs	(.../DamPipingSellmeijer4ForcesKernelWrapperTests.cs)	(revision 3875)
@@ -106,9 +106,9 @@
             {
                 Assert.AreEqual(FailureMechanismSystemType.Piping, result.DamFailureMechanismeCalculation.FailureMechanismSystemType);
                 Assert.AreEqual(PipingModelType.Sellmeijer4Forces, result.DamFailureMechanismeCalculation.PipingModelType);
-                Assert.IsNotNullOrEmpty(result.LocationName);
-                Assert.IsNotNullOrEmpty(result.ScenarioName);
-                Assert.IsNotNullOrEmpty(result.ProfileName);
+                Assert.That(result.LocationName, Is.Not.Null.Or.Empty);
+                Assert.That(result.ScenarioName, Is.Not.Null.Or.Empty);
+                Assert.That(result.ProfileName, Is.Not.Null.Or.Empty);
                 Assert.AreEqual(11.899117458988467, result.PipingDesignResults.Sellmeijer4ForcesFactor, diff);
                 Assert.AreEqual(4.7596469835953874, result.PipingDesignResults.Sellmeijer4ForcesHcritical, diff);
 
@@ -255,43 +255,39 @@
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen invoer object gedefinieerd voor Sellmeijer 4 Krachten")]
         [SetUICulture("nl-NL")]
         public void TestLanguageNLThrowsExceptionInExecuteWhenInputIsNull()
         {
             var kernelWrapper = new DamPipingSellmeijer4ForcesKernelWrapper();
             List<LogMessage> messages;
-            kernelWrapper.Execute(null, null, out messages);
+            Assert.That(() => kernelWrapper.Execute(null, null, out messages), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen invoer object gedefinieerd voor Sellmeijer 4 Krachten"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "No input object defined for Sellmeijer 4 Forces")]
         [SetUICulture("en-US")]
         public void TestLanguageENThrowsExceptionInExecuteWhenInputIsNull()
         {
             var kernelWrapper = new DamPipingSellmeijer4ForcesKernelWrapper();
             List<LogMessage> messages;
-            kernelWrapper.Execute(null, null, out messages);
+            Assert.That(() => kernelWrapper.Execute(null, null, out messages), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("No input object defined for Sellmeijer 4 Forces"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen uitvoer object gedefinieerd voor Sellmeijer 4 Krachten")]
         [SetUICulture("nl-NL")]
         public void TestThrowsExceptionInPostProcessWhenOutputIsNull()
         {
             var kernelWrapper = new DamPipingSellmeijer4ForcesKernelWrapper();
             List<DesignResult> results;
-            kernelWrapper.PostProcess(new DamKernelInput(), null, null, "", out results);
+            Assert.That(() => kernelWrapper.PostProcess(new DamKernelInput(), null, null, "", out results), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen uitvoer object gedefinieerd voor Sellmeijer 4 Krachten"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen invoer object gedefinieerd voor Sellmeijer 4 Krachten")]
         [SetUICulture("nl-NL")]
         public void TestThrowsExceptionInPostProcessWhenInputIsNull()
         {
             var kernelWrapper = new DamPipingSellmeijer4ForcesKernelWrapper();
             List<DesignResult> results;
-            kernelWrapper.PostProcess(null, new DamPipingSellmeijer4ForcesOutput(), null, "", out results);
+            Assert.That(() => kernelWrapper.PostProcess(null, new DamPipingSellmeijer4ForcesOutput(), null, "", out results), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen invoer object gedefinieerd voor Sellmeijer 4 Krachten"));
         }
 
     }
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs
===================================================================
diff -u -r3620 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs	(.../OperationalGrebbedijkTests.cs)	(revision 3620)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs	(.../OperationalGrebbedijkTests.cs)	(revision 3875)
@@ -41,8 +41,9 @@
     {
         private const double tolerance = 0.0005;
 
-        [Test, Ignore]
-        [Category("Work_In_Progress")] //Note #Bka: this is a Bishop test. So as soon as that model is implemented  it must be activated and made to work again.
+        [Test]
+        [Ignore("#Bka: this is a Bishop test. So as soon as that model is implemented  it must be activated and made to work again.")]
+        [Category("Work_In_Progress")]
         public void Run_UsingTestFiles_HasExpectedResultsInOutputFile()
         {
             const string calcDir = "TestOperationalGrebbedijk";
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj
===================================================================
diff -u -r3874 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj	(.../Deltares.DamEngine.Calculators.Tests.csproj)	(revision 3874)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Deltares.DamEngine.Calculators.Tests.csproj	(.../Deltares.DamEngine.Calculators.Tests.csproj)	(revision 3875)
@@ -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>
@@ -43,8 +44,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\CompareNETObjects.3.09.0.0\lib\net45\KellermanSoftware.Compare-NET-Objects.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\lib\NUnit\nunit.framework.dll</HintPath>
+    <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.Data" />
@@ -105,6 +106,7 @@
     <None Include="..\Copying.AGPL.licenseheader">
       <Link>Copying.AGPL.licenseheader</Link>
     </None>
+    <None Include="App.config" />
     <None Include="KernelWrappers\Assemblers\TestData\18_4_94.sti" />
     <None Include="KernelWrappers\Assemblers\TestData\1D1.sti" />
     <None Include="KernelWrappers\Common\TestFiles\18_4_94.sti">
@@ -113,6 +115,7 @@
     <None Include="KernelWrappers\Common\TestFiles\1D1.sti">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <None Include="KernelWrappers\Common\TestFiles\DWP_1.sti">
@@ -175,6 +178,12 @@
     <Folder Include="KernelWrappers\MacroStabilityCommon\TestFiles\" />
   </ItemGroup>
   <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.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: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs	(.../FillDamFromXmlInputTests.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillDamFromXmlInputTests.cs	(.../FillDamFromXmlInputTests.cs)	(revision 3875)
@@ -83,7 +83,6 @@
 
         [Test]
         [TestCase("location_12_2_1D1")] // Between "location_12" and "_2_1D1" there are 2 illegal characters (1F hex)
-        [ExpectedException(typeof(IdValidatorException), ExpectedMessage = "Location has an invalid name location_12_2_1D1")]
         public void GivenDataSetContainingIllegalCharactersWhenWritingXmlThenRaiseExceptionWithClearMessage(string id)
         {
             // Given DataSet Containing Illegal Characters
@@ -99,7 +98,7 @@
             // Then Raise Exception With Clear Message()
             input = DamXmlSerialization.LoadInputFromXmlString(xmlString);
             DamProjectData actualDamProjectData = FillDamFromXmlInput.CreateDamProjectData(input);
-            CompareDamProjectData(actualDamProjectData, expectedDamProjectData);
+            Assert.That(() => CompareDamProjectData(actualDamProjectData, expectedDamProjectData), Throws.InstanceOf<IdValidatorException>().With.Message.EqualTo("Location has an invalid name location_12_2_1D1"));
 
         }
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/EngineInterfaceTests.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/EngineInterfaceTests.cs	(.../EngineInterfaceTests.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/EngineInterfaceTests.cs	(.../EngineInterfaceTests.cs)	(revision 3875)
@@ -29,10 +29,9 @@
     public class EngineInterfaceTests
     {
         [Test]
-        [ExpectedException(typeof(EngineInterfaceException))]
         public void ThrowWhenCalledWithEmptyParameters()
         {
-            EngineInterface engineInterface = new EngineInterface("");
+            Assert.That(() => new EngineInterface(""), Throws.InstanceOf<EngineInterfaceException>());
         }
 
         [Test]
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineAdapterTest.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineAdapterTest.cs	(.../SurfaceLineAdapterTest.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineAdapterTest.cs	(.../SurfaceLineAdapterTest.cs)	(revision 3875)
@@ -33,20 +33,18 @@
     {
         private readonly Location location = new Location();
 
-        [TestFixtureTearDown]
+        [TearDown]
         public void TestFixtureTearDown()
         {
         }
 
         [Test]
-        [ExpectedException(typeof(ArgumentNullException))]
         public void ThrowsAnExceptionWhenSurfaceLineIsNull()
         {
-            new StubSurfaceLineAdapter(null, location, 0);
+            Assert.That(() => new StubSurfaceLineAdapter(null, location, 0), Throws.InstanceOf<ArgumentNullException>());
         }
 
         [Test]
-        [ExpectedException(typeof(SurfaceLineAdapterException))]
         public void ThrowsAnExceptionWhenSurfaceLineHasNoDike()
         {
             var surfaceLine = new SurfaceLine2
@@ -61,11 +59,10 @@
             surfaceLine.EnsurePoint(1, 0);
             surfaceLine.EnsurePoint(2, 0);
             surfaceLine.EnsurePoint(3, 0);
-            new StubSurfaceLineAdapter(surfaceLine, location, 0);
+            Assert.That(() => new StubSurfaceLineAdapter(surfaceLine, location, 0), Throws.InstanceOf<SurfaceLineAdapterException>());
         }
 
         [Test]
-        [ExpectedException(typeof(SurfaceLineAdapterException))]
         public void ThrowsAnExceptionWhenSurfaceLineDoesNotComplyToSpecificationUsingZeroCoordValues()
         {
             var surfaceLine1 = new SurfaceLine2
@@ -80,11 +77,10 @@
             surfaceLine1.EnsurePointOfType(0, 0, CharacteristicPointType.DikeTopAtRiver);
             surfaceLine1.EnsurePointOfType(0, 0, CharacteristicPointType.DikeTopAtPolder);
             surfaceLine1.EnsurePointOfType(0, 0, CharacteristicPointType.DikeToeAtPolder);
-            new StubSurfaceLineAdapter(surfaceLine1, location, 0);
+            Assert.That(() => new StubSurfaceLineAdapter(surfaceLine1, location, 0), Throws.InstanceOf<SurfaceLineAdapterException>());
         }
 
         [Test]
-        [ExpectedException(typeof(SurfaceLineAdapterException))]
         public void ThrowsAnExceptionWhenSurfaceLineDoesNotComplyToSpecificationUsingAskewDikeTop()
         {
             var surfaceLine1 = new SurfaceLine2
@@ -102,11 +98,10 @@
             surfaceLine1.EnsurePointOfType(p2.X, p2.Z, CharacteristicPointType.DikeTopAtRiver);
             surfaceLine1.EnsurePointOfType(p3.X, p3.Z, CharacteristicPointType.DikeTopAtPolder);
             surfaceLine1.EnsurePointOfType(p1.X, p1.Z, CharacteristicPointType.DikeToeAtPolder);
-            new StubSurfaceLineAdapter(surfaceLine1, location, 0);
+            Assert.That(() => new StubSurfaceLineAdapter(surfaceLine1, location, 0), Throws.InstanceOf<SurfaceLineAdapterException>());
         }
 
         [Test]
-        [ExpectedException(typeof(SurfaceLineAdapterException))]
         public void ThrowsAnExceptionWhenSurfaceLineDoesNotComplyToSpecificationUsingAskewTopShoulderInside()
         {
             var surfaceLine1 = new SurfaceLine2
@@ -128,7 +123,7 @@
             surfaceLine1.EnsurePointOfType(p4.X, p4.Z, CharacteristicPointType.ShoulderBaseInside);
             surfaceLine1.EnsurePointOfType(p5.X, p5.Z, CharacteristicPointType.ShoulderTopInside);
             surfaceLine1.EnsurePointOfType(p1.X, p1.Z, CharacteristicPointType.DikeToeAtPolder);
-            new StubSurfaceLineAdapter(surfaceLine1, location, 0);
+            Assert.That(() => new StubSurfaceLineAdapter(surfaceLine1, location, 0), Throws.InstanceOf<SurfaceLineAdapterException>());
         }
 
         class StubSurfaceLineAdapter : SurfaceLineAdapter
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs
===================================================================
diff -u -r3634 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 3634)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs	(.../ConversionHelperTests.cs)	(revision 3875)
@@ -49,13 +49,12 @@
             Assert.AreEqual(mStabSearchMethod, ConversionHelper.ConvertToDamSearchMethod(searchAlgorithm));
         }
 
-        [ExpectedException(typeof(ArgumentException))]
         [TestCase(SearchAlgorithm.BeeswarmAndLevenbergMarquardt)]
         [TestCase(SearchAlgorithm.LevenbergMarquardt)]
         [TestCase(SearchAlgorithm.Single)]
         public void CanConvertToDamSearchMethodHandleException(SearchAlgorithm searchAlgorithm)
         {
-            ConversionHelper.ConvertToDamSearchMethod(searchAlgorithm);
+            Assert.That(() => ConversionHelper.ConvertToDamSearchMethod(searchAlgorithm), Throws.InstanceOf<ArgumentException>());
         }
 
         [Test]
@@ -93,7 +92,6 @@
             Assert.AreEqual(modelOption, ConversionHelper.ConvertToModelOptionsOutput(mStabModelType));
         }
 
-        [ExpectedException(typeof(ArgumentException))]
         [TestCase(MStabModelType.UpliftSpencer)]
         [TestCase(MStabModelType.SpencerLow)]
         [TestCase(MStabModelType.SpencerHigh)]
@@ -106,10 +104,9 @@
         [TestCase(MStabModelType.UpliftSpencerWti)]
         public void CanConvertToModelOptionsHandleException(MStabModelType mStabModelType)
         {
-            ConversionHelper.ConvertToModelOptions(mStabModelType);
+            Assert.That(() => ConversionHelper.ConvertToModelOptions(mStabModelType), Throws.InstanceOf<ArgumentException>());
         }
 
-        [ExpectedException(typeof(ArgumentException))]
         [TestCase(MStabModelType.UpliftSpencer)]
         [TestCase(MStabModelType.SpencerLow)]
         [TestCase(MStabModelType.SpencerHigh)]
@@ -122,7 +119,7 @@
         [TestCase(MStabModelType.UpliftSpencerWti)]
         public void CanConvertToModelOptionsOutputHandleException(MStabModelType mStabModelType)
         {
-            ConversionHelper.ConvertToModelOptionsOutput(mStabModelType);
+            Assert.That(() => ConversionHelper.ConvertToModelOptionsOutput(mStabModelType), Throws.InstanceOf<ArgumentException>());
         }
         #endregion
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/SoilVolumeMassCalculatorTest.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/SoilVolumeMassCalculatorTest.cs	(.../SoilVolumeMassCalculatorTest.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/SoilVolumeMassCalculatorTest.cs	(.../SoilVolumeMassCalculatorTest.cs)	(revision 3875)
@@ -144,41 +144,43 @@
         }
 
         [Test]
-        [ExpectedException(typeof(SoilVolumicMassCalculatorException))]
         public void ThrowsExceptionWhenSoilProfileParameterIsMissing()
         {
             var calculator = new SoilVolumicMassCalculator();
-            calculator.CalculateTotalMass();
+            Assert.That(() => calculator.CalculateTotalMass(), Throws.InstanceOf<SoilVolumicMassCalculatorException>());
         }
 
         [Test]
-        [ExpectedException(typeof(SoilVolumicMassCalculatorException))]
         public void ThrowsExceptionWhenSurfaceLevelIsAboveProfile()
         {
-            var calculator = new SoilVolumicMassCalculator();
-            calculator.SoilProfile = FactoryForSoilProfiles.CreateSimpleProfile();
-            calculator.SurfaceLevel = 15.0;
-            calculator.CalculateTotalMass();
+            var calculator = new SoilVolumicMassCalculator
+            {
+                SoilProfile = FactoryForSoilProfiles.CreateSimpleProfile(),
+                SurfaceLevel = 15.0
+            };
+            Assert.That(() => calculator.CalculateTotalMass(), Throws.InstanceOf<SoilVolumicMassCalculatorException>());
         }
 
         [Test]
-        [ExpectedException(typeof(SoilVolumicMassCalculatorException))]
         public void ThrowsExceptionWhenSurfaceLevelIsBelowProfile()
         {
-            var calculator = new SoilVolumicMassCalculator();
-            calculator.SoilProfile = FactoryForSoilProfiles.CreateSimpleProfile();
-            calculator.SurfaceLevel = -100.0;
-            calculator.CalculateTotalMass();
+            var calculator = new SoilVolumicMassCalculator
+            {
+                SoilProfile = FactoryForSoilProfiles.CreateSimpleProfile(),
+                SurfaceLevel = -100.0
+            };
+            Assert.That(() => calculator.CalculateTotalMass(), Throws.InstanceOf<SoilVolumicMassCalculatorException>());
         }
 
         [Test]
-        [ExpectedException(typeof(SoilVolumicMassCalculatorException))]
         public void ThrowsExceptionWhenTopLevelToBeValuatedIsBelowProfile()
         {
-            var calculator = new SoilVolumicMassCalculator();
-            calculator.SoilProfile = FactoryForSoilProfiles.CreateSimpleProfile();
-            calculator.TopOfLayerToBeEvaluated = -100.0;
-            calculator.CalculateTotalMass();
+            var calculator = new SoilVolumicMassCalculator
+            {
+                SoilProfile = FactoryForSoilProfiles.CreateSimpleProfile(),
+                TopOfLayerToBeEvaluated = -100.0
+            };
+            Assert.That(() => calculator.CalculateTotalMass(), Throws.InstanceOf<SoilVolumicMassCalculatorException>());
         }
     }
 }
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs	(.../UpliftLocationDeterminatorTest.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs	(.../UpliftLocationDeterminatorTest.cs)	(revision 3875)
@@ -47,45 +47,41 @@
             return plLineCreator.CreateAllPlLines(location);
         }
 
-        [TestFixtureSetUp]
+        [SetUp]
         public void FixtureSetup()
         {
         }
 
-        [TestFixtureTearDown]
+        [TearDown]
         public void FixtureTearDown()
         {
         }
         [Test]
-        [ExpectedException(typeof(UpliftLocationDeterminatorException))]
         public void ThrowsExceptionIfSoilProfileNotAssignedInUpliftLocationDeterminator()
         {
             var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
             var upliftLocationDeterminator = new UpliftLocationDeterminator();
             upliftLocationDeterminator.SurfaceLine = surfaceLineTutorial1;
             upliftLocationDeterminator.PlLines = FactoryForPlLines.CreatePlLinesForUpliftLocationDeterminatorTests();
-            UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationAndResult(1.0);
-        }
+            Assert.That(() => upliftLocationDeterminator.GetLocationAndResult(1.0), Throws.InstanceOf<UpliftLocationDeterminatorException>());        }
 
         [Test]
-        [ExpectedException(typeof(UpliftLocationDeterminatorException))]
         public void ThrowsExceptionIfPlLinesNotAssignedInUpliftLocationDeterminator()
         {
             var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
             var upliftLocationDeterminator = new UpliftLocationDeterminator();
             upliftLocationDeterminator.SurfaceLine = surfaceLineTutorial1;
             upliftLocationDeterminator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile();
-            UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationAndResult(1.0);
+            Assert.That(() => upliftLocationDeterminator.GetLocationAndResult(1.0), Throws.InstanceOf<UpliftLocationDeterminatorException>());
         }
 
         [Test]
-        [ExpectedException(typeof(UpliftLocationDeterminatorException))]
         public void ThrowsExceptionIfSurfaceLineNotAssignedInUpliftLocationDeterminator()
         {
             var upliftLocationDeterminator = new UpliftLocationDeterminator();
             upliftLocationDeterminator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile();
             upliftLocationDeterminator.PlLines = FactoryForPlLines.CreatePlLinesForUpliftLocationDeterminatorTests();
-            UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationAndResult(1.0);
+            Assert.That(() => upliftLocationDeterminator.GetLocationAndResult(1.0), Throws.InstanceOf<UpliftLocationDeterminatorException>());
         }
 
         [Test]
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorTest.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorTest.cs	(.../SensorTest.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorTest.cs	(.../SensorTest.cs)	(revision 3875)
@@ -29,12 +29,12 @@
     {
         #region Setup
 
-        [TestFixtureSetUp]
+        [SetUp]
         public void FixtureSetup()
         {
         }
 
-        [TestFixtureTearDown]
+        [TearDown]
         public void FixtureTearDown()
         {
         }
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj
===================================================================
diff -u -r3444 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj	(.../Deltares.DamEngine.Interface.Tests.csproj)	(revision 3444)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/Deltares.DamEngine.Interface.Tests.csproj	(.../Deltares.DamEngine.Interface.Tests.csproj)	(revision 3875)
@@ -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>
@@ -36,9 +37,8 @@
       <HintPath>..\packages\CompareNETObjects.3.09.0.0\lib\net45\KellermanSoftware.Compare-NET-Objects.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\NUnit\nunit.framework.dll</HintPath>
+    <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" />
@@ -72,6 +72,7 @@
     <None Include="..\Copying.AGPL.licenseheader">
       <Link>Copying.AGPL.licenseheader</Link>
     </None>
+    <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -85,6 +86,12 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.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: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorLocationTests.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorLocationTests.cs	(.../SensorLocationTests.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorLocationTests.cs	(.../SensorLocationTests.cs)	(revision 3875)
@@ -34,13 +34,13 @@
 
         #region Setup
 
-        [TestFixtureSetUp]
+        [SetUp]
         public void FixtureSetup()
         {
             location.Scenarios.Add(new DesignScenario());
         }
 
-        [TestFixtureTearDown]
+        [TearDown]
         public void FixtureTearDown()
         {
         }
Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/packages.config
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/packages.config	(.../packages.config)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/packages.config	(.../packages.config)	(revision 3875)
@@ -23,4 +23,5 @@
 -->
 <packages>
   <package id="CompareNETObjects" version="3.09.0.0" targetFramework="net45" />
+  <package id="NUnit" version="3.13.3" targetFramework="net461" />
 </packages>
\ No newline at end of file
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs	(.../DamPipingSellmeijerVnkKernelWrapperTests.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingSellmeijerVnk/DamPipingSellmeijerVnkKernelWrapperTests.cs	(.../DamPipingSellmeijerVnkKernelWrapperTests.cs)	(revision 3875)
@@ -129,9 +129,9 @@
             {
                 Assert.AreEqual(FailureMechanismSystemType.Piping, result.DamFailureMechanismeCalculation.FailureMechanismSystemType);
                 Assert.AreEqual(PipingModelType.SellmeijerVnk, result.DamFailureMechanismeCalculation.PipingModelType);
-                Assert.IsNotNullOrEmpty(result.LocationName);
-                Assert.IsNotNullOrEmpty(result.ScenarioName);
-                Assert.IsNotNullOrEmpty(result.ProfileName);
+                Assert.That(result.LocationName, Is.Not.Null.Or.Empty);
+                Assert.That(result.ScenarioName, Is.Not.Null.Or.Empty);
+                Assert.That(result.ProfileName, Is.Not.Null.Or.Empty);
                 Assert.AreEqual(3.65, result.PipingDesignResults.SellmeijerVnkFactor, diff);
                 Assert.AreEqual(3.65, result.PipingDesignResults.SellmeijerVnkHcritical, diff);
 
@@ -293,43 +293,39 @@
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen invoer object gedefinieerd voor Sellmeijer VNK")]
         [SetUICulture("nl-NL")]
         public void TestLanguageNLThrowsExceptionInExecuteWhenInputIsNull()
         {
             var kernelWrapper = new DamPipingSellmeijerVnkKernelWrapper();
             List<LogMessage> messages;
-            kernelWrapper.Execute(null, null, out messages);
+            Assert.That(() => kernelWrapper.Execute(null, null, out messages), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen invoer object gedefinieerd voor Sellmeijer VNK"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "No input object defined for Sellmeijer VNK")]
         [SetUICulture("en-US")]
         public void TestLanguageENThrowsExceptionInExecuteWhenInputIsNull()
         {
             var kernelWrapper = new DamPipingSellmeijerVnkKernelWrapper();
             List<LogMessage> messages;
-            kernelWrapper.Execute(null, null, out messages);
+            Assert.That(() => kernelWrapper.Execute(null, null, out messages), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("No input object defined for Sellmeijer VNK"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen uitvoer object gedefinieerd voor Sellmeijer VNK")]
         [SetUICulture("nl-NL")]
         public void TestThrowsExceptionInPostProcessWhenOutputIsNull()
         {
             var kernelWrapper = new DamPipingSellmeijerVnkKernelWrapper();
             List<DesignResult> results;
-            kernelWrapper.PostProcess(new DamKernelInput(), null, null, "", out results);
+            Assert.That(() => kernelWrapper.PostProcess(new DamKernelInput(), null, null, "", out results), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen uitvoer object gedefinieerd voor Sellmeijer VNK"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen invoer object gedefinieerd voor Sellmeijer VNK")]
         [SetUICulture("nl-NL")]
         public void TestThrowsExceptionInPostProcessWhenInputIsNull()
         {
             var kernelWrapper = new DamPipingSellmeijerVnkKernelWrapper();
             List<DesignResult> results;
-            kernelWrapper.PostProcess(null, new DamPipingSellmeijerVnkOutput(), null, "", out results);
+            Assert.That(() => kernelWrapper.PostProcess(null, new DamPipingSellmeijerVnkOutput(), null, "", out results), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen invoer object gedefinieerd voor Sellmeijer VNK"));
         }
 
     }
Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile1DAquiferLayerCombinerTests.cs
===================================================================
diff -u -r3852 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile1DAquiferLayerCombinerTests.cs	(.../SoilProfile1DAquiferLayerCombinerTests.cs)	(revision 3852)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfile1DAquiferLayerCombinerTests.cs	(.../SoilProfile1DAquiferLayerCombinerTests.cs)	(revision 3875)
@@ -46,10 +46,6 @@
         }
 
         [Test]
-        [ExpectedException(typeof(SoilProfile1DAquiferLayerCombinerException),
-             ExpectedMessage =
-                 "Bij het samenstellen van de aquifer laag voor 1D profiel Test Profile hebben de samen te voegen lagen verschillende interpolatie methoden hetgeen niet is toegestaan."
-         )]
         [SetUICulture("nl-NL")]
         public void TestThrowsExceptionWhenInterpolationModelIsNotTheSameForAllCombinedLayers()
         {
@@ -58,7 +54,7 @@
             soilProfile1D.GetLayerWithName("L3").WaterpressureInterpolationModel = WaterpressureInterpolationModel.Hydrostatic;
             soilProfile1D.Name = "Test Profile";
             var topLayerName = "L2";
-            SoilProfile1DAquiferLayerCombiner.CombineLayers(soilProfile1D, topLayerName);
+            Assert.That(() => SoilProfile1DAquiferLayerCombiner.CombineLayers(soilProfile1D, topLayerName), Throws.InstanceOf<SoilProfile1DAquiferLayerCombinerException>().With.Message.EqualTo("Bij het samenstellen van de aquifer laag voor 1D profiel Test Profile hebben de samen te voegen lagen verschillende interpolatie methoden hetgeen niet is toegestaan."));
         }
 
         private static SoilProfile1D CreateProfile()
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineSlopeAdapterTest.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineSlopeAdapterTest.cs	(.../SurfaceLineSlopeAdapterTest.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineSlopeAdapterTest.cs	(.../SurfaceLineSlopeAdapterTest.cs)	(revision 3875)
@@ -38,7 +38,7 @@
         /// <summary>
         /// Tests the fixture tear down.
         /// </summary>
-        [TestFixtureTearDown]
+        [TearDown]
         public void TestFixtureTearDown()
         {
         }
@@ -292,12 +292,11 @@
         #region ConstructWithSlopeTangent
 
         [Test]
-        [ExpectedException(typeof(SurfaceLineAdapterException))]
         public void IsExceptionThrownIfSlopeDoesNotIntersectSurfaceLine()
         {
             var surfaceLine = CreateSimpleDike();
             var surfaceLineAdapter = new SurfaceLineSlopeAdapter(surfaceLine, location, 0);
-            surfaceLineAdapter.ConstructNewSurfaceLineBySlope(0);
+            Assert.That(() => surfaceLineAdapter.ConstructNewSurfaceLineBySlope(0), Throws.InstanceOf<SurfaceLineAdapterException>());
         }
 
         [Test]
@@ -408,7 +407,6 @@
         }
 
         [Test]
-        [ExpectedException(typeof(SurfaceLineAdapterException))]
         public void IsExceptionThrownWhenSlopeDoesNotFit()
         {
             var surfaceLine = new SurfaceLine2
@@ -436,7 +434,7 @@
             surfaceLine.EnsurePointOfType(pointSurfaceLevelInside.X, pointSurfaceLevelInside.Z, CharacteristicPointType.SurfaceLevelInside);
             var surfaceLineAdapter = new SurfaceLineSlopeAdapter(surfaceLine, location, 0);
             const double slopeTangent = 1.0 / 4.0;
-            surfaceLineAdapter.ConstructNewSurfaceLineBySlope(slopeTangent);
+            Assert.That(() => surfaceLineAdapter.ConstructNewSurfaceLineBySlope(slopeTangent), Throws.InstanceOf<SurfaceLineAdapterException>());
         }
 
         [Test]
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/Geometry2DSectionAssemblerTest.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/Geometry2DSectionAssemblerTest.cs	(.../Geometry2DSectionAssemblerTest.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/Geometry2DSectionAssemblerTest.cs	(.../Geometry2DSectionAssemblerTest.cs)	(revision 3875)
@@ -107,12 +107,13 @@
         #endregion
 
 
-        [TestFixtureSetUp]
+        [SetUp]
         public void TestFixtureSetup()
         {
         }
 
-        [Test, Ignore]
+        [Test]
+        [Ignore("")]
         [Category(Categories.WorkInProgress)]
         public void CanCreateAndValidateGeometry2DSectionXML()
         {
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs	(.../OperationalIntegrationTests.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalIntegrationTests.cs	(.../OperationalIntegrationTests.cs)	(revision 3875)
@@ -37,7 +37,8 @@
     {
         private const double tolerance = 0.0005;
 
-        [Test, Ignore]
+        [Test]
+        [Ignore("")]
         [Category(Categories.WorkInProgress)]
         public void Run_UsingTestFiles_HasExpectedResultsInOutputFile()
         {
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs	(.../PlLinesCreatorTest.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs	(.../PlLinesCreatorTest.cs)	(revision 3875)
@@ -36,7 +36,7 @@
     {
         private double Tolerance = 0.001;
 
-        [TestFixtureSetUp]
+        [SetUp]
         public void TestFixtureSetup()
         {
         }
@@ -210,7 +210,6 @@
         /// Test if exception thrown if PolderLevel above top of dike
         /// </summary>
         [Test]
-        [ExpectedException(typeof(PlLinesCreatorException))]
         public void ThrowsWhenPolderLevelHigherDikeTopAtPolder()
         {
             var surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike();
@@ -225,7 +224,7 @@
                 plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile();
                 plLineCreator.SurfaceLine = surfacelineSimpleDike;
                 plLineCreator.WaterLevelPolder = plLineCreator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z + 0.1;
-                PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02);
+                Assert.That(() => plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl1, 0.02), Throws.InstanceOf<PlLinesCreatorException>());
             }
         }
 
@@ -870,7 +869,6 @@
         /// Test if exception is thrown when creating PL2 with no soilprofile
         /// </summary>
         [Test]
-        [ExpectedException(typeof(PlLinesCreatorException))]
         public void CreatePL2WithExpertKnowledgeRRDThrowsExceptionIfNoSoilProfile()
         {
             var surfaceLine = new SurfaceLine2
@@ -886,30 +884,28 @@
                 plLineCreator.SurfaceLine = surfaceLine;
                 plLineCreator.ModelParametersForPlLines.PenetrationLength = 6.0;
                 plLineCreator.HeadInPlLine2 = 4.0;
-                plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl2, 0.02);
+                Assert.That(() => plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl2, 0.02), Throws.InstanceOf<PlLinesCreatorException>());
             }
         }
 
         /// <summary>
         /// Test if exception is thrown when creating PL2 with no surface line
         /// </summary>
         [Test]
-        [ExpectedException(typeof(PlLinesCreatorException))]
         public void CreatePL2WithExpertKnowledgeRRDThrowsExceptionIfNoSurfaceLine()
         {
             Calculators.PlLinesCreator.PlLinesCreator plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator();
             plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateSimpleProfile();
             plLineCreator.SurfaceLine = null;
             plLineCreator.ModelParametersForPlLines.PenetrationLength = 6.0;
             plLineCreator.HeadInPlLine2 = 4.0;
-            plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl2, 0.02);
+            Assert.That(() => plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl2, 0.02), Throws.InstanceOf<PlLinesCreatorException>());
         }
 
         /// <summary>
         /// Test if exception is thrown when creating PL2 if no aquifer present
         /// </summary>
         [Test]
-        [ExpectedException(typeof(PlLinesCreatorException))]
         public void CreatePL2For1DGeometryWithExpertKnowledgeRRDThrowsExceptionIfNoAquiferLayerAtAll()
         {
             var surfaceLine = new SurfaceLine2
@@ -926,7 +922,7 @@
                 plLineCreator.SurfaceLine = surfaceLine;
                 plLineCreator.ModelParametersForPlLines.PenetrationLength = 6.0;
                 plLineCreator.HeadInPlLine2 = 4.0;
-                plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl2, 0.02);
+                Assert.That(() => plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl2, 0.02), Throws.InstanceOf<PlLinesCreatorException>());
             }
         }
 
@@ -961,7 +957,6 @@
         }
 
         [Test]
-        [ExpectedException(typeof(PlLinesCreatorException))]
         public void CreatePL2WithExpertKnowledgeRRDThrowsExceptionIfPenetrationLengthNegative()
         {
             const double cHeadPL2 = 3.0;
@@ -970,7 +965,7 @@
             plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateSimpleProfile();
             plLineCreator.ModelParametersForPlLines.PenetrationLength = cPenetrationLength;
             plLineCreator.HeadInPlLine2 = cHeadPL2;
-            PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl2, 0.02);
+            Assert.That(() => plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl2, 0.02), Throws.InstanceOf<PlLinesCreatorException>());
         }
 
         /// <summary>
@@ -1252,7 +1247,6 @@
         //}
 
         [Test]
-        [ExpectedException(typeof(PlLinesCreatorException))]
         public void CreatePl3For1DGeometryWithExpertKnowledgeRrdThrowsExceptionIfNoAquiferLayers()
         {
             const double cDampingFactor = 0.3;
@@ -1265,7 +1259,7 @@
                 plLineCreator.WaterLevelPolder = -0.5;
 
                 plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = cDampingFactor;
-                PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl3, 0.02);
+                Assert.That(() => plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl3, 0.02), Throws.InstanceOf<PlLinesCreatorException>());
             }
         }
 
@@ -1576,7 +1570,6 @@
         }
 
         [Test]
-        [ExpectedException(typeof(PlLinesCreatorException))]
         public void CreatePl4For1DGeometryWithExpertKnowledgeRrdThrowsExceptionIfNoAquifers()
         {
             const double cDampingFactor = 0.4;
@@ -1589,12 +1582,11 @@
                 plLineCreator.WaterLevelPolder = -0.5;
 
                 plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = cDampingFactor;
-                PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl4, 0.02);
+                Assert.That(() => plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl4, 0.02), Throws.InstanceOf<PlLinesCreatorException>());
             }
         }
 
         [Test]
-        [ExpectedException(typeof(PlLinesCreatorException))]
         public void CreatePlLinesFromGaugesWithNonExistentGauge()
         {
             var surfaceLineTutorial1 = FactoryForSurfaceLines.CreateSurfaceLineTutorial1();
@@ -1629,7 +1621,7 @@
                 plLineCreator.GaugePlLines = gaugePlLines;
                 plLineCreator.Gauges = gauges;
                 plLineCreator.ModelParametersForPlLines.PlLineCreationMethod = PlLineCreationMethod.GaugesWithFallbackToExpertKnowledgeRRD;
-                PlLines plLines = plLineCreator.CreateAllPlLines(locations[0]);
+                Assert.That(() => plLineCreator.CreateAllPlLines(locations[0]), Throws.InstanceOf<PlLinesCreatorException>());
             }
         }
 
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs
===================================================================
diff -u -r3773 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs	(.../MacroStabilityInwardsKernelWrapperTests.cs)	(revision 3773)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs	(.../MacroStabilityInwardsKernelWrapperTests.cs)	(revision 3875)
@@ -591,39 +591,35 @@
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen invoer object gedefinieerd voor Macrostabiliteit")]
         [SetUICulture("nl-NL")]
         public void TestLanguageNLThrowsExceptionWhenInputIsNull()
         {
             var kernelWrapper = new MacroStabilityInwardsKernelWrapper();
-            kernelWrapper.Execute(null, null, out _);
+            Assert.That(() => kernelWrapper.Execute(null, null, out _), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen invoer object gedefinieerd voor Macrostabiliteit"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "No input object defined for Macro Stability")]
         [SetUICulture("en-US")]
         public void TestLanguageENThrowsExceptionWhenStabilityInputIsNull()
         {
             var kernelWrapper = new MacroStabilityInwardsKernelWrapper();
-            kernelWrapper.Execute(null, null, out _); 
+            Assert.That(() => kernelWrapper.Execute(null, null, out _), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("No input object defined for Macro Stability"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen uitvoer object gedefinieerd voor Macrostabiliteit")]
         [SetUICulture("nl-NL")]
         public void TestThrowsExceptionWhenStabilityOutputIsNull()
         {
             var kernelWrapper = new MacroStabilityInwardsKernelWrapper();
-            kernelWrapper.PostProcess(new DamKernelInput(), null, null, "", out _);
+            Assert.That(() => kernelWrapper.PostProcess(new DamKernelInput(), null, null, "", out _), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen uitvoer object gedefinieerd voor Macrostabiliteit"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen Dam invoer object gedefinieerd voor Macrostabiliteit")]
         [SetUICulture("nl-NL")]
         public void TestThrowsExceptionWhenDamKernelInputIsNull()
         {
             var kernelWrapper = new MacroStabilityInwardsKernelWrapper();
-            kernelWrapper.PostProcess(null, null, null, "", out _);
+            Assert.That(() => kernelWrapper.PostProcess(null, null, null, "", out _), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen Dam invoer object gedefinieerd voor Macrostabiliteit"));
         }
 
         private static DamKernelInput CreateDamKernelInputForTest()
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs	(.../WtiPipingSellmeijerRevisedKernelWrapperTests.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs	(.../WtiPipingSellmeijerRevisedKernelWrapperTests.cs)	(revision 3875)
@@ -127,9 +127,9 @@
             {
                 Assert.AreEqual(FailureMechanismSystemType.Piping, result.DamFailureMechanismeCalculation.FailureMechanismSystemType);
                 Assert.AreEqual(PipingModelType.Wti2017, result.DamFailureMechanismeCalculation.PipingModelType);
-                Assert.IsNotNullOrEmpty(result.LocationName);
-                Assert.IsNotNullOrEmpty(result.ScenarioName);
-                Assert.IsNotNullOrEmpty(result.ProfileName);
+                Assert.That(result.LocationName, Is.Not.Null.Or.Empty);
+                Assert.That(result.ScenarioName, Is.Not.Null.Or.Empty);
+                Assert.That(result.ProfileName, Is.Not.Null.Or.Empty);
                 Assert.AreEqual(90, result.PipingDesignResults.Wti2017BackwardErosionSafetyFactor, diff);
                 Assert.AreEqual(expectedHcbe, result.PipingDesignResults.Wti2017BackwardErosionHcritical, diff);
                 Assert.AreEqual(expectedDeltaPhiCbe, result.PipingDesignResults.Wti2017BackwardErosionDeltaPhiC, diff);
@@ -342,43 +342,39 @@
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen invoer object gedefinieerd voor WTI Sellmeijer Revised")]
         [SetUICulture("nl-NL")]
         public void TestLanguageNLThrowsExceptionInExecuteWhenInputIsNull()
         {
             var kernelWrapper = new WtiPipingSellmeijerRevisedKernelWrapper();
             List<LogMessage> messages;
-            kernelWrapper.Execute(null, null, out messages);
+            Assert.That(() => kernelWrapper.Execute(null, null, out messages), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen invoer object gedefinieerd voor WTI Sellmeijer Revised"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "No input object defined for WTI Sellmeijer Revised")]
         [SetUICulture("en-US")]
         public void TestLanguageENThrowsExceptionInExecuteWhenInputIsNull()
         {
             var kernelWrapper = new WtiPipingSellmeijerRevisedKernelWrapper();
             List<LogMessage> messages;
-            kernelWrapper.Execute(null, null, out messages);
+            Assert.That(() => kernelWrapper.Execute(null, null, out messages), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("No input object defined for WTI Sellmeijer Revised"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen uitvoer object gedefinieerd voor WTI Sellmeijer Revised")]
         [SetUICulture("nl-NL")]
         public void TestThrowsExceptionInPostProcessWhenOutputIsNull()
         {
             var kernelWrapper = new WtiPipingSellmeijerRevisedKernelWrapper();
             List<DesignResult> results;
-            kernelWrapper.PostProcess(new DamKernelInput(), null, null, "", out results);
+            Assert.That(() => kernelWrapper.PostProcess(new DamKernelInput(), null, null, "", out results), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen uitvoer object gedefinieerd voor WTI Sellmeijer Revised"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen invoer object gedefinieerd voor WTI Sellmeijer Revised")]
         [SetUICulture("nl-NL")]
         public void TestThrowsExceptionInPostProcessWhenInputIsNull()
         {
             var kernelWrapper = new WtiPipingSellmeijerRevisedKernelWrapper();
             List<DesignResult> results;
-            kernelWrapper.PostProcess(null, new DamPipingSellmeijer4ForcesOutput(), null, "", out results);
+            Assert.That(() => kernelWrapper.PostProcess(null, new DamPipingSellmeijer4ForcesOutput(), null, "", out results), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen invoer object gedefinieerd voor WTI Sellmeijer Revised"));
         }
 
         [TestCase(CharacteristicPointType.BottomDitchPolderSide, PipingCharacteristicPointType.BottomDitchPolderSide)]
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs	(.../PlLinesToWaternetConverterTests.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs	(.../PlLinesToWaternetConverterTests.cs)	(revision 3875)
@@ -1342,40 +1342,36 @@
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen ondergrond profiel gedefinieerd")]
         [SetUICulture("nl-NL")]
         public void TestLanguageNLThrowsExceptionWhenSoilProfile1DIsNull()
         {
             var plLines = new PlLines();
-            PlLinesToWaternetConverter.ConvertPlLineToWaternet(plLines,null, 0, 0, 0);
+            Assert.That(() => PlLinesToWaternetConverter.ConvertPlLineToWaternet(plLines,null, 0, 0, 0), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen ondergrond profiel gedefinieerd"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen object voor pn-lijnen gedefinieerd")]
         [SetUICulture("nl-NL")]
         public void TestLanguageNLThrowsExceptionWhenPlLinesIsNull()
         {
             var soilProfile1D = new SoilProfile1D();
-            PlLinesToWaternetConverter.ConvertPlLineToWaternet(null, soilProfile1D, 0, 0, 0);
+            Assert.That(() => PlLinesToWaternetConverter.ConvertPlLineToWaternet(null, soilProfile1D, 0, 0, 0), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen object voor pn-lijnen gedefinieerd"));
         }
 
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen ondergrond profiel gedefinieerd")]
         [SetUICulture("nl-NL")]
         public void ConvertPlLineToWaternet_SoilProfileNull_ThrowsException()
         {
             var plLines = new PlLines();
-            PlLinesToWaternetConverter.ConvertPlLineToWaternet(plLines, null, 0);
+            Assert.That(() => PlLinesToWaternetConverter.ConvertPlLineToWaternet(plLines, null, 0), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen ondergrond profiel gedefinieerd"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen object voor pn-lijnen gedefinieerd")]
         [SetUICulture("nl-NL")]
         public void ConvertPlLineToWaternet_ProfileLinesNull_ThrowsException()
         {
             var soilProfile = new SoilProfile2D();
-            PlLinesToWaternetConverter.ConvertPlLineToWaternet(null, soilProfile, 0);
+            Assert.That(() => PlLinesToWaternetConverter.ConvertPlLineToWaternet(null, soilProfile, 0), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen object voor pn-lijnen gedefinieerd"));
         }
 
 
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
===================================================================
diff -u -r3800 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj	(.../Deltares.DamEngine.IntegrationTests.csproj)	(revision 3800)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj	(.../Deltares.DamEngine.IntegrationTests.csproj)	(revision 3875)
@@ -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>
@@ -32,8 +33,8 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\lib\NUnit\nunit.framework.dll</HintPath>
+    <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" />
@@ -267,6 +268,8 @@
     <None Include="..\Copying.AGPL.licenseheader">
       <Link>Copying.AGPL.licenseheader</Link>
     </None>
+    <None Include="App.config" />
+    <None Include="packages.config" />
     <None Include="TestFiles\DAM Tutorial Design.geometries2D.0\DWP_1.sti">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -354,6 +357,12 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.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: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs
===================================================================
diff -u -r3852 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs	(.../DamPipingBlighKernelWrapperTests.cs)	(revision 3852)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs	(.../DamPipingBlighKernelWrapperTests.cs)	(revision 3875)
@@ -105,9 +105,10 @@
             {
                 Assert.AreEqual(FailureMechanismSystemType.Piping, result.DamFailureMechanismeCalculation.FailureMechanismSystemType);
                 Assert.AreEqual(PipingModelType.Bligh, result.DamFailureMechanismeCalculation.PipingModelType);
-                Assert.IsNotNullOrEmpty(result.LocationName);
-                Assert.IsNotNullOrEmpty(result.ScenarioName);
-                Assert.IsNotNullOrEmpty(result.ProfileName);
+                Assert.That(result.LocationName, Is.Not.Null.Or.Empty);
+                Assert.That(result.ScenarioName, Is.Not.Null.Or.Empty);
+                Assert.That(result.ProfileName, Is.Not.Null.Or.Empty);
+                Assert.AreEqual(result.ProfileName, Is.Null);
                 Assert.AreEqual(4.5, result.PipingDesignResults.BlighFactor, diff);
                 Assert.AreEqual(2.25, result.PipingDesignResults.BlighHcritical, diff);
 
@@ -241,43 +242,39 @@
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen invoer object gedefinieerd voor Bligh")]
         [SetUICulture("nl-NL")]
         public void TestLanguageNLThrowsExceptionInExecuteWhenInputIsNull()
         {
             var kernelWrapper = new DamPipingBlighKernelWrapper();
             List<LogMessage> messages;
-            kernelWrapper.Execute(null, null, out messages);
+            Assert.That(() => kernelWrapper.Execute(null, null, out messages), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen invoer object gedefinieerd voor Bligh"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "No input object defined for Bligh")]
         [SetUICulture("en-US")]
         public void TestLanguageENThrowsExceptionInExecuteWhenInputIsNull()
         {
             var kernelWrapper = new DamPipingBlighKernelWrapper();
             List<LogMessage> messages;
-            kernelWrapper.Execute(null, null, out messages);
+            Assert.That(() => kernelWrapper.Execute(null, null, out messages), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("No input object defined for Bligh"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen uitvoer object gedefinieerd voor Bligh")]
         [SetUICulture("nl-NL")]
         public void TestThrowsExceptionInPostProcessWhenOutputIsNull()
         {
             var kernelWrapper = new DamPipingBlighKernelWrapper();
             List<DesignResult> results;
-            kernelWrapper.PostProcess(new DamKernelInput(), null, null, "", out results);
+            Assert.That(() => kernelWrapper.PostProcess(new DamKernelInput(), null, null, "", out results), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen uitvoer object gedefinieerd voor Bligh"));
         }
 
         [Test]
-        [ExpectedException(typeof(NoNullAllowedException), ExpectedMessage = "Geen Dam invoer object gedefinieerd voor Bligh")]
         [SetUICulture("nl-NL")]
         public void TestThrowsExceptionInPostProcessWhenInputIsNull()
         {
             var kernelWrapper = new DamPipingBlighKernelWrapper();
             List<DesignResult> results;
-            kernelWrapper.PostProcess(null, new DamPipingBlighOutput(), null, "", out results);
+            Assert.That(() => kernelWrapper.PostProcess(null, new DamPipingBlighOutput(), null, "", out results), Throws.InstanceOf<NoNullAllowedException>().With.Message.EqualTo("Geen Dam invoer object gedefinieerd voor Bligh"));
         }
 
     }
Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs	(.../SensorPLLineCreatorTest.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs	(.../SensorPLLineCreatorTest.cs)	(revision 3875)
@@ -38,12 +38,12 @@
     {
         #region Setup
 
-        [TestFixtureSetUp]
+        [SetUp]
         public void FixtureSetup()
         {
         }
 
-        [TestFixtureTearDown]
+        [TearDown]
         public void FixtureTearDown()
         {
         }
@@ -63,7 +63,6 @@
         #endregion
 
         [Test]
-        [ExpectedException(typeof(PlLinesCreatorException))]
         public void CreatePlLine_Pl1NoSensorData_Throws()
         {
             // setup
@@ -72,11 +71,10 @@
             var creator = SensorPlLineCreator.CreateInstance(sensorLocation, new Dictionary<Sensor, double>());
 
             // call
-            creator.CreatePlLine(PlLineType.Pl1);
+            Assert.That(() => creator.CreatePlLine(PlLineType.Pl1), Throws.InstanceOf<PlLinesCreatorException>());
         }
 
         [Test] // Pl2 is not yet supported
-        [ExpectedException(typeof(NotSupportedException))]
         public void CreatePlLine_Pl2_ThrowsNotSupported()
         {
             // setup
@@ -85,11 +83,10 @@
             var creator = SensorPlLineCreator.CreateInstance(sensorLocation, new Dictionary<Sensor, double>());
 
             // call
-            creator.CreatePlLine(PlLineType.Pl2);
+            Assert.That(() => creator.CreatePlLine(PlLineType.Pl2), Throws.InstanceOf<NotSupportedException>());
         }
 
         [Test]
-        [ExpectedException(typeof(PlLinesCreatorException))]
         public void CreatePlLine_Pl3NoSensorData_Throws()
         {
             // setup
@@ -99,11 +96,10 @@
             var creator = SensorPlLineCreator.CreateInstance(sensorLocation, new Dictionary<Sensor, double>());
 
             // call
-            creator.CreatePlLine(PlLineType.Pl3);
+            Assert.That(() => creator.CreatePlLine(PlLineType.Pl3), Throws.InstanceOf<PlLinesCreatorException>());
         }
 
         [Test]
-        [ExpectedException(typeof(PlLinesCreatorException))]
         public void CreatePlLine_Pl4NoSensorData_Throws()
         {
             // setup
@@ -113,7 +109,7 @@
             var creator = SensorPlLineCreator.CreateInstance(sensorLocation, new Dictionary<Sensor, double>());
 
             // call
-            creator.CreatePlLine(PlLineType.Pl4);
+            Assert.That(() => creator.CreatePlLine(PlLineType.Pl4), Throws.InstanceOf<PlLinesCreatorException>());
         }
 
         [Test]
Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Deltares.DamEngine.Data.Tests.csproj
===================================================================
diff -u -r3444 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Deltares.DamEngine.Data.Tests.csproj	(.../Deltares.DamEngine.Data.Tests.csproj)	(revision 3444)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Deltares.DamEngine.Data.Tests.csproj	(.../Deltares.DamEngine.Data.Tests.csproj)	(revision 3875)
@@ -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>
@@ -36,9 +37,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\CompareNETObjects.3.09.0.0\lib\net45\KellermanSoftware.Compare-NET-Objects.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\NUnit\nunit.framework.dll</HintPath>
+    <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" />
@@ -79,8 +79,16 @@
     <None Include="..\Copying.AGPL.licenseheader">
       <Link>Copying.AGPL.licenseheader</Link>
     </None>
+    <None Include="App.config" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.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: DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/Deltares.DamEngine.Io.Tests.csproj
===================================================================
diff -u -r2101 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/Deltares.DamEngine.Io.Tests.csproj	(.../Deltares.DamEngine.Io.Tests.csproj)	(revision 2101)
+++ DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/Deltares.DamEngine.Io.Tests.csproj	(.../Deltares.DamEngine.Io.Tests.csproj)	(revision 3875)
@@ -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>
@@ -36,9 +37,8 @@
       <HintPath>..\packages\CompareNETObjects.3.09.0.0\lib\net45\KellermanSoftware.Compare-NET-Objects.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\lib\NUnit\nunit.framework.dll</HintPath>
+    <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" />
@@ -61,6 +61,12 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(ProjectDir)..\build\Deltares.DamEngine.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: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftCalculatorTest.cs
===================================================================
diff -u -r3520 -r3875
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftCalculatorTest.cs	(.../UpliftCalculatorTest.cs)	(revision 3520)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftCalculatorTest.cs	(.../UpliftCalculatorTest.cs)	(revision 3875)
@@ -143,25 +143,24 @@
         }
 
         [Test]
-        [ExpectedException(typeof(UpliftCalculatorException))]
         public void ThrowsExceptionWhenSoilProfileParameterIsMissingInCalculateHeadOfPlLine()
         {
             var calculator = new UpliftCalculator();
             calculator.CalculateHeadOfPlLine(0.0);
+            Assert.That(() => calculator.CalculateHeadOfPlLine(0.0), Throws.InstanceOf<UpliftCalculatorException>());
         }
 
         [Test]
-        [ExpectedException(typeof(UpliftCalculatorException))]
         public void ThrowsExceptionWhenSoilProfileParameterIsMissingInCalculateUpliftFactor()
         {
             var calculator = new UpliftCalculator();
-            calculator.CalculateUpliftFactor(0.0);
+            Assert.That(() => calculator.CalculateUpliftFactor(0.0), Throws.InstanceOf<UpliftCalculatorException>());
         }
 
-        [TestFixtureSetUp]
+        [SetUp]
         public void FixtureSetup() {}
 
-        [TestFixtureTearDown]
+        [TearDown]
         public void FixtureTearDown() {}
     }
 }
\ No newline at end of file
Index: DamEngine/trunk/lib/NUnit/nunit.framework.dll
===================================================================
diff -u -r877 -r3875
Binary files differ
Fisheye: Tag 3875 refers to a dead (removed) revision in file `DamEngine/trunk/lib/NUnit/nunit.framework.xml'.
Fisheye: No comparison available.  Pass `N' to diff?