Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs
===================================================================
diff -u -r2e3df635a07b2924b1cbb89020ffb089fef5f7f9 -ra3158400866c3db88b69ea30cc80b2e123fb759a
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs	(.../DesignWaterLevelCalculationsViewTest.cs)	(revision 2e3df635a07b2924b1cbb89020ffb089fef5f7f9)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs	(.../DesignWaterLevelCalculationsViewTest.cs)	(revision a3158400866c3db88b69ea30cc80b2e123fb759a)
@@ -371,26 +371,6 @@
             return ControlTestHelper.GetDataGridViewControl(testForm, "DataGridViewControl");
         }
 
-        private IllustrationPointsControl GetIllustrationPointsControl()
-        {
-            return ControlTestHelper.GetControls<IllustrationPointsControl>(testForm, "IllustrationPointsControl").Single();
-        }
-
-        private static IEnumerable<IllustrationPointControlItem> CreateControlItems(
-            GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult)
-        {
-            return generalResult.TopLevelIllustrationPoints
-                                .Select(topLevelIllustrationPoint =>
-                                {
-                                    SubMechanismIllustrationPoint illustrationPoint = topLevelIllustrationPoint.SubMechanismIllustrationPoint;
-                                    return new IllustrationPointControlItem(topLevelIllustrationPoint,
-                                                                            topLevelIllustrationPoint.WindDirection.Name,
-                                                                            topLevelIllustrationPoint.ClosingSituation,
-                                                                            illustrationPoint.Stochasts,
-                                                                            illustrationPoint.Beta);
-                                });
-        }
-
         private static DesignWaterLevelCalculationsView ShowDesignWaterLevelCalculationsView(IObservableEnumerable<HydraulicBoundaryLocationCalculation> calculations,
                                                                                              IAssessmentSection assessmentSection,
                                                                                              double targetProbability,
@@ -506,7 +486,7 @@
 
             protected override object GetCalculationSelection(HydraulicBoundaryCalculationsView view, object selectedRowObject)
             {
-                return new DesignWaterLevelCalculationContext(((HydraulicBoundaryLocationCalculationRow) selectedRowObject).CalculatableObject);
+                return new DesignWaterLevelCalculationContext(((HydraulicBoundaryLocationCalculationRow) selectedRowObject).CalculatableObject, assessmentSection);
             }
 
             protected override HydraulicBoundaryCalculationsView ShowFullyConfiguredCalculationsView(Form form)
Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/WaveHeightCalculationsViewTest.cs
===================================================================
diff -u -r2e3df635a07b2924b1cbb89020ffb089fef5f7f9 -ra3158400866c3db88b69ea30cc80b2e123fb759a
--- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/WaveHeightCalculationsViewTest.cs	(.../WaveHeightCalculationsViewTest.cs)	(revision 2e3df635a07b2924b1cbb89020ffb089fef5f7f9)
+++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/WaveHeightCalculationsViewTest.cs	(.../WaveHeightCalculationsViewTest.cs)	(revision a3158400866c3db88b69ea30cc80b2e123fb759a)
@@ -371,26 +371,6 @@
             return ControlTestHelper.GetDataGridViewControl(testForm, "DataGridViewControl");
         }
 
-        private IllustrationPointsControl GetIllustrationPointsControl()
-        {
-            return ControlTestHelper.GetControls<IllustrationPointsControl>(testForm, "IllustrationPointsControl").Single();
-        }
-
-        private static IEnumerable<IllustrationPointControlItem> CreateControlItems(
-            GeneralResult<TopLevelSubMechanismIllustrationPoint> generalResult)
-        {
-            return generalResult.TopLevelIllustrationPoints
-                                .Select(topLevelIllustrationPoint =>
-                                {
-                                    SubMechanismIllustrationPoint illustrationPoint = topLevelIllustrationPoint.SubMechanismIllustrationPoint;
-                                    return new IllustrationPointControlItem(topLevelIllustrationPoint,
-                                                                            topLevelIllustrationPoint.WindDirection.Name,
-                                                                            topLevelIllustrationPoint.ClosingSituation,
-                                                                            illustrationPoint.Stochasts,
-                                                                            illustrationPoint.Beta);
-                                });
-        }
-
         private static WaveHeightCalculationsView ShowWaveHeightCalculationsView(IObservableEnumerable<HydraulicBoundaryLocationCalculation> calculations,
                                                                                  IAssessmentSection assessmentSection,
                                                                                  double targetProbability,