Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader.cs
===================================================================
diff -u -r37595f31d0b37d1f6c93cf927f5eff067e992b33 -r3ddd2e86216438a423797aecd4b1f9808df00bcb
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader.cs	(.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader.cs)	(revision 37595f31d0b37d1f6c93cf927f5eff067e992b33)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader.cs	(.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader.cs)	(revision 3ddd2e86216438a423797aecd4b1f9808df00bcb)
@@ -20,16 +20,19 @@
 // All rights reserved.
 
 using System;
+using System.Xml.Linq;
 using Core.Common.Base.IO;
 using Ringtoets.Common.IO.Configurations;
+using Ringtoets.Common.IO.Configurations.Helpers;
+using Ringtoets.Revetment.IO.Configurations.Converters;
 
 namespace Ringtoets.Revetment.IO.Configurations
 {
     /// <summary>
     /// This class reads a wave conditions calculation configuration from XML and creates a collection of corresponding
     /// <see cref="IConfigurationItem"/>, typically containing one or more <see cref="AssessmentSectionCategoryWaveConditionsCalculationConfiguration"/>.
     /// </summary>
-    public class AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader : WaveConditionsCalculationConfigurationReader
+    public class AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader : WaveConditionsCalculationConfigurationReader<AssessmentSectionCategoryWaveConditionsCalculationConfiguration>
     {
         /// <summary>
         /// Creates a new instance of <see cref="AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader"/>.
@@ -46,5 +49,12 @@
         /// </exception>
         public AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader(string xmlFilePath)
             : base(xmlFilePath) {}
+
+        protected override AssessmentSectionCategoryWaveConditionsCalculationConfiguration ParseCalculationElement(XElement calculationElement)
+        {
+            var configuration = new AssessmentSectionCategoryWaveConditionsCalculationConfiguration(calculationElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute).Value);
+            ParseCalculationElementData(calculationElement, configuration);
+            return configuration;
+        }
     }
 };
\ No newline at end of file
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationImporter.cs
===================================================================
diff -u -rbc3e9533de8e4e270211af3ef1821373fe907569 -r3ddd2e86216438a423797aecd4b1f9808df00bcb
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationImporter.cs	(.../WaveConditionsCalculationConfigurationImporter.cs)	(revision bc3e9533de8e4e270211af3ef1821373fe907569)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationImporter.cs	(.../WaveConditionsCalculationConfigurationImporter.cs)	(revision 3ddd2e86216438a423797aecd4b1f9808df00bcb)
@@ -39,7 +39,7 @@
     /// </summary>
     /// <typeparam name="T">The type of the calculation to import.</typeparam>
     public class WaveConditionsCalculationConfigurationImporter<T>
-        : CalculationConfigurationImporter<WaveConditionsCalculationConfigurationReader, WaveConditionsCalculationConfiguration>
+        : CalculationConfigurationImporter<AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader, AssessmentSectionCategoryWaveConditionsCalculationConfiguration>
         where T : ICalculation<WaveConditionsInput>, new()
     {
         private readonly IEnumerable<HydraulicBoundaryLocation> availableHydraulicBoundaryLocations;
@@ -74,12 +74,12 @@
             availableForeshoreProfiles = foreshoreProfiles;
         }
 
-        protected override WaveConditionsCalculationConfigurationReader CreateCalculationConfigurationReader(string xmlFilePath)
+        protected override AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader CreateCalculationConfigurationReader(string xmlFilePath)
         {
-            return new WaveConditionsCalculationConfigurationReader(xmlFilePath);
+            return new AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader(xmlFilePath);
         }
 
