Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ExportInfos/ClosingStructuresCalculationContextExportInfoTest.cs
===================================================================
diff -u -r224c42bc350805701228423a2d79c6cf699a9453 -r876a1e97b3a16adbb7cbdc142f135ae184ad9298
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ExportInfos/ClosingStructuresCalculationContextExportInfoTest.cs	(.../ClosingStructuresCalculationContextExportInfoTest.cs)	(revision 224c42bc350805701228423a2d79c6cf699a9453)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ExportInfos/ClosingStructuresCalculationContextExportInfoTest.cs	(.../ClosingStructuresCalculationContextExportInfoTest.cs)	(revision 876a1e97b3a16adbb7cbdc142f135ae184ad9298)
@@ -31,6 +31,7 @@
 using Ringtoets.ClosingStructures.Forms.PresentationObjects;
 using Ringtoets.ClosingStructures.IO.Configurations;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Calculation;
 using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.ClosingStructures.Plugin.Test.ExportInfos
@@ -66,6 +67,7 @@
             mocks.ReplayAll();
 
             var context = new ClosingStructuresCalculationContext(new TestClosingStructuresCalculation(),
+                                                                  new CalculationGroup(),
                                                                   new ClosingStructuresFailureMechanism(),
                                                                   assessmentSection);
 
@@ -107,6 +109,7 @@
             mocks.ReplayAll();
 
             var context = new ClosingStructuresCalculationContext(new TestClosingStructuresCalculation(),
+                                                                  new CalculationGroup(),
                                                                   new ClosingStructuresFailureMechanism(),
                                                                   assessmentSection);
 
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ExportInfos/GrassCoverErosionInwardsCalculationContextExportInfoTest.cs
===================================================================
diff -u -r224c42bc350805701228423a2d79c6cf699a9453 -r876a1e97b3a16adbb7cbdc142f135ae184ad9298
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ExportInfos/GrassCoverErosionInwardsCalculationContextExportInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextExportInfoTest.cs)	(revision 224c42bc350805701228423a2d79c6cf699a9453)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ExportInfos/GrassCoverErosionInwardsCalculationContextExportInfoTest.cs	(.../GrassCoverErosionInwardsCalculationContextExportInfoTest.cs)	(revision 876a1e97b3a16adbb7cbdc142f135ae184ad9298)
@@ -27,6 +27,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.GrassCoverErosionInwards.Data;
 using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionInwards.IO.Configurations;
@@ -65,6 +66,7 @@
             mocks.ReplayAll();
 
             var context = new GrassCoverErosionInwardsCalculationContext(new GrassCoverErosionInwardsCalculation(),
+                                                                         new CalculationGroup(),
                                                                          new GrassCoverErosionInwardsFailureMechanism(),
                                                                          assessmentSection);
 
@@ -106,6 +108,7 @@
             mocks.ReplayAll();
 
             var context = new GrassCoverErosionInwardsCalculationContext(new GrassCoverErosionInwardsCalculation(),
+                                                                         new CalculationGroup(),
                                                                          new GrassCoverErosionInwardsFailureMechanism(),
                                                                          assessmentSection);
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs
===================================================================
diff -u -r224c42bc350805701228423a2d79c6cf699a9453 -r876a1e97b3a16adbb7cbdc142f135ae184ad9298
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs)	(revision 224c42bc350805701228423a2d79c6cf699a9453)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextConfigurationExportInfoTest.cs)	(revision 876a1e97b3a16adbb7cbdc142f135ae184ad9298)
@@ -27,6 +27,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
 using Ringtoets.GrassCoverErosionOutwards.IO.Exporters;
@@ -69,10 +70,10 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-
             var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(new GrassCoverErosionOutwardsWaveConditionsCalculation(),
-                                                                                        failureMechanism, assessmentSection);
+                                                                                        new CalculationGroup(),
+                                                                                        new GrassCoverErosionOutwardsFailureMechanism(),
+                                                                                        assessmentSection);
 
             // Call
             IFileExporter fileExporter = exportInfo.CreateFileExporter(context, "test");
@@ -100,13 +101,11 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
+            var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(new GrassCoverErosionOutwardsWaveConditionsCalculation(),
+                                                                                        new CalculationGroup(),
+                                                                                        new GrassCoverErosionOutwardsFailureMechanism(),
+                                                                                        assessmentSection);
 
