Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -r3a89e41054c6cfe6babdc150e8282cbe4a6dc672 -r937eae9d8b43f55ff798aaf21556ea009e300870
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 3a89e41054c6cfe6babdc150e8282cbe4a6dc672)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs	(.../StabilityStoneCoverPlugin.cs)	(revision 937eae9d8b43f55ff798aaf21556ea009e300870)
@@ -142,13 +142,16 @@
             yield return new ExportInfo<StabilityStoneCoverWaveConditionsCalculationGroupContext>
             {
                 CreateFileExporter = (context, filePath) => new StabilityStoneCoverWaveConditionsExporter(context.WrappedData.GetCalculations().Cast<StabilityStoneCoverWaveConditionsCalculation>(), filePath),
-                IsEnabled = context => context.WrappedData.Children.OfType<ICalculation>().Cast<StabilityStoneCoverWaveConditionsCalculation>().Any(c => c.HasOutput),
+                IsEnabled = context => context.WrappedData.GetCalculations().Cast<StabilityStoneCoverWaveConditionsCalculation>().Any(c => c.HasOutput),
                 FileFilter = Resources.DataTypeDisplayName_csv_file_filter
             };
 
             yield return new ExportInfo<StabilityStoneCoverWaveConditionsCalculationContext>
             {
-                CreateFileExporter = (context, filePath) => new StabilityStoneCoverWaveConditionsExporter(new[] { context.WrappedData }, filePath),
+                CreateFileExporter = (context, filePath) => new StabilityStoneCoverWaveConditionsExporter(new[]
+                {
+                    context.WrappedData
+                }, filePath),
                 IsEnabled = context => context.WrappedData.HasOutput,
                 FileFilter = Resources.DataTypeDisplayName_csv_file_filter
             };
@@ -393,7 +396,7 @@
                                                                                                 nodeData.AssessmentSection.HydraulicBoundaryDatabase.Locations))
             {
                 dialog.ShowDialog();
-                
+
                 if (dialog.SelectedItems.Any())
                 {
                     GenerateStabilityStoneCoverCalculations(nodeData.WrappedData, dialog.SelectedItems);
@@ -496,28 +499,30 @@
 
             StabilityStoneCoverWaveConditionsCalculation calculation = nodeData.WrappedData;
 
-            return builder.AddValidateCalculationItem(nodeData,
-                                                      c => ValidateAll(
-                                                          new[]
-                                                          {
-                                                              c.WrappedData
-                                                          },
-                                                          c.FailureMechanism.GeneralInput,
-                                                          c.AssessmentSection.FailureMechanismContribution.Norm,
-                                                          c.AssessmentSection.HydraulicBoundaryDatabase),
-                                                      ValidateAllDataAvailableAndGetErrorMessageForCalculation)
-                          .AddPerformCalculationItem(calculation, nodeData, PerformCalculation)
-                          .AddClearCalculationOutputItem(calculation)
-                          .AddExportItem()
-                          .AddSeparator()
-                          .AddRenameItem()
-                          .AddDeleteItem()
-                          .AddSeparator()
-                          .AddExpandAllItem()
-                          .AddCollapseAllItem()
-                          .AddSeparator()
-                          .AddPropertiesItem()
-                          .Build();
+            return builder
+                .AddExportItem()
+                .AddSeparator()
+                .AddValidateCalculationItem(nodeData,
+                                            c => ValidateAll(
+                                                new[]
+                                                {
+                                                    c.WrappedData
+                                                },
+                                                c.FailureMechanism.GeneralInput,
+                                                c.AssessmentSection.FailureMechanismContribution.Norm,
+                                                c.AssessmentSection.HydraulicBoundaryDatabase),
+                                            ValidateAllDataAvailableAndGetErrorMessageForCalculation)
+                .AddPerformCalculationItem(calculation, nodeData, PerformCalculation)
+                .AddClearCalculationOutputItem(calculation)
+                .AddSeparator()
+                .AddRenameItem()
+                .AddDeleteItem()
+                .AddSeparator()
+                .AddExpandAllItem()
+                .AddCollapseAllItem()
+                .AddSeparator()
+                .AddPropertiesItem()
+                .Build();
         }
 
         private void PerformCalculation(StabilityStoneCoverWaveConditionsCalculation calculation,
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -r3a89e41054c6cfe6babdc150e8282cbe4a6dc672 -r937eae9d8b43f55ff798aaf21556ea009e300870
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 3a89e41054c6cfe6babdc150e8282cbe4a6dc672)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs)	(revision 937eae9d8b43f55ff798aaf21556ea009e300870)
@@ -57,11 +57,11 @@
     [TestFixture]
     public class StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest : NUnitFormTest
     {
-        private const int validateMenuItemIndex = 0;
+        private const int validateMenuItemIndex = 2;
 
-        private const int clearOutputMenuItemIndex = 2;
+        private const int clearOutputMenuItemIndex = 4;
 
-        private const int calculateMenuItemIndex = 1;
+        private const int calculateMenuItemIndex = 3;
         private MockRepository mocks;
         private StabilityStoneCoverPlugin plugin;
         private TreeNodeInfo info;
@@ -375,10 +375,11 @@
                                                                                   assessmentSection);
 
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
+            menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);
+            menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddCustomItem(null)).IgnoreArguments().Return(menuBuilderMock);
-            menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddRenameItem()).Return(menuBuilderMock);
             menuBuilderMock.Expect(mb => mb.AddDeleteItem()).Return(menuBuilderMock);