Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismProperties.cs
===================================================================
diff -u -r79378656df68fb71e15e1511f3c5071ace38f857 -rf4a45a11e173eabd485d2bb1727c28a3d07a18d1
--- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismProperties.cs	(.../GrassCoverErosionInwardsFailureMechanismProperties.cs)	(revision 79378656df68fb71e15e1511f3c5071ace38f857)
+++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailureMechanismProperties.cs	(.../GrassCoverErosionInwardsFailureMechanismProperties.cs)	(revision f4a45a11e173eabd485d2bb1727c28a3d07a18d1)
@@ -91,6 +91,7 @@
 
         #region Length effect parameters
 
+        [DynamicPropertyOrder]
         [ResourcesCategory(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Categories_LengthEffect))]
         [ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_N_Rounded_DisplayName))]
         [ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.FailureMechanism_N_Rounded_Description))]
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsCalculationsPropertiesTest.cs
===================================================================
diff -u -r79378656df68fb71e15e1511f3c5071ace38f857 -rf4a45a11e173eabd485d2bb1727c28a3d07a18d1
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsCalculationsPropertiesTest.cs	(.../GrassCoverErosionInwardsCalculationsPropertiesTest.cs)	(revision 79378656df68fb71e15e1511f3c5071ace38f857)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsCalculationsPropertiesTest.cs	(.../GrassCoverErosionInwardsCalculationsPropertiesTest.cs)	(revision f4a45a11e173eabd485d2bb1727c28a3d07a18d1)
@@ -117,7 +117,7 @@
 
             Assert.AreEqual(generalInput.FshallowModelFactor.Mean, properties.FshallowModelFactor.Mean);
             Assert.AreEqual(generalInput.FshallowModelFactor.StandardDeviation, properties.FshallowModelFactor.StandardDeviation);
-            
+
             mocks.VerifyAll();
         }
 
@@ -243,7 +243,7 @@
             const string expectedMessage = "De waarde voor 'N' moet in het bereik [1,00, 20,00] liggen.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentOutOfRangeException>(Call, expectedMessage);
             Assert.IsTrue(changeHandler.Called);
-            
+
             mocks.VerifyAll();
         }
 
@@ -277,7 +277,7 @@
             // Assert
             Assert.AreEqual(newN, failureMechanism.GeneralInput.N);
             Assert.IsTrue(changeHandler.Called);
-            
+
             mocks.VerifyAll();
         }
     }
Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismPropertiesTest.cs
===================================================================
diff -u -r748a27c9c0b28afded29026a44953d6a467a18cc -rf4a45a11e173eabd485d2bb1727c28a3d07a18d1
--- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismPropertiesTest.cs	(.../GrassCoverErosionInwardsFailureMechanismPropertiesTest.cs)	(revision 748a27c9c0b28afded29026a44953d6a467a18cc)
+++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsFailureMechanismPropertiesTest.cs	(.../GrassCoverErosionInwardsFailureMechanismPropertiesTest.cs)	(revision f4a45a11e173eabd485d2bb1727c28a3d07a18d1)
@@ -39,11 +39,11 @@
     [TestFixture]
     public class GrassCoverErosionInwardsFailureMechanismPropertiesTest
     {
-        private const int namePropertyIndex = 0;
-        private const int codePropertyIndex = 1;
+        private const int namePropertyIndex = 4;
+        private const int codePropertyIndex = 3;
         private const int groupPropertyIndex = 2;
-        private const int contributionPropertyIndex = 3;
-        private const int nPropertyIndex = 4;
+        private const int contributionPropertyIndex = 1;
+        private const int nPropertyIndex = 0;
         private MockRepository mocks;
 
         [SetUp]
@@ -65,6 +65,7 @@
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(Call);
             Assert.AreEqual("data", exception.ParamName);
+
             mocks.VerifyAll();
         }
 
@@ -131,7 +132,14 @@
             mocks.ReplayAll();
 
             // Call
-            var properties = new GrassCoverErosionInwardsFailureMechanismProperties(failureMechanism, new GrassCoverErosionInwardsFailureMechanismProperties.ConstructionProperties(), handler);
+            var properties = new GrassCoverErosionInwardsFailureMechanismProperties(failureMechanism, new GrassCoverErosionInwardsFailureMechanismProperties.ConstructionProperties
+            {
+                NamePropertyIndex = namePropertyIndex,
+                CodePropertyIndex = codePropertyIndex,
+                GroupPropertyIndex = groupPropertyIndex,
+                ContributionPropertyIndex = contributionPropertyIndex,
+                NPropertyIndex = nPropertyIndex
+            }, handler);
 
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);