-            var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(
-                new GrassCoverErosionOutwardsWaveConditionsCalculation(),
-                failureMechanism,
-                assessmentSection);
-
             // Call
             bool isEnabled = exportInfo.IsEnabled(context);
 
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs
===================================================================
diff -u -r224c42bc350805701228423a2d79c6cf699a9453 -r876a1e97b3a16adbb7cbdc142f135ae184ad9298
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs)	(revision 224c42bc350805701228423a2d79c6cf699a9453)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs)	(revision 876a1e97b3a16adbb7cbdc142f135ae184ad9298)
@@ -27,10 +27,11 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.GrassCoverErosionOutwards.Data;
 using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
-using Ringtoets.Revetment.IO.WaveConditions;
 using Ringtoets.Revetment.Data.TestUtil;
+using Ringtoets.Revetment.IO.WaveConditions;
 using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 
 namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test.ExportInfos
@@ -70,10 +71,10 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-
             var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(new GrassCoverErosionOutwardsWaveConditionsCalculation(),
-                                                                                        failureMechanism, assessmentSection);
+                                                                                        new CalculationGroup(),
+                                                                                        new GrassCoverErosionOutwardsFailureMechanism(),
+                                                                                        assessmentSection);
 
             // Call
             IFileExporter fileExporter = exportInfo.CreateFileExporter(context, "test");
@@ -104,7 +105,9 @@
             var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
 
             var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(new GrassCoverErosionOutwardsWaveConditionsCalculation(),
-                                                                                        failureMechanism, assessmentSection);
+                                                                                        new CalculationGroup(),
+                                                                                        failureMechanism,
+                                                                                        assessmentSection);
 
             // Call
             bool isEnabled = exportInfo.IsEnabled(context);
@@ -122,18 +125,17 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism();
-            var output = new[]
-            {
-                new TestWaveConditionsOutput()
-            };
-
             var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext(
                 new GrassCoverErosionOutwardsWaveConditionsCalculation
                 {
-                    Output = new GrassCoverErosionOutwardsWaveConditionsOutput(output)
+                    Output = new GrassCoverErosionOutwardsWaveConditionsOutput(new[]
+                    {
+                        new TestWaveConditionsOutput()
+                    })
                 },
-                failureMechanism, assessmentSection);
+                new CalculationGroup(),
+                new GrassCoverErosionOutwardsFailureMechanism(),
+                assessmentSection);
 
             // Call
             bool isEnabled = exportInfo.IsEnabled(context);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ExportInfos/HeightStructuresCalculationContextExportInfoTest.cs
===================================================================
diff -u -r224c42bc350805701228423a2d79c6cf699a9453 -r876a1e97b3a16adbb7cbdc142f135ae184ad9298
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ExportInfos/HeightStructuresCalculationContextExportInfoTest.cs	(.../HeightStructuresCalculationContextExportInfoTest.cs)	(revision 224c42bc350805701228423a2d79c6cf699a9453)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ExportInfos/HeightStructuresCalculationContextExportInfoTest.cs	(.../HeightStructuresCalculationContextExportInfoTest.cs)	(revision 876a1e97b3a16adbb7cbdc142f135ae184ad9298)
@@ -27,6 +27,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.HeightStructures.Data;
 using Ringtoets.HeightStructures.Data.TestUtil;
 using Ringtoets.HeightStructures.Forms.PresentationObjects;
@@ -66,6 +67,7 @@
             mocks.ReplayAll();
 
             var context = new HeightStructuresCalculationContext(new TestHeightStructuresCalculation(),
+                                                                 new CalculationGroup(),
                                                                  new HeightStructuresFailureMechanism(),
                                                                  assessmentSection);
 
@@ -107,6 +109,7 @@
             mocks.ReplayAll();
 
             var context = new HeightStructuresCalculationContext(new TestHeightStructuresCalculation(),
+                                                                 new CalculationGroup(),
                                                                  new HeightStructuresFailureMechanism(),
                                                                  assessmentSection);
 
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationContextExportInfoTest.cs
===================================================================
diff -u -r224c42bc350805701228423a2d79c6cf699a9453 -r876a1e97b3a16adbb7cbdc142f135ae184ad9298
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationContextExportInfoTest.cs	(.../MacroStabilityInwardsCalculationContextExportInfoTest.cs)	(revision 224c42bc350805701228423a2d79c6cf699a9453)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/ExportInfos/MacroStabilityInwardsCalculationContextExportInfoTest.cs	(.../MacroStabilityInwardsCalculationContextExportInfoTest.cs)	(revision 876a1e97b3a16adbb7cbdc142f135ae184ad9298)
@@ -27,6 +27,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.MacroStabilityInwards.Data;
 using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects;
 using Ringtoets.MacroStabilityInwards.IO.Configurations;
