Index: src/Deltares.DSoilModel.Forms.Tests/BoringLookup2DControlTest.cs
===================================================================
diff -u -r305 -r316
--- src/Deltares.DSoilModel.Forms.Tests/BoringLookup2DControlTest.cs	(.../BoringLookup2DControlTest.cs)	(revision 305)
+++ src/Deltares.DSoilModel.Forms.Tests/BoringLookup2DControlTest.cs	(.../BoringLookup2DControlTest.cs)	(revision 316)
@@ -9,14 +9,11 @@
 namespace Deltares.DSoilModel.Forms.Tests
 {
     [TestFixture, RequiresSTA]
-    public class BoringLookup2DControlTest
+    public class BoringLookup2DControlTest : ControlTester
     {
         [Test]
         public void TestControlBindings()
         {
-            var oldBypass = BindSupport.BypassTimerForUnitTest;
-            BindSupport.BypassTimerForUnitTest = true;
-
             using (var control = new BoringLookup2DControl())
             {
                 var profile = new SoilProfile2D();
@@ -31,15 +28,9 @@
                 Assert.AreSame(lookup, control.SelectedObject);
 
                 Assert.IsTrue(control.IsVisible);
-                
-                var xEdit = GetPrivateField(control, "XEdit") as SpinEdit;
-                Assert.IsTrue(xEdit.Visible && xEdit.Enabled);
-                Assert.AreEqual(lookup.Xlocal, (double)xEdit.Value);
-                xEdit.EditValue = 1.0;
-                Assert.AreEqual((double)xEdit.Value, lookup.Xlocal);
 
-                var xLabel = GetPrivateField(control, "XLabel") as LabelControl;
-                Assert.AreEqual("Local x [-]", xLabel.Text);
+                TestSpinEditVisibleEnabledValue(control, "XEdit", true, true, lookup, x => x.Xlocal, 1.0);
+                TestLabelControlVisibleValue(control, "XLabel", true, "Lokale x [-]");  // unit should be [m], see issue MDNLIB-796
             };
         }