Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverCalculationsProperties.cs
===================================================================
diff -u -r6be63037d71c6270dc24c31ca132f9bc612e4519 -re025d33f32b1c7f51e101d368fbafdddff137fe9
--- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverCalculationsProperties.cs	(.../WaveImpactAsphaltCoverCalculationsProperties.cs)	(revision 6be63037d71c6270dc24c31ca132f9bc612e4519)
+++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverCalculationsProperties.cs	(.../WaveImpactAsphaltCoverCalculationsProperties.cs)	(revision e025d33f32b1c7f51e101d368fbafdddff137fe9)
@@ -47,7 +47,7 @@
         /// <param name="data">The instance to show the properties of.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="data"/>
         /// is <c>null</c>.</exception>
-        public WaveImpactAsphaltCoverCalculationsProperties(WaveImpactAsphaltCoverFailureMechanism data) : base(data, new ConstructionProperties()
+        public WaveImpactAsphaltCoverCalculationsProperties(WaveImpactAsphaltCoverFailureMechanism data) : base(data, new ConstructionProperties
         {
             NamePropertyIndex = namePropertyIndex,
             CodePropertyIndex = codePropertyIndex,
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverCalculationsPropertiesTest.cs
===================================================================
diff -u -rb9d0b7e52e1f2990800ee7f76e77ce9e2add50dd -re025d33f32b1c7f51e101d368fbafdddff137fe9
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverCalculationsPropertiesTest.cs	(.../WaveImpactAsphaltCoverCalculationsPropertiesTest.cs)	(revision b9d0b7e52e1f2990800ee7f76e77ce9e2add50dd)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverCalculationsPropertiesTest.cs	(.../WaveImpactAsphaltCoverCalculationsPropertiesTest.cs)	(revision e025d33f32b1c7f51e101d368fbafdddff137fe9)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.ComponentModel;
 using Core.Gui.TestUtil;
 using NUnit.Framework;
@@ -40,17 +39,6 @@
         private const int cPropertyIndex = 5;
 
         [Test]
-        public void Constructor_DataNull_ThrowsArgumentNullException()
-        {
-            // Call
-            void Call() => new WaveImpactAsphaltCoverCalculationsProperties(null);
-
-            // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(Call).ParamName;
-            Assert.AreEqual("data", paramName);
-        }
-
-        [Test]
         public void Constructor_ExpectedValues()
         {
             // Setup
@@ -60,7 +48,7 @@
             var properties = new WaveImpactAsphaltCoverCalculationsProperties(failureMechanism);
 
             // Assert
-            Assert.IsInstanceOf<WaveImpactAsphaltCoverFailureMechanismProperties>(properties);            
+            Assert.IsInstanceOf<WaveImpactAsphaltCoverFailureMechanismProperties>(properties);
             Assert.AreSame(failureMechanism, properties.Data);
             Assert.AreEqual(failureMechanism.Name, properties.Name);
             Assert.AreEqual(failureMechanism.Code, properties.Code);
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs
===================================================================
diff -u -rb9d0b7e52e1f2990800ee7f76e77ce9e2add50dd -re025d33f32b1c7f51e101d368fbafdddff137fe9
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs)	(revision b9d0b7e52e1f2990800ee7f76e77ce9e2add50dd)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs	(.../WaveImpactAsphaltCoverFailureMechanismPropertiesTest.cs)	(revision e025d33f32b1c7f51e101d368fbafdddff137fe9)
@@ -32,9 +32,9 @@
     [TestFixture]
     public class WaveImpactAsphaltCoverFailureMechanismPropertiesTest
     {
-        private const int namePropertyIndex = 0;
+        private const int namePropertyIndex = 2;
         private const int codePropertyIndex = 1;
-        private const int groupPropertyIndex = 2;
+        private const int groupPropertyIndex = 0;
 
         [Test]
         public void Constructor_DataNull_ThrowsArgumentNullException()
@@ -59,7 +59,7 @@
         }
 
         [Test]
-        public void Constructor_WithData_ExpectedValues()
+        public void Constructor_ExpectedValues()
         {
             // Setup
             var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
@@ -79,7 +79,12 @@
         public void Constructor_Always_PropertiesHaveExpectedAttributeValues()
         {
             // Call
-            var properties = new WaveImpactAsphaltCoverFailureMechanismProperties(new WaveImpactAsphaltCoverFailureMechanism(), new WaveImpactAsphaltCoverFailureMechanismProperties.ConstructionProperties());
+            var properties = new WaveImpactAsphaltCoverFailureMechanismProperties(new WaveImpactAsphaltCoverFailureMechanism(), new WaveImpactAsphaltCoverFailureMechanismProperties.ConstructionProperties
+            {
+                NamePropertyIndex = namePropertyIndex,
+                CodePropertyIndex = codePropertyIndex,
+                GroupPropertyIndex = groupPropertyIndex
+            });
 
             // Assert
             PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverFailurePathPropertiesTest.cs
===================================================================
diff -u -rb9d0b7e52e1f2990800ee7f76e77ce9e2add50dd -re025d33f32b1c7f51e101d368fbafdddff137fe9
--- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverFailurePathPropertiesTest.cs	(.../WaveImpactAsphaltCoverFailurePathPropertiesTest.cs)	(revision b9d0b7e52e1f2990800ee7f76e77ce9e2add50dd)
+++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverFailurePathPropertiesTest.cs	(.../WaveImpactAsphaltCoverFailurePathPropertiesTest.cs)	(revision e025d33f32b1c7f51e101d368fbafdddff137fe9)
@@ -1,4 +1,25 @@
-using System;
+// Copyright (C) Stichting Deltares 2021. All rights reserved.
+//
+// This file is part of Riskeer.
+//
+// Riskeer is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
 using System.ComponentModel;
 using Core.Common.Base;
 using Core.Common.Base.Data;
@@ -37,21 +58,6 @@
         }
 
         [Test]
-        public void Constructor_DataNull_ThrowsArgumentNullException()
-        {
-            // Setup
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
-            // Call
-            void Call() => new WaveImpactAsphaltCoverFailurePathProperties(null, assessmentSection);
-
-            // Assert
-            string paramName = Assert.Throws<ArgumentNullException>(Call).ParamName;
-            Assert.AreEqual("data", paramName);
-        }
-
-        [Test]
         public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException()
         {
             // Call