Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelSelectionRedirectorTests.cs
===================================================================
diff -u -r244 -r245
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelSelectionRedirectorTests.cs	(.../DSoilModelSelectionRedirectorTests.cs)	(revision 244)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelSelectionRedirectorTests.cs	(.../DSoilModelSelectionRedirectorTests.cs)	(revision 245)
@@ -10,10 +10,24 @@
     [TestFixture]
     class DSoilModelSelectionRedirectorTests
     {
+        private DSoilModelSelectionRedirector redirector;
+        private PropertyEditorReactionType reactionType = PropertyEditorReactionType.Ignore;
+
+        [SetUp]
+        public void SetUp()
+        {
+            redirector = new DSoilModelSelectionRedirector();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            redirector = null;
+        }
+
         [Test]
         public void SupportedTypesTest()
         {
-            var redirector = new DSoilModelSelectionRedirector();
             Assert.AreEqual(4, redirector.RedirectingTypes.Length);
 
             Assert.Contains(typeof (ConePenetrationTestLookup1D), redirector.RedirectingTypes);
@@ -29,9 +43,6 @@
         [TestCase(typeof(BoringLookup2D), "Boring", typeof(Boring))]
         public void GetRedirectedObjectTest(Type inType, string propertyName, Type outType)
         {
-            var redirector = new DSoilModelSelectionRedirector();
-            PropertyEditorReactionType reactionType = PropertyEditorReactionType.Ignore;
-
             var inObject = Activator.CreateInstance(inType);
             var property = inObject.GetType().GetProperty(propertyName, BindingFlags.Instance | BindingFlags.Public);
             property.SetValue(inObject, Activator.CreateInstance(property.PropertyType), null);
@@ -41,5 +52,16 @@
             Assert.IsNotNull(outObject);
             Assert.AreEqual(outType, outObject.GetType());
         }
+
+        [Test]
+        public void GetRedirectedObjectTest_ReturnsInputObjectIfNotSupported()
+        {
+            var lookup = new SoilProfile1DLookup2D();
+            var outObject = redirector.GetRedirectedObject(lookup, ref reactionType);
+            Assert.IsNotNull(outObject);
+            Assert.AreSame(lookup, outObject); // the same object ?
+            
+            Assert.IsNull(redirector.GetRedirectedObject(null, ref reactionType));
+        }
     }
 }