Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocation.cs
===================================================================
diff -u -r8bb6e849266ec28412ebfe23beccd7235c4db9bf -ra2ec0ef5dc52d01dc15b281ab5c9c46542e83006
--- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocation.cs	(.../HydraulicBoundaryLocation.cs)	(revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/HydraulicBoundaryLocation.cs	(.../HydraulicBoundaryLocation.cs)	(revision a2ec0ef5dc52d01dc15b281ab5c9c46542e83006)
@@ -97,7 +97,7 @@
         }
 
         /// <summary>
-        /// Gets the convergence status of the design waterlevel calculation.
+        /// Gets the convergence status of the design water level calculation.
         /// </summary>
         public CalculationConvergence DesignWaterLevelCalculationConvergence
         {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r7b372ed3506cd00bcf09c6c026e2bf5783868f74 -ra2ec0ef5dc52d01dc15b281ab5c9c46542e83006
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 7b372ed3506cd00bcf09c6c026e2bf5783868f74)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision a2ec0ef5dc52d01dc15b281ab5c9c46542e83006)
@@ -1512,6 +1512,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Illustratiepunten.
+        /// </summary>
+        public static string HydraulicBoundaryLocationCalculationInput_IncludeIllustrationPoints_DisplayName {
+            get {
+                return ResourceManager.GetString("HydraulicBoundaryLocationCalculationInput_IncludeIllustrationPoints_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Hydraulische randvoorwaardenlocatie.
         /// </summary>
         public static string HydraulicBoundaryLocationSelectionDialog_Location_Name {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r7b372ed3506cd00bcf09c6c026e2bf5783868f74 -ra2ec0ef5dc52d01dc15b281ab5c9c46542e83006
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision 7b372ed3506cd00bcf09c6c026e2bf5783868f74)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx	(.../Resources.resx)	(revision a2ec0ef5dc52d01dc15b281ab5c9c46542e83006)
@@ -993,4 +993,7 @@
   <data name="CreateUpdateForeshoreProfileOfCalculationsItem_Update_calculations_with_ForeshoreProfile_ToolTip" xml:space="preserve">
     <value>Alle berekeningen met een voorlandprofiel bijwerken.</value>
   </data>
+  <data name="HydraulicBoundaryLocationCalculationInput_IncludeIllustrationPoints_DisplayName" xml:space="preserve">
+    <value>Illustratiepunten</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/DesignWaterLevelLocationRow.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -ra2ec0ef5dc52d01dc15b281ab5c9c46542e83006
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/DesignWaterLevelLocationRow.cs	(.../DesignWaterLevelLocationRow.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/DesignWaterLevelLocationRow.cs	(.../DesignWaterLevelLocationRow.cs)	(revision a2ec0ef5dc52d01dc15b281ab5c9c46542e83006)
@@ -39,7 +39,7 @@
         /// <param name="hydraulicBoundaryLocation">The <see cref="HydraulicBoundaryLocation"/> for this row.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocation"/> is <c>null</c>.</exception>
         public DesignWaterLevelLocationRow(HydraulicBoundaryLocation hydraulicBoundaryLocation)
-            : base(hydraulicBoundaryLocation) {}
+            : base(hydraulicBoundaryLocation, hydraulicBoundaryLocation.DesignWaterLevelCalculation) {}
 
         /// <summary>
         /// Gets the <see cref="HydraulicBoundaryLocation.DesignWaterLevel"/>.
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationRow.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -ra2ec0ef5dc52d01dc15b281ab5c9c46542e83006
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationRow.cs	(.../HydraulicBoundaryLocationRow.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationRow.cs	(.../HydraulicBoundaryLocationRow.cs)	(revision a2ec0ef5dc52d01dc15b281ab5c9c46542e83006)
@@ -20,8 +20,11 @@
 // All rights reserved.
 
 using System;
+using System.ComponentModel;
+using Core.Common.Base.Data;
 using Core.Common.Base.Geometry;
 using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Forms.TypeConverters;
 
 namespace Ringtoets.Common.Forms.Views
 {
@@ -30,15 +33,41 @@
     /// </summary>
     public abstract class HydraulicBoundaryLocationRow : CalculatableRow<HydraulicBoundaryLocation>
     {
+        private readonly HydraulicBoundaryLocationCalculation calculation;
+
         /// <summary>
         /// Creates a new instance of <see cref="HydraulicBoundaryLocationRow"/>.
         /// </summary>
         /// <param name="hydraulicBoundaryLocation">The <see cref="HydraulicBoundaryLocation"/> for this row.</param>
-        /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocation"/> is <c>null</c>.</exception>
-        protected HydraulicBoundaryLocationRow(HydraulicBoundaryLocation hydraulicBoundaryLocation)
-            : base(hydraulicBoundaryLocation) {}
+        /// <param name="hydraulicBoundaryLocationCalculation">The calculation of the <see cref="HydraulicBoundaryLocation"/>.</param>
+        /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
+        protected HydraulicBoundaryLocationRow(HydraulicBoundaryLocation hydraulicBoundaryLocation,
+                                               HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation)
+            : base(hydraulicBoundaryLocation)
+        {
+            if (hydraulicBoundaryLocationCalculation == null)
+            {
+                throw new ArgumentNullException(nameof(hydraulicBoundaryLocationCalculation));
+            }
+            calculation = hydraulicBoundaryLocationCalculation;
+        }
 
         /// <summary>
+        /// Gets or sets if the illustration points need to be included.
+        /// </summary>
+        public bool IncludeIllustrationPoints
+        {
+            get
+            {
+                return calculation.InputParameters.ShouldIllustrationPointsBeCalculated;
+            }
+            set
+            {
+                calculation.InputParameters.ShouldIllustrationPointsBeCalculated = value;
+            }
+        }
+
+        /// <summary>
         /// Gets the <see cref="HydraulicBoundaryLocation.Name"/>.
         /// </summary>
         public string Name
@@ -70,5 +99,17 @@
                 return CalculatableObject.Location;
             }
         }
+
+        /// <summary>
+        /// Gets the result of the <see cref="HydraulicBoundaryLocationCalculation"/>.
+        /// </summary>
+        [TypeConverter(typeof(NoValueRoundedDoubleConverter))]
+        public RoundedDouble Result
+        {
+            get
+            {
+                return calculation.Output?.Result ?? RoundedDouble.NaN;
+            }
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -ra2ec0ef5dc52d01dc15b281ab5c9c46542e83006
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.cs	(.../HydraulicBoundaryLocationsView.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/HydraulicBoundaryLocationsView.cs	(.../HydraulicBoundaryLocationsView.cs)	(revision a2ec0ef5dc52d01dc15b281ab5c9c46542e83006)
@@ -62,6 +62,8 @@
         protected override void InitializeDataGridView()
         {
             base.InitializeDataGridView();
+            dataGridViewControl.AddCheckBoxColumn(nameof(HydraulicBoundaryLocationRow.IncludeIllustrationPoints),
+                                                  RingtoetsCommonFormsResources.HydraulicBoundaryLocationCalculationInput_IncludeIllustrationPoints_DisplayName);
             dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationRow.Name),
                                                  RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Location_Name_DisplayName);
             dataGridViewControl.AddTextBoxColumn(nameof(HydraulicBoundaryLocationRow.Id),
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/WaveHeightLocationRow.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -ra2ec0ef5dc52d01dc15b281ab5c9c46542e83006
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/WaveHeightLocationRow.cs	(.../WaveHeightLocationRow.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/WaveHeightLocationRow.cs	(.../WaveHeightLocationRow.cs)	(revision a2ec0ef5dc52d01dc15b281ab5c9c46542e83006)
@@ -39,7 +39,7 @@
         /// <param name="hydraulicBoundaryLocation">The <see cref="HydraulicBoundaryLocation"/> for this row.</param>
         /// <exception cref="ArgumentNullException">Thrown when <paramref name="hydraulicBoundaryLocation"/> is <c>null</c>.</exception>
         public WaveHeightLocationRow(HydraulicBoundaryLocation hydraulicBoundaryLocation)
-            : base(hydraulicBoundaryLocation) {}
+            : base(hydraulicBoundaryLocation, hydraulicBoundaryLocation.WaveHeightCalculation) {}
 
         /// <summary>
         /// Gets the <see cref="HydraulicBoundaryLocation.WaveHeight"/>.
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationRowTest.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -ra2ec0ef5dc52d01dc15b281ab5c9c46542e83006
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationRowTest.cs	(.../HydraulicBoundaryLocationRowTest.cs)	(revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationRowTest.cs	(.../HydraulicBoundaryLocationRowTest.cs)	(revision a2ec0ef5dc52d01dc15b281ab5c9c46542e83006)
@@ -19,9 +19,11 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
+using System;
 using Core.Common.Base.Geometry;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Common.Forms.Views;
 
 namespace Ringtoets.Common.Forms.Test.Views
@@ -30,32 +32,88 @@
     public class HydraulicBoundaryLocationRowTest
     {
         [Test]
-        public void Constructor_WithHydraulicBoundaryLocationContext_PropertiesFromHydraulicBoundaryLocation()
+        public void Constructor_HydraulicBoundaryLocationCalculationNull_ThrowsArgumentNullException()
         {
             // Setup
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+
+            // Call
+            TestDelegate call = () => new TestHydraulicBoundaryLocationRow(hydraulicBoundaryLocation, null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("hydraulicBoundaryLocationCalculation", paramName);
+        }
+
+        [Test]
+        public void Constructor_WithHydraulicBoundaryLocation_PropertiesFromHydraulicBoundaryLocation()
+        {
+            // Setup
             const int id = 1;
             const string locationname = "LocationName";
             const double coordinateX = 1.0;
             const double coordinateY = 2.0;
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, locationname, coordinateX, coordinateY);
+            var calculation = new HydraulicBoundaryLocationCalculation();
 
             // Call
-            var row = new TestHydraulicBoundaryLocationRow(hydraulicBoundaryLocation);
+            var row = new TestHydraulicBoundaryLocationRow(hydraulicBoundaryLocation,
+                                                           calculation);
 
             // Assert
             Assert.IsInstanceOf<CalculatableRow<HydraulicBoundaryLocation>>(row);
             Assert.AreEqual(id, row.Id);
             Assert.AreEqual(locationname, row.Name);
             var expectedPoint2D = new Point2D(coordinateX, coordinateY);
             Assert.AreEqual(expectedPoint2D, row.Location);
+            Assert.IsNaN(row.Result);
+
             Assert.AreSame(hydraulicBoundaryLocation, row.CalculatableObject);
             Assert.IsFalse(row.ShouldCalculate);
         }
 
+        [Test]
+        public void IncludeIllustrationPoints_NewValue_SetsProperties(
+            [Values(true, false)] bool setIllustrationPoints)
+        {
+            // Setup
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+            var calculation = new HydraulicBoundaryLocationCalculation();
+            var row = new TestHydraulicBoundaryLocationRow(hydraulicBoundaryLocation,
+                                                           calculation);
+
+            // Call
+            row.IncludeIllustrationPoints = setIllustrationPoints;
+
+            // Assert
+            Assert.AreEqual(setIllustrationPoints, row.IncludeIllustrationPoints);
+            Assert.AreEqual(setIllustrationPoints, calculation.InputParameters.ShouldIllustrationPointsBeCalculated);
+        }
+
+        [Test]
+        public void Result_WithCalculationOutput_ReturnsResult()
+        {
+            // Setup
+            var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation();
+            var calculation = new HydraulicBoundaryLocationCalculation();
+            var row = new TestHydraulicBoundaryLocationRow(hydraulicBoundaryLocation,
+                                                           calculation);
+
+            var random = new Random(432);
+            var locationOutput = new TestHydraulicBoundaryLocationOutput(random.NextDouble());
+
+            // Call
+            calculation.Output = locationOutput;
+
+            // Assert
+            Assert.AreEqual(locationOutput.Result, row.Result);
+        }
+
         private class TestHydraulicBoundaryLocationRow : HydraulicBoundaryLocationRow
         {
-            public TestHydraulicBoundaryLocationRow(HydraulicBoundaryLocation hydraulicBoundaryLocation)
-                : base(hydraulicBoundaryLocation) {}
+            public TestHydraulicBoundaryLocationRow(HydraulicBoundaryLocation hydraulicBoundaryLocation,
+                                                    HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation)
+                : base(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation) {}
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs
===================================================================
diff -u -r8bb6e849266ec28412ebfe23beccd7235c4db9bf -ra2ec0ef5dc52d01dc15b281ab5c9c46542e83006
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs	(.../HydraulicBoundaryLocationsViewTest.cs)	(revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs	(.../HydraulicBoundaryLocationsViewTest.cs)	(revision a2ec0ef5dc52d01dc15b281ab5c9c46542e83006)
@@ -37,9 +37,10 @@
     public class HydraulicBoundaryLocationsViewTest
     {
         private const int locationCalculateColumnIndex = 0;
-        private const int locationNameColumnIndex = 1;
-        private const int locationIdColumnIndex = 2;
-        private const int locationColumnIndex = 3;
+        private const int includeIllustrationPointsColumnIndex = 1;
+        private const int locationNameColumnIndex = 2;
+        private const int locationIdColumnIndex = 3;
+        private const int locationColumnIndex = 4;
         private Form testForm;
 
         [SetUp]
@@ -74,26 +75,24 @@
 
             // Assert
             var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
-            Assert.AreEqual(4, dataGridView.ColumnCount);
+            Assert.AreEqual(5, dataGridView.ColumnCount);
 
             var locationCalculateColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[locationCalculateColumnIndex];
-            const string expectedLocationCalculateHeaderText = "Berekenen";
-            Assert.AreEqual(expectedLocationCalculateHeaderText, locationCalculateColumn.HeaderText);
+            Assert.AreEqual("Berekenen", locationCalculateColumn.HeaderText);
 
+            var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[includeIllustrationPointsColumnIndex];
+            Assert.AreEqual("Illustratiepunten", includeIllustrationPointsColumn.HeaderText);
+
             var locationNameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationNameColumnIndex];
-            const string expectedLocationNameHeaderText = "Naam";
-            Assert.AreEqual(expectedLocationNameHeaderText, locationNameColumn.HeaderText);
+            Assert.AreEqual("Naam", locationNameColumn.HeaderText);
 
             var locationIdColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationIdColumnIndex];
-            const string expectedLocationIdHeaderText = "ID";
-            Assert.AreEqual(expectedLocationIdHeaderText, locationIdColumn.HeaderText);
+            Assert.AreEqual("ID", locationIdColumn.HeaderText);
 
             var locationColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationColumnIndex];
-            const string expectedLocationHeaderText = "Coördinaten [m]";
-            Assert.AreEqual(expectedLocationHeaderText, locationColumn.HeaderText);
+            Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText);
 
-            var buttonTester = new ButtonTester("CalculateForSelectedButton", testForm);
-            var button = (Button) buttonTester.TheObject;
+            var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First();
             Assert.IsFalse(button.Enabled);
         }
 
@@ -136,30 +135,41 @@
             ShowFullyConfiguredTestHydraulicBoundaryLocationsView();
 
             // Assert
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             DataGridViewRowCollection rows = dataGridView.Rows;
-            Assert.AreEqual(3, rows.Count);
+            Assert.AreEqual(4, rows.Count);
 
             DataGridViewCellCollection cells = rows[0].Cells;
-            Assert.AreEqual(4, cells.Count);
+            Assert.AreEqual(5, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("1", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("1", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(1, 1).ToString(), cells[locationColumnIndex].FormattedValue);
 
             cells = rows[1].Cells;
-            Assert.AreEqual(4, cells.Count);
+            Assert.AreEqual(5, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("2", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("2", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(2, 2).ToString(), cells[locationColumnIndex].FormattedValue);
 
             cells = rows[2].Cells;
-            Assert.AreEqual(4, cells.Count);
+            Assert.AreEqual(5, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("3", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("3", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(3, 3).ToString(), cells[locationColumnIndex].FormattedValue);
+
+            cells = rows[3].Cells;
+            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue);
+            Assert.AreEqual("4", cells[locationNameColumnIndex].FormattedValue);
+            Assert.AreEqual("4", cells[locationIdColumnIndex].FormattedValue);
+            Assert.AreEqual(new Point2D(4, 4).ToString(), cells[locationColumnIndex].FormattedValue);
         }
 
         [Test]
@@ -222,13 +232,24 @@
                         Output = new TestHydraulicBoundaryLocationOutput(2.45)
                     }
                 });
+                Locations.Add(new HydraulicBoundaryLocation(4, "4", 4.0, 4.0)
+                {
+                    WaveHeightCalculation =
+                    {
+                        InputParameters =
+                        {
+                            ShouldIllustrationPointsBeCalculated = true
+                        }
+                    }
+                });
             }
         }
 
         private class TestHydraulicBoundaryLocationRow : HydraulicBoundaryLocationRow
         {
-            public TestHydraulicBoundaryLocationRow(HydraulicBoundaryLocation hydraulicBoundaryLocation)
-                : base(hydraulicBoundaryLocation) {}
+            public TestHydraulicBoundaryLocationRow(HydraulicBoundaryLocation hydraulicBoundaryLocation,
+                                                    HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation)
+                : base(hydraulicBoundaryLocation, hydraulicBoundaryLocationCalculation) {}
         }
 
         private sealed class TestHydraulicBoundaryLocationsView : HydraulicBoundaryLocationsView<TestHydraulicBoundaryLocationRow>
@@ -237,7 +258,8 @@
 
             protected override TestHydraulicBoundaryLocationRow CreateNewRow(HydraulicBoundaryLocation location)
             {
-                return new TestHydraulicBoundaryLocationRow(location);
+                return new TestHydraulicBoundaryLocationRow(location,
+                                                            location.WaveHeightCalculation);
             }
 
             protected override void HandleCalculateSelectedLocations(IEnumerable<HydraulicBoundaryLocation> locations)
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -r8bb6e849266ec28412ebfe23beccd7235c4db9bf -ra2ec0ef5dc52d01dc15b281ab5c9c46542e83006
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs	(.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs)	(revision a2ec0ef5dc52d01dc15b281ab5c9c46542e83006)
@@ -49,10 +49,11 @@
     public class GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest
     {
         private const int locationCalculateColumnIndex = 0;
-        private const int locationNameColumnIndex = 1;
-        private const int locationIdColumnIndex = 2;
-        private const int locationColumnIndex = 3;
-        private const int locationDesignWaterlevelColumnIndex = 4;
+        private const int includeIllustrationPointsColumnIndex = 1;
+        private const int locationNameColumnIndex = 2;
+        private const int locationIdColumnIndex = 3;
+        private const int locationColumnIndex = 4;
+        private const int locationDesignWaterlevelColumnIndex = 5;
 
         private Form testForm;
         private MockRepository mockRepository;
@@ -100,7 +101,7 @@
             // Call
             using (GrassCoverErosionOutwardsDesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView())
             {
-                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+                var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
                 DataGridViewRow selectedLocationRow = dataGridView.Rows[0];
                 selectedLocationRow.Cells[0].Value = true;
 
@@ -121,31 +122,28 @@
             ShowDesignWaterLevelLocationsView();
 
             // Assert
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
-            Assert.AreEqual(5, dataGridView.ColumnCount);
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
+            Assert.AreEqual(6, dataGridView.ColumnCount);
 
             var locationCalculateColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[locationCalculateColumnIndex];
-            const string expectedLocationCalculateHeaderText = "Berekenen";
-            Assert.AreEqual(expectedLocationCalculateHeaderText, locationCalculateColumn.HeaderText);
+            Assert.AreEqual("Berekenen", locationCalculateColumn.HeaderText);
 
+            var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[includeIllustrationPointsColumnIndex];
+            Assert.AreEqual("Illustratiepunten", includeIllustrationPointsColumn.HeaderText);
+
             var locationNameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationNameColumnIndex];
-            const string expectedLocationNameHeaderText = "Naam";
-            Assert.AreEqual(expectedLocationNameHeaderText, locationNameColumn.HeaderText);
+            Assert.AreEqual("Naam", locationNameColumn.HeaderText);
 
             var locationIdColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationIdColumnIndex];
-            const string expectedLocationIdHeaderText = "ID";
-            Assert.AreEqual(expectedLocationIdHeaderText, locationIdColumn.HeaderText);
+            Assert.AreEqual("ID", locationIdColumn.HeaderText);
 
             var locationColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationColumnIndex];
-            const string expectedLocationHeaderText = "Coördinaten [m]";
-            Assert.AreEqual(expectedLocationHeaderText, locationColumn.HeaderText);
+            Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText);
 
             var locationDesignWaterlevelColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationDesignWaterlevelColumnIndex];
-            const string expectedLocationDesignWaterHeaderText = "Waterstand bij doorsnede-eis [m+NAP]";
-            Assert.AreEqual(expectedLocationDesignWaterHeaderText, locationDesignWaterlevelColumn.HeaderText);
+            Assert.AreEqual("Waterstand bij doorsnede-eis [m+NAP]", locationDesignWaterlevelColumn.HeaderText);
 
-            var buttonTester = new ButtonTester("CalculateForSelectedButton", testForm);
-            var button = (Button) buttonTester.TheObject;
+            var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First();
             Assert.IsFalse(button.Enabled);
         }
 
@@ -191,33 +189,45 @@
             ShowFullyConfiguredDesignWaterLevelLocationsView();
 
             // Assert
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             DataGridViewRowCollection rows = dataGridView.Rows;
-            Assert.AreEqual(3, rows.Count);
+            Assert.AreEqual(4, rows.Count);
 
             DataGridViewCellCollection cells = rows[0].Cells;
-            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(6, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("1", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("1", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(1, 1).ToString(), cells[locationColumnIndex].FormattedValue);
             Assert.AreEqual("-", cells[locationDesignWaterlevelColumnIndex].FormattedValue);
 
             cells = rows[1].Cells;
-            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(6, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("2", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("2", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(2, 2).ToString(), cells[locationColumnIndex].FormattedValue);
             Assert.AreEqual(1.23.ToString(CultureInfo.CurrentCulture), cells[locationDesignWaterlevelColumnIndex].FormattedValue);
 
             cells = rows[2].Cells;
-            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(6, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("3", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("3", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(3, 3).ToString(), cells[locationColumnIndex].FormattedValue);
             Assert.AreEqual("-", cells[locationDesignWaterlevelColumnIndex].FormattedValue);
+
+            cells = rows[3].Cells;
+            Assert.AreEqual(6, cells.Count);
+            Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue);
+            Assert.AreEqual("4", cells[locationNameColumnIndex].FormattedValue);
+            Assert.AreEqual("4", cells[locationIdColumnIndex].FormattedValue);
+            Assert.AreEqual(new Point2D(4, 4).ToString(), cells[locationColumnIndex].FormattedValue);
+            Assert.AreEqual("-", cells[locationDesignWaterlevelColumnIndex].FormattedValue);
         }
 
         [Test]
@@ -228,16 +238,20 @@
             var locations = (ObservableList<HydraulicBoundaryLocation>) view.Data;
 
             // Precondition
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             object dataGridViewSource = dataGridView.DataSource;
             DataGridViewRowCollection rows = dataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
-            Assert.AreEqual(3, rows.Count);
+            Assert.AreEqual(4, rows.Count);
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10.0, 10.0)
             {
                 DesignWaterLevelCalculation =
                 {
+                    InputParameters =
+                    {
+                        ShouldIllustrationPointsBeCalculated = true
+                    },
                     Output = new TestHydraulicBoundaryLocationOutput(10.23)
                 }
             };
@@ -251,8 +265,9 @@
             // Assert
             Assert.AreEqual(1, rows.Count);
             DataGridViewCellCollection cells = rows[0].Cells;
-            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(6, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("10", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("10", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(10, 10).ToString(), cells[locationColumnIndex].FormattedValue);
@@ -269,12 +284,13 @@
             var locations = (ObservableList<HydraulicBoundaryLocation>) view.Data;
 
             // Precondition
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             DataGridViewRowCollection rows = dataGridView.Rows;
-            Assert.AreEqual(3, rows.Count);
+            Assert.AreEqual(4, rows.Count);
             Assert.AreEqual("-", rows[0].Cells[locationDesignWaterlevelColumnIndex].FormattedValue);
             Assert.AreEqual(1.23.ToString(CultureInfo.CurrentCulture), rows[1].Cells[locationDesignWaterlevelColumnIndex].FormattedValue);
             Assert.AreEqual("-", rows[2].Cells[locationDesignWaterlevelColumnIndex].FormattedValue);
+            Assert.AreEqual("-", rows[3].Cells[locationDesignWaterlevelColumnIndex].FormattedValue);
 
             locations.ForEach(loc => loc.DesignWaterLevelCalculation.Output = null);
 
@@ -286,10 +302,11 @@
 
             // Assert
             Assert.IsTrue(refreshed);
-            Assert.AreEqual(3, rows.Count);
+            Assert.AreEqual(4, rows.Count);
             Assert.AreEqual("-", rows[0].Cells[locationDesignWaterlevelColumnIndex].FormattedValue);
             Assert.AreEqual("-", rows[1].Cells[locationDesignWaterlevelColumnIndex].FormattedValue);
             Assert.AreEqual("-", rows[2].Cells[locationDesignWaterlevelColumnIndex].FormattedValue);
+            Assert.AreEqual("-", rows[3].Cells[locationDesignWaterlevelColumnIndex].FormattedValue);
         }
 
         [Test]
@@ -300,7 +317,7 @@
             // Setup
             GrassCoverErosionOutwardsDesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView();
             var locations = (ObservableList<HydraulicBoundaryLocation>) view.Data;
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             object dataGridViewSource = dataGridView.DataSource;
             DataGridViewRowCollection rows = dataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
@@ -361,7 +378,7 @@
             // Setup
             ShowFullyConfiguredDesignWaterLevelLocationsView();
 
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             DataGridViewRowCollection rows = dataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
 
@@ -389,7 +406,7 @@
             // When
             if (rowSelected)
             {
-                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+                var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
                 DataGridViewRowCollection rows = dataGridView.Rows;
                 rows[0].Cells[locationCalculateColumnIndex].Value = true;
             }
@@ -437,6 +454,16 @@
                     {
                         Output = new TestHydraulicBoundaryLocationOutput(2.45)
                     }
+                },
+                new HydraulicBoundaryLocation(4, "4", 4.0, 4.0)
+                {
+                    DesignWaterLevelCalculation =
+                    {
+                        InputParameters =
+                        {
+                            ShouldIllustrationPointsBeCalculated = true
+                        }
+                    }
                 }
             };
             return view;
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs
===================================================================
diff -u -r8bb6e849266ec28412ebfe23beccd7235c4db9bf -ra2ec0ef5dc52d01dc15b281ab5c9c46542e83006
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs	(.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs)	(revision a2ec0ef5dc52d01dc15b281ab5c9c46542e83006)
@@ -49,10 +49,11 @@
     public class GrassCoverErosionOutwardsWaveHeightLocationsViewTest
     {
         private const int locationCalculateColumnIndex = 0;
-        private const int locationNameColumnIndex = 1;
-        private const int locationIdColumnIndex = 2;
-        private const int locationColumnIndex = 3;
-        private const int locationWaveHeightColumnIndex = 4;
+        private const int includeIllustrationPointsColumnIndex = 1;
+        private const int locationNameColumnIndex = 2;
+        private const int locationIdColumnIndex = 3;
+        private const int locationColumnIndex = 4;
+        private const int locationWaveHeightColumnIndex = 5;
 
         private Form testForm;
         private MockRepository mockRepository;
@@ -100,7 +101,7 @@
             // Call
             using (GrassCoverErosionOutwardsWaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView())
             {
-                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+                var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
                 DataGridViewRow selectedLocationRow = dataGridView.Rows[0];
                 selectedLocationRow.Cells[0].Value = true;
 
@@ -121,28 +122,29 @@
             ShowWaveHeightLocationsView();
 
             // Assert
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
-            Assert.AreEqual(5, dataGridView.ColumnCount);
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
+            Assert.AreEqual(6, dataGridView.ColumnCount);
 
             var locationCalculateColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[locationCalculateColumnIndex];
-            const string expectedLocationCalculateHeaderText = "Berekenen";
-            Assert.AreEqual(expectedLocationCalculateHeaderText, locationCalculateColumn.HeaderText);
+            Assert.AreEqual("Berekenen", locationCalculateColumn.HeaderText);
 
+            var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[includeIllustrationPointsColumnIndex];
+            Assert.AreEqual("Illustratiepunten", includeIllustrationPointsColumn.HeaderText);
+
             var locationNameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationNameColumnIndex];
-            const string expectedLocationNameHeaderText = "Naam";
-            Assert.AreEqual(expectedLocationNameHeaderText, locationNameColumn.HeaderText);
+            Assert.AreEqual("Naam", locationNameColumn.HeaderText);
 
             var locationIdColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationIdColumnIndex];
-            const string expectedLocationIdHeaderText = "ID";
-            Assert.AreEqual(expectedLocationIdHeaderText, locationIdColumn.HeaderText);
+            Assert.AreEqual("ID", locationIdColumn.HeaderText);
 
             var locationColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationColumnIndex];
-            const string expectedLocationHeaderText = "Coördinaten [m]";
-            Assert.AreEqual(expectedLocationHeaderText, locationColumn.HeaderText);
+            Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText);
 
             var locationWaveHeightColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationWaveHeightColumnIndex];
-            const string expectedLocationWaveHeightHeaderText = "Golfhoogte bij doorsnede-eis [m]";
-            Assert.AreEqual(expectedLocationWaveHeightHeaderText, locationWaveHeightColumn.HeaderText);
+            Assert.AreEqual("Golfhoogte bij doorsnede-eis [m]", locationWaveHeightColumn.HeaderText);
+
+            var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First();
+            Assert.IsFalse(button.Enabled);
         }
 
         [Test]
@@ -187,33 +189,45 @@
             ShowFullyConfiguredWaveHeightLocationsView();
 
             // Assert
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             DataGridViewRowCollection rows = dataGridView.Rows;
-            Assert.AreEqual(3, rows.Count);
+            Assert.AreEqual(4, rows.Count);
 
             DataGridViewCellCollection cells = rows[0].Cells;
-            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(6, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("1", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("1", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(1, 1).ToString(), cells[locationColumnIndex].FormattedValue);
             Assert.AreEqual("-", cells[locationWaveHeightColumnIndex].FormattedValue);
 
             cells = rows[1].Cells;
-            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(6, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("2", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("2", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(2, 2).ToString(), cells[locationColumnIndex].FormattedValue);
             Assert.AreEqual(1.23.ToString(CultureInfo.CurrentCulture), cells[locationWaveHeightColumnIndex].FormattedValue);
 
             cells = rows[2].Cells;
-            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(6, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("3", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("3", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(3, 3).ToString(), cells[locationColumnIndex].FormattedValue);
             Assert.AreEqual("-", cells[locationWaveHeightColumnIndex].FormattedValue);
+
+            cells = rows[3].Cells;
+            Assert.AreEqual(6, cells.Count);
+            Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue);
+            Assert.AreEqual("4", cells[locationNameColumnIndex].FormattedValue);
+            Assert.AreEqual("4", cells[locationIdColumnIndex].FormattedValue);
+            Assert.AreEqual(new Point2D(4, 4).ToString(), cells[locationColumnIndex].FormattedValue);
+            Assert.AreEqual("-", cells[locationWaveHeightColumnIndex].FormattedValue);
         }
 
         [Test]
@@ -224,16 +238,20 @@
             var locations = (ObservableList<HydraulicBoundaryLocation>) view.Data;
 
             // Precondition
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             object dataGridViewSource = dataGridView.DataSource;
             DataGridViewRowCollection rows = dataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
-            Assert.AreEqual(3, rows.Count);
+            Assert.AreEqual(4, rows.Count);
 
             var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10, 10)
             {
                 WaveHeightCalculation =
                 {
+                    InputParameters =
+                    {
+                        ShouldIllustrationPointsBeCalculated = true
+                    },
                     Output = new TestHydraulicBoundaryLocationOutput(10)
                 }
             };
@@ -247,8 +265,9 @@
             // Assert
             Assert.AreEqual(1, rows.Count);
             DataGridViewCellCollection cells = rows[0].Cells;
-            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(6, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("10", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("10", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(10, 10).ToString(), cells[locationColumnIndex].FormattedValue);
@@ -265,22 +284,24 @@
             var locations = (ObservableList<HydraulicBoundaryLocation>) view.Data;
 
             // Precondition
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             DataGridViewRowCollection rows = dataGridView.Rows;
-            Assert.AreEqual(3, rows.Count);
+            Assert.AreEqual(4, rows.Count);
             Assert.AreEqual("-", rows[0].Cells[locationWaveHeightColumnIndex].FormattedValue);
             Assert.AreEqual(1.23.ToString(CultureInfo.CurrentCulture), rows[1].Cells[locationWaveHeightColumnIndex].FormattedValue);
             Assert.AreEqual("-", rows[2].Cells[locationWaveHeightColumnIndex].FormattedValue);
+            Assert.AreEqual("-", rows[3].Cells[locationWaveHeightColumnIndex].FormattedValue);
 
             // Call
             locations.ForEach(loc => loc.WaveHeightCalculation.Output = null);
             locations.NotifyObservers();
 
             // Assert
-            Assert.AreEqual(3, rows.Count);
+            Assert.AreEqual(4, rows.Count);
             Assert.AreEqual("-", rows[0].Cells[locationWaveHeightColumnIndex].FormattedValue);
             Assert.AreEqual("-", rows[1].Cells[locationWaveHeightColumnIndex].FormattedValue);
             Assert.AreEqual("-", rows[2].Cells[locationWaveHeightColumnIndex].FormattedValue);
+            Assert.AreEqual("-", rows[3].Cells[locationWaveHeightColumnIndex].FormattedValue);
         }
 
         [Test]
@@ -291,7 +312,7 @@
             // Setup
             GrassCoverErosionOutwardsWaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView();
             var locations = (ObservableList<HydraulicBoundaryLocation>) view.Data;
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             object dataGridViewSource = dataGridView.DataSource;
             DataGridViewRowCollection rows = dataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
@@ -352,7 +373,7 @@
             // Setup
             ShowFullyConfiguredWaveHeightLocationsView();
 
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             DataGridViewRowCollection rows = dataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
 
@@ -380,7 +401,7 @@
             // When
             if (rowSelected)
             {
-                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+                var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
                 DataGridViewRowCollection rows = dataGridView.Rows;
                 rows[0].Cells[locationCalculateColumnIndex].Value = true;
             }
@@ -429,6 +450,16 @@
                     {
                         Output = new TestHydraulicBoundaryLocationOutput(2.45)
                     }
+                },
+                new HydraulicBoundaryLocation(4, "4", 4.0, 4.0)
+                {
+                    WaveHeightCalculation =
+                    {
+                        InputParameters =
+                        {
+                            ShouldIllustrationPointsBeCalculated = true
+                        }
+                    }
                 }
             };
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs
===================================================================
diff -u -r8bb6e849266ec28412ebfe23beccd7235c4db9bf -ra2ec0ef5dc52d01dc15b281ab5c9c46542e83006
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs	(.../DesignWaterLevelLocationsViewTest.cs)	(revision a2ec0ef5dc52d01dc15b281ab5c9c46542e83006)
@@ -44,10 +44,11 @@
     public class DesignWaterLevelLocationsViewTest
     {
         private const int locationCalculateColumnIndex = 0;
-        private const int locationNameColumnIndex = 1;
-        private const int locationIdColumnIndex = 2;
-        private const int locationColumnIndex = 3;
-        private const int locationDesignWaterlevelColumnIndex = 4;
+        private const int includeIllustrationPointsColumnIndex = 1;
+        private const int locationNameColumnIndex = 2;
+        private const int locationIdColumnIndex = 3;
+        private const int locationColumnIndex = 4;
+        private const int locationDesignWaterlevelColumnIndex = 5;
         private Form testForm;
 
         [SetUp]
@@ -91,7 +92,7 @@
             // Call
             using (DesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView())
             {
-                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+                var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
                 DataGridViewRow selectedLocationRow = dataGridView.Rows[0];
                 selectedLocationRow.Cells[0].Value = true;
 
@@ -112,31 +113,28 @@
             ShowDesignWaterLevelLocationsView();
 
             // Assert
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
-            Assert.AreEqual(5, dataGridView.ColumnCount);
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
+            Assert.AreEqual(6, dataGridView.ColumnCount);
 
             var locationCalculateColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[locationCalculateColumnIndex];
-            const string expectedLocationCalculateHeaderText = "Berekenen";
-            Assert.AreEqual(expectedLocationCalculateHeaderText, locationCalculateColumn.HeaderText);
+            Assert.AreEqual("Berekenen", locationCalculateColumn.HeaderText);
 
+            var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[includeIllustrationPointsColumnIndex];
+            Assert.AreEqual("Illustratiepunten", includeIllustrationPointsColumn.HeaderText);
+
             var locationNameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationNameColumnIndex];
-            const string expectedLocationNameHeaderText = "Naam";
-            Assert.AreEqual(expectedLocationNameHeaderText, locationNameColumn.HeaderText);
+            Assert.AreEqual("Naam", locationNameColumn.HeaderText);
 
             var locationIdColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationIdColumnIndex];
-            const string expectedLocationIdHeaderText = "ID";
-            Assert.AreEqual(expectedLocationIdHeaderText, locationIdColumn.HeaderText);
+            Assert.AreEqual("ID", locationIdColumn.HeaderText);
 
             var locationColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationColumnIndex];
-            const string expectedLocationHeaderText = "Coördinaten [m]";
-            Assert.AreEqual(expectedLocationHeaderText, locationColumn.HeaderText);
+            Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText);
 
             var locationDesignWaterlevelColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationDesignWaterlevelColumnIndex];
