Index: src/Deltares.DSoilModel.Forms.Tests/ControlTester.cs
===================================================================
diff -u -r311 -r312
--- src/Deltares.DSoilModel.Forms.Tests/ControlTester.cs	(.../ControlTester.cs)	(revision 311)
+++ src/Deltares.DSoilModel.Forms.Tests/ControlTester.cs	(.../ControlTester.cs)	(revision 312)
@@ -78,12 +78,12 @@
             edit.EditValue = initValueExpected; // restoring initial value - it might be still useful
         }
 
-        protected void TestLabelControlVisibleValue(Control parentControl, string labelControlName, string labelValue)
+        protected void TestLabelControlVisibleValue(Control parentControl, string labelControlName, bool isVisibleExpected, string labelTextExpected)
         {
+            TestControlVisibleEnabled(parentControl, labelControlName, isVisibleExpected, true); // labels are always enabled in DSL projects
             var labelControl = GetPrivateField(parentControl, labelControlName) as LabelControl;
             Assert.IsNotNull(labelControl);
-            Assert.IsTrue(labelControl.Visible);
-            Assert.AreEqual(labelValue, labelControl.Text);
+            Assert.AreEqual(labelTextExpected, labelControl.Text);
         }
 
         protected void TestGridVisibleEnabledSize(Control parentControl, string gridName, bool isVisibleExpected, bool isEnabledExpected, int rowCount, int colCount)
@@ -94,14 +94,5 @@
             Assert.AreEqual(rowCount, gridControl.gridView1.RowCount);
             Assert.AreEqual(colCount, gridControl.gridView1.Columns.Count);
         }
-
-        protected void TestTextBoxVisibleEnabledCaption(Control parentControl, string textBoxName,
-            bool isVisibleExpected, bool isEnabledExpected, string caption)
-        {
-            TestControlVisibleEnabled(parentControl, textBoxName, isVisibleExpected, isEnabledExpected);
-            var textBox = GetPrivateField(parentControl, textBoxName) as TextEdit;
-            Assert.IsNotNull(textBox);
-            Assert.AreEqual(caption, textBox.EditValue);
-        }
     }
 }
\ No newline at end of file
Index: src/Deltares.DSoilModel.Forms.Tests/CenterCrestLocationPropertyControlTest.cs
===================================================================
diff -u -r310 -r312
--- src/Deltares.DSoilModel.Forms.Tests/CenterCrestLocationPropertyControlTest.cs	(.../CenterCrestLocationPropertyControlTest.cs)	(revision 310)
+++ src/Deltares.DSoilModel.Forms.Tests/CenterCrestLocationPropertyControlTest.cs	(.../CenterCrestLocationPropertyControlTest.cs)	(revision 312)
@@ -1,6 +1,5 @@
 using Deltares.DSoilModel.Data;
 using Deltares.Geotechnics;
-using Deltares.Standard.Forms.DExpress;
 using NUnit.Framework;
 
 namespace Deltares.DSoilModel.Forms.Tests
@@ -26,7 +25,7 @@
                 Assert.IsTrue(control.IsVisible);
 
                 TestSpinEditVisibleEnabledValue(control, "XcoordinateEdit", true, true, 1.23, 2.34);
-                TestLabelControlVisibleValue(control, "XcoordinateLabel", "Location");
+                TestLabelControlVisibleValue(control, "XcoordinateLabel", true, "Location");
             }    
         }
     }