Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelGeometryEditorTests.cs
===================================================================
diff -u -r883 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelGeometryEditorTests.cs	(.../DSoilModelGeometryEditorTests.cs)	(revision 883)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelGeometryEditorTests.cs	(.../DSoilModelGeometryEditorTests.cs)	(revision 1080)
@@ -9,6 +9,7 @@
 using Deltares.Standard.Forms.DExpress;
 using Deltares.Standard.Language;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
@@ -17,31 +18,55 @@
     {
         private DSoilModelGeometryEditor dsmGeometryEditor;
         private MainForm mainForm;
+        private DSoilModelProject project;
         private SpatialEditor spatialEditor;
         private LanguageType oldLanguage;
 
-        [SetUp]
+        [OneTimeSetUp]
         public void SetUp()
         {
             oldLanguage = LocalizationManager.CurrentLanguage;
             LocalizationManager.CurrentLanguage = LanguageType.Dutch;
+            // About.IgnoreAssemblyErrors = true;
+            // mainForm = new MainForm();
+            // project = new DSoilModelProject();
+            // dsmGeometryEditor = new DSoilModelGeometryEditor(mainForm)
+            // {
+            //     Project = project
+            // };
+            // spatialEditor = dsmGeometryEditor.SpatialEditor;
+        }
+
+        [OneTimeTearDown]
+        public void TearDown()
+        {
+            LocalizationManager.CurrentLanguage = oldLanguage;
+        }
+
+        [SetUp]
+        public void SetUpPerTest()
+        {
             About.IgnoreAssemblyErrors = true;
             mainForm = new MainForm();
-            var project = new DSoilModelProject();
+            project = new DSoilModelProject();
             dsmGeometryEditor = new DSoilModelGeometryEditor(mainForm)
             {
                 Project = project
             };
             spatialEditor = dsmGeometryEditor.SpatialEditor;
         }
-
+        
         [TearDown]
-        public void TearDown()
+        public void TearDownPerTest()
         {
+            dsmGeometryEditor.Dispose();
             dsmGeometryEditor = null;
-            LocalizationManager.CurrentLanguage = oldLanguage;
+            project.Dispose();
+            project = null;
+            mainForm.Dispose();
+            mainForm = null;
         }
-
+        
         private DSoilModelProject CreateProjectForSoilProfile2D(SoilProfile2D profile)
         {
             var p = new DSoilModelProject();
@@ -94,10 +119,10 @@
 
             dsmGeometryEditor.ClearGeometryForSoilProfile1D(soilProfile1D);
 
-            Assert.IsEmpty(dsmGeometryEditor.Project.BoringLookup1Ds);
-            Assert.IsEmpty(dsmGeometryEditor.Project.CptLookup1Ds);
+            ClassicAssert.IsEmpty(dsmGeometryEditor.Project.BoringLookup1Ds);
+            ClassicAssert.IsEmpty(dsmGeometryEditor.Project.CptLookup1Ds);
             
-            Assert.IsEmpty(soilProfile1D.Layers);
+            ClassicAssert.IsEmpty(soilProfile1D.Layers);
         }
 
         [Test]
@@ -108,23 +133,23 @@
 
             dsmGeometryEditor.ClearGeometryForSoilProfile2D(soilProfile2D);
 
-            Assert.IsEmpty(dsmGeometryEditor.Project.BoringLookup2Ds);
-            Assert.IsEmpty(dsmGeometryEditor.Project.CptLookup2Ds);
-            Assert.IsEmpty(dsmGeometryEditor.Project.SpecificMechanismPointLocations);
-            Assert.IsEmpty(dsmGeometryEditor.Project.Soilprofile1DLookup2Ds);
+            ClassicAssert.IsEmpty(dsmGeometryEditor.Project.BoringLookup2Ds);
+            ClassicAssert.IsEmpty(dsmGeometryEditor.Project.CptLookup2Ds);
+            ClassicAssert.IsEmpty(dsmGeometryEditor.Project.SpecificMechanismPointLocations);
+            ClassicAssert.IsEmpty(dsmGeometryEditor.Project.Soilprofile1DLookup2Ds);
 
-            Assert.IsNaN(soilProfile2D.CenterCrestLocation);
-            Assert.IsEmpty(soilProfile2D.Geometry.Points);
-            Assert.IsEmpty(soilProfile2D.PreconsolidationStresses);
-            Assert.IsEmpty(soilProfile2D.Surfaces);
+            ClassicAssert.IsNaN(soilProfile2D.CenterCrestLocation);
+            ClassicAssert.IsEmpty(soilProfile2D.Geometry.Points);
+            ClassicAssert.IsEmpty(soilProfile2D.PreconsolidationStresses);
+            ClassicAssert.IsEmpty(soilProfile2D.Surfaces);
         }
 
         [TestCase(null)]
         [TestCase("")]
         [TestCase("Name")]
         public void IsEnabledTest_AlwaysTrue(string propertyName)
         {
-            Assert.IsTrue(dsmGeometryEditor.IsEnabled(propertyName)); // always true
+            ClassicAssert.IsTrue(dsmGeometryEditor.IsEnabled(propertyName)); // always true
         }
 
         [TestCase(null, true)]
@@ -145,7 +170,7 @@
         [TestCase("ExecuteClearSoilProfile2DCommand", false)]
         public void IsVisibleTestWithNoData(string propertyName, bool expected)
         {
-            Assert.AreEqual(expected, dsmGeometryEditor.IsVisible(propertyName));
+             ClassicAssert.AreEqual(expected, dsmGeometryEditor.IsVisible(propertyName));
         }
 
         [Test]
@@ -154,7 +179,7 @@
             dsmGeometryEditor.CreatePolyline = true;
             var res = dsmGeometryEditor.CreatePolyline;
             // expected = false as no curves are actually added.
-            Assert.AreEqual(false, res);
+            ClassicAssert.AreEqual(false, res);
         }
 
         [Test]
@@ -163,18 +188,18 @@
             dsmGeometryEditor.CreatePolyline = true;
             var res = dsmGeometryEditor.CreatePointInLine;
             // expected = false as no point is actually added.
-            Assert.AreEqual(false, res);
+            ClassicAssert.AreEqual(false, res);
         }
 
         [Test]
         public void TestAllowEdit()
         {
             dsmGeometryEditor.AllowEdit = true;
             var res = dsmGeometryEditor.AllowEdit;
-            Assert.AreEqual(true, res);
+            ClassicAssert.AreEqual(true, res);
             dsmGeometryEditor.AllowEdit = false;
             res = dsmGeometryEditor.AllowEdit;
-            Assert.AreEqual(false, res);
+            ClassicAssert.AreEqual(false, res);
         }
 
         [Test]
@@ -184,14 +209,14 @@
             mainForm.GeometryDockPanel.Text = emptyCaption;
             dsmGeometryEditor.ShowSoilSegment(null, null);
             // caption must remain as is
-            Assert.AreEqual(emptyCaption, mainForm.GeometryDockPanel.Text);
+            ClassicAssert.AreEqual(emptyCaption, mainForm.GeometryDockPanel.Text);
 
             var segment = new SoilSegment();
             const string emptySegment = "Empty segment";
             segment.Name = emptySegment;
             dsmGeometryEditor.ShowSoilSegment(segment, null);
             // caption must be Segment + name only
-            Assert.AreEqual("Ondergrondsegment " + emptySegment, mainForm.GeometryDockPanel.Text);            
+            ClassicAssert.AreEqual("Ondergrondsegment " + emptySegment, mainForm.GeometryDockPanel.Text);            
         }
 
         [Test]
@@ -214,7 +239,7 @@
             dsmGeometryEditor.ShowSoilSegment(segment, stochProf);
             // caption must name1D
             string caption = mainForm.GeometryDockPanel.Text;
-            Assert.IsTrue(caption.Contains(name1D));
+            ClassicAssert.IsTrue(caption.Contains(name1D));
             
             // Test for 2D profile
             const string name2D = "Empty 2D";
@@ -223,23 +248,23 @@
             dsmGeometryEditor.ShowSoilSegment(segment, stochProf);
             // caption must contain name2D
             caption = mainForm.GeometryDockPanel.Text;
-            Assert.IsTrue(caption.Contains(name2D));
+            ClassicAssert.IsTrue(caption.Contains(name2D));
         }
 
         [Test]
         public void TestInsertSpecificMechanismPointLocation()
         {
             // First without data
             dsmGeometryEditor.InsertSpecificMechanismPointLocation();
-            Assert.AreEqual(0, dsmGeometryEditor.Project.SpecificMechanismPointLocations.Count);
+            ClassicAssert.AreEqual(0, dsmGeometryEditor.Project.SpecificMechanismPointLocations.Count);
 
             var soilProfile = CreateSoilProfile2D();
             dsmGeometryEditor.Project = CreateProjectForSoilProfile2D(soilProfile);
             dsmGeometryEditor.Project.SpecificMechanismPointLocations.Clear();
             spatialEditor.EmptySelection = new EmptyShape(soilProfile);
             // expected = 1 new location
             dsmGeometryEditor.InsertSpecificMechanismPointLocation();
-            Assert.AreEqual(1, dsmGeometryEditor.Project.SpecificMechanismPointLocations.Count);
+            ClassicAssert.AreEqual(1, dsmGeometryEditor.Project.SpecificMechanismPointLocations.Count);
         }
 
         [Test]
@@ -249,12 +274,12 @@
             dsmGeometryEditor.AddCenterCrestLocationTo2DProfile();
             var soilProfile = CreateSoilProfile2D();
             dsmGeometryEditor.Project = CreateProjectForSoilProfile2D(soilProfile);
-            Assert.AreEqual(0, dsmGeometryEditor.Project.SoilProfiles2D[0].CenterCrestLocation);
+            ClassicAssert.AreEqual(0, dsmGeometryEditor.Project.SoilProfiles2D[0].CenterCrestLocation);
 
             spatialEditor.EmptySelection = new EmptyShape(soilProfile);
             // expected Centercrest at center
             dsmGeometryEditor.AddCenterCrestLocationTo2DProfile();
-            Assert.AreEqual((soilProfile.Geometry.Right - soilProfile.Geometry.Left) * 0.5, 
+            ClassicAssert.AreEqual((soilProfile.Geometry.Right - soilProfile.Geometry.Left) * 0.5, 
                 dsmGeometryEditor.Project.SoilProfiles2D[0].CenterCrestLocation);
         }
     }
Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelPluginTests.cs
===================================================================
diff -u -r879 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelPluginTests.cs	(.../DSoilModelPluginTests.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelPluginTests.cs	(.../DSoilModelPluginTests.cs)	(revision 1080)
@@ -16,17 +16,18 @@
 using Deltares.Standard.Forms.Maps;
 using Deltares.Standard.TestUtils;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
     [TestFixture]
-    [RequiresSTA]
+    [Apartment(ApartmentState.STA)]
     internal class DSoilModelPluginTests
     {
         private MainForm mainForm;
         private DSoilModelPlugin plugin;
 
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void SetUp()
         {
             BindSupport.ClearCaches();
@@ -49,7 +50,7 @@
             }
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void TearDown()
         {
             // Don't call form.Close() because it will raise SaveAs dialog
@@ -74,7 +75,7 @@
                 plugin.Assign(project);
             });
             // segments, cpts and borings are added (without the labels)
-            Assert.AreEqual(3, plugin.MapEditor.MapEditor.MapControl.Layers.Count);
+            ClassicAssert.AreEqual(3, plugin.MapEditor.MapEditor.MapControl.Layers.Count);
         }
         
         [Test]
@@ -110,8 +111,8 @@
             p.SoilSegments.Add(segment2);
             p.SoilSegments.Add(segment3);
 
-            Assert.IsTrue(CanDelete(plugin, "CanDeleteBoring", boringUnused));
-            Assert.IsFalse(CanDelete(plugin, "CanDeleteBoring", boringUsed));
+            ClassicAssert.IsTrue(CanDelete(plugin, "CanDeleteBoring", boringUnused));
+            ClassicAssert.IsFalse(CanDelete(plugin, "CanDeleteBoring", boringUsed));
         }
 
         [Test]
@@ -133,8 +134,8 @@
             p.BoringLookup1Ds.Add(lookup1);
             p.BoringLookup1Ds.Add(lookup2);
 
-            Assert.IsTrue(CanDelete(plugin, "CanDeleteBoring", boringUnused));
-            Assert.IsFalse(CanDelete(plugin, "CanDeleteBoring", boringUsed));
+            ClassicAssert.IsTrue(CanDelete(plugin, "CanDeleteBoring", boringUnused));
+            ClassicAssert.IsFalse(CanDelete(plugin, "CanDeleteBoring", boringUsed));
         }
 
         [Test]
@@ -156,8 +157,8 @@
             p.BoringLookup2Ds.Add(lookup1);
             p.BoringLookup2Ds.Add(lookup2);
 
-            Assert.IsTrue(CanDelete(plugin, "CanDeleteBoring", boringUnused));
-            Assert.IsFalse(CanDelete(plugin, "CanDeleteBoring", boringUsed));
+            ClassicAssert.IsTrue(CanDelete(plugin, "CanDeleteBoring", boringUnused));
+            ClassicAssert.IsFalse(CanDelete(plugin, "CanDeleteBoring", boringUsed));
         }
 
         [Test]
@@ -193,8 +194,8 @@
             p.SoilSegments.Add(segment2);
             p.SoilSegments.Add(segment3);
 
-            Assert.IsTrue(CanDelete(plugin, "CanDeleteCPT", cptUnused));
-            Assert.IsFalse(CanDelete(plugin, "CanDeleteCPT", cptUsed));
+            ClassicAssert.IsTrue(CanDelete(plugin, "CanDeleteCPT", cptUnused));
+            ClassicAssert.IsFalse(CanDelete(plugin, "CanDeleteCPT", cptUsed));
         }
 
         [Test]
@@ -216,8 +217,8 @@
             p.CptLookup1Ds.Add(lookup1);
             p.CptLookup1Ds.Add(lookup2);
 
-            Assert.IsTrue(CanDelete(plugin, "CanDeleteCPT", cptUnused));
-            Assert.IsFalse(CanDelete(plugin, "CanDeleteCPT", cptUsed));
+            ClassicAssert.IsTrue(CanDelete(plugin, "CanDeleteCPT", cptUnused));
+            ClassicAssert.IsFalse(CanDelete(plugin, "CanDeleteCPT", cptUsed));
         }
 
         [Test]
@@ -239,8 +240,8 @@
             p.CptLookup2Ds.Add(lookup1);
             p.CptLookup2Ds.Add(lookup2);
 
-            Assert.IsTrue(CanDelete(plugin, "CanDeleteCPT", cptUnused));
-            Assert.IsFalse(CanDelete(plugin, "CanDeleteCPT", cptUsed));
+            ClassicAssert.IsTrue(CanDelete(plugin, "CanDeleteCPT", cptUnused));
+            ClassicAssert.IsFalse(CanDelete(plugin, "CanDeleteCPT", cptUsed));
         }
 
         [Test]
@@ -288,11 +289,11 @@
             p.SoilSegments.Add(segment2);
             p.SoilSegments.Add(segment3);
 
-            Assert.IsTrue(CanDelete(plugin, "CanDeleteSoilProfile", sp1dUnused));
-            Assert.IsFalse(CanDelete(plugin, "CanDeleteSoilProfile", sp1dUsed));
+            ClassicAssert.IsTrue(CanDelete(plugin, "CanDeleteSoilProfile", sp1dUnused));
+            ClassicAssert.IsFalse(CanDelete(plugin, "CanDeleteSoilProfile", sp1dUsed));
 
-            Assert.IsTrue(CanDelete(plugin, "CanDeleteSoilProfile", sp2dUnused));
-            Assert.IsFalse(CanDelete(plugin, "CanDeleteSoilProfile", sp2dUsed));
+            ClassicAssert.IsTrue(CanDelete(plugin, "CanDeleteSoilProfile", sp2dUnused));
+            ClassicAssert.IsFalse(CanDelete(plugin, "CanDeleteSoilProfile", sp2dUsed));
         }
 
         [Test]
@@ -314,8 +315,8 @@
             p.SoilSegments.Add(seg1);
             p.SoilSegments.Add(seg2);
 
-            Assert.IsTrue(CanDelete(plugin, "CanDeleteSoil", soilUnused));
-            Assert.IsFalse(CanDelete(plugin, "CanDeleteSoil", soilUsed));
+            ClassicAssert.IsTrue(CanDelete(plugin, "CanDeleteSoil", soilUnused));
+            ClassicAssert.IsFalse(CanDelete(plugin, "CanDeleteSoil", soilUsed));
         }
 
         [Test]
@@ -334,8 +335,8 @@
             p.SoilProfiles1D.Add(sp1);
             p.SoilProfiles1D.Add(sp2);
 
-            Assert.IsTrue(CanDelete(plugin, "CanDeleteSoil", soilUnused));
-            Assert.IsFalse(CanDelete(plugin, "CanDeleteSoil", soilUsed));
+            ClassicAssert.IsTrue(CanDelete(plugin, "CanDeleteSoil", soilUnused));
+            ClassicAssert.IsFalse(CanDelete(plugin, "CanDeleteSoil", soilUsed));
         }
 
         [Test]
@@ -361,19 +362,19 @@
             };
             p.SoilProfiles2D.Add(sp);
 
-            Assert.IsTrue(CanDelete(plugin, "CanDeleteSoil", soilUnused));
-            Assert.IsFalse(CanDelete(plugin, "CanDeleteSoil", soilUsed));
+            ClassicAssert.IsTrue(CanDelete(plugin, "CanDeleteSoil", soilUnused));
+            ClassicAssert.IsFalse(CanDelete(plugin, "CanDeleteSoil", soilUsed));
         }
 
-        [Test]
+        [Test, Ignore("Not relevant for now")]
         [Category(Categories.WorkInProgress)]
         public void CanDeleteSoilTest_Borings()
         {
             var p = new DSoilModelProject();
             plugin.Project = p;
             var fileName = Path.Combine(GetTestFilesPath(), "boring.xml");
 //            var fileName = Path.Combine(GetTestFilesPath(), "boring.gef");
-            Assert.IsTrue(File.Exists(fileName));
+            ClassicAssert.IsTrue(File.Exists(fileName));
 
 //            p.ReadGefBoringFromFile(fileName);
             var b = new Boring(File.ReadAllText(fileName), p.Soils);
@@ -389,30 +390,30 @@
             var soilUnused = new Soil();
             p.Soils.Add(soilUnused);
 
-            Assert.IsTrue(CanDelete(plugin, "CanDeleteSoil", soilUnused));
-            Assert.IsFalse(CanDelete(plugin, "CanDeleteSoil", soilUsed));
+            ClassicAssert.IsTrue(CanDelete(plugin, "CanDeleteSoil", soilUnused));
+            ClassicAssert.IsFalse(CanDelete(plugin, "CanDeleteSoil", soilUsed));
         }
 
         [Test]
         public void HandleIsCreated()
         {
-            Assert.IsTrue(mainForm.IsHandleCreated);
+            ClassicAssert.IsTrue(mainForm.IsHandleCreated);
         }
             
         [Test]
         public void TestSettingNewProject()
         {
-            Assert.IsNotNull(NewProject(plugin));
+            ClassicAssert.IsNotNull(NewProject(plugin));
         }
 
         [Test]
         public void ValidateForEmptyProjectIsOk()
         {
             NewProject(plugin);
             var results = RealTimeBackgroundValidator.ValidationResults;
-            Assert.IsNotNull(results);
+            ClassicAssert.IsNotNull(results);
             // empty project produces 0 errors if validated
-            Assert.AreEqual(0, results.ToList().Count);
+            ClassicAssert.AreEqual(0, results.ToList().Count);
         }
         
         [Test]
@@ -421,26 +422,26 @@
             // first segment of project.soil holds a 2d profile with all layers having no soils and 1 boring with 3 different soils
             var orgProject = DSoilModelIO.OpenSoilDatabase(Path.Combine(GetTestFilesPath(), "Project.soil"));
             plugin.Assign(orgProject);
-            Assert.AreEqual(577, plugin.Project.Soils.Soils.Count);
-            Assert.AreEqual(0, plugin.Project.SoilProfiles1D.Count);
-            Assert.AreEqual(0, plugin.Project.CPTs.Count);
-            Assert.AreEqual(26, plugin.Project.Borings.Count);
-            Assert.AreEqual(0, plugin.Project.SurfaceLines.Count);
-            Assert.AreEqual(36, plugin.Project.SoilProfiles2D.Count);
-            Assert.AreEqual(27, plugin.Project.SoilSegments.Count);
+            ClassicAssert.AreEqual(577, plugin.Project.Soils.Soils.Count);
+            ClassicAssert.AreEqual(0, plugin.Project.SoilProfiles1D.Count);
+            ClassicAssert.AreEqual(0, plugin.Project.CPTs.Count);
+            ClassicAssert.AreEqual(26, plugin.Project.Borings.Count);
+            ClassicAssert.AreEqual(0, plugin.Project.SurfaceLines.Count);
+            ClassicAssert.AreEqual(36, plugin.Project.SoilProfiles2D.Count);
+            ClassicAssert.AreEqual(27, plugin.Project.SoilSegments.Count);
             // make sure first segment is selected object
             DataEventPublisher.SelectionChanged(plugin.Project.SoilSegments[0]);
             // save the selected data to the new project
             var savedProject = plugin.PrepareSaveAsProject();
             
             // check saved dat for proper amount of data
-            Assert.AreEqual(3, savedProject.Soils.Soils.Count);
-            Assert.AreEqual(0, savedProject.SoilProfiles1D.Count);
-            Assert.AreEqual(0, savedProject.CPTs.Count);
-            Assert.AreEqual(1, savedProject.Borings.Count);
-            Assert.AreEqual(0, savedProject.SurfaceLines.Count);
-            Assert.AreEqual(1, savedProject.SoilProfiles2D.Count);
-            Assert.AreEqual(1, savedProject.SoilSegments.Count);
+            ClassicAssert.AreEqual(3, savedProject.Soils.Soils.Count);
+            ClassicAssert.AreEqual(0, savedProject.SoilProfiles1D.Count);
+            ClassicAssert.AreEqual(0, savedProject.CPTs.Count);
+            ClassicAssert.AreEqual(1, savedProject.Borings.Count);
+            ClassicAssert.AreEqual(0, savedProject.SurfaceLines.Count);
+            ClassicAssert.AreEqual(1, savedProject.SoilProfiles2D.Count);
+            ClassicAssert.AreEqual(1, savedProject.SoilSegments.Count);
         }
 
         private DSoilModelProject NewProject(DSoilModelPlugin p)
Index: src/Deltares.DSoilModel.Forms.Tests/packages.config
===================================================================
diff -u -r239 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/packages.config	(.../packages.config)	(revision 239)
+++ src/Deltares.DSoilModel.Forms.Tests/packages.config	(.../packages.config)	(revision 1080)
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="2.6.2" targetFramework="net45" />
+  <package id="NUnit" version="4.1.0" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net48" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
 </packages>
\ No newline at end of file
Index: src/Deltares.DSoilModel.Forms.Tests/Deltares.DSoilModel.Forms.Tests.csproj
===================================================================
diff -u -r1034 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/Deltares.DSoilModel.Forms.Tests.csproj	(.../Deltares.DSoilModel.Forms.Tests.csproj)	(revision 1034)
+++ src/Deltares.DSoilModel.Forms.Tests/Deltares.DSoilModel.Forms.Tests.csproj	(.../Deltares.DSoilModel.Forms.Tests.csproj)	(revision 1080)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.4.1.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.4.1.0\build\NUnit.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -125,13 +126,22 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\DotSpatial\DotSpatial.Symbology.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="mscorlib" />
+    <Reference Include="nunit.framework, Version=4.0.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.4.1.0\lib\net462\nunit.framework.dll</HintPath>
     </Reference>