-            const string expectedLocationDesignWaterHeaderText = "Toetspeil [m+NAP]";
-            Assert.AreEqual(expectedLocationDesignWaterHeaderText, locationDesignWaterlevelColumn.HeaderText);
+            Assert.AreEqual("Toetspeil [m+NAP]", locationDesignWaterlevelColumn.HeaderText);
 
-            var buttonTester = new ButtonTester("CalculateForSelectedButton", testForm);
-            var button = (Button) buttonTester.TheObject;
+            var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First();
             Assert.IsFalse(button.Enabled);
         }
 
@@ -147,33 +145,45 @@
             ShowFullyConfiguredDesignWaterLevelLocationsView();
 
             // Assert
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             DataGridViewRowCollection rows = dataGridView.Rows;
-            Assert.AreEqual(3, rows.Count);
+            Assert.AreEqual(4, rows.Count);
 
             DataGridViewCellCollection cells = rows[0].Cells;
-            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(6, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("1", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("1", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(1, 1).ToString(), cells[locationColumnIndex].FormattedValue);
             Assert.AreEqual("-", cells[locationDesignWaterlevelColumnIndex].FormattedValue);
 
             cells = rows[1].Cells;
-            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(6, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("2", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("2", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(2, 2).ToString(), cells[locationColumnIndex].FormattedValue);
             Assert.AreEqual(1.23.ToString(CultureInfo.CurrentCulture), cells[locationDesignWaterlevelColumnIndex].FormattedValue);
 
             cells = rows[2].Cells;
-            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(6, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("3", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("3", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(3, 3).ToString(), cells[locationColumnIndex].FormattedValue);
             Assert.AreEqual("-", cells[locationDesignWaterlevelColumnIndex].FormattedValue);
+
+            cells = rows[3].Cells;
+            Assert.AreEqual(6, cells.Count);
+            Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue);
+            Assert.AreEqual("4", cells[locationNameColumnIndex].FormattedValue);
+            Assert.AreEqual("4", cells[locationIdColumnIndex].FormattedValue);
+            Assert.AreEqual(new Point2D(4, 4).ToString(), cells[locationColumnIndex].FormattedValue);
+            Assert.AreEqual("-", cells[locationDesignWaterlevelColumnIndex].FormattedValue);
         }
 
         [Test]
@@ -187,15 +197,19 @@
             {
                 DesignWaterLevelCalculation =
                 {
+                    InputParameters =
+                    {
+                        ShouldIllustrationPointsBeCalculated = true
+                    },
                     Output = new TestHydraulicBoundaryLocationOutput(10.23)
                 }
             };
             newHydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
 
             // Precondition
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             DataGridViewRowCollection rows = dataGridView.Rows;
-            Assert.AreEqual(3, rows.Count);
+            Assert.AreEqual(4, rows.Count);
 
             assessmentSection.HydraulicBoundaryDatabase = newHydraulicBoundaryDatabase;
 
@@ -205,8 +219,9 @@
             // Assert
             Assert.AreEqual(1, rows.Count);
             DataGridViewCellCollection cells = rows[0].Cells;
-            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(6, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("10", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("10", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(10, 10).ToString(), cells[locationColumnIndex].FormattedValue);
@@ -221,22 +236,24 @@
             IAssessmentSection assessmentSection = view.AssessmentSection;
 
             // Precondition
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             DataGridViewRowCollection rows = dataGridView.Rows;
-            Assert.AreEqual(3, rows.Count);
+            Assert.AreEqual(4, rows.Count);
             Assert.AreEqual("-", rows[0].Cells[locationDesignWaterlevelColumnIndex].FormattedValue);
             Assert.AreEqual(1.23.ToString(CultureInfo.CurrentCulture), rows[1].Cells[locationDesignWaterlevelColumnIndex].FormattedValue);
             Assert.AreEqual("-", rows[2].Cells[locationDesignWaterlevelColumnIndex].FormattedValue);
+            Assert.AreEqual("-", rows[3].Cells[locationDesignWaterlevelColumnIndex].FormattedValue);
 
             // Call
             assessmentSection.HydraulicBoundaryDatabase.Locations.ForEach(loc => loc.DesignWaterLevelCalculation.Output = null);
             assessmentSection.NotifyObservers();
 
             // Assert
-            Assert.AreEqual(3, rows.Count);
+            Assert.AreEqual(4, rows.Count);
             Assert.AreEqual("-", rows[0].Cells[locationDesignWaterlevelColumnIndex].FormattedValue);
             Assert.AreEqual("-", rows[1].Cells[locationDesignWaterlevelColumnIndex].FormattedValue);
             Assert.AreEqual("-", rows[2].Cells[locationDesignWaterlevelColumnIndex].FormattedValue);
+            Assert.AreEqual("-", rows[3].Cells[locationDesignWaterlevelColumnIndex].FormattedValue);
         }
 
         [Test]
@@ -247,7 +264,7 @@
             // Setup
             DesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView();
             IAssessmentSection assessmentSection = view.AssessmentSection;
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             DataGridViewRowCollection rows = dataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
 
@@ -294,7 +311,7 @@
             // Setup
             ShowFullyConfiguredDesignWaterLevelLocationsView();
 
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             DataGridViewRowCollection rows = dataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
 
@@ -350,6 +367,16 @@
                         Output = new TestHydraulicBoundaryLocationOutput(2.45)
                     }
                 });
+                Locations.Add(new HydraulicBoundaryLocation(4, "4", 4.0, 4.0)
+                {
+                    DesignWaterLevelCalculation =
+                    {
+                        InputParameters =
+                        {
+                            ShouldIllustrationPointsBeCalculated = true
+                        }
+                    }
+                });
             }
         }
     }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs
