Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationsContextPropertiesTest.cs
===================================================================
diff -u -r9696877b8e90de7c28ac96e336d3f9db28b02118 -r3d1365e8ec250bc6e93c923736635a049a7facec
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationsContextPropertiesTest.cs	(.../DuneLocationsContextPropertiesTest.cs)	(revision 9696877b8e90de7c28ac96e336d3f9db28b02118)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PropertyClasses/DuneLocationsContextPropertiesTest.cs	(.../DuneLocationsContextPropertiesTest.cs)	(revision 3d1365e8ec250bc6e93c923736635a049a7facec)
@@ -28,14 +28,14 @@
             var mockRepository = new MockRepository();
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
-            var failureMechanism = new DuneErosionFailureMechanism();
-
+            
             var location = new TestDuneLocation();
             var items = new ObservableList<DuneLocation>
             {
                 location
             };
 
+            var failureMechanism = new DuneErosionFailureMechanism();
             var context = new DuneLocationsContext(items, failureMechanism, assessmentSection);
 
             // Call
@@ -80,12 +80,12 @@
             var mockRepository = new MockRepository();
             var assessmentSection = mockRepository.Stub<IAssessmentSection>();
             mockRepository.ReplayAll();
-            var failureMechanism = new DuneErosionFailureMechanism();
-
+            
             var items = new ObservableList<DuneLocation>
             {
                 new TestDuneLocation()
             };
+            var failureMechanism = new DuneErosionFailureMechanism();
             var context = new DuneLocationsContext(items, failureMechanism, assessmentSection);
 
             // Call
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationsContextPropertyInfoTest.cs
===================================================================
diff -u
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationsContextPropertyInfoTest.cs	(revision 0)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/PropertyInfos/DuneLocationsContextPropertyInfoTest.cs	(revision 3d1365e8ec250bc6e93c923736635a049a7facec)
@@ -0,0 +1,61 @@
+using System.Linq;
+using Core.Common.Gui.Plugin;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.DuneErosion.Data;
+using Ringtoets.DuneErosion.Forms.PresentationObjects;
+using Ringtoets.DuneErosion.Forms.PropertyClasses;
+
+namespace Ringtoets.DuneErosion.Plugin.Test.PropertyInfos
+{
+    [TestFixture]
+    public class DuneLocationsContextPropertyInfoTest
+    {
+        [Test]
+        public void Initialized_Always_ExpectedPropertiesSet()
+        {
+            // Setup
+            using (var plugin = new DuneErosionPlugin())
+            {
+                // Call
+                PropertyInfo info = GetInfo(plugin);
+
+                // Assert
+                Assert.AreEqual(typeof(DuneLocationsContext), info.DataType);
+                Assert.AreEqual(typeof(DuneLocationsContextProperties), info.PropertyObjectType);
+            }
+        }
+
+        [Test]
+        public void CreateInstance_Always_SetsHydraulicBoundaryLocationsAsData()
+        {
+            // Setup
+            MockRepository mockRepository = new MockRepository();
+            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
+            mockRepository.ReplayAll();
+
+            var failureMechanism = new DuneErosionFailureMechanism();
+            var context = new DuneLocationsContext(failureMechanism.DuneLocations,
+                                                   failureMechanism, assessmentSection);
+
+            using (DuneErosionPlugin plugin = new DuneErosionPlugin())
+            {
+                PropertyInfo info = GetInfo(plugin);
+
+                // Call
+                var objectProperties = info.CreateInstance(context);
+
+                // Assert
+                Assert.IsInstanceOf<DuneLocationsContextProperties>(objectProperties);
+                Assert.AreSame(context, objectProperties.Data);
+            }
+            mockRepository.VerifyAll();
+        }
+
+        private static PropertyInfo GetInfo(DuneErosionPlugin plugin)
+        {
+            return plugin.GetPropertyInfos().First(pi => pi.DataType == typeof(DuneLocationsContext));
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/Ringtoets.DuneErosion.Plugin.Test.csproj
===================================================================
diff -u -r363b9edc0d685d5bcaf41411604c5996c013ef89 -r3d1365e8ec250bc6e93c923736635a049a7facec
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/Ringtoets.DuneErosion.Plugin.Test.csproj	(.../Ringtoets.DuneErosion.Plugin.Test.csproj)	(revision 363b9edc0d685d5bcaf41411604c5996c013ef89)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/Ringtoets.DuneErosion.Plugin.Test.csproj	(.../Ringtoets.DuneErosion.Plugin.Test.csproj)	(revision 3d1365e8ec250bc6e93c923736635a049a7facec)
@@ -65,6 +65,7 @@
     <Compile Include="ExportInfos\DuneLocationsContextExportInfoTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="PropertyInfos\DuneErosionFailureMechanismPropertyInfoTest.cs" />
+    <Compile Include="PropertyInfos\DuneLocationsContextPropertyInfoTest.cs" />
     <Compile Include="TreeNodeInfos\DuneErosionFailureMechanismContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\DuneErosionFailureMechanismSectionResultContextTreeNodeInfoTest.cs" />
     <Compile Include="TreeNodeInfos\DuneLocationsContextTreeNodeInfoTest.cs" />