@@ -66,6 +67,7 @@
             mocks.ReplayAll();
 
             var context = new MacroStabilityInwardsCalculationScenarioContext(new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()),
+                                                                              new CalculationGroup(),
                                                                               Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
                                                                               Enumerable.Empty<StochasticSoilModel>(),
                                                                               new MacroStabilityInwardsFailureMechanism(),
@@ -109,6 +111,7 @@
             mocks.ReplayAll();
 
             var context = new MacroStabilityInwardsCalculationScenarioContext(new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()),
+                                                                              new CalculationGroup(),
                                                                               Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
                                                                               Enumerable.Empty<StochasticSoilModel>(),
                                                                               new MacroStabilityInwardsFailureMechanism(),
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ExportInfos/PipingCalculationContextExportInfoTest.cs
===================================================================
diff -u -r224c42bc350805701228423a2d79c6cf699a9453 -r876a1e97b3a16adbb7cbdc142f135ae184ad9298
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ExportInfos/PipingCalculationContextExportInfoTest.cs	(.../PipingCalculationContextExportInfoTest.cs)	(revision 224c42bc350805701228423a2d79c6cf699a9453)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ExportInfos/PipingCalculationContextExportInfoTest.cs	(.../PipingCalculationContextExportInfoTest.cs)	(revision 876a1e97b3a16adbb7cbdc142f135ae184ad9298)
@@ -27,6 +27,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Forms.PresentationObjects;
 using Ringtoets.Piping.IO.Configurations;
@@ -66,6 +67,7 @@
             mocks.ReplayAll();
 
             var context = new PipingCalculationScenarioContext(new PipingCalculationScenario(new GeneralPipingInput()),
+                                                               new CalculationGroup(),
                                                                Enumerable.Empty<PipingSurfaceLine>(),
                                                                Enumerable.Empty<StochasticSoilModel>(),
                                                                new PipingFailureMechanism(),
@@ -109,6 +111,7 @@
             mocks.ReplayAll();
 
             var context = new PipingCalculationScenarioContext(new PipingCalculationScenario(new GeneralPipingInput()),
+                                                               new CalculationGroup(),
                                                                Enumerable.Empty<PipingSurfaceLine>(),
                                                                Enumerable.Empty<StochasticSoilModel>(),
                                                                new PipingFailureMechanism(),
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ExportInfos/StabilityPointStructuresCalculationContextExportInfoTest.cs
===================================================================
diff -u -r224c42bc350805701228423a2d79c6cf699a9453 -r876a1e97b3a16adbb7cbdc142f135ae184ad9298
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ExportInfos/StabilityPointStructuresCalculationContextExportInfoTest.cs	(.../StabilityPointStructuresCalculationContextExportInfoTest.cs)	(revision 224c42bc350805701228423a2d79c6cf699a9453)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ExportInfos/StabilityPointStructuresCalculationContextExportInfoTest.cs	(.../StabilityPointStructuresCalculationContextExportInfoTest.cs)	(revision 876a1e97b3a16adbb7cbdc142f135ae184ad9298)
@@ -27,6 +27,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.StabilityPointStructures.Data;
 using Ringtoets.StabilityPointStructures.Data.TestUtil;
 using Ringtoets.StabilityPointStructures.Forms.PresentationObjects;
@@ -66,6 +67,7 @@
             mocks.ReplayAll();
 
             var context = new StabilityPointStructuresCalculationContext(new TestStabilityPointStructuresCalculation(),
+                                                                         new CalculationGroup(),
                                                                          new StabilityPointStructuresFailureMechanism(),
                                                                          assessmentSection);
 
@@ -107,6 +109,7 @@
             mocks.ReplayAll();
 
             var context = new StabilityPointStructuresCalculationContext(new TestStabilityPointStructuresCalculation(),
+                                                                         new CalculationGroup(),
                                                                          new StabilityPointStructuresFailureMechanism(),
                                                                          assessmentSection);
 
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs
===================================================================
diff -u -r7261037d9779a908ec89ded5b4fdb73c568a9606 -r876a1e97b3a16adbb7cbdc142f135ae184ad9298
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs)	(revision 7261037d9779a908ec89ded5b4fdb73c568a9606)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs)	(revision 876a1e97b3a16adbb7cbdc142f135ae184ad9298)
@@ -27,6 +27,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
 using Ringtoets.StabilityStoneCover.IO.Exporters;