-        protected override ICalculation ParseReadCalculation(WaveConditionsCalculationConfiguration calculationConfiguration)
+        protected override ICalculation ParseReadCalculation(AssessmentSectionCategoryWaveConditionsCalculationConfiguration calculationConfiguration)
         {
             var waveConditionsCalculation = new T
             {
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs
===================================================================
diff -u -r408972eaea004e68ac9fcaa892c71a47f3521b24 -r3ddd2e86216438a423797aecd4b1f9808df00bcb
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs	(.../WaveConditionsCalculationConfigurationReader.cs)	(revision 408972eaea004e68ac9fcaa892c71a47f3521b24)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationReader.cs	(.../WaveConditionsCalculationConfigurationReader.cs)	(revision 3ddd2e86216438a423797aecd4b1f9808df00bcb)
@@ -36,15 +36,17 @@
     /// This class reads a wave conditions calculation configuration from XML and creates a collection of corresponding
     /// <see cref="IConfigurationItem"/>, typically containing one or more <see cref="WaveConditionsCalculationConfiguration"/>.
     /// </summary>
-    public class WaveConditionsCalculationConfigurationReader : CalculationConfigurationReader<WaveConditionsCalculationConfiguration>
+    /// <typeparam name="T">The type of the calculation configuration.</typeparam>
+    public abstract class WaveConditionsCalculationConfigurationReader<T> : CalculationConfigurationReader<T>
+    where T : WaveConditionsCalculationConfiguration
     {
         private const string hydraulicBoundaryLocationSchemaName = "HrLocatieSchema.xsd";
         private const string orientationSchemaName = "OrientatieSchema.xsd";
         private const string foreshoreProfileSchemaName = "VoorlandProfielSchema.xsd";
         private const string waveReductionSchemaName = "GolfReductieSchema.xsd";
 
         /// <summary>
-        /// Creates a new instance of <see cref="WaveConditionsCalculationConfigurationReader"/>.
+        /// Creates a new instance of <see cref="WaveConditionsCalculationConfigurationReader{T]"/>.
         /// </summary>
         /// <param name="xmlFilePath">The file path to the XML file.</param>
         /// <exception cref="ArgumentException">Thrown when <paramref name="xmlFilePath"/> is invalid.</exception>
@@ -75,20 +77,19 @@
                        }
                    }) {}
 
-        protected override WaveConditionsCalculationConfiguration ParseCalculationElement(XElement calculationElement)
+        protected abstract override T ParseCalculationElement(XElement calculationElement);
+
+        protected void ParseCalculationElementData(XElement calculationElement, T configuration)
         {
-            return new WaveConditionsCalculationConfiguration(calculationElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute).Value)
-            {
-                HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement),
-                UpperBoundaryRevetment = calculationElement.GetDoubleValueFromDescendantElement(WaveConditionsCalculationConfigurationSchemaIdentifiers.UpperBoundaryRevetment),
-                LowerBoundaryRevetment = calculationElement.GetDoubleValueFromDescendantElement(WaveConditionsCalculationConfigurationSchemaIdentifiers.LowerBoundaryRevetment),
-                UpperBoundaryWaterLevels = calculationElement.GetDoubleValueFromDescendantElement(WaveConditionsCalculationConfigurationSchemaIdentifiers.UpperBoundaryWaterLevels),
-                LowerBoundaryWaterLevels = calculationElement.GetDoubleValueFromDescendantElement(WaveConditionsCalculationConfigurationSchemaIdentifiers.LowerBoundaryWaterLevels),
-                StepSize = (ConfigurationWaveConditionsInputStepSize?) calculationElement.GetConvertedValueFromDescendantDoubleElement<ConfigurationWaveConditionsInputStepSizeConverter>(WaveConditionsCalculationConfigurationSchemaIdentifiers.StepSize),
-                ForeshoreProfileId = calculationElement.GetStringValueFromDescendantElement(WaveConditionsCalculationConfigurationSchemaIdentifiers.ForeshoreProfile),
-                Orientation = calculationElement.GetDoubleValueFromDescendantElement(ConfigurationSchemaIdentifiers.Orientation),
-                WaveReduction = calculationElement.GetWaveReductionParameters()
-            };
+            configuration.HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement);
+            configuration.UpperBoundaryRevetment = calculationElement.GetDoubleValueFromDescendantElement(WaveConditionsCalculationConfigurationSchemaIdentifiers.UpperBoundaryRevetment);
+            configuration.LowerBoundaryRevetment = calculationElement.GetDoubleValueFromDescendantElement(WaveConditionsCalculationConfigurationSchemaIdentifiers.LowerBoundaryRevetment);
+            configuration.UpperBoundaryWaterLevels = calculationElement.GetDoubleValueFromDescendantElement(WaveConditionsCalculationConfigurationSchemaIdentifiers.UpperBoundaryWaterLevels);
+            configuration.LowerBoundaryWaterLevels = calculationElement.GetDoubleValueFromDescendantElement(WaveConditionsCalculationConfigurationSchemaIdentifiers.LowerBoundaryWaterLevels);
+            configuration.StepSize = (ConfigurationWaveConditionsInputStepSize?) calculationElement.GetConvertedValueFromDescendantDoubleElement<ConfigurationWaveConditionsInputStepSizeConverter>(WaveConditionsCalculationConfigurationSchemaIdentifiers.StepSize);
+            configuration.ForeshoreProfileId = calculationElement.GetStringValueFromDescendantElement(WaveConditionsCalculationConfigurationSchemaIdentifiers.ForeshoreProfile);
+            configuration.Orientation = calculationElement.GetDoubleValueFromDescendantElement(ConfigurationSchemaIdentifiers.Orientation);
+            configuration.WaveReduction = calculationElement.GetWaveReductionParameters();
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Resources/BekledingenHrConfiguratieSchema.xsd
===================================================================
diff -u -r92f1f075ba2b7487ae4e10a4c298ec6b7a68c634 -r3ddd2e86216438a423797aecd4b1f9808df00bcb
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Resources/BekledingenHrConfiguratieSchema.xsd	(.../BekledingenHrConfiguratieSchema.xsd)	(revision 92f1f075ba2b7487ae4e10a4c298ec6b7a68c634)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Resources/BekledingenHrConfiguratieSchema.xsd	(.../BekledingenHrConfiguratieSchema.xsd)	(revision 3ddd2e86216438a423797aecd4b1f9808df00bcb)
@@ -105,10 +105,10 @@
   <xs:element name="categoriegrens">
     <xs:simpleType>
       <xs:restriction base="xs:string">
