Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Exporters/StabilityPointStructuresCalculationConfigurationExporterTest.cs
===================================================================
diff -u -ra9b3b3d970ae59100d45e092e767dd2dbc5ccdf7 -re4ac9527c2d9c837a35ca5195b7774612d72f750
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Exporters/StabilityPointStructuresCalculationConfigurationExporterTest.cs	(.../StabilityPointStructuresCalculationConfigurationExporterTest.cs)	(revision a9b3b3d970ae59100d45e092e767dd2dbc5ccdf7)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Exporters/StabilityPointStructuresCalculationConfigurationExporterTest.cs	(.../StabilityPointStructuresCalculationConfigurationExporterTest.cs)	(revision e4ac9527c2d9c837a35ca5195b7774612d72f750)
@@ -29,7 +29,6 @@
 using Ringtoets.Common.Data.Probabilistics;
 using Ringtoets.Common.Data.Structures;
 using Ringtoets.Common.Data.TestUtil;
-using Ringtoets.Common.IO.Configurations;
 using Ringtoets.Common.IO.TestUtil;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityPointStructures.Data.TestUtil;
@@ -78,6 +77,21 @@
                         }
                     })
                     .SetName("Calculation configuration with hierarchy");
+                yield return new TestCaseData("configurationWithForeshoreProfile", new[]
+                    {
+                        CreateCalculationWithForeshoreProfile()
+                    })
+                    .SetName("Calculation configuration with foreshore profile");
+                yield return new TestCaseData("configurationWithUseBreakWater", new[]
+                    {
+                        CreateCalculationWithUseBreakWater()
+                    })
+                    .SetName("Calculation configuration with use breakwater true");
+                yield return new TestCaseData("configurationWithStructure", new[]
+                    {
+                        CreateCalculationWithStructure()
+                    })
+                    .SetName("Calculation configuration with a structure set");
             }
         }
 
@@ -96,6 +110,49 @@
             WriteAndValidate(calculations, expectedXmlFilePath);
         }
 