@@ -69,10 +70,10 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new StabilityStoneCoverFailureMechanism();
-
             var context = new StabilityStoneCoverWaveConditionsCalculationContext(new StabilityStoneCoverWaveConditionsCalculation(),
-                                                                                  failureMechanism, assessmentSection);
+                                                                                  new CalculationGroup(),
+                                                                                  new StabilityStoneCoverFailureMechanism(),
+                                                                                  assessmentSection);
 
             // Call
             IFileExporter fileExporter = exportInfo.CreateFileExporter(context, "test");
@@ -100,13 +101,11 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new StabilityStoneCoverFailureMechanism();
+            var context = new StabilityStoneCoverWaveConditionsCalculationContext(new StabilityStoneCoverWaveConditionsCalculation(),
+                                                                                  new CalculationGroup(),
+                                                                                  new StabilityStoneCoverFailureMechanism(),
+                                                                                  assessmentSection);
 
-            var context = new StabilityStoneCoverWaveConditionsCalculationContext(
-                new StabilityStoneCoverWaveConditionsCalculation(),
-                failureMechanism,
-                assessmentSection);
-
             // Call
             bool isEnabled = exportInfo.IsEnabled(context);
 
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs
===================================================================
diff -u -r7261037d9779a908ec89ded5b4fdb73c568a9606 -r876a1e97b3a16adbb7cbdc142f135ae184ad9298
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs)	(revision 7261037d9779a908ec89ded5b4fdb73c568a9606)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs)	(revision 876a1e97b3a16adbb7cbdc142f135ae184ad9298)
@@ -27,8 +27,9 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
-using Ringtoets.Revetment.IO.WaveConditions;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Revetment.Data.TestUtil;
+using Ringtoets.Revetment.IO.WaveConditions;
 using Ringtoets.StabilityStoneCover.Data;
 using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
 using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
@@ -70,10 +71,10 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new StabilityStoneCoverFailureMechanism();
-
             var context = new StabilityStoneCoverWaveConditionsCalculationContext(new StabilityStoneCoverWaveConditionsCalculation(),
-                                                                                  failureMechanism, assessmentSection);
+                                                                                  new CalculationGroup(),
+                                                                                  new StabilityStoneCoverFailureMechanism(),
+                                                                                  assessmentSection);
 
             // Call
             IFileExporter fileExporter = exportInfo.CreateFileExporter(context, "test");
@@ -101,10 +102,10 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new StabilityStoneCoverFailureMechanism();
-
             var context = new StabilityStoneCoverWaveConditionsCalculationContext(new StabilityStoneCoverWaveConditionsCalculation(),
-                                                                                  failureMechanism, assessmentSection);
+                                                                                  new CalculationGroup(),
+                                                                                  new StabilityStoneCoverFailureMechanism(),
+                                                                                  assessmentSection);
 
             // Call
             bool isEnabled = exportInfo.IsEnabled(context);
@@ -122,18 +123,20 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new StabilityStoneCoverFailureMechanism();
-            var output = new[]
-            {
-                new TestWaveConditionsOutput()
-            };
-
             var context = new StabilityStoneCoverWaveConditionsCalculationContext(
                 new StabilityStoneCoverWaveConditionsCalculation
                 {
-                    Output = new StabilityStoneCoverWaveConditionsOutput(output, output)
+                    Output = new StabilityStoneCoverWaveConditionsOutput(new[]
+                    {
+                        new TestWaveConditionsOutput()
+                    }, new[]
+                    {
+                        new TestWaveConditionsOutput()
+                    })
                 },
-                failureMechanism, assessmentSection);
+                new CalculationGroup(),
+                new StabilityStoneCoverFailureMechanism(),
+                assessmentSection);
 
             // Call
             bool isEnabled = exportInfo.IsEnabled(context);
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs
===================================================================
diff -u -r7261037d9779a908ec89ded5b4fdb73c568a9606 -r876a1e97b3a16adbb7cbdc142f135ae184ad9298
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs)	(revision 7261037d9779a908ec89ded5b4fdb73c568a9606)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextConfigurationExportInfoTest.cs)	(revision 876a1e97b3a16adbb7cbdc142f135ae184ad9298)
@@ -27,6 +27,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.WaveImpactAsphaltCover.Data;
 using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects;
 using Ringtoets.WaveImpactAsphaltCover.IO.Exporters;
