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