===================================================================
diff -u -r8bb6e849266ec28412ebfe23beccd7235c4db9bf -ra2ec0ef5dc52d01dc15b281ab5c9c46542e83006
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision 8bb6e849266ec28412ebfe23beccd7235c4db9bf)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs	(.../WaveHeightLocationsViewTest.cs)	(revision a2ec0ef5dc52d01dc15b281ab5c9c46542e83006)
@@ -42,10 +42,11 @@
     public class WaveHeightLocationsViewTest
     {
         private const int locationCalculateColumnIndex = 0;
-        private const int locationNameColumnIndex = 1;
-        private const int locationIdColumnIndex = 2;
-        private const int locationColumnIndex = 3;
-        private const int locationWaveHeightColumnIndex = 4;
+        private const int includeIllustrationPointsColumnIndex = 1;
+        private const int locationNameColumnIndex = 2;
+        private const int locationIdColumnIndex = 3;
+        private const int locationColumnIndex = 4;
+        private const int locationWaveHeightColumnIndex = 5;
         private Form testForm;
 
         [SetUp]
@@ -89,7 +90,7 @@
             // Call
             using (WaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView())
             {
-                var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+                var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
                 DataGridViewRow selectedLocationRow = dataGridView.Rows[0];
                 selectedLocationRow.Cells[0].Value = true;
 
@@ -110,28 +111,29 @@
             ShowWaveHeightLocationsView();
 
             // Assert
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
-            Assert.AreEqual(5, dataGridView.ColumnCount);
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
+            Assert.AreEqual(6, dataGridView.ColumnCount);
 
             var locationCalculateColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[locationCalculateColumnIndex];
-            const string expectedLocationCalculateHeaderText = "Berekenen";
-            Assert.AreEqual(expectedLocationCalculateHeaderText, locationCalculateColumn.HeaderText);
+            Assert.AreEqual("Berekenen", locationCalculateColumn.HeaderText);
 
+            var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[includeIllustrationPointsColumnIndex];
+            Assert.AreEqual("Illustratiepunten", includeIllustrationPointsColumn.HeaderText);
+
             var locationNameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationNameColumnIndex];
-            const string expectedLocationNameHeaderText = "Naam";
-            Assert.AreEqual(expectedLocationNameHeaderText, locationNameColumn.HeaderText);
+            Assert.AreEqual("Naam", locationNameColumn.HeaderText);
 
             var locationIdColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationIdColumnIndex];