@@ -69,10 +70,10 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
-
             var context = new WaveImpactAsphaltCoverWaveConditionsCalculationContext(new WaveImpactAsphaltCoverWaveConditionsCalculation(),
-                                                                                     failureMechanism, assessmentSection);
+                                                                                     new CalculationGroup(),
+                                                                                     new WaveImpactAsphaltCoverFailureMechanism(),
+                                                                                     assessmentSection);
 
             // Call
             IFileExporter fileExporter = exportInfo.CreateFileExporter(context, "test");
@@ -100,13 +101,11 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
+            var context = new WaveImpactAsphaltCoverWaveConditionsCalculationContext(new WaveImpactAsphaltCoverWaveConditionsCalculation(),
+                                                                                     new CalculationGroup(),
+                                                                                     new WaveImpactAsphaltCoverFailureMechanism(),
+                                                                                     assessmentSection);
 
-            var context = new WaveImpactAsphaltCoverWaveConditionsCalculationContext(
-                new WaveImpactAsphaltCoverWaveConditionsCalculation(),
-                failureMechanism,
-                assessmentSection);
-
             // Call
             bool isEnabled = exportInfo.IsEnabled(context);
 
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs
===================================================================
diff -u -r7261037d9779a908ec89ded5b4fdb73c568a9606 -r876a1e97b3a16adbb7cbdc142f135ae184ad9298
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs)	(revision 7261037d9779a908ec89ded5b4fdb73c568a9606)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs	(.../WaveImpactAsphaltCoverWaveConditionsCalculationContextWaveConditionsExportInfoTest.cs)	(revision 876a1e97b3a16adbb7cbdc142f135ae184ad9298)
@@ -27,6 +27,7 @@
 using NUnit.Framework;
 using Rhino.Mocks;
 using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Revetment.Data.TestUtil;
 using Ringtoets.WaveImpactAsphaltCover.Data;
 using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects;
@@ -70,10 +71,10 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
-
             var context = new WaveImpactAsphaltCoverWaveConditionsCalculationContext(new WaveImpactAsphaltCoverWaveConditionsCalculation(),
-                                                                                     failureMechanism, assessmentSection);
+                                                                                     new CalculationGroup(),
+                                                                                     new WaveImpactAsphaltCoverFailureMechanism(),
+                                                                                     assessmentSection);
 
             // Call
             IFileExporter fileExporter = exportInfo.CreateFileExporter(context, "test");
@@ -101,10 +102,10 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
-
             var context = new WaveImpactAsphaltCoverWaveConditionsCalculationContext(new WaveImpactAsphaltCoverWaveConditionsCalculation(),
-                                                                                     failureMechanism, assessmentSection);
+                                                                                     new CalculationGroup(),
+                                                                                     new WaveImpactAsphaltCoverFailureMechanism(),
+                                                                                     assessmentSection);
 
             // Call
             bool isEnabled = exportInfo.IsEnabled(context);
@@ -122,18 +123,16 @@
             var assessmentSection = mocks.Stub<IAssessmentSection>();
             mocks.ReplayAll();
 
-            var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism();
-            var output = new[]
-            {
-                new TestWaveConditionsOutput()
-            };
-
             var context = new WaveImpactAsphaltCoverWaveConditionsCalculationContext(
                 new WaveImpactAsphaltCoverWaveConditionsCalculation
                 {
-                    Output = new WaveImpactAsphaltCoverWaveConditionsOutput(output)
+                    Output = new WaveImpactAsphaltCoverWaveConditionsOutput(new[]
+                    {
+                        new TestWaveConditionsOutput()
+                    })
                 },
-                failureMechanism, assessmentSection);
+                new CalculationGroup(),
+                new WaveImpactAsphaltCoverFailureMechanism(), assessmentSection);
 
             // Call
             bool isEnabled = exportInfo.IsEnabled(context);