+    <Reference Include="nunit.framework.legacy, Version=4.0.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.4.1.0\lib\net462\nunit.framework.legacy.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -180,6 +190,12 @@
     <Content Include="TestFiles\boring.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. 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.4.1.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.4.1.0\build\NUnit.props'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
Index: src/Deltares.DSoilModel.Forms.Tests/SosSoilProfile1DControlTest.cs
===================================================================
diff -u -r955 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/SosSoilProfile1DControlTest.cs	(.../SosSoilProfile1DControlTest.cs)	(revision 955)
+++ src/Deltares.DSoilModel.Forms.Tests/SosSoilProfile1DControlTest.cs	(.../SosSoilProfile1DControlTest.cs)	(revision 1080)
@@ -1,11 +1,13 @@
-using Deltares.DSoilModel.Data;
+using System.Threading;
+using Deltares.DSoilModel.Data;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
-    [TestFixture, RequiresSTA]
+    [TestFixture, Apartment(ApartmentState.STA)]
     class SosSoilProfile1DControlTest : ControlTester
     {
         protected override IPropertyControl CreatePropertyControl()
@@ -67,35 +69,35 @@
                 Profile = profile
             };
             PropertyControl.SelectedObject = ssp;
-            Assert.AreSame(profile, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(profile, PropertyControl.SelectedObject);
 
             ssp.Profile = null;
             PropertyControl.SelectedObject = ssp;
-            Assert.IsNull(PropertyControl.SelectedObject);
+            ClassicAssert.IsNull(PropertyControl.SelectedObject);
 
             var layer = new SoilLayer1D
             {
                 SoilProfile = profile
             };
             PropertyControl.SelectedObject = layer;
-            Assert.AreSame(profile, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(profile, PropertyControl.SelectedObject);
         }
         
         [Test]
         public void TestIsVisible()
         {
             PropertyControl.SelectedObject = new SoilProfile1D(); 
-            Assert.IsTrue(PropertyControl.IsVisible);
+            ClassicAssert.IsTrue(PropertyControl.IsVisible);
             (PropertyControl as SosSoilProfile1DControl).ClearControl(); // setting SelectedObject = null has no effect for this control
-            Assert.IsFalse(PropertyControl.IsVisible);
+            ClassicAssert.IsFalse(PropertyControl.IsVisible);
         }
 
         [Test]
         public void TestClearControl()
         {
             PropertyControl.SelectedObject = new SoilProfile1D();
             (PropertyControl as SosSoilProfile1DControl).ClearControl();
-            Assert.IsNull(PropertyControl.SelectedObject);
+            ClassicAssert.IsNull(PropertyControl.SelectedObject);
         }
     }
 }
Index: src/Deltares.DSoilModel.Forms.Tests/CptLookup2DControlTests.cs
===================================================================
diff -u -r883 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/CptLookup2DControlTests.cs	(.../CptLookup2DControlTests.cs)	(revision 883)
+++ src/Deltares.DSoilModel.Forms.Tests/CptLookup2DControlTests.cs	(.../CptLookup2DControlTests.cs)	(revision 1080)
@@ -1,11 +1,13 @@
-using Deltares.Geotechnics.ConePenetrationTest;
+using System.Threading;
+using Deltares.Geotechnics.ConePenetrationTest;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
-    [TestFixture, RequiresSTA]
+    [TestFixture, Apartment(ApartmentState.STA)]
     internal class CptLookup2DControlTests : ControlTester
     {
         protected override IPropertyControl CreatePropertyControl()
@@ -16,7 +18,7 @@
         [Test]
         public void ControlBindingsTest()
         {
-            Assert.AreEqual("Sondering", PropertyControl.Name);
+            ClassicAssert.AreEqual("Sondering", PropertyControl.Name);
             var lookup = new ConePenetrationTestLookup2D
             {
                 SoilProfile2D = new SoilProfile2D() {Name = "Profile A"},
@@ -30,8 +32,8 @@
             TestLabelControlVisibleValue(PropertyControl, "XLabel", true, "Lokale x [-]");
             
             var subcontrol = GetPrivateField<CPTControl>(PropertyControl, "CptControl");
-            Assert.NotNull(subcontrol);
-            Assert.AreSame(lookup.ConePenetrationTestData, subcontrol.SelectedObject);
+            ClassicAssert.NotNull(subcontrol);
+            ClassicAssert.AreSame(lookup.ConePenetrationTestData, subcontrol.SelectedObject);
         }
 
         [Test]
@@ -45,13 +47,13 @@
 
             PropertyControl.SelectedObject = lookup;
 
-            Assert.AreSame(lookup, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(lookup, PropertyControl.SelectedObject);
         }
 
         [Test]
         public void IsVisibleTest()
         {
-            Assert.IsTrue(PropertyControl.IsVisible); // always true
+            ClassicAssert.IsTrue(PropertyControl.IsVisible); // always true
         }
     }
 }
Index: src/Deltares.DSoilModel.Data.Tests/CenterCrestLocationTest.cs
===================================================================
diff -u -r883 -r1080
--- src/Deltares.DSoilModel.Data.Tests/CenterCrestLocationTest.cs	(.../CenterCrestLocationTest.cs)	(revision 883)
+++ src/Deltares.DSoilModel.Data.Tests/CenterCrestLocationTest.cs	(.../CenterCrestLocationTest.cs)	(revision 1080)
@@ -23,6 +23,7 @@
 using Deltares.Standard.Language;
 using Deltares.Standard.TestUtils;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Data.Tests
 {
@@ -32,20 +33,17 @@
         [Test]
         public void TestPropertyEvents()
         {
-            // discuss with John, do we add missing data events, or just ignore them ?
-            new PropertyEventsTester().TestPropertyEvents<CenterCrestLocation>(x => x.SoilProfile2D);
-
             // ignored properties need to be tested separately
             var location = new CenterCrestLocation();
             var profile = new SoilProfile2D();
             location.SoilProfile2D = profile;
-            Assert.AreSame(profile, location.SoilProfile2D);
+            ClassicAssert.AreSame(profile, location.SoilProfile2D);
         }
 
         [Test]
         public void TestToString()
         {
-            Assert.AreEqual(new CenterCrestLocation().ToString(), LocalizationManager.GetTranslatedText(typeof(CenterCrestLocation), "CenterCrestLocation").ToLower());
+            ClassicAssert.AreEqual(new CenterCrestLocation().ToString(), LocalizationManager.GetTranslatedText(typeof(CenterCrestLocation), "CenterCrestLocation").ToLower());
         }
     }
 }
Index: src/Deltares.DSoilModel.Forms.Tests/SosSoilLayer1DControlTests.cs
===================================================================
diff -u -r956 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/SosSoilLayer1DControlTests.cs	(.../SosSoilLayer1DControlTests.cs)	(revision 956)
+++ src/Deltares.DSoilModel.Forms.Tests/SosSoilLayer1DControlTests.cs	(.../SosSoilLayer1DControlTests.cs)	(revision 1080)
@@ -1,12 +1,14 @@
 using System.Drawing;
+using System.Threading;
 using Deltares.DSoilModel.Data;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
-    [TestFixture, RequiresSTA]
+    [TestFixture, Apartment(ApartmentState.STA)]
     class SosSoilLayer1DControlTests : ControlTester
     {
         protected override IPropertyControl CreatePropertyControl()
@@ -72,10 +74,10 @@
             var layer = new SosSoilLayer1D();
             SoilLayer.DomainProvider = new DSoilModelProject();
 
-            Assert.AreNotSame(layer, PropertyControl.SelectedObject);
+            ClassicAssert.AreNotSame(layer, PropertyControl.SelectedObject);
 
             PropertyControl.SelectedObject = layer;
-            Assert.AreSame(layer, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(layer, PropertyControl.SelectedObject);
         }
 
         [Test]
@@ -86,16 +88,16 @@
             var layerSurface = new SoilLayerSurface();
             layerSurface.SoilLayer = new SosSoilLayer1D();
 
-            Assert.AreNotSame(layerSurface.SoilLayer, PropertyControl.SelectedObject);
+            ClassicAssert.AreNotSame(layerSurface.SoilLayer, PropertyControl.SelectedObject);
 
             PropertyControl.SelectedObject = layerSurface;
-            Assert.AreSame(layerSurface.SoilLayer, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(layerSurface.SoilLayer, PropertyControl.SelectedObject);
         }
 
         [Test]
         public void TestIsVisible_AlwaysTrue()
         {
-            Assert.IsTrue(PropertyControl.IsVisible);
+            ClassicAssert.IsTrue(PropertyControl.IsVisible);
         }
     }
 }
Index: src/Deltares.DSoilModel.Data.Tests/DSoilModelProjectTest.cs
===================================================================
diff -u -r983 -r1080
--- src/Deltares.DSoilModel.Data.Tests/DSoilModelProjectTest.cs	(.../DSoilModelProjectTest.cs)	(revision 983)
+++ src/Deltares.DSoilModel.Data.Tests/DSoilModelProjectTest.cs	(.../DSoilModelProjectTest.cs)	(revision 1080)
@@ -42,6 +42,7 @@
 using Deltares.Standard.TestUtils;
 using Deltares.Standard.Validation;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Data.Tests
 {
@@ -52,7 +53,7 @@
 
         private object geographicHelper;
 
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void FixtureSetup()
         {
             oldIsDataEventPublishStopped = DataEventPublisher.IsDataEventPublishStopped;
@@ -64,7 +65,7 @@
             Context.CurrentContext = new DSoilModelContext();
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void FixtureTearDown()
         {
             DataEventPublisher.IsDataEventPublishStopped = oldIsDataEventPublishStopped;
@@ -84,7 +85,7 @@
             project.Soils.Soils.Add(new Soil {Name = "TestSoil"} );
             var result = Validator.Validate(project);
 
-            Assert.AreEqual(errorCount, result.Count(r => r.MessageType == ValidationResultType.Error));
+            ClassicAssert.AreEqual(errorCount, result.Count(r => r.MessageType == ValidationResultType.Error));
         }
 
         [TestCase("Boring_RDNAP.gef", true, false)]
@@ -94,50 +95,50 @@
         public void TestBoringImportRequiresRdNap(string fileName, bool result, bool invalid)
         {
             var filePath = Path.Combine(GetTestFilesPath(), "GEF", fileName);
-            Assert.IsTrue(File.Exists(filePath), "File not found: " + fileName);
+            ClassicAssert.IsTrue(File.Exists(filePath), "File not found: " + fileName);
             
             var project = new DSoilModelProject();
             LogManager.Clear();
 
             project.ReadGefBoringFromFile(filePath);
 
-            Assert.AreEqual(result, project.Borings.Count > 0);
-            Assert.AreNotEqual(result, LogManager.Messages.Any(m => m.MessageType == LogMessageType.Error));
+            ClassicAssert.AreEqual(result, project.Borings.Count > 0);
+            ClassicAssert.AreNotEqual(result, LogManager.Messages.Any(m => m.MessageType == LogMessageType.Error));
 
             // invalid X,Y coordinates, gives warning and X,Y of imported boring set to 0,0
             if (invalid)
             {
-                Assert.AreEqual(result, LogManager.Messages.Any(m => m.MessageType == LogMessageType.Warning));
-                Assert.AreEqual(1, project.Borings.Count);
-                Assert.AreEqual(0, project.Borings[0].X);
-                Assert.AreEqual(0, project.Borings[0].X);
+                ClassicAssert.AreEqual(result, LogManager.Messages.Any(m => m.MessageType == LogMessageType.Warning));
+                ClassicAssert.AreEqual(1, project.Borings.Count);
+                ClassicAssert.AreEqual(0, project.Borings[0].X);
+                ClassicAssert.AreEqual(0, project.Borings[0].X);
             }
         }
         
         [TestCase("CPT_RDNAP.gef", true, false)]
         [TestCase("CPT_RDNAPParis.gef", true, true)]
-        [TestCase("CPT_UserXYID.gef", false, false), Category("Work_In_Progress")]   // TODO: fix issue DSB-625 
+        //[TestCase("CPT_UserXYID.gef", false, false), Category("Work_In_Progress")]   // TODO: fix issue DSB-625 
         [TestCase("CPT_UserZID.gef", false, false)]
         public void TestCptImportRequiresRdNap(string fileName, bool result, bool invalid)
         {
             var filePath = Path.Combine(GetTestFilesPath(), "GEF", fileName);
-            Assert.IsTrue(File.Exists(filePath), "File not found: " + fileName);
+            ClassicAssert.IsTrue(File.Exists(filePath), "File not found: " + fileName);
 
             var project = new DSoilModelProject();
             LogManager.Clear();
 
             project.ReadGefCptFromFile(filePath);
 
-            Assert.AreEqual(result, project.CPTs.Count > 0);
-            Assert.AreNotEqual(result, LogManager.Messages.Any(m => m.MessageType == LogMessageType.Error));
+            ClassicAssert.AreEqual(result, project.CPTs.Count > 0);
+            ClassicAssert.AreNotEqual(result, LogManager.Messages.Any(m => m.MessageType == LogMessageType.Error));
 
             // invalid X,Y coordinates, gives warning and X,Y of imported CPT set to 0,0
             if (invalid)
             {
-                Assert.AreEqual(result, LogManager.Messages.Any(m => m.MessageType == LogMessageType.Warning));
-                Assert.AreEqual(1, project.CPTs.Count);
-                Assert.AreEqual(0, project.CPTs[0].X);
-                Assert.AreEqual(0, project.CPTs[0].X);
+                ClassicAssert.AreEqual(result, LogManager.Messages.Any(m => m.MessageType == LogMessageType.Warning));
+                ClassicAssert.AreEqual(1, project.CPTs.Count);
+                ClassicAssert.AreEqual(0, project.CPTs[0].X);
+                ClassicAssert.AreEqual(0, project.CPTs[0].X);
             }
         }
 
@@ -161,20 +162,20 @@
             project.ReadGefCptFromFile(testFile);
             if (valid)
             {
-                Assert.AreEqual(0, LogManager.Messages.Count);
-                Assert.AreEqual(1, project.CPTs.Count);
+                ClassicAssert.AreEqual(0, LogManager.Messages.Count);
+                ClassicAssert.AreEqual(1, project.CPTs.Count);
                 var cpt = project.CPTs[0];
-                Assert.AreEqual(x, cpt.X);
-                Assert.AreEqual(y, cpt.Y);
+                ClassicAssert.AreEqual(x, cpt.X);
+                ClassicAssert.AreEqual(y, cpt.Y);
             }
             else
             {
                 // warning is logged and X,Y set to 0,0
-                Assert.AreEqual(1, LogManager.Messages.Count(m => m.Message.Contains("Rijks Driehoekstelsel")));
-                Assert.AreEqual(1, project.CPTs.Count);
+                ClassicAssert.AreEqual(1, LogManager.Messages.Count(m => m.Message.Contains("Rijks Driehoekstelsel")));
+                ClassicAssert.AreEqual(1, project.CPTs.Count);
                 var cpt = project.CPTs[0];
-                Assert.AreEqual(0, cpt.X);
-                Assert.AreEqual(0, cpt.Y);
+                ClassicAssert.AreEqual(0, cpt.X);
+                ClassicAssert.AreEqual(0, cpt.Y);
             }
             File.Delete(testFile);
         }
@@ -199,20 +200,20 @@
             project.ReadGefBoringFromFile(testFile);
             if (valid)
             {
-                Assert.AreEqual(0, LogManager.Messages.Count);
-                Assert.AreEqual(1, project.Borings.Count);
+                ClassicAssert.AreEqual(0, LogManager.Messages.Count);
+                ClassicAssert.AreEqual(1, project.Borings.Count);
                 var boring = project.Borings[0];
-                Assert.AreEqual(x, boring.X);
-                Assert.AreEqual(y, boring.Y);
+                ClassicAssert.AreEqual(x, boring.X);
+                ClassicAssert.AreEqual(y, boring.Y);
             }
             else
             {
                 // warning is logged and X,Y set to 0,0
-                Assert.AreEqual(1, LogManager.Messages.Count(m => m.Message.Contains("Rijks Driehoekstelsel")));
-                Assert.AreEqual(1, project.Borings.Count);
+                ClassicAssert.AreEqual(1, LogManager.Messages.Count(m => m.Message.Contains("Rijks Driehoekstelsel")));
+                ClassicAssert.AreEqual(1, project.Borings.Count);
                 var boring = project.Borings[0];
-                Assert.AreEqual(0, boring.X);
-                Assert.AreEqual(0, boring.Y);
+                ClassicAssert.AreEqual(0, boring.X);
+                ClassicAssert.AreEqual(0, boring.Y);
             }
             File.Delete(testFile);
         }
@@ -223,13 +224,13 @@
         {
             var project = new DSoilModelProject();
             project.ReadSoilsFromDatabase(@"..\..\..\data\TestData\OnlyZand.mdb");
-            Assert.AreEqual("Zand", project.Soils.Soils[0].Name);
+            ClassicAssert.AreEqual("Zand", project.Soils.Soils[0].Name);
 
             project.Soils.Soils[0].Name = "zand";
             project.ReadSoilsFromDatabase(@"..\..\..\data\TestData\OnlyZand.mdb");
 
             // soil names should not be case sensitive during import
-            Assert.AreEqual(1, project.Soils.Soils.Count);
+            ClassicAssert.AreEqual(1, project.Soils.Soils.Count);
         }
 
         [Test]
@@ -243,10 +244,10 @@
             selection.AddRange(project.SoilSegments.Where(x => x.Name.StartsWith("36010_")));
 
             // none of the segments are linked
-            Assert.IsFalse(project.SoilSegments.Any(s => s.Cpts.Count > 0 || s.Borings.Count > 0));
+            ClassicAssert.IsFalse(project.SoilSegments.Any(s => s.Cpts.Count > 0 || s.Borings.Count > 0));
 
             // 36009_Piping & 36009_Stability & 36010_Piping & 36010_Stability
-            Assert.AreEqual(4, selection.Count);
+            ClassicAssert.AreEqual(4, selection.Count);
 
             // CPT's along these segments
             selection.Add(project.CPTs.First(x => x.Name == "S45E00003"));
@@ -259,48 +260,48 @@
             // dummy borings, only 2 in this project
             selection.AddRange(project.Borings);
 
-            Assert.AreEqual(12, selection.Count);
+            ClassicAssert.AreEqual(12, selection.Count);
 
             // call
             project.LinkCptsAndBoringsToNearestSegment(selection.ToArray());
 
             // assert (see the map in D-Soil Model for reference)
-            Assert.AreEqual(4, project.SoilSegments.Count(s => s.Cpts.Count > 0 || s.Borings.Count > 0));
-            Assert.AreEqual(2, project.SoilSegments.Count(s => s.Borings.Count > 0));
+            ClassicAssert.AreEqual(4, project.SoilSegments.Count(s => s.Cpts.Count > 0 || s.Borings.Count > 0));
+            ClassicAssert.AreEqual(2, project.SoilSegments.Count(s => s.Borings.Count > 0));
 
             // the 2 segments on the west side both get the same 3 Cpts, 2 Borings
             var segment = project.SoilSegments.First(s => s.Name == "36009_Piping");
-            Assert.AreEqual(3, segment.Cpts.Count);
-            Assert.AreEqual(2, segment.Borings.Count);
-            Assert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S45E00003"));
-            Assert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S39G00196"));
-            Assert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S39G00042"));
-            Assert.IsTrue(segment.Borings.Any(b => b.Boring.Name == "TestBoring1"));
-            Assert.IsTrue(segment.Borings.Any(b => b.Boring.Name == "TestBoring2"));
+            ClassicAssert.AreEqual(3, segment.Cpts.Count);
+            ClassicAssert.AreEqual(2, segment.Borings.Count);
+            ClassicAssert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S45E00003"));
+            ClassicAssert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S39G00196"));
+            ClassicAssert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S39G00042"));
+            ClassicAssert.IsTrue(segment.Borings.Any(b => b.Boring.Name == "TestBoring1"));
+            ClassicAssert.IsTrue(segment.Borings.Any(b => b.Boring.Name == "TestBoring2"));
 
             segment = project.SoilSegments.First(s => s.Name == "36009_Stability");
-            Assert.AreEqual(3, segment.Cpts.Count);
-            Assert.AreEqual(2, segment.Borings.Count);
-            Assert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S45E00003"));
-            Assert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S39G00196"));
-            Assert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S39G00042"));
-            Assert.IsTrue(segment.Borings.Any(b => b.Boring.Name == "TestBoring1"));
-            Assert.IsTrue(segment.Borings.Any(b => b.Boring.Name == "TestBoring2"));
+            ClassicAssert.AreEqual(3, segment.Cpts.Count);
+            ClassicAssert.AreEqual(2, segment.Borings.Count);
+            ClassicAssert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S45E00003"));
+            ClassicAssert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S39G00196"));
+            ClassicAssert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S39G00042"));
+            ClassicAssert.IsTrue(segment.Borings.Any(b => b.Boring.Name == "TestBoring1"));
+            ClassicAssert.IsTrue(segment.Borings.Any(b => b.Boring.Name == "TestBoring2"));
 
             // the 2 segments on the east side both get the same 3 Cpts, no Borings
             segment = project.SoilSegments.First(s => s.Name == "36010_Piping");
-            Assert.AreEqual(3, segment.Cpts.Count);
-            Assert.AreEqual(0, segment.Borings.Count);
-            Assert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S45F00115"));
-            Assert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S45F00080"));
-            Assert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S45F00128"));
+            ClassicAssert.AreEqual(3, segment.Cpts.Count);
+            ClassicAssert.AreEqual(0, segment.Borings.Count);
+            ClassicAssert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S45F00115"));
+            ClassicAssert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S45F00080"));
+            ClassicAssert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S45F00128"));
 
             segment = project.SoilSegments.First(s => s.Name == "36010_Stability");
-            Assert.AreEqual(3, segment.Cpts.Count);
-            Assert.AreEqual(0, segment.Borings.Count);
-            Assert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S45F00115"));
-            Assert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S45F00080"));
-            Assert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S45F00128"));
+            ClassicAssert.AreEqual(3, segment.Cpts.Count);
+            ClassicAssert.AreEqual(0, segment.Borings.Count);
+            ClassicAssert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S45F00115"));
+            ClassicAssert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S45F00080"));
+            ClassicAssert.IsTrue(segment.Cpts.Any(c => c.ConePenetrationTestData.Name == "S45F00128"));
         }
 
         [Test]
@@ -333,30 +334,30 @@
 
             project.SplitSoilSegment(segment, 50);
 
-            Assert.AreEqual(2, project.SoilSegments.Count);
-            Assert.AreEqual(2, project.SoilSegments[0].Points.Count);
-            Assert.AreEqual(2, project.SoilSegments[1].Points.Count);
+            ClassicAssert.AreEqual(2, project.SoilSegments.Count);
+            ClassicAssert.AreEqual(2, project.SoilSegments[0].Points.Count);
+            ClassicAssert.AreEqual(2, project.SoilSegments[1].Points.Count);
 
             // check the resulting two segments
-            Assert.AreEqual(1, project.SoilSegments[0].Cpts.Count);
-            Assert.AreEqual(1, project.SoilSegments[1].Cpts.Count);
-            Assert.AreEqual(1, project.SoilSegments[0].Borings.Count);
-            Assert.AreEqual(1, project.SoilSegments[1].Borings.Count);
+            ClassicAssert.AreEqual(1, project.SoilSegments[0].Cpts.Count);
+            ClassicAssert.AreEqual(1, project.SoilSegments[1].Cpts.Count);
+            ClassicAssert.AreEqual(1, project.SoilSegments[0].Borings.Count);
+            ClassicAssert.AreEqual(1, project.SoilSegments[1].Borings.Count);
 
