Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationDesignWaterLevelProperties.cs
===================================================================
diff -u -rc703acd9b4aa18825e6938815ba975c34949cc6f -r7779966cdf2cc1cbaf00ce0643da3f47f34fa0af
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationDesignWaterLevelProperties.cs	(.../HydraulicBoundaryLocationDesignWaterLevelProperties.cs)	(revision c703acd9b4aa18825e6938815ba975c34949cc6f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationDesignWaterLevelProperties.cs	(.../HydraulicBoundaryLocationDesignWaterLevelProperties.cs)	(revision 7779966cdf2cc1cbaf00ce0643da3f47f34fa0af)
@@ -67,7 +67,7 @@
         }
 
         /// <summary>
-        /// Gets the <see cref="HydraulicBoundaryLocation.DesignWaterLevel"/> from the <see cref="HydraulicBoundaryLocation"/>.
+        /// Gets the <see cref="HydraulicBoundaryLocation.DesignWaterLevel"/>.
         /// </summary>
         [PropertyOrder(4)]
         [ResourcesDisplayName(typeof(Resources), "HydraulicBoundaryDatabase_Locations_DesignWaterLevel_DisplayName")]
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationProperties.cs
===================================================================
diff -u -rc703acd9b4aa18825e6938815ba975c34949cc6f -r7779966cdf2cc1cbaf00ce0643da3f47f34fa0af
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationProperties.cs	(.../HydraulicBoundaryLocationProperties.cs)	(revision c703acd9b4aa18825e6938815ba975c34949cc6f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/HydraulicBoundaryLocationProperties.cs	(.../HydraulicBoundaryLocationProperties.cs)	(revision 7779966cdf2cc1cbaf00ce0643da3f47f34fa0af)
@@ -45,7 +45,7 @@
         }
 
         /// <summary>
-        /// Gets the <see cref="HydraulicBoundaryLocation.Id"/> from the <see cref="HydraulicBoundaryLocation"/>.
+        /// Gets the <see cref="HydraulicBoundaryLocation.Id"/>.
         /// </summary>
         [PropertyOrder(1)]
         [ResourcesDisplayName(typeof(Resources), "HydraulicBoundaryDatabase_Locations_Id_DisplayName")]
@@ -59,7 +59,7 @@
         }
 
         /// <summary>
-        /// Gets the <see cref="HydraulicBoundaryLocation.Name"/> from the <see cref="HydraulicBoundaryLocation"/>.
+        /// Gets the <see cref="HydraulicBoundaryLocation.Name"/>.
         /// </summary>
         [PropertyOrder(2)]
         [ResourcesDisplayName(typeof(Resources), "HydraulicBoundaryDatabase_Locations_Name_DisplayName")]
@@ -73,7 +73,7 @@
         }
 
         /// <summary>
