Index: src/Deltares.DSoilModel.Forms.Tests/CptControlTests.cs
===================================================================
diff -u -r343 -r345
--- src/Deltares.DSoilModel.Forms.Tests/CptControlTests.cs	(.../CptControlTests.cs)	(revision 343)
+++ src/Deltares.DSoilModel.Forms.Tests/CptControlTests.cs	(.../CptControlTests.cs)	(revision 345)
@@ -1,6 +1,7 @@
 using Deltares.Geotechnics.ConePenetrationTest;
 using Deltares.Geotechnics.Xsd;
 using Deltares.Standard.Forms;
+using Deltares.Standard.TestUtils;
 using NUnit.Framework;
 
 namespace Deltares.DSoilModel.Forms.Tests
@@ -14,6 +15,7 @@
         }
 
         [Test]
+        [Category(Categories.WorkInProgress)]
         public void ControlBindingsTest()
         {
             var cpt = new ConePenetrationTestData
@@ -38,10 +40,10 @@
             TestLabelControlVisibleValue(PropertyControl, "DescriptionLabel", true, "Beschrijving");
             TestTextEditVisibleEnabledValue(PropertyControl, "DescriptionEdit", true, true, cpt, c => c.Description, "DescrTest");
 
-            TestLabelControlVisibleValue(PropertyControl, "GroundLevelLabel", true, "Niveau maaiveld"); // TODO: no units?
+            TestLabelControlVisibleValue(PropertyControl, "GroundLevelLabel", true, "Niveau maaiveld [m]"); // Fails due to MDNLIB-797
             TestSpinEditVisibleEnabledValue(PropertyControl, "GroundLevelEdit", true, false, cpt, c => c.GroundLevel, 88.8);
 
-            TestLabelControlVisibleValue(PropertyControl, "PreExcavationLabel", true, "Voorontgraving"); // TODO: no units?
+            TestLabelControlVisibleValue(PropertyControl, "PreExcavationLabel", true, "Voorontgraving [m]"); // Fails due to MDNLIB-797
             TestSpinEditVisibleEnabledValue(PropertyControl, "PreExcavationEdit", true, false, cpt, c => c.PreExcavation, 99.9);
 
             TestGridVisibleEnabledSize(PropertyControl, "CptValuesGridControl", true, true, 4, 5);
Index: src/Deltares.DSoilModel.Forms.Tests/Deltares.DSoilModel.Forms.Tests.csproj
===================================================================
diff -u -r343 -r345
--- src/Deltares.DSoilModel.Forms.Tests/Deltares.DSoilModel.Forms.Tests.csproj	(.../Deltares.DSoilModel.Forms.Tests.csproj)	(revision 343)
+++ src/Deltares.DSoilModel.Forms.Tests/Deltares.DSoilModel.Forms.Tests.csproj	(.../Deltares.DSoilModel.Forms.Tests.csproj)	(revision 345)
@@ -64,6 +64,10 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\Deltares\DslFormsStandard\Deltares.Standard.Forms.DExpress.dll</HintPath>
     </Reference>
+    <Reference Include="Deltares.Standard.TestUtils, Version=16.1.0.0, Culture=neutral, PublicKeyToken=02706bdeb4edde3b, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\lib\Deltares\DslCore\Deltares.Standard.TestUtils.dll</HintPath>
+    </Reference>
     <Reference Include="DevExpress.Data.v12.2, Version=12.2.13.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\lib\DevExpress\DevExpress.Data.v12.2.dll</HintPath>