-            Assert.AreEqual(50, project.SoilSegments[0].GetSegmentLength(), 0.01);
-            Assert.AreEqual(cpt1, project.SoilSegments[0].Cpts[0].ConePenetrationTestData);
-            Assert.AreEqual(boring1, project.SoilSegments[0].Borings[0].Boring);
-            Assert.AreEqual("Segment X (0)", project.SoilSegments[0].Name);
+            ClassicAssert.AreEqual(50, project.SoilSegments[0].GetSegmentLength(), 0.01);
+            ClassicAssert.AreEqual(cpt1, project.SoilSegments[0].Cpts[0].ConePenetrationTestData);
+            ClassicAssert.AreEqual(boring1, project.SoilSegments[0].Borings[0].Boring);
+            ClassicAssert.AreEqual("Segment X (0)", project.SoilSegments[0].Name);
 
-            Assert.AreEqual(50, project.SoilSegments[1].GetSegmentLength(), 0.01);
-            Assert.AreEqual(cpt2, project.SoilSegments[1].Cpts[0].ConePenetrationTestData);
-            Assert.AreEqual(boring2, project.SoilSegments[1].Borings[0].Boring);
-            Assert.AreEqual("Segment X (1)", project.SoilSegments[1].Name);
+            ClassicAssert.AreEqual(50, project.SoilSegments[1].GetSegmentLength(), 0.01);
+            ClassicAssert.AreEqual(cpt2, project.SoilSegments[1].Cpts[0].ConePenetrationTestData);
+            ClassicAssert.AreEqual(boring2, project.SoilSegments[1].Borings[0].Boring);
+            ClassicAssert.AreEqual("Segment X (1)", project.SoilSegments[1].Name);
 
             // undo !
             UndoRedoManager.Instance.Undo();
 
-            Assert.AreEqual(2, project.SoilSegments.Count);
+            ClassicAssert.AreEqual(2, project.SoilSegments.Count);
 
             GeographicHelper.Instance = restoreHelper;
         }
@@ -430,8 +431,8 @@
                         }
                 });
 
-            Assert.AreEqual(1, myProject.Soils.Soils.Count);
-            Assert.AreEqual(mySoil, myProject.Soils.Soils.First());
+            ClassicAssert.AreEqual(1, myProject.Soils.Soils.Count);
+            ClassicAssert.AreEqual(mySoil, myProject.Soils.Soils.First());
 
             // Try to add the soil with the same name and the differences in the stochastic properties to the project
             myProject.AddSoilDataToProject(new SoilList
@@ -442,10 +443,10 @@
                         }
                 });
 
-            Assert.AreEqual(2, myProject.Soils.Soils.Count, "Soil with the same name and the small difference in properties should be added with a postfix to make the name unique");
-            Assert.AreEqual(mySoil, myProject.Soils.Soils.First());
-            Assert.AreEqual(myOtherSoil, myProject.Soils.Soils.Last());
-            Assert.AreEqual(myOtherSoil.Name, mySoil.Name + " (1)");
+            ClassicAssert.AreEqual(2, myProject.Soils.Soils.Count, "Soil with the same name and the small difference in properties should be added with a postfix to make the name unique");
+            ClassicAssert.AreEqual(mySoil, myProject.Soils.Soils.First());
+            ClassicAssert.AreEqual(myOtherSoil, myProject.Soils.Soils.Last());
+            ClassicAssert.AreEqual(myOtherSoil.Name, mySoil.Name + " (1)");
         }
 
         [Test]
@@ -466,8 +467,8 @@
                         }
                 });
 
-            Assert.AreEqual(1, myProject.Soils.Soils.Count);
-            Assert.AreEqual(mySoil, myProject.Soils.Soils.First());
+            ClassicAssert.AreEqual(1, myProject.Soils.Soils.Count);
+            ClassicAssert.AreEqual(mySoil, myProject.Soils.Soils.First());
 
             // Try to add the soil with the same name and the small difference in properties to the project
             myProject.AddSoilDataToProject(new SoilList
@@ -478,10 +479,10 @@
                         }
                 });
 
-            Assert.AreEqual(2, myProject.Soils.Soils.Count, "Soil with the same name and the small difference in properties should be added with a postfix to make the name unique");
-            Assert.AreEqual(mySoil, myProject.Soils.Soils.First());
-            Assert.AreEqual(myOtherSoil, myProject.Soils.Soils.Last());
-            Assert.AreEqual(myOtherSoil.Name, mySoil.Name + " (1)");
+            ClassicAssert.AreEqual(2, myProject.Soils.Soils.Count, "Soil with the same name and the small difference in properties should be added with a postfix to make the name unique");
+            ClassicAssert.AreEqual(mySoil, myProject.Soils.Soils.First());
+            ClassicAssert.AreEqual(myOtherSoil, myProject.Soils.Soils.Last());
+            ClassicAssert.AreEqual(myOtherSoil.Name, mySoil.Name + " (1)");
         }
 
         [Test]
@@ -550,8 +551,8 @@
                         }
                 });
 
-            Assert.AreEqual(1, myProject.Soils.Soils.Count);
-            Assert.AreEqual(mySoil, myProject.Soils.Soils.First());
+            ClassicAssert.AreEqual(1, myProject.Soils.Soils.Count);
+            ClassicAssert.AreEqual(mySoil, myProject.Soils.Soils.First());
 
             // Try to add the soil with the same name and the differences in the stochastic properties to the project
             myProject.AddSoilDataToProject(new SoilList
@@ -562,8 +563,8 @@
                         }
                 });
 
-            Assert.AreEqual(1, myProject.Soils.Soils.Count, "Already present soil should not be added a second time");
-            Assert.AreEqual(mySoil, myProject.Soils.Soils.First());
+            ClassicAssert.AreEqual(1, myProject.Soils.Soils.Count, "Already present soil should not be added a second time");
+            ClassicAssert.AreEqual(mySoil, myProject.Soils.Soils.First());
         }
 
         [Test]
@@ -581,8 +582,8 @@
                         }
                 });
 
-            Assert.AreEqual(1, myProject.Soils.Soils.Count);
-            Assert.AreEqual(mySoil, myProject.Soils.Soils.First());
+            ClassicAssert.AreEqual(1, myProject.Soils.Soils.Count);
+            ClassicAssert.AreEqual(mySoil, myProject.Soils.Soils.First());
 
             // Try to add the same soil for the second time
             myProject.AddSoilDataToProject(new SoilList
@@ -593,8 +594,8 @@
                         }
                 });
 
-            Assert.AreEqual(1, myProject.Soils.Soils.Count, "Already present soil should not be added a second time");
-            Assert.AreEqual(mySoil, myProject.Soils.Soils.First());
+            ClassicAssert.AreEqual(1, myProject.Soils.Soils.Count, "Already present soil should not be added a second time");
+            ClassicAssert.AreEqual(mySoil, myProject.Soils.Soils.First());
         }
 
         [Test]
@@ -666,8 +667,8 @@
                         }
                 });
 
-            Assert.AreEqual(1, myProject.Soils.Soils.Count);
-            Assert.AreEqual(mySoil, myProject.Soils.Soils.First());
+            ClassicAssert.AreEqual(1, myProject.Soils.Soils.Count);
+            ClassicAssert.AreEqual(mySoil, myProject.Soils.Soils.First());
 
             // Try to add the soil with the same name and the differences in the stochastic properties to the project
             myProject.AddSoilDataToProject(new SoilList
@@ -678,10 +679,10 @@
                         }
                 });
 
-            Assert.AreEqual(2, myProject.Soils.Soils.Count, "Soil with the same name and the small difference in properties should be added with a postfix to make the name unique");
-            Assert.AreEqual(mySoil, myProject.Soils.Soils.First());
-            Assert.AreEqual(myOtherSoil, myProject.Soils.Soils.Last());
-            Assert.AreEqual(myOtherSoil.Name, mySoil.Name + " (1)");
+            ClassicAssert.AreEqual(2, myProject.Soils.Soils.Count, "Soil with the same name and the small difference in properties should be added with a postfix to make the name unique");
+            ClassicAssert.AreEqual(mySoil, myProject.Soils.Soils.First());
+            ClassicAssert.AreEqual(myOtherSoil, myProject.Soils.Soils.Last());
+            ClassicAssert.AreEqual(myOtherSoil.Name, mySoil.Name + " (1)");
         }
 
         [Test]
@@ -702,8 +703,8 @@
                         }
                 });
 
-            Assert.AreEqual(1, myProject.Soils.Soils.Count);
-            Assert.AreEqual(mySoil, myProject.Soils.Soils.First());
+            ClassicAssert.AreEqual(1, myProject.Soils.Soils.Count);
+            ClassicAssert.AreEqual(mySoil, myProject.Soils.Soils.First());
 
             // Try to add the soil with the same name and the small difference in properties to the project
             myProject.AddSoilDataToProject(new SoilList
@@ -714,10 +715,10 @@
                         }
                 });
 
-            Assert.AreEqual(2, myProject.Soils.Soils.Count, "Soil with the same name and the small difference in properties should be added with a postfix to make the name unique");
-            Assert.AreEqual(mySoil, myProject.Soils.Soils.First());
-            Assert.AreEqual(myOtherSoil, myProject.Soils.Soils.Last());
-            Assert.AreEqual(myOtherSoil.Name, mySoil.Name + " (1)");
+            ClassicAssert.AreEqual(2, myProject.Soils.Soils.Count, "Soil with the same name and the small difference in properties should be added with a postfix to make the name unique");
+            ClassicAssert.AreEqual(mySoil, myProject.Soils.Soils.First());
+            ClassicAssert.AreEqual(myOtherSoil, myProject.Soils.Soils.Last());
+            ClassicAssert.AreEqual(myOtherSoil.Name, mySoil.Name + " (1)");
         }
 
         [Test]
@@ -786,8 +787,8 @@
                         }
                 });
 
-            Assert.AreEqual(1, myProject.Soils.Soils.Count);
-            Assert.AreEqual(mySoil, myProject.Soils.Soils.First());
+            ClassicAssert.AreEqual(1, myProject.Soils.Soils.Count);
+            ClassicAssert.AreEqual(mySoil, myProject.Soils.Soils.First());
 
             // Try to add the soil with the same name and the differences in the stochastic properties to the project
             myProject.AddSoilDataToProject(new SoilList
@@ -798,8 +799,8 @@
                         }
                 });
 
-            Assert.AreEqual(1, myProject.Soils.Soils.Count, "Already present soil should not be added a second time");
-            Assert.AreEqual(mySoil, myProject.Soils.Soils.First());
+            ClassicAssert.AreEqual(1, myProject.Soils.Soils.Count, "Already present soil should not be added a second time");
+            ClassicAssert.AreEqual(mySoil, myProject.Soils.Soils.First());
         }
 
         [Test]
@@ -817,8 +818,8 @@
                         }
                 });
 
-            Assert.AreEqual(1, myProject.Soils.Soils.Count);
-            Assert.AreEqual(mySoil, myProject.Soils.Soils.First());
+            ClassicAssert.AreEqual(1, myProject.Soils.Soils.Count);
+            ClassicAssert.AreEqual(mySoil, myProject.Soils.Soils.First());
 
             // Try to add the same soil for the second time
             myProject.AddSoilDataToProject(new SoilList
@@ -829,8 +830,8 @@
                         }
                 });
 
-            Assert.AreEqual(1, myProject.Soils.Soils.Count, "Already present soil should not be added a second time");
-            Assert.AreEqual(mySoil, myProject.Soils.Soils.First());
+            ClassicAssert.AreEqual(1, myProject.Soils.Soils.Count, "Already present soil should not be added a second time");
+            ClassicAssert.AreEqual(mySoil, myProject.Soils.Soils.First());
         }
 
         [Test]
@@ -855,7 +856,7 @@
                 }
                 var validationResults = Validator.Validate(project);
 
-                Assert.AreEqual(20, validationResults.Count(r => r.MessageType == ValidationResultType.Error && r.Text.Contains("unit weight is less")));
+                ClassicAssert.AreEqual(20, validationResults.Count(r => r.MessageType == ValidationResultType.Error && r.Text.Contains("unit weight is less")));
 
                 RealTimeBackgroundValidator.ValidationResults.AddRange(validationResults);
 
@@ -865,7 +866,7 @@
                 // assert
                 validationResults = Validator.Validate(project);
 
-                Assert.AreEqual(0, validationResults.Count(r => r.MessageType == ValidationResultType.Error && r.Text.Contains("unit weight is less")));
+                ClassicAssert.AreEqual(0, validationResults.Count(r => r.MessageType == ValidationResultType.Error && r.Text.Contains("unit weight is less")));
             }
             Soil.Mechanisms = oldMechanisms;
         }
@@ -975,12 +976,12 @@
             var fileName = Path.Combine(GetTestFilesPath(), "DGeoStability2D.sti");
             project.ReadGeometryFromFile(fileName);
 
-            Assert.IsNotEmpty(project.Soils.Soils);
+            ClassicAssert.IsNotEmpty(project.Soils.Soils);
 
             var soil = project.Soils.GetSoilByName("klei antropogeen");
             var valueInSoil = soil.GetType().GetProperty(paramName).GetValue(soil, null);
             
-            Assert.AreEqual(expectedDoubleValue, valueInSoil);
+            ClassicAssert.AreEqual(expectedDoubleValue, valueInSoil);
 
             Context.CurrentContext = prevContext;
         }
@@ -1008,13 +1009,12 @@
 
         [TestCase("Tutorial-1a withTooHighSoilVersion.sti")]
         [TestCase("BM2_1.SEI")]
-        [ExpectedException(typeof(DSoilModelProjectException))]
         public void IsCheckOnInvalidFileVersionCorrect(string filename)
         {
             var project = new DSoilModelProject();
 
             var fileName = Path.Combine(GetTestFilesPath(), filename);
-            project.ReadGeometryFromFile(fileName);
+            Assert.That(() => project.ReadGeometryFromFile(fileName), Throws.Exception);
         }
 
         /// <summary>
@@ -1043,12 +1043,12 @@
             var project = new DSoilModelProject();
             project.ReadGeometryFromFile(fileName);
 
-            Assert.IsNotEmpty(project.Soils.Soils);
+            ClassicAssert.IsNotEmpty(project.Soils.Soils);
 
             var soil = project.Soils.GetSoilByName("Soft Clay");
-            Assert.AreEqual(ShearStrengthModel.CuCalculated, soil.ShearStrengthModel);
-            Assert.AreEqual(true, soil.UsePop);
-            Assert.AreEqual(0.65, soil.StrengthIncreaseExponent, tolerance);
+            ClassicAssert.AreEqual(ShearStrengthModel.CuCalculated, soil.ShearStrengthModel);
+            ClassicAssert.AreEqual(true, soil.UsePop);
+            ClassicAssert.AreEqual(0.65, soil.StrengthIncreaseExponent, tolerance);
             
         }
     }
Index: src/Deltares.DSoilModel.Forms.Tests/BoringLookup1DControlTests.cs
===================================================================
diff -u -r350 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/BoringLookup1DControlTests.cs	(.../BoringLookup1DControlTests.cs)	(revision 350)
+++ src/Deltares.DSoilModel.Forms.Tests/BoringLookup1DControlTests.cs	(.../BoringLookup1DControlTests.cs)	(revision 1080)
@@ -1,10 +1,12 @@
-using Deltares.Geotechnics;
+using System.Threading;
+using Deltares.Geotechnics;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
-    [TestFixture, RequiresSTA]
+    [TestFixture, Apartment(ApartmentState.STA)]
     class BoringLookup1DControlTests : ControlTester
     {
         protected override IPropertyControl CreatePropertyControl()
@@ -17,7 +19,7 @@
         {
             // there are no extra bindings
             // at least let's test assigned name
-            Assert.AreEqual("Boring", PropertyControl.Name);
+            ClassicAssert.AreEqual("Boring", PropertyControl.Name);
         }
 
         [Test]
@@ -28,19 +30,19 @@
                 Boring = new Boring()
             };
 
-            Assert.AreNotSame(lookup, PropertyControl.SelectedObject); // because we haven't assign it yet
+            ClassicAssert.AreNotSame(lookup, PropertyControl.SelectedObject); // because we haven't assign it yet
             PropertyControl.SelectedObject = lookup;
-            Assert.AreSame(lookup, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(lookup, PropertyControl.SelectedObject);
 
             var subcontrol = GetPrivateField<BoringControl>(PropertyControl, "BoringControl");
-            Assert.NotNull(subcontrol);
-            Assert.AreSame(lookup.Boring, subcontrol.SelectedObject);
+            ClassicAssert.NotNull(subcontrol);
+            ClassicAssert.AreSame(lookup.Boring, subcontrol.SelectedObject);
         }
 
         [Test]
         public void IsVisibleTest()
         {
-            Assert.IsTrue(PropertyControl.IsVisible); // always true
+            ClassicAssert.IsTrue(PropertyControl.IsVisible); // always true
         }
     }
 }
Index: src/Deltares.DSoilModel.Data.Tests/DSoilModelTransformerTests.cs
===================================================================
diff -u -r883 -r1080
--- src/Deltares.DSoilModel.Data.Tests/DSoilModelTransformerTests.cs	(.../DSoilModelTransformerTests.cs)	(revision 883)
+++ src/Deltares.DSoilModel.Data.Tests/DSoilModelTransformerTests.cs	(.../DSoilModelTransformerTests.cs)	(revision 1080)
@@ -27,6 +27,7 @@
 using Deltares.Standard.EventPublisher;
 using Deltares.Standard.Reflection;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Data.Tests
 {
@@ -35,7 +36,7 @@
     {
         private bool oldIsDataEventPublishStopped;
 
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void FixtureSetup()
         {
             oldIsDataEventPublishStopped = DataEventPublisher.IsDataEventPublishStopped;
@@ -44,7 +45,7 @@
             TransformerManager.Transformer = new DSoilModelTransformer();
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void FixtureTearDown()
         {
             DataEventPublisher.IsDataEventPublishStopped = oldIsDataEventPublishStopped;
@@ -65,15 +66,15 @@
             foreach (BindPropertyInfo propertyInfo in stochastProperties)
             {
                 var stochast = (Stochast) propertyInfo.GetValue(obj, null);
-                Assert.AreSame(stochast, FindAutoStochastProperty(obj, stochast.AssociatedPropertyName));
+                ClassicAssert.AreSame(stochast, FindAutoStochastProperty(obj, stochast.AssociatedPropertyName));
             }
         }
 
         [Test]
         public void FindAutoStochastPropertyTest_ReturnsNullForUnknownProperty()
         {
-            Assert.IsNull(FindAutoStochastProperty(new SosSoilLayer1D(), "Property"));
-            Assert.IsNull(FindAutoStochastProperty(new SosSoilLayer1D(), null));
+            ClassicAssert.IsNull(FindAutoStochastProperty(new SosSoilLayer1D(), "Property"));
+            ClassicAssert.IsNull(FindAutoStochastProperty(new SosSoilLayer1D(), null));
         }
 
         [Test]
@@ -89,16 +90,16 @@
             var changedValue = 123.456;
             deterministicProperty.SetValue(obj, changedValue, null);
 
-            Assert.AreEqual(changedValue, deterministicProperty.GetValue(obj, null)); // deterministic property indeed changed
-            Assert.AreNotEqual(changedValue, stochasticProperty.Mean); // but stochastic property remained its mean value
+            ClassicAssert.AreEqual(changedValue, deterministicProperty.GetValue(obj, null)); // deterministic property indeed changed
+            ClassicAssert.AreNotEqual(changedValue, stochasticProperty.Mean); // but stochastic property remained its mean value
         }
 
         [Test]
         public void GetTransformedValueTest_ReturnsInitialValueIfNotSupported()
         {
             var transformer = new DSoilModelTransformer();
-            Assert.AreEqual(44, transformer.GetTransformedValue(new SosSoilLayer1D(), "Property", 44));
-            Assert.AreEqual(54, transformer.SetTransformedValue(new SosSoilLayer1D(), "Property", 54));
+            ClassicAssert.AreEqual(44, transformer.GetTransformedValue(new SosSoilLayer1D(), "Property", 44));
+            ClassicAssert.AreEqual(54, transformer.SetTransformedValue(new SosSoilLayer1D(), "Property", 54));
         }
     }
 }
Index: src/Deltares.DSoilModel.Forms.Tests/FilmStripTest.cs
===================================================================
diff -u -r883 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/FilmStripTest.cs	(.../FilmStripTest.cs)	(revision 883)
+++ src/Deltares.DSoilModel.Forms.Tests/FilmStripTest.cs	(.../FilmStripTest.cs)	(revision 1080)
@@ -3,15 +3,19 @@
 using System.Drawing;
 using System.Globalization;
 using System.Reflection;
+using System.Threading;
 using Deltares.Geometry;
 using Deltares.Geotechnics.Soils;
 using Deltares.Geotechnics.TestUtils;
 using Deltares.Standard.Extensions;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
+
 namespace Deltares.DSoilModel.Forms.Tests
 {
+    [TestFixture, Apartment(ApartmentState.STA)]
     public class FilmStripTest
     {
         [Test]
@@ -30,8 +34,8 @@
                 var field = typeof(FilmStrip).GetField("thumbnailList", BindingFlags.NonPublic | BindingFlags.Instance);
                 var thumbnailList = field == null ? null : field.GetValue(filmStrip) as List<Image>;
 
-                Assert.IsNotNull(thumbnailList, "The film strip should have created a thumbnails list.");
-                Assert.AreEqual(2, thumbnailList.Count, "The thumbnails list should contain the exact amount of thumbnails.");
+                ClassicAssert.IsNotNull(thumbnailList, "The film strip should have created a thumbnails list.");
+                ClassicAssert.AreEqual(2, thumbnailList.Count, "The thumbnails list should contain the exact amount of thumbnails.");
             }
         }
 
@@ -51,8 +55,8 @@
                 var field = typeof(FilmStrip).GetField("thumbnailList", BindingFlags.NonPublic | BindingFlags.Instance);
                 var thumbnailList = field == null ? null : field.GetValue(filmStrip) as List<Image>;
 
-                Assert.IsNotNull(thumbnailList, "The film strip should have created a thumbnails list.");
-                Assert.AreEqual(4, thumbnailList.Count, "The thumbnails list should contain the exact amount of thumbnails.");
+                ClassicAssert.IsNotNull(thumbnailList, "The film strip should have created a thumbnails list.");
+                ClassicAssert.AreEqual(4, thumbnailList.Count, "The thumbnails list should contain the exact amount of thumbnails.");
             }
         }
 
@@ -72,8 +76,8 @@
                 var field = typeof(FilmStrip).GetField("thumbnailList", BindingFlags.NonPublic | BindingFlags.Instance);
                 var thumbnailList = field == null ? null : field.GetValue(filmStrip) as List<Image>;
 
-                Assert.IsNotNull(thumbnailList, "The film strip should have created a thumbnails list.");
-                Assert.AreEqual(3, thumbnailList.Count, "The thumbnails list should contain the exact amount of thumbnails.");
+                ClassicAssert.IsNotNull(thumbnailList, "The film strip should have created a thumbnails list.");
+                ClassicAssert.AreEqual(3, thumbnailList.Count, "The thumbnails list should contain the exact amount of thumbnails.");
             }
         }
 