-            const string expectedLocationIdHeaderText = "ID";
-            Assert.AreEqual(expectedLocationIdHeaderText, locationIdColumn.HeaderText);
+            Assert.AreEqual("ID", locationIdColumn.HeaderText);
 
             var locationColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationColumnIndex];
-            const string expectedLocationHeaderText = "Coördinaten [m]";
-            Assert.AreEqual(expectedLocationHeaderText, locationColumn.HeaderText);
+            Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText);
 
             var locationWaveHeightColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[locationWaveHeightColumnIndex];
-            const string expectedLocationWaveHeightHeaderText = "Hs [m]";
-            Assert.AreEqual(expectedLocationWaveHeightHeaderText, locationWaveHeightColumn.HeaderText);
+            Assert.AreEqual("Hs [m]", locationWaveHeightColumn.HeaderText);
+
+            var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First();
+            Assert.IsFalse(button.Enabled);
         }
 
         [Test]
@@ -141,33 +143,45 @@
             ShowFullyConfiguredWaveHeightLocationsView();
 
             // Assert
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             DataGridViewRowCollection rows = dataGridView.Rows;
-            Assert.AreEqual(3, rows.Count);
+            Assert.AreEqual(4, rows.Count);
 
             DataGridViewCellCollection cells = rows[0].Cells;