+        private static StructuresCalculation<StabilityPointStructuresInput> CreateCalculationWithStructure()
+        {
+            return new StructuresCalculation<StabilityPointStructuresInput>
+            {
+                Name = "with structure",
+                InputParameters =
+                {
+                    Structure = new TestStabilityPointStructure("kunstwerk1")
+                }
+            };
+        }
+
+        private static StructuresCalculation<StabilityPointStructuresInput> CreateCalculationWithForeshoreProfile()
+        {
+            return new StructuresCalculation<StabilityPointStructuresInput>
+            {
+                Name = "with foreshore profile",
+                InputParameters =
+                {
+                    ForeshoreProfile = new TestForeshoreProfile("profiel1")
+                }
+            };
+        }
+
+        private static StructuresCalculation<StabilityPointStructuresInput> CreateCalculationWithUseBreakWater()
+        {
+            return new StructuresCalculation<StabilityPointStructuresInput>
+            {
+                Name = "with use breakwater",
+                InputParameters =
+                {
+                    ForeshoreProfile = new TestForeshoreProfile("profiel1"),
+                    BreakWater =
+                    {
+                        Type = BreakWaterType.Wall,
+                        Height = (RoundedDouble) 1.24
+                    },
+                    UseBreakWater = true,
+                    UseForeshore = false
+                }
+            };
+        }
+
         private static ICalculationBase CreateSparseCalculation()
         {
             return new StructuresCalculation<StabilityPointStructuresInput>
@@ -253,139 +310,5 @@
         {
             return new StabilityPointStructuresCalculationConfigurationExporter(calculations, filePath);
         }
-
-        private static StabilityPointStructuresCalculationConfiguration CreateFullCalculation2()
-        {
-            return new StabilityPointStructuresCalculationConfiguration("full config")
-            {
-                AllowedLevelIncreaseStorage = new MeanStandardDeviationStochastConfiguration
-                {
-                    Mean = 0.2,
-                    StandardDeviation = 0.01
-                },
-                AreaFlowApertures = new MeanStandardDeviationStochastConfiguration
-                {
-                    Mean = 80.5,
-                    StandardDeviation = 1
-                },
-                BankWidth = new MeanStandardDeviationStochastConfiguration
-                {
-                    Mean = 1.2,
-                    StandardDeviation = 0.1
-                },
-                ConstructiveStrengthLinearLoadModel = new MeanVariationCoefficientStochastConfiguration
-                {
-                    Mean = 2,
-                    VariationCoefficient = 0.1
-                },
-                ConstructiveStrengthQuadraticLoadModel = new MeanVariationCoefficientStochastConfiguration
-                {
-                    Mean = 2,
-                    VariationCoefficient = 0.1
-                },
-                CriticalOvertoppingDischarge = new MeanVariationCoefficientStochastConfiguration
-                {
-                    Mean = 2,
-                    VariationCoefficient = 0.1
-                },
-                DrainCoefficient = new MeanStandardDeviationStochastConfiguration
-                {
-                    Mean = 0.1
-                },
-                EvaluationLevel = 1e-1,
-                FactorStormDurationOpenStructure = 1e-2,
-                FailureCollisionEnergy = new MeanVariationCoefficientStochastConfiguration
-                {
-                    Mean = 1.2,
-                    VariationCoefficient = 0.1
-                },
-                FailureProbabilityRepairClosure = 1e-3,
-                FailureProbabilityStructureWithErosion = 1e-4,
-                FlowVelocityStructureClosable = new MeanVariationCoefficientStochastConfiguration
-                {
-                    Mean = 1.1
-                },
-                FlowWidthAtBottomProtection = new MeanStandardDeviationStochastConfiguration
-                {
-                    Mean = 15.2,
-                    StandardDeviation = 0.1
-                },
-                ForeshoreProfileName = "profiel1",
-                HydraulicBoundaryLocationName = "Locatie1",
-                InflowModelType = ConfigurationStabilityPointStructuresInflowModelType.FloodedCulvert,
-                InsideWaterLevel = new MeanStandardDeviationStochastConfiguration
-                {
-                    Mean = 0.5,
-                    StandardDeviation = 0.1
-                },
-                InsideWaterLevelFailureConstruction = new MeanStandardDeviationStochastConfiguration
-                {
-                    Mean = 0.7,
-                    StandardDeviation = 0.1
-                },
-                LevelCrestStructure = new MeanStandardDeviationStochastConfiguration
-                {
-                    Mean = 4.3,
-                    StandardDeviation = 0.1
-                },
-                LevellingCount = 1,
-                LoadSchematizationType = ConfigurationStabilityPointStructuresLoadSchematizationType.Linear,
-                ModelFactorSuperCriticalFlow = new MeanStandardDeviationStochastConfiguration
-                {
-                    Mean = 0.1
-                },
-                ProbabilityCollisionSecondaryStructure = 1e-5,
-                VolumicWeightWater = 1e-6,
-                StormDuration = new MeanVariationCoefficientStochastConfiguration
-                {
-                    Mean = 6.0
-                },
-                ShipMass = new MeanVariationCoefficientStochastConfiguration
-                {
-                    Mean = 16000,
-                    VariationCoefficient = 0.1
-                },
-                ShipVelocity = new MeanVariationCoefficientStochastConfiguration
-                {
-                    Mean = 1.2,
-                    VariationCoefficient = 0.1
-                },
-                StabilityLinearLoadModel = new MeanVariationCoefficientStochastConfiguration
-                {
-                    Mean = 1.2,
-                    VariationCoefficient = 0.1
-                },
-                StabilityQuadraticLoadModel = new MeanVariationCoefficientStochastConfiguration
-                {
-                    Mean = 1.2,
-                    VariationCoefficient = 0.1
-                },
-                StorageStructureArea = new MeanVariationCoefficientStochastConfiguration
-                {
-                    Mean = 15000,
-                    VariationCoefficient = 0.01
-                },
-                StructureName = "kunstwerk1",
-                StructureNormalOrientation = 1e-7,
-                ThresholdHeightOpenWeir = new MeanStandardDeviationStochastConfiguration
-                {
-                    Mean = 1.2,
-                    StandardDeviation = 0.1
-                },
-                VerticalDistance = 1e-8,
-                WaveReduction = new WaveReductionConfiguration
-                {
-                    UseBreakWater = true,
-                    BreakWaterType = ConfigurationBreakWaterType.Dam,
-                    BreakWaterHeight = 1.23,
-                    UseForeshoreProfile = false
-                },
-                WidthFlowApertures = new MeanStandardDeviationStochastConfiguration
-                {
-                    Mean = 15.2,
-                    StandardDeviation = 0.1
-                }
-            };
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationExporter/configurationWithForeshoreProfile.xml
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationExporter/configurationWithForeshoreProfile.xml	(revision 0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationExporter/configurationWithForeshoreProfile.xml	(revision e4ac9527c2d9c837a35ca5195b7774612d72f750)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="with foreshore profile">
+    <faalkansgegevenerosiebodem>1</faalkansgegevenerosiebodem>
+    <voorlandprofiel>profiel1</voorlandprofiel>
+    <factorstormduur>1</factorstormduur>
+    <volumiekgewichtwater>9.81</volumiekgewichtwater>
+    <golfreductie>
+      <damgebruiken>false</damgebruiken>
+      <damtype>havendam</damtype>
+      <damhoogte>0</damhoogte>
+      <voorlandgebruiken>false</voorlandgebruiken>
+    </golfreductie>
+    <stochasten>
+      <stochast naam="modelfactoroverloopdebiet">
+        <verwachtingswaarde>1.1</verwachtingswaarde>
+      </stochast>
+      <stochast naam="stormduur">
+        <verwachtingswaarde>6</verwachtingswaarde>
+      </stochast>
+      <stochast naam="afvoercoefficient">
+        <verwachtingswaarde>1</verwachtingswaarde>
+      </stochast>
+    </stochasten>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationExporter/configurationWithStructure.xml
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationExporter/configurationWithStructure.xml	(revision 0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationExporter/configurationWithStructure.xml	(revision e4ac9527c2d9c837a35ca5195b7774612d72f750)
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="with structure">
+    <kunstwerk>kunstwerk1</kunstwerk>
+    <orientatie>123.46</orientatie>
+    <faalkansgegevenerosiebodem>1</faalkansgegevenerosiebodem>
+    <analysehoogte>555.55</analysehoogte>
+    <factorstormduur>1</factorstormduur>
+    <faalkansherstel>0.55</faalkansherstel>
+    <instroommodel>verdronkenkoker</instroommodel>
+    <nrnivelleringen>42</nrnivelleringen>
+    <kansaanvaringtweedekeermiddel>0.55</kansaanvaringtweedekeermiddel>
+    <afstandonderkantwandteendijk>555.55</afstandonderkantwandteendijk>
+    <volumiekgewichtwater>9.81</volumiekgewichtwater>
+    <stochasten>
+      <stochast naam="breedtebodembescherming">
+        <verwachtingswaarde>890.12</verwachtingswaarde>
+        <standaardafwijking>0.89</standaardafwijking>
+      </stochast>
+      <stochast naam="breedtedoorstroomopening">
+        <verwachtingswaarde>456.79</verwachtingswaarde>
+        <standaardafwijking>0.46</standaardafwijking>
+      </stochast>
+      <stochast naam="kombergendoppervlak">
+        <verwachtingswaarde>234.57</verwachtingswaarde>
+        <variatiecoefficient>0.23</variatiecoefficient>
+      </stochast>
+      <stochast naam="kritiekinstromenddebiet">
+        <verwachtingswaarde>789.01</verwachtingswaarde>
+        <variatiecoefficient>0.79</variatiecoefficient>
+      </stochast>
+      <stochast naam="modelfactoroverloopdebiet">
+        <verwachtingswaarde>1.1</verwachtingswaarde>
+      </stochast>
+      <stochast naam="peilverhogingkomberging">
+        <verwachtingswaarde>345.68</verwachtingswaarde>
+        <standaardafwijking>0.35</standaardafwijking>
+      </stochast>
+      <stochast naam="stormduur">
+        <verwachtingswaarde>6</verwachtingswaarde>
+      </stochast>
+      <stochast naam="doorstroomoppervlak">
+        <verwachtingswaarde>901.23</verwachtingswaarde>
+        <standaardafwijking>0.9</standaardafwijking>
+      </stochast>
+      <stochast naam="bermbreedte">
+        <verwachtingswaarde>234.57</verwachtingswaarde>
+      </stochast>
+      <stochast naam="lineairebelastingschematiseringsterkte">
+        <verwachtingswaarde>901.23</verwachtingswaarde>
+        <variatiecoefficient>0.9</variatiecoefficient>
+      </stochast>
+      <stochast naam="kwadratischebelastingschematiseringsterkte">
+        <verwachtingswaarde>123.46</verwachtingswaarde>
+        <variatiecoefficient>0.12</variatiecoefficient>
+      </stochast>
+      <stochast naam="afvoercoefficient">
+        <verwachtingswaarde>1</verwachtingswaarde>
+      </stochast>
+      <stochast naam="aanvaarenergie">
+        <verwachtingswaarde>567.89</verwachtingswaarde>
+        <variatiecoefficient>0.57</variatiecoefficient>
+      </stochast>
+      <stochast naam="kritiekestroomsnelheid">
+        <verwachtingswaarde>678.9</verwachtingswaarde>
+        <variatiecoefficient>0.2</variatiecoefficient>
+      </stochast>
+      <stochast naam="binnenwaterstand">
+        <verwachtingswaarde>567.89</verwachtingswaarde>
+        <standaardafwijking>0.57</standaardafwijking>
+      </stochast>
+      <stochast naam="binnenwaterstandbijfalen">
+        <verwachtingswaarde>345.68</verwachtingswaarde>
+        <standaardafwijking>0.35</standaardafwijking>
+      </stochast>
+      <stochast naam="kerendehoogte">
+        <verwachtingswaarde>456.79</verwachtingswaarde>
+        <standaardafwijking>0.46</standaardafwijking>
+      </stochast>
+      <stochast naam="massaschip">
+        <verwachtingswaarde>7777777.78</verwachtingswaarde>
+        <variatiecoefficient>0.78</variatiecoefficient>
+      </stochast>
+      <stochast naam="aanvaarsnelheid">
+        <verwachtingswaarde>567.89</verwachtingswaarde>
+        <variatiecoefficient>0.57</variatiecoefficient>
+      </stochast>
+      <stochast naam="lineairebelastingschematiseringstabiliteit">
+        <verwachtingswaarde>789.01</verwachtingswaarde>
+        <variatiecoefficient>0.79</variatiecoefficient>
+      </stochast>
+      <stochast naam="kwadratischebelastingschematiseringstabiliteit">
+        <verwachtingswaarde>890.12</verwachtingswaarde>
+        <variatiecoefficient>0.89</variatiecoefficient>
+      </stochast>
+      <stochast naam="drempelhoogte">
+        <verwachtingswaarde>678.9</verwachtingswaarde>
+        <standaardafwijking>0.68</standaardafwijking>
+      </stochast>
+    </stochasten>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationExporter/configurationWithUseBreakWater.xml
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationExporter/configurationWithUseBreakWater.xml	(revision 0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationExporter/configurationWithUseBreakWater.xml	(revision e4ac9527c2d9c837a35ca5195b7774612d72f750)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="with use breakwater">
+    <faalkansgegevenerosiebodem>1</faalkansgegevenerosiebodem>
+    <voorlandprofiel>profiel1</voorlandprofiel>
+    <factorstormduur>1</factorstormduur>
+    <volumiekgewichtwater>9.81</volumiekgewichtwater>
+    <golfreductie>
+      <damgebruiken>true</damgebruiken>
+      <damtype>verticalewand</damtype>
+      <damhoogte>1.24</damhoogte>
+      <voorlandgebruiken>false</voorlandgebruiken>
+    </golfreductie>
+    <stochasten>
+      <stochast naam="modelfactoroverloopdebiet">
+        <verwachtingswaarde>1.1</verwachtingswaarde>
+      </stochast>
+      <stochast naam="stormduur">
+        <verwachtingswaarde>6</verwachtingswaarde>
+      </stochast>
+      <stochast naam="afvoercoefficient">
+        <verwachtingswaarde>1</verwachtingswaarde>
+      </stochast>
+    </stochasten>
+  </berekening>
+</configuratie>
\ No newline at end of file