@@ -104,8 +108,8 @@
 
                 typeof(FilmStrip).GetMethod("DetermineBoundingBoxes", BindingFlags.NonPublic | BindingFlags.Instance).Invoke(filmStrip, arguments);
 
-                Assert.AreEqual(expectedBoundingBox1D, arguments[1], "The bounding box 1D is not as expected.");
-                Assert.AreEqual(expectedBoundingBox2D, arguments[2], "The bounding box 2D is not as expected.");
+                ClassicAssert.AreEqual(expectedBoundingBox1D, arguments[1], "The bounding box 1D is not as expected.");
+                ClassicAssert.AreEqual(expectedBoundingBox2D, arguments[2], "The bounding box 2D is not as expected.");
             }
         }
 
Index: src/Deltares.DSoilModel.Forms.Tests/ControlTester.cs
===================================================================
diff -u -r376 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/ControlTester.cs	(.../ControlTester.cs)	(revision 376)
+++ src/Deltares.DSoilModel.Forms.Tests/ControlTester.cs	(.../ControlTester.cs)	(revision 1080)
@@ -9,6 +9,7 @@
 using Deltares.Standard.Units;
 using DevExpress.XtraEditors;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
@@ -29,7 +30,7 @@
             throw new Exception("CreatePropertyControl() should return an instance. This instanse can be found in PropertyControl public property.");
         }
 
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public virtual void TestFixtureSetUp()
         {
             knownUnits = new KnownUnits();
@@ -43,7 +44,7 @@
             PropertyControl = CreatePropertyControl();
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public virtual void TestFixtureTearDown()
         {
             PropertyControl.Dispose();
@@ -57,11 +58,11 @@
         protected T GetPrivateField<T>(object obj, string field) where T : class
         {
             var fi = obj.GetType().GetField(field, BindingFlags.NonPublic | BindingFlags.Instance);
-            Assert.IsNotNull(fi, ClassFieldDoesNotExist, field, obj.GetType().Name);
+            ClassicAssert.IsNotNull(fi, ClassFieldDoesNotExist, field, obj.GetType().Name);
             
             // even if we found the field it class can differ from expected
             var value = fi.GetValue(obj);
-            Assert.IsInstanceOf(typeof (T), value, ClassFieldValueDoesntMatchExpected, field, value.GetType().Name, typeof(T).Name);
+            ClassicAssert.IsInstanceOf(typeof (T), value, ClassFieldValueDoesntMatchExpected, field, value.GetType().Name, typeof(T).Name);
             return value as T;
         }
 
@@ -83,8 +84,8 @@
             bool isEnabledExpected)
         {
             var edit = GetPrivateField<Control>(parentControl, spinEditName);
-            Assert.AreEqual(isVisibleExpected, edit.Visible, spinEditName + ": Visible-check failed");
-            Assert.AreEqual(isEnabledExpected, edit.Enabled, spinEditName + ": Enabled-check failed");
+            ClassicAssert.AreEqual(isVisibleExpected, edit.Visible, spinEditName + ": Visible-check failed");
+            ClassicAssert.AreEqual(isEnabledExpected, edit.Enabled, spinEditName + ": Enabled-check failed");
         }
 
         protected void TestSpinEditVisibleEnabledValue<T, TValue>(IPropertyControl parentControl, string spinEditName, bool isVisibleExpected, bool isEnabledExpected, T target, Expression<Func<T, TValue>> outExpr, TValue valueToTestWith = default(TValue))
@@ -95,12 +96,12 @@
                 var edit = GetPrivateField<SpinEdit>(parentControl, spinEditName);
                 
                 var initialValue = GetValue(target, outExpr);
-                Assert.AreEqual(initialValue, edit.EditValue, InitialValueMismatchString);
+                ClassicAssert.AreEqual(initialValue, edit.EditValue, InitialValueMismatchString);
 
                 if (!IsReadOnly(target, outExpr))
                 {
                     edit.EditValue = valueToTestWith;
-                    Assert.AreEqual(valueToTestWith, GetValue(target, outExpr), ObjectDidntReceivedValueString);
+                    ClassicAssert.AreEqual(valueToTestWith, GetValue(target, outExpr), ObjectDidntReceivedValueString);
                     edit.EditValue = initialValue; // restoring initial value - it might be still useful
                 }
             }
@@ -112,14 +113,14 @@
             if (isVisibleExpected)
             {
                 var edit = GetPrivateField<CheckEdit>(parentControl, checkEditName);
-                Assert.AreEqual(expectedCaption, edit.Text, "Invalid caption");
+                ClassicAssert.AreEqual(expectedCaption, edit.Text, "Invalid caption");
                 var initialValue = GetValue(target, outExpr);
-                Assert.AreEqual(initialValue, edit.EditValue, InitialValueMismatchString);
+                ClassicAssert.AreEqual(initialValue, edit.EditValue, InitialValueMismatchString);
 
                 if (valueToTestWith != null)
                 {
                     edit.EditValue = valueToTestWith;
-                    Assert.AreEqual(valueToTestWith, GetValue(target, outExpr), ObjectDidntReceivedValueString);
+                    ClassicAssert.AreEqual(valueToTestWith, GetValue(target, outExpr), ObjectDidntReceivedValueString);
                     edit.EditValue = initialValue; // restoring initial value - it might be still useful
                 }
             }
@@ -134,12 +135,12 @@
                 var edit = GetPrivateField<TextEdit>(parentControl, textEditName);
 
                 var initialValue = GetValue(target, outExpr);
-                Assert.AreEqual(initialValue.ToString(), edit.EditValue, InitialValueMismatchString);
+                ClassicAssert.AreEqual(initialValue.ToString(), edit.EditValue, InitialValueMismatchString);
 
                 if (newValue != null)
                 {
                     edit.EditValue = newValue;
-                    Assert.AreEqual(newValue, GetValue(target, outExpr), ObjectDidntReceivedValueString);
+                    ClassicAssert.AreEqual(newValue, GetValue(target, outExpr), ObjectDidntReceivedValueString);
                     edit.EditValue = initialValue; // restoring initial value - it might be still useful
                 }
             }
@@ -159,15 +160,15 @@
                 {
                     // the case with enumeration: index is not reliable and caption translated and formatted
                     var editValue = ((DisplayItem)(edit.SelectedItem)).Value; // we need this hack, becuase edit.EditValue contains formatted and translated text
-                    Assert.AreEqual(initialValue, editValue, InitialValueMismatchString);
+                    ClassicAssert.AreEqual(initialValue, editValue, InitialValueMismatchString);
                 }
                 else
                 {
-                    Assert.AreEqual(initialValue, edit.EditValue, InitialValueMismatchString);
+                    ClassicAssert.AreEqual(initialValue, edit.EditValue, InitialValueMismatchString);
                     if (newValue != null)
                     {
                         edit.EditValue = newValue;
-                        Assert.AreEqual(newValue, GetValue(target, outExpr), ObjectDidntReceivedValueString);
+                        ClassicAssert.AreEqual(newValue, GetValue(target, outExpr), ObjectDidntReceivedValueString);
                         edit.EditValue = initialValue; // restoring initial value - it might be still useful
                     }
                 }
@@ -178,15 +179,15 @@
         {
             TestControlVisibleEnabled(parentControl, labelControlName, isVisibleExpected, true); // labels are always enabled in DSL projects
             var labelControl = GetPrivateField<LabelControl>(parentControl, labelControlName);
-            Assert.AreEqual(labelTextExpected, labelControl.Text, InitialValueMismatchString);
+            ClassicAssert.AreEqual(labelTextExpected, labelControl.Text, InitialValueMismatchString);
         }
 
         protected void TestGridVisibleEnabledSize(IPropertyControl parentControl, string gridName, bool isVisibleExpected, bool isEnabledExpected, int rowCount, int colCount)
         {
             TestControlVisibleEnabled(parentControl, gridName, isVisibleExpected, isEnabledExpected);
             var gridControl = GetPrivateField<GridViewControl>(parentControl, gridName);
-            Assert.AreEqual(rowCount, gridControl.gridView1.RowCount, "Row count mismatch");
-            Assert.AreEqual(colCount, gridControl.gridView1.Columns.Count, "Columns count mismatch");
+            ClassicAssert.AreEqual(rowCount, gridControl.gridView1.RowCount, "Row count mismatch");
+            ClassicAssert.AreEqual(colCount, gridControl.gridView1.Columns.Count, "Columns count mismatch");
         }
     }
 }
\ No newline at end of file
Index: src/Deltares.DSoilModel.Data.Tests/DSoilModelIOTest.cs
===================================================================
diff -u -r883 -r1080
--- src/Deltares.DSoilModel.Data.Tests/DSoilModelIOTest.cs	(.../DSoilModelIOTest.cs)	(revision 883)
+++ src/Deltares.DSoilModel.Data.Tests/DSoilModelIOTest.cs	(.../DSoilModelIOTest.cs)	(revision 1080)
@@ -32,6 +32,7 @@
 using Deltares.Standard.Language;
 using Deltares.Standard.Logging;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Data.Tests
 {
@@ -41,7 +42,7 @@
         private bool oldIsDataEventPublishStopped;
         private LanguageType oldLanguageType;
 
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void FixtureSetup()
         {
             oldIsDataEventPublishStopped = DataEventPublisher.IsDataEventPublishStopped;
@@ -51,7 +52,7 @@
             Directory.CreateDirectory("TempFiles");
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void FixtureTearDown()
         {
             DataEventPublisher.IsDataEventPublishStopped = oldIsDataEventPublishStopped;
@@ -71,11 +72,11 @@
             if (File.Exists(filePath))
             {
                 // Number of soils is original 65, but after reading borings the number will be 66 because a material "Onbepaald" is added
-                Assert.AreEqual(soils, project.Soils.Soils.Count);
-                Assert.AreEqual(profiles1D, project.SoilProfiles1D.Count);
-                Assert.AreEqual(profiles2D, project.SoilProfiles2D.Count);
-                Assert.AreEqual(cpts, project.CPTs.Count);
-                Assert.AreEqual(borings, project.Borings.Count);
+                ClassicAssert.AreEqual(soils, project.Soils.Soils.Count);
+                ClassicAssert.AreEqual(profiles1D, project.SoilProfiles1D.Count);
+                ClassicAssert.AreEqual(profiles2D, project.SoilProfiles2D.Count);
+                ClassicAssert.AreEqual(cpts, project.CPTs.Count);
+                ClassicAssert.AreEqual(borings, project.Borings.Count);
             }
             else
             {
@@ -128,18 +129,18 @@
 
         private static void CheckForEmptyWarningInLog()
         {
-            Assert.Greater(LogManager.Messages.Count, 0);
+            ClassicAssert.Greater(LogManager.Messages.Count, 0);
             var logMessage = LogManager.Messages.FirstOrDefault(m => m.Message.Contains("empty"));
-            Assert.NotNull(logMessage);
-            Assert.AreEqual(logMessage.MessageType, LogMessageType.Warning);
+            ClassicAssert.NotNull(logMessage);
+            ClassicAssert.AreEqual(logMessage.MessageType, LogMessageType.Warning);
         }
 
         [Test]
         public void DamDefxImporterMustRefuseIncompleteSegments()
         {
             // setup, using a copy of DAM tutorial Design with the Geometries folder deleted.
             string tutorial = Path.Combine(GetTestFilesPath(), "DAM Incomplete.defx");
-            Assert.IsTrue(File.Exists(tutorial));
+            ClassicAssert.IsTrue(File.Exists(tutorial));
 
             // call
             using (var project = new DSoilModelProject())
@@ -148,10 +149,10 @@
                 DSoilModelIO.ReadDamDefinitionsFromFileAndAddToProject(tutorial, project);
 
                 // assert
-                Assert.AreEqual(0, project.SoilSegments.Count);
-                Assert.AreEqual(0, project.SoilProfiles2D.Count);
-                Assert.AreEqual(200, project.Soils.Soils.Count);
-                Assert.GreaterOrEqual(LogManager.Messages.Count(m => m.MessageType == LogMessageType.Warning && m.Message.Contains("is refused as one or more profiles are missing")), 23);
+                ClassicAssert.AreEqual(0, project.SoilSegments.Count);
+                ClassicAssert.AreEqual(0, project.SoilProfiles2D.Count);
+                ClassicAssert.AreEqual(200, project.Soils.Soils.Count);
+                ClassicAssert.GreaterOrEqual(LogManager.Messages.Count(m => m.MessageType == LogMessageType.Warning && m.Message.Contains("is refused as one or more profiles are missing")), 23);
             }
         }
 
@@ -163,7 +164,7 @@
         {
             // setup
             string tutorial = Path.Combine(GetTestFilesPath(), "Dam Tutorial Design", "DAM Tutorial Design.defx");
-            Assert.IsTrue(File.Exists(tutorial));
+            ClassicAssert.IsTrue(File.Exists(tutorial));
 
             // call
             using (var project = new DSoilModelProject())
@@ -172,15 +173,15 @@
                 DSoilModelIO.ReadDamDefinitionsFromFileAndAddToProject(tutorial, project);
 
                 // assert
-                Assert.AreEqual(23, project.SoilSegments.Count);
-                Assert.AreEqual(23, project.SoilProfiles2D.Count);
-                Assert.AreEqual(200, project.Soils.Soils.Count);
-                Assert.IsFalse(LogManager.Messages.Any(m => m.MessageType == LogMessageType.Error ||m.MessageType == LogMessageType.FatalError));
+                ClassicAssert.AreEqual(23, project.SoilSegments.Count);
+                ClassicAssert.AreEqual(23, project.SoilProfiles2D.Count);
+                ClassicAssert.AreEqual(200, project.Soils.Soils.Count);
+                ClassicAssert.IsFalse(LogManager.Messages.Any(m => m.MessageType == LogMessageType.Error ||m.MessageType == LogMessageType.FatalError));
                 foreach (var segment in project.SoilSegments)
                 {
                     foreach (var profile in segment.StochasticSoilModel.StochasticSoilProfiles)
                     {
-                        Assert.IsTrue(profile.Profile is SoilProfile1D || profile.Profile is SoilProfile2D);
+                        ClassicAssert.IsTrue(profile.Profile is SoilProfile1D || profile.Profile is SoilProfile2D);
                     }
                 }
             }
@@ -194,7 +195,7 @@
         {
             // setup
             string defxPath = Path.Combine(GetTestFilesPath(), "Delfland.defx");
-            Assert.IsTrue(File.Exists(defxPath));
+            ClassicAssert.IsTrue(File.Exists(defxPath));
 
             // call
             using (var project = new DSoilModelProject())
@@ -203,15 +204,15 @@
                 DSoilModelIO.ReadDamDefinitionsFromFileAndAddToProject(defxPath, project);
 
                 // assert
-                Assert.AreEqual(10, project.SoilSegments.Count);
-                Assert.AreEqual(147, project.SoilProfiles1D.Count);
-                Assert.AreEqual(51, project.Soils.Soils.Count);
-                Assert.IsFalse(LogManager.Messages.Any(m => m.MessageType == LogMessageType.Error || m.MessageType == LogMessageType.FatalError));
+                ClassicAssert.AreEqual(10, project.SoilSegments.Count);
+                ClassicAssert.AreEqual(147, project.SoilProfiles1D.Count);
+                ClassicAssert.AreEqual(51, project.Soils.Soils.Count);
+                ClassicAssert.IsFalse(LogManager.Messages.Any(m => m.MessageType == LogMessageType.Error || m.MessageType == LogMessageType.FatalError));
                 foreach (var segment in project.SoilSegments)
                 {
                     foreach (var profile in segment.StochasticSoilModel.StochasticSoilProfiles)
                     {
-                        Assert.IsTrue(profile.Profile is SoilProfile1D || profile.Profile is SoilProfile2D);
+                        ClassicAssert.IsTrue(profile.Profile is SoilProfile1D || profile.Profile is SoilProfile2D);
                     }
                 }
             }
@@ -228,7 +229,7 @@
 
             // importing the same file again should not add to the soil count
             project.ReadSoilsFromDatabase(mdbFile);
-            Assert.AreEqual(soilsCount, project.Soils.Soils.Count);
+            ClassicAssert.AreEqual(soilsCount, project.Soils.Soils.Count);
         }
 
         [Test]
@@ -242,11 +243,11 @@
             // file with TestSand as aquitard
             project.ReadSoilsFromDatabase(Path.Combine(GetTestFilesPath(), "AquitardTest.mdb"));
 
-            Assert.AreEqual(3, project.Soils.Soils.Count);
-            Assert.AreEqual(1, project.Soils.Soils.Count(s => s.Name == "TestSand"));
-            Assert.AreEqual(1, project.Soils.Soils.Count(s => s.Name == "TestSand (1)"));
-            Assert.AreEqual(1, project.Soils.Soils.Count(s => s.Name == "TestLoam"));
-            Assert.AreEqual(1, project.Soils.AquiferDictionary.Count(item => item.Value == true));
+            ClassicAssert.AreEqual(3, project.Soils.Soils.Count);
+            ClassicAssert.AreEqual(1, project.Soils.Soils.Count(s => s.Name == "TestSand"));
+            ClassicAssert.AreEqual(1, project.Soils.Soils.Count(s => s.Name == "TestSand (1)"));
+            ClassicAssert.AreEqual(1, project.Soils.Soils.Count(s => s.Name == "TestLoam"));
+            ClassicAssert.AreEqual(1, project.Soils.AquiferDictionary.Count(item => item.Value == true));
         }
 
         // please note that not all ShearstrengthModel options are supported by DSoilModel, so most values in the file are converted to ShearStrengthModel.None here
@@ -266,49 +267,49 @@
             var project = new DSoilModelProject();
             project.ReadSoilsFromDatabase(Path.Combine(GetTestFilesPath(), "MSoilBase.mdb"));
 
-            Assert.AreEqual(7, project.Soils.Soils.Count);
+            ClassicAssert.AreEqual(7, project.Soils.Soils.Count);
             project.Soils.Soils.Sort();
 
             // General properties
-            Assert.AreEqual(name, project.Soils.Soils[nb-1].Name);
-            Assert.AreEqual(type, project.Soils.Soils[nb-1].SoilType);
+            ClassicAssert.AreEqual(name, project.Soils.Soils[nb-1].Name);
+            ClassicAssert.AreEqual(type, project.Soils.Soils[nb-1].SoilType);
 
             // Filter BM Macrostabiliteit
-            Assert.AreEqual(gammaUnsat, project.Soils.Soils[nb - 1].AbovePhreaticLevel);
-            Assert.AreEqual(gammaSat, project.Soils.Soils[nb - 1].BelowPhreaticLevel);
+            ClassicAssert.AreEqual(gammaUnsat, project.Soils.Soils[nb - 1].AbovePhreaticLevel);
+            ClassicAssert.AreEqual(gammaSat, project.Soils.Soils[nb - 1].BelowPhreaticLevel);
             // Note at TestCase 7, the ShearStrengthModel in the soil itself is set to None (or in fact default model)  and as 
             // the "default" default model is CPhi, CPhi is to be expected.
-            Assert.AreEqual(model, project.Soils.Soils[nb - 1].ShearStrengthModel);
-            Assert.AreEqual(coh, project.Soils.Soils[nb - 1].Cohesion);
-            Assert.AreEqual(coh, project.Soils.Soils[nb - 1].CohesionStochast.Mean);
-            Assert.AreEqual(phi, project.Soils.Soils[nb - 1].FrictionAngle);
-            Assert.AreEqual(phi, project.Soils.Soils[nb - 1].FrictionAngleStochast.Mean);
-            Assert.AreEqual(usePop, project.Soils.Soils[nb - 1].UsePop);
-            Assert.AreEqual(pop, project.Soils.Soils[nb - 1].POP);
-            Assert.AreEqual(pop, project.Soils.Soils[nb - 1].POPStochast.Mean);
-            Assert.AreEqual(ratioS, project.Soils.Soils[nb - 1].RatioCuPc);
-            Assert.AreEqual(ratioS, project.Soils.Soils[nb - 1].RatioCuPcStochast.Mean);
-            Assert.AreEqual(expM, project.Soils.Soils[nb - 1].StrengthIncreaseExponent);
-            Assert.AreEqual(expM, project.Soils.Soils[nb - 1].StrengthIncreaseExponentStochast.Mean);
+            ClassicAssert.AreEqual(model, project.Soils.Soils[nb - 1].ShearStrengthModel);
+            ClassicAssert.AreEqual(coh, project.Soils.Soils[nb - 1].Cohesion);
+            ClassicAssert.AreEqual(coh, project.Soils.Soils[nb - 1].CohesionStochast.Mean);
+            ClassicAssert.AreEqual(phi, project.Soils.Soils[nb - 1].FrictionAngle);
+            ClassicAssert.AreEqual(phi, project.Soils.Soils[nb - 1].FrictionAngleStochast.Mean);
+            ClassicAssert.AreEqual(usePop, project.Soils.Soils[nb - 1].UsePop);
+            ClassicAssert.AreEqual(pop, project.Soils.Soils[nb - 1].POP);
+            ClassicAssert.AreEqual(pop, project.Soils.Soils[nb - 1].POPStochast.Mean);
+            ClassicAssert.AreEqual(ratioS, project.Soils.Soils[nb - 1].RatioCuPc);
+            ClassicAssert.AreEqual(ratioS, project.Soils.Soils[nb - 1].RatioCuPcStochast.Mean);
+            ClassicAssert.AreEqual(expM, project.Soils.Soils[nb - 1].StrengthIncreaseExponent);
+            ClassicAssert.AreEqual(expM, project.Soils.Soils[nb - 1].StrengthIncreaseExponentStochast.Mean);
 
             // Filter Piping - Ringtoets
-            Assert.AreEqual(gammaUnsat, project.Soils.Soils[nb - 1].AbovePhreaticLevelStochast.Mean);
-            Assert.AreEqual(abovePhreaticLevelDeviation, project.Soils.Soils[nb - 1].AbovePhreaticLevelStochast.Deviation);
-            Assert.AreEqual(abovePhreaticLevelDistributionType, project.Soils.Soils[nb - 1].AbovePhreaticLevelStochast.DistributionType);
-            Assert.AreEqual(gammaSat, project.Soils.Soils[nb - 1].BelowPhreaticLevelStochast.Mean);
-            Assert.AreEqual(belowPhreaticLevelDeviation, project.Soils.Soils[nb - 1].BelowPhreaticLevelStochast.Deviation);
-            Assert.AreEqual(belowPhreaticLevelDistributionType, project.Soils.Soils[nb - 1].BelowPhreaticLevelStochast.DistributionType);
-            Assert.AreEqual(d70MeanInMicroMeter * 1e-6, project.Soils.Soils[nb - 1].DiameterD70);
-            Assert.AreEqual(d70MeanInMicroMeter * 1e-6, project.Soils.Soils[nb - 1].DiameterD70Stochast.Mean);
-            Assert.AreEqual(d70StdDevInMicroMeter * 1e-6, project.Soils.Soils[nb - 1].DiameterD70Stochast.Deviation);
-            Assert.AreEqual(d70Dist, project.Soils.Soils[nb - 1].DiameterD70Stochast.DistributionType);
-            Assert.AreEqual(permMean, project.Soils.Soils[nb - 1].PermeabKx);
-            Assert.AreEqual(permMean, project.Soils.Soils[nb - 1].PermeabKxStochast.Mean);
-            Assert.AreEqual(permStdDev, project.Soils.Soils[nb - 1].PermeabKxStochast.Deviation);
-            Assert.AreEqual(permDist, project.Soils.Soils[nb - 1].PermeabKxStochast.DistributionType);
-            Assert.AreEqual(porosity, project.Soils.Soils[nb - 1].Porosity);
-            Assert.AreEqual(d15 * 1e-3, project.Soils.Soils[nb - 1].DiameterD15, 1e-8);
-            Assert.AreEqual(d50 * 1e-3, project.Soils.Soils[nb - 1].DiameterD50, 1e-8);
+            ClassicAssert.AreEqual(gammaUnsat, project.Soils.Soils[nb - 1].AbovePhreaticLevelStochast.Mean);
+            ClassicAssert.AreEqual(abovePhreaticLevelDeviation, project.Soils.Soils[nb - 1].AbovePhreaticLevelStochast.Deviation);
+            ClassicAssert.AreEqual(abovePhreaticLevelDistributionType, project.Soils.Soils[nb - 1].AbovePhreaticLevelStochast.DistributionType);
+            ClassicAssert.AreEqual(gammaSat, project.Soils.Soils[nb - 1].BelowPhreaticLevelStochast.Mean);
+            ClassicAssert.AreEqual(belowPhreaticLevelDeviation, project.Soils.Soils[nb - 1].BelowPhreaticLevelStochast.Deviation);
+            ClassicAssert.AreEqual(belowPhreaticLevelDistributionType, project.Soils.Soils[nb - 1].BelowPhreaticLevelStochast.DistributionType);
+            ClassicAssert.AreEqual(d70MeanInMicroMeter * 1e-6, project.Soils.Soils[nb - 1].DiameterD70);
+            ClassicAssert.AreEqual(d70MeanInMicroMeter * 1e-6, project.Soils.Soils[nb - 1].DiameterD70Stochast.Mean);
+            ClassicAssert.AreEqual(d70StdDevInMicroMeter * 1e-6, project.Soils.Soils[nb - 1].DiameterD70Stochast.Deviation);
+            ClassicAssert.AreEqual(d70Dist, project.Soils.Soils[nb - 1].DiameterD70Stochast.DistributionType);
+            ClassicAssert.AreEqual(permMean, project.Soils.Soils[nb - 1].PermeabKx);
+            ClassicAssert.AreEqual(permMean, project.Soils.Soils[nb - 1].PermeabKxStochast.Mean);
+            ClassicAssert.AreEqual(permStdDev, project.Soils.Soils[nb - 1].PermeabKxStochast.Deviation);
+            ClassicAssert.AreEqual(permDist, project.Soils.Soils[nb - 1].PermeabKxStochast.DistributionType);
+            ClassicAssert.AreEqual(porosity, project.Soils.Soils[nb - 1].Porosity);
+            ClassicAssert.AreEqual(d15 * 1e-3, project.Soils.Soils[nb - 1].DiameterD15, 1e-8);
+            ClassicAssert.AreEqual(d50 * 1e-3, project.Soils.Soils[nb - 1].DiameterD50, 1e-8);
         }
 
         /// <summary>
