Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/ForeshoreProfileEditorTest.cs
===================================================================
diff -u -rf35371f467919042f47b41f84d31e8d4f47cff2a -re8e9033d644387817a2bd7a7a9ce0ced231ecde8
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/ForeshoreProfileEditorTest.cs	(.../ForeshoreProfileEditorTest.cs)	(revision f35371f467919042f47b41f84d31e8d4f47cff2a)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/UITypeEditors/ForeshoreProfileEditorTest.cs	(.../ForeshoreProfileEditorTest.cs)	(revision e8e9033d644387817a2bd7a7a9ce0ced231ecde8)
@@ -45,6 +45,17 @@
         }
 
         [Test]
+        public void Constructor_NullItemSet()
+        {
+            // Call
+            var editor = new ForeshoreProfileEditorWithPublicNullItem();
+
+            // Assert
+            Assert.IsInstanceOf<ForeshoreProfile>(editor.PublicNullItem);
+            Assert.AreEqual("<geen>", editor.PublicNullItem.Name);
+        }
+
+        [Test]
         public void EditValue_WithCurrentItemNotInAvailableItems_ReturnsOriginalValue()
         {
             // Setup
@@ -95,30 +106,6 @@
             mockRepository.VerifyAll();
         }
 
-        [Test]
-        public void EditValue_NullItem_ReturnsNullItem()
-        {
-            // Setup
-            var foreshoreProfile = CreateForeshoreProfile();
-            var properties = new ObjectPropertiesWithForeshoreProfile(foreshoreProfile, new ForeshoreProfile[0]);
-            var propertyBag = new DynamicPropertyBag(properties);
-            var editor = new ForeshoreProfileEditorWithPublicNullItem();
-            var serviceProviderMock = mockRepository.Stub<IServiceProvider>();
-            var serviceMock = mockRepository.Stub<IWindowsFormsEditorService>();
-            var descriptorContextMock = mockRepository.Stub<ITypeDescriptorContext>();
-            serviceProviderMock.Stub(p => p.GetService(null)).IgnoreArguments().Return(serviceMock);
-            descriptorContextMock.Stub(c => c.Instance).Return(propertyBag);
-            mockRepository.ReplayAll();
-
-            // Call
-            var result = editor.EditValue(descriptorContextMock, serviceProviderMock, editor.PublicNullItem) as ForeshoreProfile;
-
-            // Assert
-            Assert.IsNotNull(result);
-            Assert.AreEqual("<geen>", result.Name);
-            mockRepository.VerifyAll();
-        }
-
         private static ForeshoreProfile CreateForeshoreProfile()
         {
             return new ForeshoreProfile(new Point2D(0, 0), Enumerable.Empty<Point2D>(), new BreakWater(BreakWaterType.Caisson, 0.0), new ForeshoreProfile.ConstructionProperties());