Index: src/Deltares.DSoilModel.Forms.Tests/ControlTester.cs
===================================================================
diff -u -r369 -r371
--- src/Deltares.DSoilModel.Forms.Tests/ControlTester.cs	(.../ControlTester.cs)	(revision 369)
+++ src/Deltares.DSoilModel.Forms.Tests/ControlTester.cs	(.../ControlTester.cs)	(revision 371)
@@ -117,16 +117,16 @@
             }
         }
 
-        protected void TestTextEditVisibleEnabledValue<T>(IPropertyControl parentControl, string textEditName,
-            bool isVisibleExpected, bool isEnabledExpected, T target, Expression<Func<T, string>> outExpr, string newValue = null)
+        protected void TestTextEditVisibleEnabledValue<T, TValue>(IPropertyControl parentControl, string textEditName,
+            bool isVisibleExpected, bool isEnabledExpected, T target, Expression<Func<T, TValue>> outExpr, TValue newValue = default(TValue))
         {
             TestControlVisibleEnabled(parentControl, textEditName, isVisibleExpected, isEnabledExpected);
             if (isVisibleExpected)
             {
                 var edit = GetPrivateField<TextEdit>(parentControl, textEditName);
 
                 var initialValue = GetValue(target, outExpr);
-                Assert.AreEqual(initialValue, edit.EditValue, InitialValueMismatchString);
+                Assert.AreEqual(initialValue.ToString(), edit.EditValue, InitialValueMismatchString);
 
                 if (newValue != null)
                 {
@@ -136,19 +136,6 @@
                 }
             }
         }
-        
-        protected void TestTextEditVisibleEnabledValue<T>(IPropertyControl parentControl, string textEditName,
-            bool isVisibleExpected, bool isEnabledExpected, T target, Expression<Func<T, object>> outExpr)
-        {
-            TestControlVisibleEnabled(parentControl, textEditName, isVisibleExpected, isEnabledExpected);
-            if (isVisibleExpected)
-            {
-                var edit = GetPrivateField<TextEdit>(parentControl, textEditName);
-                var initialValue = GetValue(target, outExpr);
-                Assert.AreEqual(initialValue.ToString(), edit.EditValue, InitialValueMismatchString);
-                // we cannot assign a new object to the TextEdit. So don't expect to have a test for setting a value
-            }
-        }
 
         protected void TestComboBoxVisibleEnabledValue<T, TEnum>(IPropertyControl parentControl, string comboBoxEditName,
             bool isVisibleExpected, bool isEnabledExpected, T target, Expression<Func<T, TEnum>> outExpr, TEnum newValue = default(TEnum))