@@ -323,11 +324,11 @@
             {
                 DSoilModelIO.ReadCsvSurfaceLineFromFileAndAddToProject(csvFullFileName, project);
 
-                Assert.AreEqual(2, project.SurfaceLines.Count,
+                ClassicAssert.AreEqual(2, project.SurfaceLines.Count,
                                 "The number of surface lines read from csv file is not right.");
-                Assert.AreEqual(202, project.SurfaceLines[0].Geometry.Count,
+                ClassicAssert.AreEqual(202, project.SurfaceLines[0].Geometry.Count,
                                 "The number of points in the surface lines read from csv file is not right.");
-                Assert.AreEqual(132, project.SurfaceLines[1].Geometry.Count,
+                ClassicAssert.AreEqual(132, project.SurfaceLines[1].Geometry.Count,
                                 "The number of points in the surface lines read from csv file is not right.");
             }
         }
@@ -343,20 +344,20 @@
             {
                 // complete import
                 project.SoilProfiles1D.AddRange(new SoilProfilesImporter().ReadSoilProfiles(soilprofileFile, new SoilList()));
-                Assert.AreEqual(147, project.SoilProfiles1D.Count);
+                ClassicAssert.AreEqual(147, project.SoilProfiles1D.Count);
 
                 LogManager.Clear();
                 DSoilModelIO.ReadCsvSegmentsFromFileAndAddToProject(segmentFile, project);
-                Assert.AreEqual(10, project.SoilSegments.Count);
-                Assert.AreEqual(0, LogManager.Messages.Count);
+                ClassicAssert.AreEqual(10, project.SoilSegments.Count);
+                ClassicAssert.AreEqual(0, LogManager.Messages.Count);
 
                 // incomplete import of segments
                 project.SoilProfiles1D.Clear();
                 project.SoilSegments.Clear();
 
                 DSoilModelIO.ReadCsvSegmentsFromFileAndAddToProject(segmentFile, project);
-                Assert.AreEqual(0, project.SoilSegments.Count);
-                Assert.GreaterOrEqual(LogManager.Messages.Count, 10);
+                ClassicAssert.AreEqual(0, project.SoilSegments.Count);
+                ClassicAssert.GreaterOrEqual(LogManager.Messages.Count, 10);
             }
         }
 
@@ -373,10 +374,10 @@
             }
             using (var project = (DSoilModelProject) DSoilModelIO.OpenSoilDatabase(testFile))
             {
-                Assert.AreEqual(1, project.StressCurves.Count);
-                Assert.AreEqual("StressCurve", project.StressCurves.First().Name);
-                Assert.AreEqual(1, project.BondStressCurves.Count);
-                Assert.AreEqual("BondStressCurve", project.BondStressCurves.First().Name);
+                ClassicAssert.AreEqual(1, project.StressCurves.Count);
+                ClassicAssert.AreEqual("StressCurve", project.StressCurves.First().Name);
+                ClassicAssert.AreEqual(1, project.BondStressCurves.Count);
+                ClassicAssert.AreEqual("BondStressCurve", project.BondStressCurves.First().Name);
             }
         }
 
@@ -387,13 +388,13 @@
             var project = new DSoilModelProject();
             LogManager.Clear();
             project.ReadSoilProfiles1DFromFile(Path.Combine(GetTestFilesPath(), "Missing profiles", "1D_profiles.csv"));
-            Assert.AreEqual(3, project.SoilProfiles1D.Count);
-            Assert.AreEqual(5, LogManager.Messages.Count(m => m.Message.Contains("undefined soil")));
+            ClassicAssert.AreEqual(3, project.SoilProfiles1D.Count);
+            ClassicAssert.AreEqual(5, LogManager.Messages.Count(m => m.Message.Contains("undefined soil")));
 
             LogManager.Clear();
             DSoilModelIO.ReadCsvSegmentsFromFileAndAddToProject(Path.Combine(GetTestFilesPath(), "Missing profiles", "Soilsegments.csv"), project, true);
-            Assert.AreEqual(0, project.SoilSegments.Count);
-            Assert.AreEqual(2, LogManager.Messages.Count(m => m.Message.Contains("profiles are missing")));
+            ClassicAssert.AreEqual(0, project.SoilSegments.Count);
+            ClassicAssert.AreEqual(2, LogManager.Messages.Count(m => m.Message.Contains("profiles are missing")));
         }
 
         [Test]
@@ -403,13 +404,13 @@
             var project = new DSoilModelProject();
             LogManager.Clear();
             project.ReadSoilProfiles1DFromFile(Path.Combine(GetTestFilesPath(), "Missing profiles", "1D_profiles_2segmenten.csv"));
-            Assert.AreEqual(5, project.SoilProfiles1D.Count);
-            Assert.AreEqual(7, LogManager.Messages.Count(m => m.Message.Contains("undefined soil")));
+            ClassicAssert.AreEqual(5, project.SoilProfiles1D.Count);
+            ClassicAssert.AreEqual(7, LogManager.Messages.Count(m => m.Message.Contains("undefined soil")));
 
             LogManager.Clear();
             DSoilModelIO.ReadCsvSegmentsFromFileAndAddToProject(Path.Combine(GetTestFilesPath(), "Missing profiles", "Soilsegments_2segmenten.csv"), project, true);
-            Assert.AreEqual(2, project.SoilSegments.Count);
-            Assert.AreEqual(2, LogManager.Messages.Count(m => m.Message.Contains("profiles are missing")));
+            ClassicAssert.AreEqual(2, project.SoilSegments.Count);
+            ClassicAssert.AreEqual(2, LogManager.Messages.Count(m => m.Message.Contains("profiles are missing")));
         }
 
         [Test]
@@ -419,25 +420,25 @@
             var project = new DSoilModelProject();
             var filePath = Path.Combine(GetTestFilesPath(), "segmentShapefile");
             var fileName = Path.Combine(filePath, "1001_1D.csv");
-            Assert.IsTrue(File.Exists(fileName));
+            ClassicAssert.IsTrue(File.Exists(fileName));
             project.ReadSoilProfiles1DFromFile(fileName);
-            Assert.AreEqual(3, project.SoilProfiles1D.Count);
+            ClassicAssert.AreEqual(3, project.SoilProfiles1D.Count);
 
             fileName = Path.Combine(filePath, "1001_segmenten.csv");
-            Assert.IsTrue(File.Exists(fileName));
+            ClassicAssert.IsTrue(File.Exists(fileName));
             DSoilModelIO.ReadCsvSegmentsFromFileAndAddToProject(fileName, project);
-            Assert.AreEqual(2, project.SoilSegments.Count);
+            ClassicAssert.AreEqual(2, project.SoilSegments.Count);
 
             fileName = Path.Combine(filePath, "1001_shape.shp");
-            Assert.IsTrue(File.Exists(fileName));
+            ClassicAssert.IsTrue(File.Exists(fileName));
             DSoilModelIO.ReadSegmentShapefileAndAddToProject(fileName, project, "Segmentnr");
-            Assert.AreEqual(2, project.SoilSegments.Count);
-            Assert.AreEqual(Mechanism.Stability, project.SoilSegments.First().Mechanism);
-            Assert.AreEqual("1001_Stability", project.SoilSegments.First().Name);
-            Assert.AreEqual(120, project.SoilSegments.First().Points.Count);
-            Assert.AreEqual(Mechanism.Piping, project.SoilSegments.Last().Mechanism);
-            Assert.AreEqual("1001_Piping", project.SoilSegments.Last().Name);
-            Assert.AreEqual(120, project.SoilSegments.Last().Points.Count);
+            ClassicAssert.AreEqual(2, project.SoilSegments.Count);
+            ClassicAssert.AreEqual(Mechanism.Stability, project.SoilSegments.First().Mechanism);
+            ClassicAssert.AreEqual("1001_Stability", project.SoilSegments.First().Name);
+            ClassicAssert.AreEqual(120, project.SoilSegments.First().Points.Count);
+            ClassicAssert.AreEqual(Mechanism.Piping, project.SoilSegments.Last().Mechanism);
+            ClassicAssert.AreEqual("1001_Piping", project.SoilSegments.Last().Name);
+            ClassicAssert.AreEqual(120, project.SoilSegments.Last().Points.Count);
         }
 
         private string GetTestFilesPath()
@@ -457,17 +458,17 @@
             var node = doc.CreateNode(XmlNodeType.Element, "SomeName", "SomeUrl");
 
             var res = GetNodeAttribute(null, "SomeAttribute");
-            Assert.IsNull(res, "No node - no attributes");
+            ClassicAssert.IsNull(res, "No node - no attributes");
 
             res = GetNodeAttribute(node, "SomeAttribute");
-            Assert.IsNull(res, "Attribute doesn't exist");
+            ClassicAssert.IsNull(res, "Attribute doesn't exist");
 
             var attr = doc.CreateAttribute("Attr1");
             attr.Value = "Text1";
             node.Attributes.Append(attr);
 
             res = GetNodeAttribute(node, "Attr1");
-            Assert.AreEqual("Text1", res, "Attribute doesn't exist");
+            ClassicAssert.AreEqual("Text1", res, "Attribute doesn't exist");
         }
     }
 }
\ No newline at end of file
Index: src/Deltares.DSoilModel.Forms.Tests/SegmentControlTests.cs
===================================================================
diff -u -r883 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/SegmentControlTests.cs	(.../SegmentControlTests.cs)	(revision 883)
+++ src/Deltares.DSoilModel.Forms.Tests/SegmentControlTests.cs	(.../SegmentControlTests.cs)	(revision 1080)
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Drawing;
+using System.Threading;
 using Deltares.DSoilModel.Data;
 using Deltares.Geotechnics;
 using Deltares.Geotechnics.ConePenetrationTest;
@@ -9,10 +10,11 @@
 using Deltares.Geotechnics.Xsd;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
-    [TestFixture, RequiresSTA]
+    [TestFixture, Apartment(ApartmentState.STA)]
     class SegmentControlTests : ControlTester
     {
         protected override IPropertyControl CreatePropertyControl()
@@ -80,16 +82,16 @@
         {
             var soilSegment = new SoilSegment();
 
-            Assert.AreNotSame(soilSegment, PropertyControl.SelectedObject);
+            ClassicAssert.AreNotSame(soilSegment, PropertyControl.SelectedObject);
 
             PropertyControl.SelectedObject = soilSegment;
-            Assert.AreSame(soilSegment, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(soilSegment, PropertyControl.SelectedObject);
         }
 
         [Test]
         public void TestIsVisible_AlwaysTrue()
         {
-            Assert.IsTrue(PropertyControl.IsVisible);
+            ClassicAssert.IsTrue(PropertyControl.IsVisible);
         }
     }
 }
Index: src/Deltares.DSoilModel.Data.Tests/TestFiles/Groot Salland.gdb
===================================================================
diff -u -r1034 -r1080
Binary files differ
Index: src/Deltares.DSoilModel.Forms.Tests/CenterCrestLocationPropertyControlTest.cs
===================================================================
diff -u -r883 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/CenterCrestLocationPropertyControlTest.cs	(.../CenterCrestLocationPropertyControlTest.cs)	(revision 883)
+++ src/Deltares.DSoilModel.Forms.Tests/CenterCrestLocationPropertyControlTest.cs	(.../CenterCrestLocationPropertyControlTest.cs)	(revision 1080)
@@ -1,11 +1,13 @@
-using Deltares.DSoilModel.Data;
+using System.Threading;
+using Deltares.DSoilModel.Data;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
-    [TestFixture, RequiresSTA]
+    [TestFixture, Apartment(ApartmentState.STA)]
     public class CenterCrestLocationPropertyControlTest : ControlTester
     {
         protected override IPropertyControl CreatePropertyControl()
@@ -24,9 +26,9 @@
             };
             PropertyControl.SelectedObject = location;
 
-            Assert.AreSame(location, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(location, PropertyControl.SelectedObject);
 
-            Assert.IsTrue(PropertyControl.IsVisible);
+            ClassicAssert.IsTrue(PropertyControl.IsVisible);
 
             TestSpinEditVisibleEnabledValue(PropertyControl, "XcoordinateEdit", true, true, location, x => x.Location, 2.34);
             TestLabelControlVisibleValue(PropertyControl, "XcoordinateLabel", true, "X-coördinaat [m]");
@@ -37,13 +39,13 @@
         {
             var location = new CenterCrestLocation();
             PropertyControl.SelectedObject = location;
-            Assert.AreSame(location, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(location, PropertyControl.SelectedObject);
         }
 
         [Test]
         public void TestIsVisible()
         {
-            Assert.IsTrue(PropertyControl.IsVisible);
+            ClassicAssert.IsTrue(PropertyControl.IsVisible);
         }
 
     }
Index: src/Deltares.DSoilModel.Data.Tests/SosSoilLayer1DTest.cs
===================================================================
diff -u -r954 -r1080
--- src/Deltares.DSoilModel.Data.Tests/SosSoilLayer1DTest.cs	(.../SosSoilLayer1DTest.cs)	(revision 954)
+++ src/Deltares.DSoilModel.Data.Tests/SosSoilLayer1DTest.cs	(.../SosSoilLayer1DTest.cs)	(revision 1080)
@@ -32,6 +32,7 @@
 using Deltares.Standard.TestUtils;
 using KellermanSoftware.CompareNetObjects;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Data.Tests
 {
@@ -42,7 +43,7 @@
         private bool oldIsDataEventPublishStopped;
         private LanguageType oldLanguage;
 
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void FixtureSetup()
         {
             oldLanguage = LocalizationManager.CurrentLanguage;
@@ -55,7 +56,7 @@
             }
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void FixtureTearDown()
         {
             DataEventPublisher.IsDataEventPublishStopped = oldIsDataEventPublishStopped;
@@ -66,13 +67,13 @@
         public void DefaultConstructorDefaultValues()
         {
             var sosLayer = new SosSoilLayer1D();
-            Assert.IsNull(sosLayer.MinimumTopLevel);
-            Assert.IsNull(sosLayer.MaximumTopLevel);
-            Assert.IsNullOrEmpty(sosLayer.RemarkTopLevel);
-            Assert.IsNull(sosLayer.Soil);
-            Assert.IsFalse(sosLayer.IsAquifer);
-            Assert.AreEqual(0, sosLayer.TopLevel);
-            Assert.AreEqual(WaterpressureInterpolationModel.Automatic, sosLayer.WaterpressureInterpolationModel);
+            ClassicAssert.IsNull(sosLayer.MinimumTopLevel);
+            ClassicAssert.IsNull(sosLayer.MaximumTopLevel);
+            ClassicAssert.IsEmpty(sosLayer.RemarkTopLevel);
+            ClassicAssert.IsNull(sosLayer.Soil);
+            ClassicAssert.IsFalse(sosLayer.IsAquifer);
+            ClassicAssert.AreEqual(0, sosLayer.TopLevel);
+            ClassicAssert.AreEqual(WaterpressureInterpolationModel.Automatic, sosLayer.WaterpressureInterpolationModel);
         }
 
         [Test]
@@ -82,16 +83,16 @@
             {
                 db.Open(Path.Combine(TestDataFolder, "SoilSegments_version_1_3_3.soil"));
                 var profiles = db.ReadSoilProfiles1D<SosSoilLayer1D>();
-                Assert.AreEqual(34, profiles.Count);
+                ClassicAssert.AreEqual(34, profiles.Count);
                 foreach (var soilProfile in profiles)
                 {
                     foreach (var layer in soilProfile.Layers)
                     {
                         var sosLayer = layer as SosSoilLayer1D;
-                        Assert.NotNull(sosLayer);
-                        Assert.IsNull(sosLayer.MinimumTopLevel);
-                        Assert.IsNull(sosLayer.MaximumTopLevel);
-                        Assert.IsNullOrEmpty(sosLayer.RemarkTopLevel);
+                        ClassicAssert.NotNull(sosLayer);
+                        ClassicAssert.IsNull(sosLayer.MinimumTopLevel);
+                        ClassicAssert.IsNull(sosLayer.MaximumTopLevel);
+                        ClassicAssert.IsEmpty(sosLayer.RemarkTopLevel);
                     }
                 }
             }
@@ -150,7 +151,7 @@
                     "Id", "Name", "Soil", "Color", "SetCoordinate", "ChangeLog"
                 };
             var result = co.Compare(sosProfiles, sosProfilesCopy);
-            Assert.AreEqual(0, result.Differences.Count, "SOSProfileLayer1D fails comparison: " + result.DifferencesString);
+            ClassicAssert.AreEqual(0, result.Differences.Count, "SOSProfileLayer1D fails comparison: " + result.DifferencesString);
         }
 
         [Test]
@@ -170,33 +171,33 @@
             var soils = database.ReadSoils().Soils;
             timer.Stop();
             Console.WriteLine("{0} seconds for reading soils", timer.Elapsed.Seconds);
-            Assert.LessOrEqual(timer.Elapsed.Seconds, 25);
-            Assert.AreEqual(42, soils.Count);
+            ClassicAssert.LessOrEqual(timer.Elapsed.Seconds, 25);
+            ClassicAssert.AreEqual(42, soils.Count);
 
             // soilprofiles
             timer.Restart();
             var profiles = database.ReadSoilProfiles1D<SosSoilLayer1D>();
             timer.Stop();
             Console.WriteLine("{0} seconds for reading soil profiles", timer.Elapsed.Seconds);
-            Assert.LessOrEqual(timer.Elapsed.Seconds, 20);
+            ClassicAssert.LessOrEqual(timer.Elapsed.Seconds, 20);
 
             // soilsegments
             timer.Restart();
             var segments = database.ReadSoilSegments();
             timer.Stop();
             Console.WriteLine("{0} seconds for reading soil segments", timer.Elapsed.Seconds);
-            Assert.LessOrEqual(timer.Elapsed.Seconds, 10);
+            ClassicAssert.LessOrEqual(timer.Elapsed.Seconds, 10);
 
             // sanity check !
-            Assert.AreEqual(5574, profiles.Count);
+            ClassicAssert.AreEqual(5574, profiles.Count);
             foreach (var profile in profiles)
             {
                 foreach (var layer in profile.Layers)
                 {
-                    Assert.IsInstanceOf(typeof(SosSoilLayer1D), layer);
+                   ClassicAssert.IsInstanceOf(typeof(SosSoilLayer1D), layer);
                     var sosLayer = (SosSoilLayer1D)layer;
-                    Assert.NotNull(sosLayer.MaximumTopLevel);
-                    Assert.NotNull(sosLayer.MinimumTopLevel);
+                   ClassicAssert.NotNull(sosLayer.MaximumTopLevel);
+                   ClassicAssert.NotNull(sosLayer.MinimumTopLevel);
                 }
             }
         }
@@ -255,7 +256,7 @@
                     "Id", "Soil", "SetCoordinate", "Color"
                 }; // including the soils here takes a looong time to prove nothing....
             var result = co.Compare(profilesCopy, project.SoilProfiles1D);
-            Assert.AreEqual(0, result.Differences.Count, "SOSProfileLayer1D fails comparison: " + result.DifferencesString);
+            ClassicAssert.AreEqual(0, result.Differences.Count, "SOSProfileLayer1D fails comparison: " + result.DifferencesString);
             Console.WriteLine("OK !");
         }
 
@@ -282,7 +283,7 @@
             comparer.Config.AttributesToIgnore = new List<Type> { typeof(XmlIgnoreAttribute) };
 
             var compareResult = comparer.Compare(sosLayer1D, sosLayer1DClone);
-            Assert.IsTrue(compareResult.AreEqual, compareResult.DifferencesString);
+            ClassicAssert.IsTrue(compareResult.AreEqual, compareResult.DifferencesString);
         }
 
         [Test]
@@ -309,10 +310,10 @@
 
             sosLayer2.Assign(sosLayer1);
 
-            Assert.AreEqual("remark testSos1", sosLayer2.RemarkTopLevel);
-            Assert.AreEqual(13, sosLayer2.MinimumTopLevel);
-            Assert.AreEqual(12, sosLayer2.MaximumTopLevel);
-            Assert.AreEqual(WaterpressureInterpolationModel.Hydrostatic, sosLayer2.WaterpressureInterpolationModel);
+            ClassicAssert.AreEqual("remark testSos1", sosLayer2.RemarkTopLevel);
+            ClassicAssert.AreEqual(13, sosLayer2.MinimumTopLevel);
+            ClassicAssert.AreEqual(12, sosLayer2.MaximumTopLevel);
+            ClassicAssert.AreEqual(WaterpressureInterpolationModel.Hydrostatic, sosLayer2.WaterpressureInterpolationModel);
         }
     }
 }
\ No newline at end of file
Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs
===================================================================
diff -u -r879 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 1080)
@@ -14,6 +14,7 @@
 using Deltares.Standard.Forms.DExpress;
 using Deltares.Standard.Reflection;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
@@ -59,7 +60,7 @@
                     passAllMembers = false;
                 }
             }