-        <xs:enumeration value="A+->A"/>
-        <xs:enumeration value="A->B"/>
-        <xs:enumeration value="B->C"/>
-        <xs:enumeration value="C->D"/>
+        <xs:enumeration value="A+-A"/>
+        <xs:enumeration value="A-B"/>
+        <xs:enumeration value="B-C"/>
+        <xs:enumeration value="C-D"/>
       </xs:restriction>
     </xs:simpleType>
   </xs:element>
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r37595f31d0b37d1f6c93cf927f5eff067e992b33 -r3ddd2e86216438a423797aecd4b1f9808df00bcb
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs	(.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs)	(revision 37595f31d0b37d1f6c93cf927f5eff067e992b33)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs	(.../AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest.cs)	(revision 3ddd2e86216438a423797aecd4b1f9808df00bcb)
@@ -19,9 +19,14 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
+using System.Xml.Schema;
+using Core.Common.Base.IO;
 using Core.Common.TestUtil;
 using NUnit.Framework;
+using Ringtoets.Common.IO.Configurations;
 using Ringtoets.Revetment.IO.Configurations;
 
 namespace Ringtoets.Revetment.IO.Test.Configurations
@@ -30,8 +35,21 @@
     public class AssessmentSectionCategoryWaveConditionsCalculationConfigurationReaderTest
     {
         private readonly string testDirectoryPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Revetment.IO,
-                                                                               nameof(WaveConditionsCalculationConfigurationReader));
+                                                                               nameof(AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader));
 
+        private static IEnumerable<TestCaseData> InvalidConfigurations
+        {
+            get
+            {
+                yield return new TestCaseData("invalidCalculationMultipleCategoryType.xml",
+                                              "Element 'categoriegrens' cannot appear more than once if content model type is \"all\".")
+                    .SetName("invalidCalculationMultipleCategoryType");
+                yield return new TestCaseData("invalidCategoryTypeUnknownValue.xml",
+                                              "The 'categoriegrens' element is invalid - The value 'F-G' is invalid according to its datatype 'String' - The Enumeration constraint failed.")
+                    .SetName("invalidCategoryTypeUnknownValue");
+            }
+        }
+
         [Test]
         public void Constructor_ExpectedValues()
         {
@@ -42,7 +60,52 @@
             var reader = new AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader(filePath);
 
             // Assert
-            Assert.IsInstanceOf<WaveConditionsCalculationConfigurationReader>(reader);
+            Assert.IsInstanceOf<WaveConditionsCalculationConfigurationReader<AssessmentSectionCategoryWaveConditionsCalculationConfiguration>>(reader);
         }