-            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(6, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("1", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("1", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(1, 1).ToString(), cells[locationColumnIndex].FormattedValue);
             Assert.AreEqual("-", cells[locationWaveHeightColumnIndex].FormattedValue);
 
             cells = rows[1].Cells;
-            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(6, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("2", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("2", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(2, 2).ToString(), cells[locationColumnIndex].FormattedValue);
             Assert.AreEqual(1.23.ToString(CultureInfo.CurrentCulture), cells[locationWaveHeightColumnIndex].FormattedValue);
 
             cells = rows[2].Cells;
-            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(6, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("3", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("3", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(3, 3).ToString(), cells[locationColumnIndex].FormattedValue);
             Assert.AreEqual("-", cells[locationWaveHeightColumnIndex].FormattedValue);
+
+            cells = rows[3].Cells;
+            Assert.AreEqual(6, cells.Count);
+            Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue);
+            Assert.AreEqual("4", cells[locationNameColumnIndex].FormattedValue);
+            Assert.AreEqual("4", cells[locationIdColumnIndex].FormattedValue);
+            Assert.AreEqual(new Point2D(4, 4).ToString(), cells[locationColumnIndex].FormattedValue);
+            Assert.AreEqual("-", cells[locationWaveHeightColumnIndex].FormattedValue);
         }
 
         [Test]
@@ -181,15 +195,19 @@
             {
                 WaveHeightCalculation =
                 {
+                    InputParameters =
+                    {
+                        ShouldIllustrationPointsBeCalculated = true
+                    },
                     Output = new TestHydraulicBoundaryLocationOutput(10.23)
                 }
             };
             newHydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation);
 
             // Precondition
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             DataGridViewRowCollection rows = dataGridView.Rows;
-            Assert.AreEqual(3, rows.Count);
+            Assert.AreEqual(4, rows.Count);
 
             // Call
             assessmentSection.HydraulicBoundaryDatabase = newHydraulicBoundaryDatabase;
@@ -198,8 +216,9 @@
             // Assert
             Assert.AreEqual(1, rows.Count);
             DataGridViewCellCollection cells = rows[0].Cells;
-            Assert.AreEqual(5, cells.Count);
+            Assert.AreEqual(6, cells.Count);
             Assert.AreEqual(false, cells[locationCalculateColumnIndex].FormattedValue);
+            Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue);
             Assert.AreEqual("10", cells[locationNameColumnIndex].FormattedValue);
             Assert.AreEqual("10", cells[locationIdColumnIndex].FormattedValue);
             Assert.AreEqual(new Point2D(10, 10).ToString(), cells[locationColumnIndex].FormattedValue);
@@ -214,22 +233,24 @@
             IAssessmentSection assessmentSection = view.AssessmentSection;
 
             // Precondition
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             DataGridViewRowCollection rows = dataGridView.Rows;
-            Assert.AreEqual(3, rows.Count);
+            Assert.AreEqual(4, rows.Count);
             Assert.AreEqual("-", rows[0].Cells[locationWaveHeightColumnIndex].FormattedValue);
             Assert.AreEqual(1.23.ToString(CultureInfo.CurrentCulture), rows[1].Cells[locationWaveHeightColumnIndex].FormattedValue);
             Assert.AreEqual("-", rows[2].Cells[locationWaveHeightColumnIndex].FormattedValue);
+            Assert.AreEqual("-", rows[3].Cells[locationWaveHeightColumnIndex].FormattedValue);
 
             // Call
             assessmentSection.HydraulicBoundaryDatabase.Locations.ForEach(loc => loc.WaveHeightCalculation.Output = null);
             assessmentSection.NotifyObservers();
 
             // Assert
-            Assert.AreEqual(3, rows.Count);
+            Assert.AreEqual(4, rows.Count);
             Assert.AreEqual("-", rows[0].Cells[locationWaveHeightColumnIndex].FormattedValue);
             Assert.AreEqual("-", rows[1].Cells[locationWaveHeightColumnIndex].FormattedValue);
             Assert.AreEqual("-", rows[2].Cells[locationWaveHeightColumnIndex].FormattedValue);
+            Assert.AreEqual("-", rows[3].Cells[locationWaveHeightColumnIndex].FormattedValue);
         }
 
         [Test]
@@ -240,7 +261,7 @@
             // Setup
             WaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView();
             IAssessmentSection assessmentSection = view.AssessmentSection;
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             DataGridViewRowCollection rows = dataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
 
@@ -280,7 +301,7 @@
             // Setup
             ShowFullyConfiguredWaveHeightLocationsView();
 
-            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+            var dataGridView = (DataGridView) testForm.Controls.Find("dataGridView", true).First();
             DataGridViewRowCollection rows = dataGridView.Rows;
             rows[0].Cells[locationCalculateColumnIndex].Value = true;
 
@@ -336,6 +357,16 @@
                         Output = new TestHydraulicBoundaryLocationOutput(2.45)
                     }
                 });
+                Locations.Add(new HydraulicBoundaryLocation(4, "4", 4.0, 4.0)
+                {
+                    WaveHeightCalculation =
+                    {
+                        InputParameters =
+                        {
+                            ShouldIllustrationPointsBeCalculated = true
+                        }
+                    }
+                });
             }
         }
     }