-            Assert.IsTrue(passAllMembers, "The filter " + filter + " is not defined correctly.");
+            ClassicAssert.IsTrue(passAllMembers, "The filter " + filter + " is not defined correctly.");
         }
 
         [Test]
@@ -90,7 +91,7 @@
                         Console.WriteLine(errorMessage);
                         passAllMembers = false;
                     }
-                    Assert.IsTrue(passAllMembers, "The filter " + filter + " is not defined correctly.");
+                    ClassicAssert.IsTrue(passAllMembers, "The filter " + filter + " is not defined correctly.");
                 }
             }
         }
@@ -176,25 +177,25 @@
                 UseDefaultShearStrengthModel = false, // or it will mess up this test !
 
             };
-            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.Cohesion)));
-            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.FrictionAngle)));
-            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.UsePop)));
-            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.POP)));
-            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.RatioCuPc)));
-            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.StrengthIncreaseExponent)));
+            ClassicAssert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.Cohesion)));
+            ClassicAssert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.FrictionAngle)));
+            ClassicAssert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.UsePop)));
+            ClassicAssert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.POP)));
+            ClassicAssert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.RatioCuPc)));
+            ClassicAssert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.StrengthIncreaseExponent)));
 
             soil.ShearStrengthModel = ShearStrengthModel.CuCalculated;
-            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.Cohesion)));
-            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.FrictionAngle)));
-            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.UsePop)));
+            ClassicAssert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.Cohesion)));
+            ClassicAssert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.FrictionAngle)));
+            ClassicAssert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.UsePop)));
             soil.UsePop = true;
-            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.POP)));
-            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.RatioCuPc)));
-            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.StrengthIncreaseExponent)));
+            ClassicAssert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.POP)));
+            ClassicAssert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.RatioCuPc)));
+            ClassicAssert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.StrengthIncreaseExponent)));
             soil.UsePop = false;
-            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.POP)));
-            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.RatioCuPc)));
-            Assert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.StrengthIncreaseExponent)));
+            ClassicAssert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.POP)));
+            ClassicAssert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.RatioCuPc)));
+            ClassicAssert.AreEqual(true, context.IsEnabled(soil, soil.GetMemberName(s => s.StrengthIncreaseExponent)));
         }
 
         [Test]
@@ -247,21 +248,21 @@
 
             dSoilModelContext.ParameterView = ParameterViewSettings.AllParameters;
             var isVisible = dSoilModelContext.IsVisible(pcs, pcs.GetMemberName(x => x.StressValue));
-            Assert.IsTrue(isVisible != null && isVisible.Value);
+            ClassicAssert.IsTrue(isVisible != null && isVisible.Value);
             isVisible = dSoilModelContext.IsVisible(pcs, pcs.GetMemberName(x => x.StressStochast));
-            Assert.IsTrue(isVisible != null && isVisible.Value);
+            ClassicAssert.IsTrue(isVisible != null && isVisible.Value);
 
             dSoilModelContext.ParameterView = ParameterViewSettings.AsIsParameters;
             isVisible = dSoilModelContext.IsVisible(pcs, pcs.GetMemberName(x => x.StressValue));
-            Assert.IsTrue(isVisible != null && isVisible.Value);
+            ClassicAssert.IsTrue(isVisible != null && isVisible.Value);
             isVisible = dSoilModelContext.IsVisible(pcs, pcs.GetMemberName(x => x.StressStochast));
-            Assert.IsTrue(isVisible != null && !isVisible.Value);
+            ClassicAssert.IsTrue(isVisible != null && !isVisible.Value);
 
             dSoilModelContext.ParameterView = ParameterViewSettings.ProbabilisticParameters;
             isVisible = dSoilModelContext.IsVisible(pcs, pcs.GetMemberName(x => x.StressValue));
-            Assert.IsTrue(isVisible != null && !isVisible.Value);
+            ClassicAssert.IsTrue(isVisible != null && !isVisible.Value);
             isVisible = dSoilModelContext.IsVisible(pcs, pcs.GetMemberName(x => x.StressStochast));
-            Assert.IsTrue(isVisible != null && isVisible.Value);
+            ClassicAssert.IsTrue(isVisible != null && isVisible.Value);
         }
 
         [TestCase("AbovePhreaticLevel")]
@@ -280,22 +281,22 @@
             var stochastName = memberName + "Stochast";
 
             dSoilModelContext.ParameterView = ParameterViewSettings.AllParameters;
-            Assert.AreEqual(true, dSoilModelContext.IsVisible(soil, memberName));
-            Assert.AreEqual(true, dSoilModelContext.IsVisible(soil, stochastName));
-            Assert.AreEqual(true, dSoilModelContext.IsEnabled(soil, memberName));
-            Assert.AreEqual(true, dSoilModelContext.IsEnabled(soil, stochastName));
+            ClassicAssert.AreEqual(true, dSoilModelContext.IsVisible(soil, memberName));
+            ClassicAssert.AreEqual(true, dSoilModelContext.IsVisible(soil, stochastName));
+            ClassicAssert.AreEqual(true, dSoilModelContext.IsEnabled(soil, memberName));
+            ClassicAssert.AreEqual(true, dSoilModelContext.IsEnabled(soil, stochastName));
 
             dSoilModelContext.ParameterView = ParameterViewSettings.AsIsParameters;
-            Assert.AreEqual(true, dSoilModelContext.IsVisible(soil, memberName));
-            Assert.AreEqual(false, dSoilModelContext.IsVisible(soil, stochastName));
-            Assert.AreEqual(true, dSoilModelContext.IsEnabled(soil, memberName));
-            Assert.AreEqual(false, dSoilModelContext.IsEnabled(soil, stochastName));
+            ClassicAssert.AreEqual(true, dSoilModelContext.IsVisible(soil, memberName));
+            ClassicAssert.AreEqual(false, dSoilModelContext.IsVisible(soil, stochastName));
+            ClassicAssert.AreEqual(true, dSoilModelContext.IsEnabled(soil, memberName));
+            ClassicAssert.AreEqual(false, dSoilModelContext.IsEnabled(soil, stochastName));
             
             dSoilModelContext.ParameterView = ParameterViewSettings.ProbabilisticParameters;
-            Assert.AreEqual(false, dSoilModelContext.IsVisible(soil, memberName));
-            Assert.AreEqual(true, dSoilModelContext.IsVisible(soil, stochastName));
-            Assert.AreEqual(false, dSoilModelContext.IsEnabled(soil, memberName));
-            Assert.AreEqual(true, dSoilModelContext.IsEnabled(soil, stochastName));
+            ClassicAssert.AreEqual(false, dSoilModelContext.IsVisible(soil, memberName));
+            ClassicAssert.AreEqual(true, dSoilModelContext.IsVisible(soil, stochastName));
+            ClassicAssert.AreEqual(false, dSoilModelContext.IsEnabled(soil, memberName));
+            ClassicAssert.AreEqual(true, dSoilModelContext.IsEnabled(soil, stochastName));
         }
 
         [Test]
@@ -305,8 +306,8 @@
             using (var mainForm = new MainForm())
             {
                 var context = new DSoilModelContext();
-                Assert.AreEqual(false, context.IsVisible(mainForm, "SelectUnits"));
-                Assert.AreEqual(false, context.IsVisible(mainForm, "ExecuteDeleteCommand"));
+                ClassicAssert.AreEqual(false, context.IsVisible(mainForm, "SelectUnits"));
+                ClassicAssert.AreEqual(false, context.IsVisible(mainForm, "ExecuteDeleteCommand"));
             }
         }
 
@@ -327,8 +328,7 @@
         public void DSoilModelContext_GetFormat(Type type, string member, string format)
         {
             var dSoilModelContext = SetupDSoilModelContext(null);
-
-            Assert.AreEqual(format, dSoilModelContext.GetFormat(type, null, member));
+            ClassicAssert.AreEqual(format, dSoilModelContext.GetFormat(type, null, member));
         }
 
         private static void AdhereToFilter(UserColumnFilters? filter, ICollection<string> visibleProperties)
@@ -342,7 +342,7 @@
                 var isVisible = dSoilModelContext.IsVisible(testSoil, propertyName);
                 var propertyVisible = isVisible != null && (bool)isVisible;
 
-                Assert.IsTrue(propertyVisible, "Soil property " + propertyName + " should be visible.");
+                ClassicAssert.IsTrue(propertyVisible, "Soil property " + propertyName + " should be visible.");
             }
 
             var type = testSoil.GetType();
@@ -356,7 +356,7 @@
                     var isVisible = dSoilModelContext.IsVisible(testSoil, propertyName);
                     var propertyVisible = isVisible != null && (bool)isVisible;
 
-                    Assert.IsFalse(propertyVisible, "Soil property " + propertyName + " should not be visible.");
+                    ClassicAssert.IsFalse(propertyVisible, "Soil property " + propertyName + " should not be visible.");
                 }
             }
         }
@@ -404,11 +404,11 @@
             var sp1 = new SoilProfile1D();
 
             var isVisible = dSoilModelContext.IsVisible(sp1, sp1.GetMemberName(x => x.X));
-            Assert.IsTrue(isVisible != null && !isVisible.Value);
+            ClassicAssert.IsTrue(isVisible != null && !isVisible.Value);
             isVisible = dSoilModelContext.IsVisible(sp1, sp1.GetMemberName(x => x.Y));
-            Assert.IsTrue(isVisible != null && !isVisible.Value);
+            ClassicAssert.IsTrue(isVisible != null && !isVisible.Value);
             isVisible = dSoilModelContext.IsVisible(sp1, sp1.GetMemberName(x => x.Location));
-            Assert.IsTrue(isVisible != null && !isVisible.Value);
+            ClassicAssert.IsTrue(isVisible != null && !isVisible.Value);
         }
 
         [Test]
@@ -418,22 +418,22 @@
             var sp2 = new SoilProfile2D();
 
             var isVisible = dSoilModelContext.IsVisible(sp2, sp2.GetMemberName(p => p.XBegin));
-            Assert.IsTrue(isVisible != null && !isVisible.Value);
+            ClassicAssert.IsTrue(isVisible != null && !isVisible.Value);
 
             isVisible = dSoilModelContext.IsVisible(sp2, sp2.GetMemberName(p => p.XEnd));
-            Assert.IsTrue(isVisible != null && !isVisible.Value);
+            ClassicAssert.IsTrue(isVisible != null && !isVisible.Value);
 
             isVisible = dSoilModelContext.IsVisible(sp2, sp2.GetMemberName(p => p.YBegin));
-            Assert.IsTrue(isVisible != null && !isVisible.Value);
+            ClassicAssert.IsTrue(isVisible != null && !isVisible.Value);
 
             isVisible = dSoilModelContext.IsVisible(sp2, sp2.GetMemberName(p => p.YEnd));
-            Assert.IsTrue(isVisible != null && !isVisible.Value);
+            ClassicAssert.IsTrue(isVisible != null && !isVisible.Value); 
 
             isVisible = dSoilModelContext.IsVisible(sp2, sp2.GetMemberName(p => p.Length));
-            Assert.IsTrue(isVisible != null && !isVisible.Value);
+            ClassicAssert.IsTrue(isVisible != null && !isVisible.Value);
 
             isVisible = dSoilModelContext.IsVisible(sp2, sp2.GetMemberName(p => p.Location));
-            Assert.IsTrue(isVisible != null && !isVisible.Value);
+            ClassicAssert.IsTrue(isVisible != null && !isVisible.Value);
         }
 
         // Note: this is a temporary check as the property has to be visible in the end, only invisible for now See DSB-538
@@ -444,7 +444,7 @@
             var seg = new SoilSegment();
 
             var isVisible = dSoilModelContext.IsVisible(seg, seg.GetMemberName(p => p.CreateSettlementZones));
-            Assert.IsTrue(isVisible != null && !isVisible.Value);
+            ClassicAssert.IsTrue(isVisible != null && !isVisible.Value);
         }
 
         [TestCase("GeometryPointsGridViewControl", "AddRowCommand", false)]
@@ -453,7 +453,7 @@
         {
             var context = new DSoilModelContext();
             var grid = new GridViewControl { Name = gridViewControlName };
-            Assert.AreEqual(expectedVisible, context.IsVisible(grid, memberName));
+            ClassicAssert.AreEqual(expectedVisible, context.IsVisible(grid, memberName));
         }
 
         [TestCase("CptsGridViewControl", "EditCommand", false)]
@@ -480,7 +480,7 @@
         {
             var context = new DSoilModelContext();
             var grid = new GridViewControl { Name = gridViewControlName };
-            Assert.AreEqual(expectedEnabled, context.IsEnabled(grid, memberName));
+            ClassicAssert.AreEqual(expectedEnabled, context.IsEnabled(grid, memberName));
         }
 
         [TestCase(typeof(CharacteristicPoint), "CharacteristicPointType", false)]
@@ -490,7 +490,7 @@
         {
             var sender = Activator.CreateInstance(senderType);
             var context = new DSoilModelContext();
-            Assert.AreEqual(expectedEnabled, context.IsEnabled(sender, memberName));
+            ClassicAssert.AreEqual(expectedEnabled, context.IsEnabled(sender, memberName));
         }
 
         [TestCase(typeof(Boring), "TopVoid", false)]
@@ -509,7 +509,7 @@
         {
             var sender = Activator.CreateInstance(senderType);
             var context = new DSoilModelContext();
-            Assert.AreEqual(expectedVisible, context.IsVisible(sender, memberName));
+            ClassicAssert.AreEqual(expectedVisible, context.IsVisible(sender, memberName));
         }
 
         [TestCase("IsSandMedianUsed", false)]
@@ -519,7 +519,7 @@
         {
             var sender = new BoringLayer(new SoilList(), new BoringDatarow());
             var context = new DSoilModelContext();
-            Assert.AreEqual(expectedVisible, context.IsVisible(sender, memberName));
+            ClassicAssert.AreEqual(expectedVisible, context.IsVisible(sender, memberName));
         }
 
         [TestCase(typeof(ConePenetrationTestData))]
@@ -530,12 +530,12 @@
             var context = new DSoilModelContext();
             
             // response depends on selected object in geometry editor
-            Assert.AreEqual(null, context.IsEnabled(geometryEditor, "DeleteSelectedObjects"));
+            ClassicAssert.AreEqual(null, context.IsEnabled(geometryEditor, "DeleteSelectedObjects"));
 
             var selection = Activator.CreateInstance(selectedType);
             geometryEditor.SpatialEditor.EmptySelection = new Shape { DataObject = selection };
             
-            Assert.AreEqual(false, context.IsEnabled(geometryEditor, "DeleteSelectedObjects"));
+            ClassicAssert.AreEqual(false, context.IsEnabled(geometryEditor, "DeleteSelectedObjects"));
 
             geometryEditor.Dispose();
             BindSupport.ClearCaches();    
@@ -548,7 +548,7 @@
             var context = new DSoilModelContext();
             var plugin = new DSoilModelPlugin();
 
-            Assert.AreEqual(false, context.IsVisible(plugin, "OldProjectImport"));
+            ClassicAssert.AreEqual(false, context.IsVisible(plugin, "OldProjectImport"));
             plugin.Dispose();
             BindSupport.ClearCaches();
         }
Index: src/Deltares.DSoilModel.Forms.Tests/CptLookup1DControlTests.cs
===================================================================
diff -u -r883 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/CptLookup1DControlTests.cs	(.../CptLookup1DControlTests.cs)	(revision 883)
+++ src/Deltares.DSoilModel.Forms.Tests/CptLookup1DControlTests.cs	(.../CptLookup1DControlTests.cs)	(revision 1080)
@@ -1,11 +1,13 @@
-using Deltares.Geotechnics.ConePenetrationTest;
+using System.Threading;
+using Deltares.Geotechnics.ConePenetrationTest;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
-    [TestFixture, RequiresSTA]
+    [TestFixture, Apartment(ApartmentState.STA)]
     internal class CptLookup1DControlTests : ControlTester
     {
         protected override IPropertyControl CreatePropertyControl()
@@ -18,7 +20,7 @@
         {
             // there are no extra bindings
             // at least let's test assigned name
-            Assert.AreEqual("Sondering", PropertyControl.Name);
+            ClassicAssert.AreEqual("Sondering", PropertyControl.Name);
         }
 
         [Test]
@@ -32,17 +34,17 @@
 
             PropertyControl.SelectedObject = lookup;
 
-            Assert.AreSame(lookup, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(lookup, PropertyControl.SelectedObject);
 
             var subcontrol = GetPrivateField<CPTControl>(PropertyControl, "cptControl");
-            Assert.NotNull(subcontrol);
-            Assert.AreSame(lookup.ConePenetrationTestData, subcontrol.SelectedObject); 
+            ClassicAssert.NotNull(subcontrol);
+            ClassicAssert.AreSame(lookup.ConePenetrationTestData, subcontrol.SelectedObject); 
         }
 
         [Test]
         public void IsVisibleTest()
         {
-            Assert.IsTrue(PropertyControl.IsVisible); // always true
+            ClassicAssert.IsTrue(PropertyControl.IsVisible); // always true
         }
     }
 }
Index: src/Deltares.DSoilModel.Forms.Tests/SoilSegmentSplitLocationControlTests.cs
===================================================================
diff -u -r556 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/SoilSegmentSplitLocationControlTests.cs	(.../SoilSegmentSplitLocationControlTests.cs)	(revision 556)
+++ src/Deltares.DSoilModel.Forms.Tests/SoilSegmentSplitLocationControlTests.cs	(.../SoilSegmentSplitLocationControlTests.cs)	(revision 1080)
@@ -1,10 +1,12 @@
-using Deltares.DSoilModel.Data;
+using System.Threading;
+using Deltares.DSoilModel.Data;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
-    [TestFixture, RequiresSTA]
+    [TestFixture, Apartment(ApartmentState.STA)]
     class SoilSegmentSplitLocationControlTests : ControlTester
     {
         protected override IPropertyControl CreatePropertyControl()
@@ -26,16 +28,16 @@
         public void TestSelectedObject()
         {
             var location = new SoilSegmentSplitLocation();
-            Assert.AreNotSame(location, PropertyControl.SelectedObject); // because we didn't assign it yet
+            ClassicAssert.AreNotSame(location, PropertyControl.SelectedObject); // because we didn't assign it yet
 
             PropertyControl.SelectedObject = location;
-            Assert.AreSame(location, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(location, PropertyControl.SelectedObject);
         }
 
         [Test]
         public void TestIsVisible()
         {
-            Assert.IsTrue(PropertyControl.IsVisible); // always true
+            ClassicAssert.IsTrue(PropertyControl.IsVisible); // always true
         }
     }
 }
Index: src/Deltares.DSoilModel.Forms.Tests/PreconsolidationStressControlTests.cs
===================================================================
diff -u -r883 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/PreconsolidationStressControlTests.cs	(.../PreconsolidationStressControlTests.cs)	(revision 883)
+++ src/Deltares.DSoilModel.Forms.Tests/PreconsolidationStressControlTests.cs	(.../PreconsolidationStressControlTests.cs)	(revision 1080)
@@ -1,10 +1,12 @@
-using Deltares.Geotechnics.Soils;
+using System.Threading;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
-    [TestFixture, RequiresSTA]
+    [TestFixture, Apartment(ApartmentState.STA)]
     class PreconsolidationStressControlTests : ControlTester
     {
         protected override IPropertyControl CreatePropertyControl()
@@ -29,19 +31,19 @@
         public void TestSelectedObject()
         {
             var sp = new SoilProfile();
-            Assert.AreNotSame(sp, PropertyControl.SelectedObject); // because we didn't assign it yet
+            ClassicAssert.AreNotSame(sp, PropertyControl.SelectedObject); // because we didn't assign it yet
 
             PropertyControl.SelectedObject = sp;
-            Assert.AreSame(sp, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(sp, PropertyControl.SelectedObject);
 
             PropertyControl.SelectedObject = null;
-            Assert.IsNull(PropertyControl.SelectedObject); // null is also accepted
+            ClassicAssert.IsNull(PropertyControl.SelectedObject); // null is also accepted
         }
 
         [Test]
         public void TestIsVisible()
         {
-            Assert.IsTrue(PropertyControl.IsVisible); // always true
+            ClassicAssert.IsTrue(PropertyControl.IsVisible); // always true
         }
     }
 }