+
+        [Test]
+        [TestCaseSource(nameof(InvalidConfigurations))]
+        public void Constructor_FileInvalidBasedOnSchemaDefinition_ThrowCriticalFileReadException(string fileName, string expectedParsingMessage)
+        {
+            // Setup
+            string filePath = Path.Combine(testDirectoryPath, fileName);
+
+            // Call
+            TestDelegate call = () => new AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader(filePath);
+
+            // Assert
+            var exception = Assert.Throws<CriticalFileReadException>(call);
+            Assert.IsInstanceOf<XmlSchemaValidationException>(exception.InnerException);
+            StringAssert.Contains(expectedParsingMessage, exception.InnerException?.Message);
+        }
+
+        [Test]
+        [TestCase("validConfigurationFullCalculation.xml")]
+        public void Read_ValidConfigurationWithFullCalculation_ReturnExpectedReadWaveConditionsCalculation(string fileName)
+        {
+            // Setup
+            string filePath = Path.Combine(testDirectoryPath, fileName);
+            var reader = new AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader(filePath);
+
+            // Call
+            IEnumerable<IConfigurationItem> readItems = reader.Read().ToArray();
+
+            // Assert
+            var calculation = (AssessmentSectionCategoryWaveConditionsCalculationConfiguration)readItems.Single();
+
+            Assert.IsNotNull(calculation);
+            Assert.AreEqual("HRlocatie", calculation.HydraulicBoundaryLocationName);
+            Assert.AreEqual(1.1, calculation.UpperBoundaryRevetment);
+            Assert.AreEqual(2.2, calculation.LowerBoundaryRevetment);
+            Assert.AreEqual(3.3, calculation.UpperBoundaryWaterLevels);
+            Assert.AreEqual(4.4, calculation.LowerBoundaryWaterLevels);
+            Assert.AreEqual(ConfigurationWaveConditionsInputStepSize.Half, calculation.StepSize);
+            Assert.AreEqual("Voorlandprofiel", calculation.ForeshoreProfileId);
+            Assert.AreEqual(5.5, calculation.Orientation);
+            Assert.IsTrue(calculation.WaveReduction.UseBreakWater);
+            Assert.AreEqual(ConfigurationBreakWaterType.Caisson, calculation.WaveReduction.BreakWaterType);
+            Assert.AreEqual(6.6, calculation.WaveReduction.BreakWaterHeight);
+            Assert.IsFalse(calculation.WaveReduction.UseForeshoreProfile);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r46fc5973d93a6f1844ab8a5e80f17096829cc90d -r3ddd2e86216438a423797aecd4b1f9808df00bcb
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs	(.../WaveConditionsCalculationConfigurationImporterTest.cs)	(revision 46fc5973d93a6f1844ab8a5e80f17096829cc90d)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs	(.../WaveConditionsCalculationConfigurationImporterTest.cs)	(revision 3ddd2e86216438a423797aecd4b1f9808df00bcb)
@@ -53,7 +53,7 @@
                 Enumerable.Empty<ForeshoreProfile>());
 
             // Assert
-            Assert.IsInstanceOf<CalculationConfigurationImporter<WaveConditionsCalculationConfigurationReader, WaveConditionsCalculationConfiguration>>(importer);
+            Assert.IsInstanceOf<CalculationConfigurationImporter<AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader, AssessmentSectionCategoryWaveConditionsCalculationConfiguration>>(importer);
         }
 
         [Test]
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r6949918830314633db5cc8c16bb2188779fffc93 -r3ddd2e86216438a423797aecd4b1f9808df00bcb
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationReaderTest.cs	(.../WaveConditionsCalculationConfigurationReaderTest.cs)	(revision 6949918830314633db5cc8c16bb2188779fffc93)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationReaderTest.cs	(.../WaveConditionsCalculationConfigurationReaderTest.cs)	(revision 3ddd2e86216438a423797aecd4b1f9808df00bcb)
@@ -22,6 +22,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Xml.Linq;
 using System.Xml.Schema;
 using Core.Common.Base.IO;
 using Core.Common.TestUtil;