-        /// Gets the <see cref="HydraulicBoundaryLocation.Location"/> from the <see cref="HydraulicBoundaryLocation"/>.
+        /// Gets the <see cref="HydraulicBoundaryLocation.Location"/>.
         /// </summary>
         [PropertyOrder(3)]
         [ResourcesDisplayName(typeof(Resources), "HydraulicBoundaryDatabase_Locations_Coordinates_DisplayName")]
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelContextPropertiesTest.cs
===================================================================
diff -u -rc703acd9b4aa18825e6938815ba975c34949cc6f -r7779966cdf2cc1cbaf00ce0643da3f47f34fa0af
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelContextPropertiesTest.cs	(.../DesignWaterLevelContextPropertiesTest.cs)	(revision c703acd9b4aa18825e6938815ba975c34949cc6f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/DesignWaterLevelContextPropertiesTest.cs	(.../DesignWaterLevelContextPropertiesTest.cs)	(revision 7779966cdf2cc1cbaf00ce0643da3f47f34fa0af)
@@ -102,12 +102,12 @@
 
             // Call
             TypeConverter classTypeConverter = TypeDescriptor.GetConverter(properties, true);
+
+            // Assert
             PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties();
             PropertyDescriptor locationsProperty = dynamicProperties.Find("Locations", false);
 
-            // Assert
             Assert.IsInstanceOf<TypeConverter>(classTypeConverter);
-
             Assert.IsNotNull(locationsProperty);
             Assert.IsInstanceOf<ExpandableArrayConverter>(locationsProperty.Converter);
             Assert.IsTrue(locationsProperty.IsReadOnly);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationDesignWaterLevelPropertiesTest.cs
===================================================================
diff -u -rc703acd9b4aa18825e6938815ba975c34949cc6f -r7779966cdf2cc1cbaf00ce0643da3f47f34fa0af
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationDesignWaterLevelPropertiesTest.cs	(.../HydraulicBoundaryLocationDesignWaterLevelPropertiesTest.cs)	(revision c703acd9b4aa18825e6938815ba975c34949cc6f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationDesignWaterLevelPropertiesTest.cs	(.../HydraulicBoundaryLocationDesignWaterLevelPropertiesTest.cs)	(revision 7779966cdf2cc1cbaf00ce0643da3f47f34fa0af)
@@ -21,7 +21,9 @@
 
 using System.ComponentModel;
 using System.Globalization;
+using System.Linq;
 using Core.Common.Base.Geometry;
+using Core.Common.Gui.Attributes;
 using Core.Common.Gui.PropertyBag;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -98,24 +100,28 @@
             Assert.IsTrue(idProperty.IsBrowsable);
             Assert.AreEqual(expectedIdDisplayName, idProperty.DisplayName);
             Assert.AreEqual(expectedIdDescription, idProperty.Description);
+            Assert.AreEqual(1, idProperty.Attributes.OfType<PropertyOrderAttribute>().First().Order);
 
             Assert.IsNotNull(nameProperty);
             Assert.IsTrue(nameProperty.IsReadOnly);
             Assert.IsTrue(nameProperty.IsBrowsable);
             Assert.AreEqual(expectedNameDisplayName, nameProperty.DisplayName);
             Assert.AreEqual(expectedNameDescription, nameProperty.Description);
+            Assert.AreEqual(2, nameProperty.Attributes.OfType<PropertyOrderAttribute>().First().Order);
 
             Assert.IsNotNull(locationProperty);
             Assert.IsTrue(locationProperty.IsReadOnly);
             Assert.IsTrue(locationProperty.IsBrowsable);
             Assert.AreEqual(expectedLocationDisplayName, locationProperty.DisplayName);
             Assert.AreEqual(expectedLocationDescription, locationProperty.Description);
+            Assert.AreEqual(3, locationProperty.Attributes.OfType<PropertyOrderAttribute>().First().Order);
 
             Assert.IsNotNull(designWaterLevelProperty);
             Assert.IsTrue(designWaterLevelProperty.IsReadOnly);
             Assert.IsTrue(designWaterLevelProperty.IsBrowsable);
             Assert.AreEqual(expectedDesignWaterLevelDisplayName, designWaterLevelProperty.DisplayName);
             Assert.AreEqual(expectedDesignWaterLevelDescription, designWaterLevelProperty.Description);
+            Assert.AreEqual(4, designWaterLevelProperty.Attributes.OfType<PropertyOrderAttribute>().First().Order);
 
             mockRepository.VerifyAll();
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs
===================================================================
diff -u -rc703acd9b4aa18825e6938815ba975c34949cc6f -r7779966cdf2cc1cbaf00ce0643da3f47f34fa0af
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs	(.../HydraulicBoundaryLocationPropertiesTest.cs)	(revision c703acd9b4aa18825e6938815ba975c34949cc6f)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs	(.../HydraulicBoundaryLocationPropertiesTest.cs)	(revision 7779966cdf2cc1cbaf00ce0643da3f47f34fa0af)
@@ -20,7 +20,9 @@
 // All rights reserved.
 
 using System.ComponentModel;
+using System.Linq;
 using Core.Common.Base.Geometry;
+using Core.Common.Gui.Attributes;
 using Core.Common.Gui.PropertyBag;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -142,18 +144,21 @@
             Assert.IsTrue(idProperty.IsBrowsable);
             Assert.AreEqual(expectedIdDisplayName, idProperty.DisplayName);
             Assert.AreEqual(expectedIdDescription, idProperty.Description);
+            Assert.AreEqual(1, idProperty.Attributes.OfType<PropertyOrderAttribute>().First().Order);
 
             Assert.IsNotNull(nameProperty);
             Assert.IsTrue(nameProperty.IsReadOnly);
             Assert.IsTrue(nameProperty.IsBrowsable);
             Assert.AreEqual(expectedNameDisplayName, nameProperty.DisplayName);
             Assert.AreEqual(expectedNameDescription, nameProperty.Description);
+            Assert.AreEqual(2, nameProperty.Attributes.OfType<PropertyOrderAttribute>().First().Order);
 
             Assert.IsNotNull(locationProperty);
             Assert.IsTrue(locationProperty.IsReadOnly);
             Assert.IsTrue(locationProperty.IsBrowsable);
             Assert.AreEqual(expectedLocationDisplayName, locationProperty.DisplayName);
             Assert.AreEqual(expectedLocationDescription, locationProperty.Description);
+            Assert.AreEqual(3, locationProperty.Attributes.OfType<PropertyOrderAttribute>().First().Order);
 
             mockRepository.VerifyAll();
         }