Index: src/Deltares.DSoilModel.Data.Tests/Deltares.DSoilModel.Data.Tests.csproj
===================================================================
diff -u -r1034 -r1080
--- src/Deltares.DSoilModel.Data.Tests/Deltares.DSoilModel.Data.Tests.csproj	(.../Deltares.DSoilModel.Data.Tests.csproj)	(revision 1034)
+++ src/Deltares.DSoilModel.Data.Tests/Deltares.DSoilModel.Data.Tests.csproj	(.../Deltares.DSoilModel.Data.Tests.csproj)	(revision 1080)
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit.4.1.0\build\NUnit.props" Condition="Exists('..\packages\NUnit.4.1.0\build\NUnit.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -63,13 +64,22 @@
       <HintPath>..\packages\CompareNETObjects.3.03.0.0\lib\net40\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">
-      <HintPath>..\packages\NUnit.2.6.2\lib\nunit.framework.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="mscorlib" />
+    <Reference Include="nunit.framework, Version=4.0.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.4.1.0\lib\net462\nunit.framework.dll</HintPath>
     </Reference>
+    <Reference Include="nunit.framework.legacy, Version=4.0.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.4.1.0\lib\net462\nunit.framework.legacy.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
@@ -194,6 +204,12 @@
     <Content Include="TestFiles\Stabiliteit\soilmaterials.mdb" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. 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.4.1.0\build\NUnit.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit.4.1.0\build\NUnit.props'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
Index: src/Deltares.DSoilModel.Forms.Tests/BoringLookup2DControlTest.cs
===================================================================
diff -u -r879 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/BoringLookup2DControlTest.cs	(.../BoringLookup2DControlTest.cs)	(revision 879)
+++ src/Deltares.DSoilModel.Forms.Tests/BoringLookup2DControlTest.cs	(.../BoringLookup2DControlTest.cs)	(revision 1080)
@@ -1,11 +1,13 @@
-using Deltares.Geotechnics;
+using System.Threading;
+using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
-    [TestFixture, RequiresSTA]
+    [TestFixture, Apartment(ApartmentState.STA)]
     public class BoringLookup2DControlTest : ControlTester
     {
         protected override IPropertyControl CreatePropertyControl()
@@ -25,9 +27,9 @@
             };
             PropertyControl.SelectedObject = lookup;
 
-            Assert.AreSame(lookup, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(lookup, PropertyControl.SelectedObject);
 
-            Assert.IsTrue(PropertyControl.IsVisible);
+            ClassicAssert.IsTrue(PropertyControl.IsVisible);
 
             TestSpinEditVisibleEnabledValue(PropertyControl, "XEdit", true, true, lookup, x => x.Xlocal, 1.0);
             TestLabelControlVisibleValue(PropertyControl, "XLabel", true, "Lokale x [-]");  // unit should be [m], see issue MDNLIB-796
@@ -38,17 +40,17 @@
         {
             var lookup =  new BoringLookup2D { Boring = new Boring( )};
             PropertyControl.SelectedObject = lookup;
-            Assert.AreSame(lookup, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(lookup, PropertyControl.SelectedObject);
 
             var subcontrol = GetPrivateField<BoringControl>(PropertyControl, "BoringControl");
-            Assert.NotNull(subcontrol);
-            Assert.AreSame(lookup.Boring, subcontrol.SelectedObject);
+            ClassicAssert.NotNull(subcontrol);
+            ClassicAssert.AreSame(lookup.Boring, subcontrol.SelectedObject);
         }
 
         [Test]
         public void TestIsVisible()
         {
-            Assert.IsTrue(PropertyControl.IsVisible);
+            ClassicAssert.IsTrue(PropertyControl.IsVisible);
         }
     }
 }
Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelSegmentGeometryEditorTests.cs
===================================================================
diff -u -r883 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelSegmentGeometryEditorTests.cs	(.../DSoilModelSegmentGeometryEditorTests.cs)	(revision 883)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelSegmentGeometryEditorTests.cs	(.../DSoilModelSegmentGeometryEditorTests.cs)	(revision 1080)
@@ -1,4 +1,5 @@
-using Deltares.DSoilModel.Data;
+using System.Threading;
+using Deltares.DSoilModel.Data;
 using Deltares.Geometry;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard;
@@ -7,18 +8,19 @@
 using Deltares.Standard.Forms;
 using Deltares.Standard.Forms.DExpress;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
-    [TestFixture, RequiresSTA]
+    [TestFixture, Apartment(ApartmentState.STA)]
     public class DSoilModelSegmentGeometryEditorTests
     {
         private DSoilModelSegmentGeometryEditor dsmGeometryEditor;
         private readonly GeometryEditor extraGeometryEditor = new GeometryEditor();
         private MainForm mainForm;
         private SpatialEditor spatialEditor;
         
-        [TestFixtureSetUp]
+        [OneTimeSetUp]
         public void SetUp()
         {
             BindSupport.ClearCaches();
@@ -34,7 +36,7 @@
             //mainForm.DynamicPropertyControl.ClearRegistrationsForType(typeof(SoilSegmentSplitLocation));
         }
 
-        [TestFixtureTearDown]
+        [OneTimeTearDown]
         public void TearDown()
         {
             dsmGeometryEditor.Dispose();
@@ -78,7 +80,7 @@
         public void IsVisibleTest_AlwaysTrue(string propertyName)
         {
             dsmGeometryEditor.Project = new DSoilModelProject();
-            Assert.IsTrue(dsmGeometryEditor.IsVisible(propertyName)); // always true
+            ClassicAssert.IsTrue(dsmGeometryEditor.IsVisible(propertyName)); // always true
         }
 
         [TestCase(null, true)]
@@ -89,7 +91,7 @@
         public void IsEnabledTest_NoData(string propertyName, bool expected)
         {
             dsmGeometryEditor.Project = new DSoilModelProject();
-            Assert.AreEqual(expected, dsmGeometryEditor.IsEnabled(propertyName)); // always true
+            ClassicAssert.AreEqual(expected, dsmGeometryEditor.IsEnabled(propertyName)); // always true
         }
 
         [TestCase(null, true)]
@@ -108,7 +110,7 @@
             };
             spatialEditor.EmptySelection = new EmptyShape(dsmGeometryEditor.Project.SoilProfiles2D[0]);
             DataEventPublisher.SelectionChanged(splitLocation, PropertyEditorReactionType.Ignore);
-            Assert.AreEqual(expected, dsmGeometryEditor.IsEnabled(propertyName));
+            ClassicAssert.AreEqual(expected, dsmGeometryEditor.IsEnabled(propertyName));
         }
 
         [TestCase("SplitSegment", false)]
@@ -127,7 +129,7 @@
             var seg = new SoilSegment();
             dsmGeometryEditor.Project.SoilSegments.Add(seg);
             DataEventPublisher.SelectionChanged(seg);
-            Assert.AreEqual(expected, dsmGeometryEditor.IsEnabled(propertyName));
+            ClassicAssert.AreEqual(expected, dsmGeometryEditor.IsEnabled(propertyName));
         }
     }
 }
Index: src/Deltares.DSoilModel.Data.Tests/packages.config
===================================================================
diff -u -r1034 -r1080
--- src/Deltares.DSoilModel.Data.Tests/packages.config	(.../packages.config)	(revision 1034)
+++ src/Deltares.DSoilModel.Data.Tests/packages.config	(.../packages.config)	(revision 1080)
@@ -23,5 +23,7 @@
 -->
 <packages>
   <package id="CompareNETObjects" version="3.03.0.0" targetFramework="net40" requireReinstallation="true" />
-  <package id="NUnit" version="2.6.2" targetFramework="net40" />
+  <package id="NUnit" version="4.1.0" targetFramework="net48" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net48" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
 </packages>
\ No newline at end of file
Index: src/Deltares.DSoilModel.Forms.Tests/SpecificMechanismPointLocationControlTests.cs
===================================================================
diff -u -r883 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/SpecificMechanismPointLocationControlTests.cs	(.../SpecificMechanismPointLocationControlTests.cs)	(revision 883)
+++ src/Deltares.DSoilModel.Forms.Tests/SpecificMechanismPointLocationControlTests.cs	(.../SpecificMechanismPointLocationControlTests.cs)	(revision 1080)
@@ -1,12 +1,14 @@
-using Deltares.Geotechnics.IO;
+using System.Threading;
+using Deltares.Geotechnics.IO;
 using Deltares.Geotechnics.Mechanisms;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
-    [TestFixture, RequiresSTA]
+    [TestFixture, Apartment(ApartmentState.STA)]
     class SpecificMechanismPointLocationControlTests : ControlTester
     {
         protected override IPropertyControl CreatePropertyControl()
@@ -39,16 +41,16 @@
         public void TestSelectedObject()
         {
             var smpl = new SpecificMechanismPointLocation();
-            Assert.AreNotSame(smpl, PropertyControl.SelectedObject);
+            ClassicAssert.AreNotSame(smpl, PropertyControl.SelectedObject);
 
             PropertyControl.SelectedObject = smpl;
-            Assert.AreSame(smpl, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(smpl, PropertyControl.SelectedObject);
         }
 
         [Test]
         public void TestIsVisible()
         {
-            Assert.IsTrue(PropertyControl.IsVisible);
+            ClassicAssert.IsTrue(PropertyControl.IsVisible);
         }
     }
 }
Index: src/Deltares.DSoilModel.Data.Tests/SosSoilProfilesImporterTests.cs
===================================================================
diff -u -r883 -r1080
--- src/Deltares.DSoilModel.Data.Tests/SosSoilProfilesImporterTests.cs	(.../SosSoilProfilesImporterTests.cs)	(revision 883)
+++ src/Deltares.DSoilModel.Data.Tests/SosSoilProfilesImporterTests.cs	(.../SosSoilProfilesImporterTests.cs)	(revision 1080)
@@ -24,6 +24,7 @@
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Logging;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Data.Tests
 {
@@ -46,17 +47,17 @@
             {
                 project.ReadSoilProfiles1DFromFile(csvFullFileName);
 
-                Assert.AreEqual(10, project.SoilProfiles1D.Count, "The number of profiles read from the csv file is not right.");
-                Assert.AreEqual("Segment_11_1D1", project.SoilProfiles1D[0].Name);
-                Assert.AreEqual(4, project.SoilProfiles1D[0].LayerCount, "The number of layers in the first profile read from csv file is not right.");
-                Assert.AreEqual(1, project.SoilProfiles1D[0].Layers[0].TopLevel);
-                Assert.AreEqual(2.5, (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).MaximumTopLevel);
-                Assert.AreEqual(-0.5, (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).MinimumTopLevel);
-                Assert.AreEqual("", (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).RemarkTopLevel);
-                Assert.AreEqual(-9.5, project.SoilProfiles1D[0].Layers[2].TopLevel);
-                Assert.AreEqual(13.25, (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).MaximumTopLevel);
-                Assert.AreEqual(-9.5, (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).MinimumTopLevel);
-                Assert.AreEqual("Aan basis max. 25 cm basisveen", (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).RemarkTopLevel);
+                ClassicAssert.AreEqual(10, project.SoilProfiles1D.Count, "The number of profiles read from the csv file is not right.");
+                ClassicAssert.AreEqual("Segment_11_1D1", project.SoilProfiles1D[0].Name);
+                ClassicAssert.AreEqual(4, project.SoilProfiles1D[0].LayerCount, "The number of layers in the first profile read from csv file is not right.");
+                ClassicAssert.AreEqual(1, project.SoilProfiles1D[0].Layers[0].TopLevel);
+                ClassicAssert.AreEqual(2.5, (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).MaximumTopLevel);
+                ClassicAssert.AreEqual(-0.5, (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).MinimumTopLevel);
+                ClassicAssert.AreEqual("", (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).RemarkTopLevel);
+                ClassicAssert.AreEqual(-9.5, project.SoilProfiles1D[0].Layers[2].TopLevel);
+                ClassicAssert.AreEqual(13.25, (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).MaximumTopLevel);
+                ClassicAssert.AreEqual(-9.5, (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).MinimumTopLevel);
+                ClassicAssert.AreEqual("Aan basis max. 25 cm basisveen", (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).RemarkTopLevel);
             }
         }
 
@@ -73,15 +74,15 @@
             {
                 project.ReadSoilProfiles1DFromFile(csvFullFileName);
 
-                Assert.AreEqual(1, project.SoilProfiles1D.Count, "The number of profiles read from the csv file is not right.");
-                Assert.AreEqual("Segment_11_1D1", project.SoilProfiles1D[0].Name);
-                Assert.AreEqual(4, project.SoilProfiles1D[0].LayerCount, "The number of layers in the first profile read from csv file is not right.");
-                Assert.AreEqual(1, project.SoilProfiles1D[0].Layers[0].TopLevel);
-                Assert.AreEqual(2.5, (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).MaximumTopLevel);
-                Assert.AreEqual(-0.5, (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).MinimumTopLevel);
-                Assert.AreEqual("", (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).RemarkTopLevel);
+                ClassicAssert.AreEqual(1, project.SoilProfiles1D.Count, "The number of profiles read from the csv file is not right.");
+                ClassicAssert.AreEqual("Segment_11_1D1", project.SoilProfiles1D[0].Name);
+                ClassicAssert.AreEqual(4, project.SoilProfiles1D[0].LayerCount, "The number of layers in the first profile read from csv file is not right.");
+                ClassicAssert.AreEqual(1, project.SoilProfiles1D[0].Layers[0].TopLevel);
+                ClassicAssert.AreEqual(2.5, (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).MaximumTopLevel);
+                ClassicAssert.AreEqual(-0.5, (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).MinimumTopLevel);
+                ClassicAssert.AreEqual("", (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).RemarkTopLevel);
                 // Log contains 9 profile errors, 47 layer errors and 13 soil errors.
-                Assert.AreEqual(69, LogManager.Messages.Count);
+                ClassicAssert.AreEqual(69, LogManager.Messages.Count);
             }
         }
 
@@ -98,31 +99,31 @@
             {
                 project.ReadSoilProfiles1DFromFile(csvFullFileName);
 
-                Assert.AreEqual(3, project.SoilProfiles1D.Count, "The number of profiles read from the csv file is not right.");
-                Assert.AreEqual("Segment_11_1D1", project.SoilProfiles1D[0].Name);
-                Assert.AreEqual(4, project.SoilProfiles1D[0].LayerCount, "The number of layers in the first profile read from csv file is not right.");
-                Assert.AreEqual(1, project.SoilProfiles1D[0].Layers[0].TopLevel);
-                Assert.AreEqual(2.5, (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).MaximumTopLevel);
-                Assert.AreEqual(-0.5, (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).MinimumTopLevel);
-                Assert.AreEqual("", (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).RemarkTopLevel);
-                Assert.AreEqual(-9.5, project.SoilProfiles1D[0].Layers[2].TopLevel);
-                Assert.AreEqual(13.25, (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).MaximumTopLevel);
-                Assert.AreEqual(-9.5, (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).MinimumTopLevel);
-                Assert.AreEqual("Aan basis max. 25 cm basisveen", (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).RemarkTopLevel);
-                Assert.AreEqual(SoilType.Sand, project.SoilProfiles1D[0].Layers[0].Soil.SoilType);
-                Assert.AreEqual(SoilType.Clay, project.SoilProfiles1D[0].Layers[1].Soil.SoilType);
-                Assert.AreEqual(SoilType.Clay, project.SoilProfiles1D[0].Layers[2].Soil.SoilType);
-                Assert.AreEqual(SoilType.Peat, project.SoilProfiles1D[0].Layers[3].Soil.SoilType);
-                Assert.AreEqual(SoilType.Gravel, project.SoilProfiles1D[1].Layers[0].Soil.SoilType);
-                Assert.AreEqual(SoilType.Gravel, project.SoilProfiles1D[1].Layers[1].Soil.SoilType);
-                Assert.AreEqual(SoilType.Sand, project.SoilProfiles1D[1].Layers[2].Soil.SoilType);
-                Assert.AreEqual(SoilType.Loam, project.SoilProfiles1D[1].Layers[3].Soil.SoilType);
-                Assert.AreEqual(SoilType.Loam, project.SoilProfiles1D[2].Layers[0].Soil.SoilType);
-                Assert.AreEqual(SoilType.Sand, project.SoilProfiles1D[2].Layers[1].Soil.SoilType);
-                Assert.AreEqual(SoilType.Peat, project.SoilProfiles1D[2].Layers[2].Soil.SoilType);
-                Assert.AreEqual(SoilType.Gravel, project.SoilProfiles1D[2].Layers[3].Soil.SoilType);
-                Assert.AreEqual(SoilType.Loam, project.SoilProfiles1D[2].Layers[4].Soil.SoilType);
-                Assert.AreEqual(SoilType.Sand, project.SoilProfiles1D[2].Layers[5].Soil.SoilType);
+                ClassicAssert.AreEqual(3, project.SoilProfiles1D.Count, "The number of profiles read from the csv file is not right.");
+                ClassicAssert.AreEqual("Segment_11_1D1", project.SoilProfiles1D[0].Name);
+                ClassicAssert.AreEqual(4, project.SoilProfiles1D[0].LayerCount, "The number of layers in the first profile read from csv file is not right.");
+                ClassicAssert.AreEqual(1, project.SoilProfiles1D[0].Layers[0].TopLevel);
+                ClassicAssert.AreEqual(2.5, (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).MaximumTopLevel);
+                ClassicAssert.AreEqual(-0.5, (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).MinimumTopLevel);
+                ClassicAssert.AreEqual("", (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).RemarkTopLevel);
+                ClassicAssert.AreEqual(-9.5, project.SoilProfiles1D[0].Layers[2].TopLevel);
+                ClassicAssert.AreEqual(13.25, (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).MaximumTopLevel);
+                ClassicAssert.AreEqual(-9.5, (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).MinimumTopLevel);
+                ClassicAssert.AreEqual("Aan basis max. 25 cm basisveen", (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).RemarkTopLevel);
+                ClassicAssert.AreEqual(SoilType.Sand, project.SoilProfiles1D[0].Layers[0].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Clay, project.SoilProfiles1D[0].Layers[1].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Clay, project.SoilProfiles1D[0].Layers[2].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Peat, project.SoilProfiles1D[0].Layers[3].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Gravel, project.SoilProfiles1D[1].Layers[0].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Gravel, project.SoilProfiles1D[1].Layers[1].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Sand, project.SoilProfiles1D[1].Layers[2].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Loam, project.SoilProfiles1D[1].Layers[3].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Loam, project.SoilProfiles1D[2].Layers[0].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Sand, project.SoilProfiles1D[2].Layers[1].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Peat, project.SoilProfiles1D[2].Layers[2].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Gravel, project.SoilProfiles1D[2].Layers[3].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Loam, project.SoilProfiles1D[2].Layers[4].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Sand, project.SoilProfiles1D[2].Layers[5].Soil.SoilType);
             }
         }
 
@@ -139,46 +140,43 @@
             {
                 project.ReadSoilProfiles1DFromFile(csvFullFileName);
 
-                Assert.AreEqual(3, project.SoilProfiles1D.Count, "The number of profiles read from the csv file is not right.");
-                Assert.AreEqual("Segment_11_1D1", project.SoilProfiles1D[0].Name);
-                Assert.AreEqual(4, project.SoilProfiles1D[0].LayerCount, "The number of layers in the first profile read from csv file is not right.");
-                Assert.AreEqual(1, project.SoilProfiles1D[0].Layers[0].TopLevel);
-                Assert.AreEqual(2.5, (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).MaximumTopLevel);
-                Assert.AreEqual(-0.5, (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).MinimumTopLevel);
-                Assert.AreEqual("", (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).RemarkTopLevel);
-                Assert.AreEqual(-9.5, project.SoilProfiles1D[0].Layers[2].TopLevel);
-                Assert.AreEqual(13.25, (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).MaximumTopLevel);
-                Assert.AreEqual(-9.5, (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).MinimumTopLevel);
-                Assert.AreEqual("Aan basis max. 25 cm basisveen", (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).RemarkTopLevel);
-                Assert.AreEqual(SoilType.Sand, project.SoilProfiles1D[0].Layers[0].Soil.SoilType);
-                Assert.AreEqual(SoilType.Clay, project.SoilProfiles1D[0].Layers[1].Soil.SoilType);
-                Assert.AreEqual(SoilType.Clay, project.SoilProfiles1D[0].Layers[2].Soil.SoilType);
-                Assert.AreEqual(SoilType.Peat, project.SoilProfiles1D[0].Layers[3].Soil.SoilType);
-                Assert.AreEqual(SoilType.Gravel, project.SoilProfiles1D[1].Layers[0].Soil.SoilType);
-                Assert.AreEqual(SoilType.Gravel, project.SoilProfiles1D[1].Layers[1].Soil.SoilType);
-                Assert.AreEqual(SoilType.Sand, project.SoilProfiles1D[1].Layers[2].Soil.SoilType);
-                Assert.AreEqual(SoilType.Loam, project.SoilProfiles1D[1].Layers[3].Soil.SoilType);
-                Assert.AreEqual(SoilType.Loam, project.SoilProfiles1D[2].Layers[0].Soil.SoilType);
-                Assert.AreEqual(SoilType.Sand, project.SoilProfiles1D[2].Layers[1].Soil.SoilType);
-                Assert.AreEqual(SoilType.Peat, project.SoilProfiles1D[2].Layers[2].Soil.SoilType);
-                Assert.AreEqual(SoilType.Gravel, project.SoilProfiles1D[2].Layers[3].Soil.SoilType);
-                Assert.AreEqual(SoilType.Loam, project.SoilProfiles1D[2].Layers[4].Soil.SoilType);
-                Assert.AreEqual(SoilType.Sand, project.SoilProfiles1D[2].Layers[5].Soil.SoilType);
+                ClassicAssert.AreEqual(1, project.SoilProfiles1D[0].Layers[0].TopLevel);
+                ClassicAssert.AreEqual(2.5, (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).MaximumTopLevel);
+                ClassicAssert.AreEqual(-0.5, (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).MinimumTopLevel);
+                ClassicAssert.AreEqual("", (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).RemarkTopLevel);
+                ClassicAssert.AreEqual(-9.5, project.SoilProfiles1D[0].Layers[2].TopLevel);
+                ClassicAssert.AreEqual(13.25, (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).MaximumTopLevel);
+                ClassicAssert.AreEqual(-9.5, (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).MinimumTopLevel);
+                ClassicAssert.AreEqual("Aan basis max. 25 cm basisveen", (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).RemarkTopLevel);
+                ClassicAssert.AreEqual(SoilType.Sand, project.SoilProfiles1D[0].Layers[0].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Clay, project.SoilProfiles1D[0].Layers[1].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Clay, project.SoilProfiles1D[0].Layers[2].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Peat, project.SoilProfiles1D[0].Layers[3].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Gravel, project.SoilProfiles1D[1].Layers[0].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Gravel, project.SoilProfiles1D[1].Layers[1].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Sand, project.SoilProfiles1D[1].Layers[2].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Loam, project.SoilProfiles1D[1].Layers[3].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Loam, project.SoilProfiles1D[2].Layers[0].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Sand, project.SoilProfiles1D[2].Layers[1].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Peat, project.SoilProfiles1D[2].Layers[2].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Gravel, project.SoilProfiles1D[2].Layers[3].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Loam, project.SoilProfiles1D[2].Layers[4].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Sand, project.SoilProfiles1D[2].Layers[5].Soil.SoilType);
 
-                Assert.AreEqual(Color.Bisque, project.SoilProfiles1D[0].Layers[0].Soil.Color);
-                Assert.AreEqual(Color.CadetBlue, project.SoilProfiles1D[0].Layers[1].Soil.Color);
-                Assert.AreEqual(Color.Chocolate, project.SoilProfiles1D[0].Layers[2].Soil.Color);
-                Assert.AreEqual(Color.Maroon, project.SoilProfiles1D[0].Layers[3].Soil.Color);
-                Assert.AreEqual(Color.Linen, project.SoilProfiles1D[1].Layers[0].Soil.Color);
-                Assert.AreEqual(Color.Orchid, project.SoilProfiles1D[1].Layers[1].Soil.Color);
-                Assert.AreEqual(Color.Yellow, project.SoilProfiles1D[1].Layers[2].Soil.Color);
-                Assert.AreEqual(Color.Red, project.SoilProfiles1D[1].Layers[3].Soil.Color);
-                Assert.AreEqual(Color.Blue, project.SoilProfiles1D[2].Layers[0].Soil.Color);
-                Assert.AreEqual(Color.Azure, project.SoilProfiles1D[2].Layers[1].Soil.Color);
-                Assert.AreEqual(Color.Beige, project.SoilProfiles1D[2].Layers[2].Soil.Color);
-                Assert.AreEqual(Color.Coral, project.SoilProfiles1D[2].Layers[3].Soil.Color);
-                Assert.AreEqual(Color.Cyan, project.SoilProfiles1D[2].Layers[4].Soil.Color);
-                Assert.AreEqual(Color.Red, project.SoilProfiles1D[2].Layers[5].Soil.Color);
+                ClassicAssert.AreEqual(Color.Bisque, project.SoilProfiles1D[0].Layers[0].Soil.Color);
+                ClassicAssert.AreEqual(Color.CadetBlue, project.SoilProfiles1D[0].Layers[1].Soil.Color);
+                ClassicAssert.AreEqual(Color.Chocolate, project.SoilProfiles1D[0].Layers[2].Soil.Color);
+                ClassicAssert.AreEqual(Color.Maroon, project.SoilProfiles1D[0].Layers[3].Soil.Color);
+                ClassicAssert.AreEqual(Color.Linen, project.SoilProfiles1D[1].Layers[0].Soil.Color);
+                ClassicAssert.AreEqual(Color.Orchid, project.SoilProfiles1D[1].Layers[1].Soil.Color);
+                ClassicAssert.AreEqual(Color.Yellow, project.SoilProfiles1D[1].Layers[2].Soil.Color);
+                ClassicAssert.AreEqual(Color.Red, project.SoilProfiles1D[1].Layers[3].Soil.Color);
+                ClassicAssert.AreEqual(Color.Blue, project.SoilProfiles1D[2].Layers[0].Soil.Color);
+                ClassicAssert.AreEqual(Color.Azure, project.SoilProfiles1D[2].Layers[1].Soil.Color);
+                ClassicAssert.AreEqual(Color.Beige, project.SoilProfiles1D[2].Layers[2].Soil.Color);
+                ClassicAssert.AreEqual(Color.Coral, project.SoilProfiles1D[2].Layers[3].Soil.Color);
+                ClassicAssert.AreEqual(Color.Cyan, project.SoilProfiles1D[2].Layers[4].Soil.Color);
+                ClassicAssert.AreEqual(Color.Red, project.SoilProfiles1D[2].Layers[5].Soil.Color);
             }
         }
 