@@ -36,7 +37,7 @@
     public class WaveConditionsCalculationConfigurationReaderTest
     {
         private readonly string testDirectoryPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Revetment.IO,
-                                                                               nameof(WaveConditionsCalculationConfigurationReader));
+                                                                               nameof(WaveConditionsCalculationConfigurationReader<WaveConditionsCalculationConfiguration>));
 
         private static IEnumerable<TestCaseData> InvalidConfigurations
         {
@@ -160,7 +161,7 @@
             string filePath = Path.Combine(testDirectoryPath, "validConfigurationEmptyCalculation.xml");
 
             // Call
-            var reader = new WaveConditionsCalculationConfigurationReader(filePath);
+            var reader = new TestWaveConditionsCalculationConfigurationReader(filePath);
 
             // Assert
             Assert.IsInstanceOf<CalculationConfigurationReader<WaveConditionsCalculationConfiguration>>(reader);
@@ -174,7 +175,7 @@
             string filePath = Path.Combine(testDirectoryPath, fileName);
 
             // Call
-            TestDelegate call = () => new WaveConditionsCalculationConfigurationReader(filePath);
+            TestDelegate call = () => new TestWaveConditionsCalculationConfigurationReader(filePath);
 
             // Assert
             var exception = Assert.Throws<CriticalFileReadException>(call);
@@ -187,7 +188,7 @@
         {
             // Setup
             string filePath = Path.Combine(testDirectoryPath, "validConfigurationEmptyCalculation.xml");
-            var reader = new WaveConditionsCalculationConfigurationReader(filePath);
+            var reader = new TestWaveConditionsCalculationConfigurationReader(filePath);
 
             // Call
             IEnumerable<IConfigurationItem> readItems = reader.Read().ToArray();
@@ -196,7 +197,6 @@
             var calculation = (WaveConditionsCalculationConfiguration) readItems.Single();
 
             Assert.IsNotNull(calculation);
-            Assert.AreEqual("Berekening 1", calculation.Name);
             Assert.IsNull(calculation.HydraulicBoundaryLocationName);
             Assert.IsNull(calculation.UpperBoundaryRevetment);
             Assert.IsNull(calculation.LowerBoundaryRevetment);
@@ -213,7 +213,7 @@
         {
             // Setup
             string filePath = Path.Combine(testDirectoryPath, "validConfigurationCalculationContainingEmptyWaveReduction.xml");
-            var reader = new WaveConditionsCalculationConfigurationReader(filePath);
+            var reader = new TestWaveConditionsCalculationConfigurationReader(filePath);
 
             // Call
             IEnumerable<IConfigurationItem> readItems = reader.Read().ToArray();
@@ -233,7 +233,7 @@
         {
             // Setup
             string filePath = Path.Combine(testDirectoryPath, "validConfigurationCalculationContainingNaNs.xml");
-            var reader = new WaveConditionsCalculationConfigurationReader(filePath);
+            var reader = new TestWaveConditionsCalculationConfigurationReader(filePath);
 
             // Call
             IEnumerable<IConfigurationItem> readItems = reader.Read().ToArray();
@@ -255,7 +255,7 @@
         {
             // Setup
             string filePath = Path.Combine(testDirectoryPath, "validConfigurationCalculationContaininInfinities.xml");
-            var reader = new WaveConditionsCalculationConfigurationReader(filePath);
+            var reader = new TestWaveConditionsCalculationConfigurationReader(filePath);
 
             // Call
             IEnumerable<IConfigurationItem> readItems = reader.Read().ToArray();
@@ -287,7 +287,7 @@
         {
             // Setup
             string filePath = Path.Combine(testDirectoryPath, fileName);
-            var reader = new WaveConditionsCalculationConfigurationReader(filePath);
+            var reader = new TestWaveConditionsCalculationConfigurationReader(filePath);
 
             // Call
             IEnumerable<IConfigurationItem> readItems = reader.Read().ToArray();
@@ -296,7 +296,6 @@
             var calculation = (WaveConditionsCalculationConfiguration) readItems.Single();
 
             Assert.IsNotNull(calculation);
-            Assert.AreEqual("Berekening 1", calculation.Name);
             Assert.AreEqual("HRlocatie", calculation.HydraulicBoundaryLocationName);
             Assert.AreEqual(1.1, calculation.UpperBoundaryRevetment);
             Assert.AreEqual(2.2, calculation.LowerBoundaryRevetment);
@@ -316,7 +315,7 @@
         {
             // Setup
             string filePath = Path.Combine(testDirectoryPath, "validConfigurationPartialCalculation.xml");
-            var reader = new WaveConditionsCalculationConfigurationReader(filePath);
+            var reader = new TestWaveConditionsCalculationConfigurationReader(filePath);
 
             // Call
             IEnumerable<IConfigurationItem> readItems = reader.Read().ToArray();
@@ -325,7 +324,6 @@
             var calculation = (WaveConditionsCalculationConfiguration) readItems.Single();
 
             Assert.IsNotNull(calculation);
-            Assert.AreEqual("Berekening 1", calculation.Name);
             Assert.IsNull(calculation.HydraulicBoundaryLocationName);
             Assert.AreEqual(1.1, calculation.UpperBoundaryRevetment);
             Assert.AreEqual(2.2, calculation.LowerBoundaryRevetment);
@@ -339,5 +337,16 @@
             Assert.AreEqual(3.3, calculation.WaveReduction.BreakWaterHeight);
             Assert.IsNull(calculation.WaveReduction.UseForeshoreProfile);
         }
+
+        private class TestWaveConditionsCalculationConfigurationReader : WaveConditionsCalculationConfigurationReader<WaveConditionsCalculationConfiguration>
+        {
+            public TestWaveConditionsCalculationConfigurationReader(string xmlFilePath) : base(xmlFilePath) {}
+            protected override WaveConditionsCalculationConfiguration ParseCalculationElement(XElement calculationElement)
+            {
+                var configuration = new WaveConditionsCalculationConfiguration("test");
+                ParseCalculationElementData(calculationElement, configuration);
+                return configuration;
+            }
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Ringtoets.Revetment.IO.Test.csproj
===================================================================
diff -u -r37595f31d0b37d1f6c93cf927f5eff067e992b33 -r3ddd2e86216438a423797aecd4b1f9808df00bcb
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Ringtoets.Revetment.IO.Test.csproj	(.../Ringtoets.Revetment.IO.Test.csproj)	(revision 37595f31d0b37d1f6c93cf927f5eff067e992b33)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Ringtoets.Revetment.IO.Test.csproj	(.../Ringtoets.Revetment.IO.Test.csproj)	(revision 3ddd2e86216438a423797aecd4b1f9808df00bcb)
@@ -14,6 +14,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Configurations\AssessmentSectionCategoryWaveConditionsCalculationConfigurationExporterTest.cs" />
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCalculationMultipleCategoryType.xml	(revision 3ddd2e86216438a423797aecd4b1f9808df00bcb)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <categoriegrens>A+-A</categoriegrens>
+    <categoriegrens>B-C</categoriegrens>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCategoryTypeEmpty.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCategoryTypeEmpty.xml	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCategoryTypeEmpty.xml	(revision 3ddd2e86216438a423797aecd4b1f9808df00bcb)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <categoriegrens/>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/invalidCategoryTypeUnknownValue.xml	(revision 3ddd2e86216438a423797aecd4b1f9808df00bcb)
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <categoriegrens>F-G</categoriegrens>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/validConfigurationEmptyCalculation.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/validConfigurationEmptyCalculation.xml	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/validConfigurationEmptyCalculation.xml	(revision 3ddd2e86216438a423797aecd4b1f9808df00bcb)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Berekening 1" />
+</configuratie>
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml
===================================================================
diff -u
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml	(revision 0)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/test-data/AssessmentSectionCategoryWaveConditionsCalculationConfigurationReader/validConfigurationFullCalculation.xml	(revision 3ddd2e86216438a423797aecd4b1f9808df00bcb)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Berekening 1">
+    <hrlocatie>HRlocatie</hrlocatie>
+    <categoriegrens>A-B</categoriegrens>
+    <bovengrensbekleding>1.1</bovengrensbekleding>
+    <ondergrensbekleding>2.2</ondergrensbekleding>
+    <bovengrenswaterstanden>3.3</bovengrenswaterstanden>
+    <ondergrenswaterstanden>4.4</ondergrenswaterstanden>
+    <stapgrootte>0.5</stapgrootte>
+    <voorlandprofiel>Voorlandprofiel</voorlandprofiel>
+    <orientatie>5.5</orientatie>
+    <golfreductie>
+      <damgebruiken>true</damgebruiken>
+      <damtype>caisson</damtype>
+      <damhoogte>6.6</damhoogte>
+      <voorlandgebruiken>false</voorlandgebruiken>
+    </golfreductie>
+  </berekening>
+</configuratie>