@@ -195,55 +193,55 @@
             {
                 project.ReadSoilProfiles1DFromFile(csvFullFileName);
 
-                Assert.AreEqual(3, project.SoilProfiles1D.Count, "The number of profiles read from the csv file is not right.");
-                Assert.AreEqual("Segment_11_1D1", project.SoilProfiles1D[0].Name);
-                Assert.AreEqual(4, project.SoilProfiles1D[0].LayerCount, "The number of layers in the first profile read from csv file is not right.");
-                Assert.AreEqual(1, project.SoilProfiles1D[0].Layers[0].TopLevel);
-                Assert.AreEqual(2.5, (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).MaximumTopLevel);
-                Assert.AreEqual(-0.5, (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).MinimumTopLevel);
-                Assert.AreEqual("", (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).RemarkTopLevel);
-                Assert.AreEqual(-9.5, project.SoilProfiles1D[0].Layers[2].TopLevel);
-                Assert.AreEqual(13.25, (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).MaximumTopLevel);
-                Assert.AreEqual(-9.5, (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).MinimumTopLevel);
-                Assert.AreEqual("Aan basis max. 25 cm basisveen", (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).RemarkTopLevel);
+                ClassicAssert.AreEqual(3, project.SoilProfiles1D.Count, "The number of profiles read from the csv file is not right.");
+                ClassicAssert.AreEqual("Segment_11_1D1", project.SoilProfiles1D[0].Name);
+                ClassicAssert.AreEqual(4, project.SoilProfiles1D[0].LayerCount, "The number of layers in the first profile read from csv file is not right.");
+                ClassicAssert.AreEqual(1, project.SoilProfiles1D[0].Layers[0].TopLevel);
+                ClassicAssert.AreEqual(2.5, (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).MaximumTopLevel);
+                ClassicAssert.AreEqual(-0.5, (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).MinimumTopLevel);
+                ClassicAssert.AreEqual("", (project.SoilProfiles1D[0].Layers[0] as SosSoilLayer1D).RemarkTopLevel);
+                ClassicAssert.AreEqual(-9.5, project.SoilProfiles1D[0].Layers[2].TopLevel);
+                ClassicAssert.AreEqual(13.25, (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).MaximumTopLevel);
+                ClassicAssert.AreEqual(-9.5, (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).MinimumTopLevel);
+                ClassicAssert.AreEqual("Aan basis max. 25 cm basisveen", (project.SoilProfiles1D[0].Layers[2] as SosSoilLayer1D).RemarkTopLevel);
 
-                Assert.AreEqual(SoilType.Sand, project.SoilProfiles1D[0].Layers[0].Soil.SoilType);
-                Assert.AreEqual(SoilType.Clay, project.SoilProfiles1D[0].Layers[1].Soil.SoilType);
-                Assert.AreEqual(SoilType.Clay, project.SoilProfiles1D[0].Layers[2].Soil.SoilType);
-                Assert.AreEqual(SoilType.Peat, project.SoilProfiles1D[0].Layers[3].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Sand, project.SoilProfiles1D[0].Layers[0].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Clay, project.SoilProfiles1D[0].Layers[1].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Clay, project.SoilProfiles1D[0].Layers[2].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Peat, project.SoilProfiles1D[0].Layers[3].Soil.SoilType);
                 //Double so equal to 0, 0
-                Assert.AreEqual(SoilType.Sand, project.SoilProfiles1D[1].Layers[0].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Sand, project.SoilProfiles1D[1].Layers[0].Soil.SoilType);
                 //Double so equal to 0, 1
-                Assert.AreEqual(SoilType.Clay, project.SoilProfiles1D[1].Layers[1].Soil.SoilType);
-                Assert.AreEqual(SoilType.Sand, project.SoilProfiles1D[1].Layers[2].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Clay, project.SoilProfiles1D[1].Layers[1].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Sand, project.SoilProfiles1D[1].Layers[2].Soil.SoilType);
                 //Double so equal to 0, 4
-                Assert.AreEqual(SoilType.Peat, project.SoilProfiles1D[1].Layers[3].Soil.SoilType);
-                Assert.AreEqual(SoilType.Loam, project.SoilProfiles1D[2].Layers[0].Soil.SoilType);
-                Assert.AreEqual(SoilType.Sand, project.SoilProfiles1D[2].Layers[1].Soil.SoilType);
-                Assert.AreEqual(SoilType.Peat, project.SoilProfiles1D[2].Layers[2].Soil.SoilType);
-                Assert.AreEqual(SoilType.Gravel, project.SoilProfiles1D[2].Layers[3].Soil.SoilType);
-                Assert.AreEqual(SoilType.Loam, project.SoilProfiles1D[2].Layers[4].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Peat, project.SoilProfiles1D[1].Layers[3].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Loam, project.SoilProfiles1D[2].Layers[0].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Sand, project.SoilProfiles1D[2].Layers[1].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Peat, project.SoilProfiles1D[2].Layers[2].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Gravel, project.SoilProfiles1D[2].Layers[3].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Loam, project.SoilProfiles1D[2].Layers[4].Soil.SoilType);
                 //Double so equal to 0, 4
-                Assert.AreEqual(SoilType.Peat, project.SoilProfiles1D[2].Layers[5].Soil.SoilType);
+                ClassicAssert.AreEqual(SoilType.Peat, project.SoilProfiles1D[2].Layers[5].Soil.SoilType);
 
-                Assert.AreEqual(Color.Bisque, project.SoilProfiles1D[0].Layers[0].Soil.Color);
-                Assert.AreEqual(Color.CadetBlue, project.SoilProfiles1D[0].Layers[1].Soil.Color);
-                Assert.AreEqual(Color.Chocolate, project.SoilProfiles1D[0].Layers[2].Soil.Color);
-                Assert.AreEqual(Color.Maroon, project.SoilProfiles1D[0].Layers[3].Soil.Color);
+                ClassicAssert.AreEqual(Color.Bisque, project.SoilProfiles1D[0].Layers[0].Soil.Color);
+                ClassicAssert.AreEqual(Color.CadetBlue, project.SoilProfiles1D[0].Layers[1].Soil.Color);
+                ClassicAssert.AreEqual(Color.Chocolate, project.SoilProfiles1D[0].Layers[2].Soil.Color);
+                ClassicAssert.AreEqual(Color.Maroon, project.SoilProfiles1D[0].Layers[3].Soil.Color);
                 //Double so equal to 0, 0
-                Assert.AreEqual(Color.Bisque, project.SoilProfiles1D[1].Layers[0].Soil.Color);
+                ClassicAssert.AreEqual(Color.Bisque, project.SoilProfiles1D[1].Layers[0].Soil.Color);
                 //Double so equal to 0, 1
-                Assert.AreEqual(Color.CadetBlue, project.SoilProfiles1D[1].Layers[1].Soil.Color);
-                Assert.AreEqual(Color.Yellow, project.SoilProfiles1D[1].Layers[2].Soil.Color);
+                ClassicAssert.AreEqual(Color.CadetBlue, project.SoilProfiles1D[1].Layers[1].Soil.Color);
+                ClassicAssert.AreEqual(Color.Yellow, project.SoilProfiles1D[1].Layers[2].Soil.Color);
                 //Double so equal to 0, 4
-                Assert.AreEqual(Color.Maroon, project.SoilProfiles1D[1].Layers[3].Soil.Color);
-                Assert.AreEqual(Color.Blue, project.SoilProfiles1D[2].Layers[0].Soil.Color);
-                Assert.AreEqual(Color.Azure, project.SoilProfiles1D[2].Layers[1].Soil.Color);
-                Assert.AreEqual(Color.Beige, project.SoilProfiles1D[2].Layers[2].Soil.Color);
-                Assert.AreEqual(Color.Coral, project.SoilProfiles1D[2].Layers[3].Soil.Color);
-                Assert.AreEqual(Color.Cyan, project.SoilProfiles1D[2].Layers[4].Soil.Color);
+                ClassicAssert.AreEqual(Color.Maroon, project.SoilProfiles1D[1].Layers[3].Soil.Color);
+                ClassicAssert.AreEqual(Color.Blue, project.SoilProfiles1D[2].Layers[0].Soil.Color);
+                ClassicAssert.AreEqual(Color.Azure, project.SoilProfiles1D[2].Layers[1].Soil.Color);
+                ClassicAssert.AreEqual(Color.Beige, project.SoilProfiles1D[2].Layers[2].Soil.Color);
+                ClassicAssert.AreEqual(Color.Coral, project.SoilProfiles1D[2].Layers[3].Soil.Color);
+                ClassicAssert.AreEqual(Color.Cyan, project.SoilProfiles1D[2].Layers[4].Soil.Color);
                 //Double so equal to 0, 4
-                Assert.AreEqual(Color.Maroon, project.SoilProfiles1D[2].Layers[5].Soil.Color);
+                ClassicAssert.AreEqual(Color.Maroon, project.SoilProfiles1D[2].Layers[5].Soil.Color);
             }
         }
 
@@ -259,8 +257,8 @@
             using (var project = new DSoilModelProject())
             {
                 project.ReadSoilProfiles1DFromFile(csvFullFileName);
-                Assert.AreEqual(5,LogManager.Messages.Count, "Expected five messages");
-                Assert.AreNotEqual(0,project.SoilProfiles1D.Count, "Expected the profiles were read anyway");
+                ClassicAssert.AreEqual(5,LogManager.Messages.Count, "Expected five messages");
+                ClassicAssert.AreNotEqual(0,project.SoilProfiles1D.Count, "Expected the profiles were read anyway");
             }
         }
 
@@ -276,8 +274,8 @@
             using (var project = new DSoilModelProject())
             {
                 project.ReadSoilProfiles1DFromFile(csvFullFileName);
-                Assert.AreEqual(2, LogManager.Messages.Count, "Expected two messages");
-                Assert.AreEqual(0, project.SoilProfiles1D.Count, "Expected the profiles were not read");
+                ClassicAssert.AreEqual(2, LogManager.Messages.Count, "Expected two messages");
+                ClassicAssert.AreEqual(0, project.SoilProfiles1D.Count, "Expected the profiles were not read");
             }
         }
 
Index: src/Deltares.DSoilModel.Forms.Tests/CptControlTests.cs
===================================================================
diff -u -r883 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/CptControlTests.cs	(.../CptControlTests.cs)	(revision 883)
+++ src/Deltares.DSoilModel.Forms.Tests/CptControlTests.cs	(.../CptControlTests.cs)	(revision 1080)
@@ -1,11 +1,13 @@
-using Deltares.Geotechnics.ConePenetrationTest;
+using System.Threading;
+using Deltares.Geotechnics.ConePenetrationTest;
 using Deltares.Geotechnics.Xsd;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
-    [TestFixture, RequiresSTA]
+    [TestFixture, Apartment(ApartmentState.STA)]
     class CptControlTests : ControlTester
     {
         protected override IPropertyControl CreatePropertyControl()
@@ -51,16 +53,16 @@
         public void TestSelectedObject()
         {
             var cpt = new ConePenetrationTestData();
-            Assert.AreNotSame(cpt, PropertyControl.SelectedObject);
+            ClassicAssert.AreNotSame(cpt, PropertyControl.SelectedObject);
 
             PropertyControl.SelectedObject = cpt;
-            Assert.AreSame(cpt, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(cpt, PropertyControl.SelectedObject);
         }
 
         [Test]
         public void TestIsVisible()
         {
-            Assert.IsTrue(PropertyControl.IsVisible);
+            ClassicAssert.IsTrue(PropertyControl.IsVisible);
         }
     }
 }
Index: src/Deltares.DSoilModel.Forms.Tests/SoilProfile1DLookup2DControlTest.cs
===================================================================
diff -u -r883 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/SoilProfile1DLookup2DControlTest.cs	(.../SoilProfile1DLookup2DControlTest.cs)	(revision 883)
+++ src/Deltares.DSoilModel.Forms.Tests/SoilProfile1DLookup2DControlTest.cs	(.../SoilProfile1DLookup2DControlTest.cs)	(revision 1080)
@@ -1,10 +1,12 @@
-using Deltares.Geotechnics.Soils;
+using System.Threading;
+using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
-    [TestFixture, RequiresSTA]
+    [TestFixture, Apartment(ApartmentState.STA)]
     public class SoilProfile1DLookup2DControlTest : ControlTester
     {
         protected override IPropertyControl CreatePropertyControl()
@@ -25,7 +27,7 @@
             };
             PropertyControl.SelectedObject = lookup;
 
-            Assert.AreSame(lookup, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(lookup, PropertyControl.SelectedObject);
 
             TestSpinEditVisibleEnabledValue(PropertyControl, "XEdit", true, true, lookup, x => x.Xlocal, 1.0);
             TestLabelControlVisibleValue(PropertyControl, "XLabel", true, "Lokale x [-]");
@@ -37,17 +39,17 @@
         {
             var lookup = new SoilProfile1DLookup2D() { SoilProfile1D = new SoilProfile1D() };
             PropertyControl.SelectedObject = lookup;
-            Assert.AreSame(lookup, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(lookup, PropertyControl.SelectedObject);
 
             var subcontrol = GetPrivateField<SosSoilProfile1DControl>(PropertyControl, "sosSoilProfile1DControl1");
-            Assert.NotNull(subcontrol);
-            Assert.AreSame(lookup.SoilProfile1D, subcontrol.SelectedObject);
+            ClassicAssert.NotNull(subcontrol);
+            ClassicAssert.AreSame(lookup.SoilProfile1D, subcontrol.SelectedObject);
         }
 
         [Test]
         public void TestIsVisible()
         {
-            Assert.IsTrue(PropertyControl.IsVisible);
+            ClassicAssert.IsTrue(PropertyControl.IsVisible);
         }
     }
 }
Index: src/Deltares.DSoilModel.Data.Tests/DSoilModelDataSourceRedirectorTests.cs
===================================================================
diff -u -r883 -r1080
--- src/Deltares.DSoilModel.Data.Tests/DSoilModelDataSourceRedirectorTests.cs	(.../DSoilModelDataSourceRedirectorTests.cs)	(revision 883)
+++ src/Deltares.DSoilModel.Data.Tests/DSoilModelDataSourceRedirectorTests.cs	(.../DSoilModelDataSourceRedirectorTests.cs)	(revision 1080)
@@ -27,6 +27,7 @@
 using Deltares.Standard;
 using Deltares.Standard.Reflection;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Data.Tests
 {
@@ -48,7 +49,7 @@
         public void StochastPropertiesTest(string propertyName)
         {
             var pi = PropertyInfoSupport.GetPropertyInfo(typeof (Stochast), propertyName);
-            Assert.Contains(pi, DSoilModelDataSourceRedirector.StochastProperties);
+            ClassicAssert.Contains(pi, DSoilModelDataSourceRedirector.StochastProperties);
         }
 
         [TestCase("CohesionStochast")]
@@ -71,10 +72,10 @@
             var dataSources = redirector.GetRedirectedDataSources(source, propertyName).ToList();
 
             // As there are no datasources in the manager, source and property must not be redirected
-            Assert.IsNotNull(dataSources);
-            Assert.AreEqual(1, dataSources.Count);
-            Assert.AreEqual(source, dataSources[0].Source);
-            Assert.AreEqual(propertyName, dataSources[0].Property);
+            ClassicAssert.IsNotNull(dataSources);
+            ClassicAssert.AreEqual(1, dataSources.Count);
+            ClassicAssert.AreEqual(source, dataSources[0].Source);
+            ClassicAssert.AreEqual(propertyName, dataSources[0].Property);
 
             // Add redirection info
             var listdsi = new List<DataSourceInfo>();
@@ -89,28 +90,28 @@
             dataSources = redirector.GetRedirectedDataSources(source, propertyName).ToList();
 
             // source/property must now be found and return the subproperties of the stochast
-            Assert.IsNotNull(dataSources);
-            Assert.AreEqual(7, dataSources.Count);
-            Assert.AreEqual("DistributionType", dataSources[0].Property);
-            Assert.AreEqual("Mean", dataSources[1].Property);
-            Assert.AreEqual("Deviation", dataSources[2].Property);
-            Assert.AreEqual("Variation", dataSources[3].Property);
-            Assert.AreEqual("DeviationType", dataSources[4].Property);
-            Assert.AreEqual("Shift", dataSources[5].Property);
-            Assert.AreEqual(propertyName, dataSources[6].Property);
+            ClassicAssert.IsNotNull(dataSources);
+            ClassicAssert.AreEqual(7, dataSources.Count);
+            ClassicAssert.AreEqual("DistributionType", dataSources[0].Property);
+            ClassicAssert.AreEqual("Mean", dataSources[1].Property);
+            ClassicAssert.AreEqual("Deviation", dataSources[2].Property);
+            ClassicAssert.AreEqual("Variation", dataSources[3].Property);
+            ClassicAssert.AreEqual("DeviationType", dataSources[4].Property);
+            ClassicAssert.AreEqual("Shift", dataSources[5].Property);
+            ClassicAssert.AreEqual(propertyName, dataSources[6].Property);
 
             // Changing CurrentSource should not matter
             DataSourceManager.CurrentSource = DataSourceSystemType.MGeobase;
             dataSources = redirector.GetRedirectedDataSources(source, propertyName).ToList();
-            Assert.IsNotNull(dataSources);
-            Assert.AreEqual(7, dataSources.Count);
-            Assert.AreEqual("DistributionType", dataSources[0].Property);
-            Assert.AreEqual("Mean", dataSources[1].Property);
-            Assert.AreEqual("Deviation", dataSources[2].Property);
-            Assert.AreEqual("Variation", dataSources[3].Property);
-            Assert.AreEqual("DeviationType", dataSources[4].Property);
-            Assert.AreEqual("Shift", dataSources[5].Property);
-            Assert.AreEqual(propertyName, dataSources[6].Property);
+            ClassicAssert.IsNotNull(dataSources);
+            ClassicAssert.AreEqual(7, dataSources.Count);
+            ClassicAssert.AreEqual("DistributionType", dataSources[0].Property);
+            ClassicAssert.AreEqual("Mean", dataSources[1].Property);
+            ClassicAssert.AreEqual("Deviation", dataSources[2].Property);
+            ClassicAssert.AreEqual("Variation", dataSources[3].Property);
+            ClassicAssert.AreEqual("DeviationType", dataSources[4].Property);
+            ClassicAssert.AreEqual("Shift", dataSources[5].Property);
+            ClassicAssert.AreEqual(propertyName, dataSources[6].Property);
         }
 
         [TestCase("Cohesion")]
@@ -134,10 +135,10 @@
             var dataSources = redirector.GetRedirectedDataSources(source, propertyName).ToList();
 
             // As there are no stochasts visible in a default soil without mechanisms, source and property must not be redirected
-            Assert.IsNotNull(dataSources);
-            Assert.AreEqual(1, dataSources.Count);
-            Assert.AreEqual(source, dataSources[0].Source);
-            Assert.AreEqual(propertyName, dataSources[0].Property);
+            ClassicAssert.IsNotNull(dataSources);
+            ClassicAssert.AreEqual(1, dataSources.Count);
+            ClassicAssert.AreEqual(source, dataSources[0].Source);
+            ClassicAssert.AreEqual(propertyName, dataSources[0].Property);
 
             // Set mechanism for Soil so the stochasts become visible
             Soil.Mechanisms = new[]
@@ -147,12 +148,12 @@
 
             // Now the redirection must take place
             dataSources = redirector.GetRedirectedDataSources(source, propertyName).ToList();
-            Assert.IsNotNull(dataSources);
-            Assert.AreEqual(2, dataSources.Count);
-            Assert.AreEqual(stochast, dataSources[0].Source);
-            Assert.AreEqual("ActualValue", dataSources[0].Property);
-            Assert.AreEqual(source, dataSources[1].Source);
-            Assert.AreEqual(propertyName, dataSources[1].Property);
+            ClassicAssert.IsNotNull(dataSources);
+            ClassicAssert.AreEqual(2, dataSources.Count);
+            ClassicAssert.AreEqual(stochast, dataSources[0].Source);
+            ClassicAssert.AreEqual("ActualValue", dataSources[0].Property);
+            ClassicAssert.AreEqual(source, dataSources[1].Source);
+            ClassicAssert.AreEqual(propertyName, dataSources[1].Property);
         }
 
         [TestCase("Variation")]
@@ -172,15 +173,15 @@
             var dataSources = redirector.GetRedirectedDataSources(source.CohesionStochast, propertyName).ToList();
             
             // property must be redirected to deviation
-            Assert.IsNotNull(dataSources);
-            Assert.AreEqual("Deviation", dataSources[0].Property);
+            ClassicAssert.IsNotNull(dataSources);
+            ClassicAssert.AreEqual("Deviation", dataSources[0].Property);
 
             DataSourceManager.CurrentSource = DataSourceSystemType.Csv;
             dataSources = redirector.GetRedirectedDataSources(source.CohesionStochast, propertyName).ToList();
             
             // property must always be redirected as it is independend of the CurrentSource
-            Assert.IsNotNull(dataSources);
-            Assert.AreEqual("Deviation", dataSources[0].Property);
+            ClassicAssert.IsNotNull(dataSources);
+            ClassicAssert.AreEqual("Deviation", dataSources[0].Property);
         }
 
         [Test]
@@ -200,15 +201,15 @@
             var dataSources = redirector.GetRedirectedDataSources(source.CohesionStochast, propertyName).ToList();
 
             // property must be redirected to deviation
-            Assert.IsNotNull(dataSources);
-            Assert.AreEqual("DeviationType", dataSources[0].Property);
+            ClassicAssert.IsNotNull(dataSources);
+            ClassicAssert.AreEqual("DeviationType", dataSources[0].Property);
 
             DataSourceManager.CurrentSource = DataSourceSystemType.Csv;
             dataSources = redirector.GetRedirectedDataSources(source.CohesionStochast, propertyName).ToList();
 
             // property must always be redirected as it is independend of the CurrentSource
-            Assert.IsNotNull(dataSources);
-            Assert.AreEqual("DeviationType", dataSources[0].Property);
+            ClassicAssert.IsNotNull(dataSources);
+            ClassicAssert.AreEqual("DeviationType", dataSources[0].Property);
         }
     }
 }
Index: src/Deltares.DSoilModel.Forms.Tests/BoringControlTests.cs
===================================================================
diff -u -r955 -r1080
--- src/Deltares.DSoilModel.Forms.Tests/BoringControlTests.cs	(.../BoringControlTests.cs)	(revision 955)
+++ src/Deltares.DSoilModel.Forms.Tests/BoringControlTests.cs	(.../BoringControlTests.cs)	(revision 1080)
@@ -1,11 +1,13 @@
-using Deltares.Geotechnics;
+using System.Threading;
+using Deltares.Geotechnics;
 using Deltares.Geotechnics.Soils;
 using Deltares.Standard.Forms;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
 namespace Deltares.DSoilModel.Forms.Tests
 {
-    [TestFixture, RequiresSTA]
+    [TestFixture, Apartment(ApartmentState.STA)]
     class BoringControlTests : ControlTester
     {
         protected override IPropertyControl CreatePropertyControl()
@@ -50,16 +52,16 @@
         {
             var b = new Boring();
 
-            Assert.AreNotSame(b, PropertyControl.SelectedObject);
+            ClassicAssert.AreNotSame(b, PropertyControl.SelectedObject);
 
             PropertyControl.SelectedObject = b;
-            Assert.AreSame(b, PropertyControl.SelectedObject);
+            ClassicAssert.AreSame(b, PropertyControl.SelectedObject);
         }
 
         [Test]
         public void TestIsVisible_AlwaysTrue()
         {
-            Assert.IsTrue(PropertyControl.IsVisible);
+            ClassicAssert.IsTrue(PropertyControl.IsVisible);
         }
     }
 }