Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsInputView.cs
===================================================================
diff -u -r056401642a9c557f5264d490154b71b14454721e -r6ece2b192fc90bb8ad6ce27a457d8691fb36b12b
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsInputView.cs	(.../GrassCoverErosionInwardsInputView.cs)	(revision 056401642a9c557f5264d490154b71b14454721e)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsInputView.cs	(.../GrassCoverErosionInwardsInputView.cs)	(revision 6ece2b192fc90bb8ad6ce27a457d8691fb36b12b)
@@ -81,7 +81,7 @@
                 if (data == null)
                 {
                     chartControl.Data = null;
-                    chartControl.Name = string.Empty;
+                    chartControl.ChartTitle = string.Empty;
                 }
                 else
                 {
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs
===================================================================
diff -u -r056401642a9c557f5264d490154b71b14454721e -r6ece2b192fc90bb8ad6ce27a457d8691fb36b12b
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs	(.../GrassCoverErosionInwardsInputViewTest.cs)	(revision 056401642a9c557f5264d490154b71b14454721e)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs	(.../GrassCoverErosionInwardsInputViewTest.cs)	(revision 6ece2b192fc90bb8ad6ce27a457d8691fb36b12b)
@@ -106,19 +106,22 @@
         public void Data_SetToNull_ChartDataCleared()
         {
             // Setup
-            using (var view = new GrassCoverErosionInwardsInputView())
+            using (var view = new GrassCoverErosionInwardsInputView
             {
-                view.Data = new GrassCoverErosionInwardsCalculation();
-
+                Data = new GrassCoverErosionInwardsCalculation()
+            })
+            {
                 // Precondition
                 Assert.AreEqual(3, view.Chart.Data.Collection.Count());
+                Assert.AreEqual("Nieuwe berekening", view.Chart.ChartTitle);
 
                 // Call
                 view.Data = null;
 
                 // Assert
                 Assert.IsNull(view.Data);
                 Assert.IsNull(view.Chart.Data);
+                Assert.AreEqual(string.Empty, view.Chart.ChartTitle);
             }
         }
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs
===================================================================
diff -u -r62ed6462b31529a87c231f131195aef6efa6e3a7 -r6ece2b192fc90bb8ad6ce27a457d8691fb36b12b
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs	(.../PipingInputView.cs)	(revision 62ed6462b31529a87c231f131195aef6efa6e3a7)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs	(.../PipingInputView.cs)	(revision 6ece2b192fc90bb8ad6ce27a457d8691fb36b12b)
@@ -110,7 +110,7 @@
                 if (data == null)
                 {
                     chartControl.Data = null;
-                    chartControl.Name = string.Empty;
+                    chartControl.ChartTitle = string.Empty;
                 }
                 else
                 {
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs
===================================================================
diff -u -r056401642a9c557f5264d490154b71b14454721e -r6ece2b192fc90bb8ad6ce27a457d8691fb36b12b
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs	(.../PipingInputViewTest.cs)	(revision 056401642a9c557f5264d490154b71b14454721e)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs	(.../PipingInputViewTest.cs)	(revision 6ece2b192fc90bb8ad6ce27a457d8691fb36b12b)
@@ -128,31 +128,32 @@
         public void Data_SetToNull_ChartDataCleared()
         {
             // Setup
-            using (var view = new PipingInputView())
+            using (var view = new PipingInputView
             {
-                view.Data = new PipingCalculationScenario(new GeneralPipingInput());
-
+                Data = new PipingCalculationScenario(new GeneralPipingInput())
+            })
+            {
                 // Precondition
                 Assert.AreEqual(10, view.Chart.Data.Collection.Count());
+                Assert.AreEqual("Nieuwe berekening", view.Chart.ChartTitle);
 
                 // Call
                 view.Data = null;
 
                 // Assert
                 Assert.IsNull(view.Data);
                 Assert.IsNull(view.Chart.Data);
+                Assert.AreEqual(string.Empty, view.Chart.ChartTitle);
             }
         }
 
         [Test]
         public void Data_SetToNull_TableDataCleared()
         {
             // Setup
-            using (var view = new PipingInputView())
+            var calculation = new PipingCalculationScenario(new GeneralPipingInput())
             {
-                var calculation = new PipingCalculationScenario(new GeneralPipingInput())
-                {
-                    InputParameters =
+                InputParameters =
                     {
                         StochasticSoilProfile = new StochasticSoilProfile(0.1, SoilProfileType.SoilProfile1D, 1)
                         {
@@ -169,9 +170,13 @@
                                 1)
                         }
                     }
-                };
+            };
 
-                view.Data = calculation;
+            using (var view = new PipingInputView
+            {
+                Data = calculation
+            })
+            {
                 var tableControl = view.Controls.Find("pipingSoilLayerTable", true).First() as PipingSoilLayerTable;
 
                 // Precondition
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs
===================================================================
diff -u -r056401642a9c557f5264d490154b71b14454721e -r6ece2b192fc90bb8ad6ce27a457d8691fb36b12b
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs	(.../WaveConditionsInputView.cs)	(revision 056401642a9c557f5264d490154b71b14454721e)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs	(.../WaveConditionsInputView.cs)	(revision 6ece2b192fc90bb8ad6ce27a457d8691fb36b12b)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.Windows.Forms;
 using Core.Components.Charting.Data;
 using Core.Components.Charting.Forms;
@@ -62,8 +61,13 @@
             {
                 data = value as IWaveConditionsCalculation;
 
-                if (data != null)
+                if (data == null)
                 {
+                    chartControl.Data = null;
+                    chartControl.ChartTitle = string.Empty;
+                }
+                else
+                {
                     SetChartData();
 
                     chartControl.Data = chartDataCollection;
@@ -72,6 +76,14 @@
             }
         }
 
+        public IChartControl Chart
+        {
+            get
+            {
+                return chartControl;
+            }
+        }
+
         private void SetChartData()
         {
             WaveConditionsInput input = data.InputParameters;
@@ -80,13 +92,5 @@
 
             foreshoreChartData.Points = WaveConditionsChartDataPointsFactory.CreateForeshoreGeometryPoints(input);
         }
-
-        public IChartControl Chart
-        {
-            get
-            {
-                return chartControl;
-            }
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/TestWaveConditionsCalculationTest.cs
===================================================================
diff -u -rec15ff35b39f333c422b8ca6988c34bd8573f134 -r6ece2b192fc90bb8ad6ce27a457d8691fb36b12b
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/TestWaveConditionsCalculationTest.cs	(.../TestWaveConditionsCalculationTest.cs)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/TestWaveConditionsCalculationTest.cs	(.../TestWaveConditionsCalculationTest.cs)	(revision 6ece2b192fc90bb8ad6ce27a457d8691fb36b12b)
@@ -20,6 +20,7 @@
 // All rights reserved.
 
 using Core.Common.Base;
+using Core.Common.Base.Geometry;
 using NUnit.Framework;
 using Ringtoets.Common.Data.Calculation;
 
@@ -37,9 +38,17 @@
             // Assert
             Assert.IsInstanceOf<ICalculation>(calculation);
             Assert.IsInstanceOf<Observable>(calculation);
+            Assert.AreEqual("Nieuwe berekening", calculation.Name);
             Assert.IsNull(calculation.Output);
             Assert.IsFalse(calculation.HasOutput);
-            Assert.IsNull(calculation.InputParameters);
+            Assert.IsNotNull(calculation.InputParameters);
+            Assert.IsNotNull(calculation.InputParameters.ForeshoreProfile);
+            CollectionAssert.AreEqual(new[]
+            {
+                new Point2D(0.0, 0.0),
+                new Point2D(1.0, 1.0),
+                new Point2D(2.0, 2.0)
+            }, calculation.InputParameters.ForeshoreGeometry);
         }
     }
 }
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/Ringtoets.Revetment.Data.TestUtil.csproj
===================================================================
diff -u -rec15ff35b39f333c422b8ca6988c34bd8573f134 -r6ece2b192fc90bb8ad6ce27a457d8691fb36b12b
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/Ringtoets.Revetment.Data.TestUtil.csproj	(.../Ringtoets.Revetment.Data.TestUtil.csproj)	(revision ec15ff35b39f333c422b8ca6988c34bd8573f134)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/Ringtoets.Revetment.Data.TestUtil.csproj	(.../Ringtoets.Revetment.Data.TestUtil.csproj)	(revision 6ece2b192fc90bb8ad6ce27a457d8691fb36b12b)
@@ -58,6 +58,10 @@
       <Project>{d4200f43-3f72-4f42-af0a-8ced416a38ec}</Project>
       <Name>Ringtoets.Common.Data</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\test\Ringtoets.Common.Data.TestUtil\Ringtoets.Common.Data.TestUtil.csproj">
+      <Project>{4843D6E5-066F-4795-94F5-1D53932DD03C}</Project>
+      <Name>Ringtoets.Common.Data.TestUtil</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\Ringtoets.Revetment.Data\Ringtoets.Revetment.Data.csproj">
       <Project>{87c2c553-c0bc-40bf-b1ea-b83bff357f27}</Project>
       <Name>Ringtoets.Revetment.Data</Name>
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsCalculation.cs
===================================================================
diff -u -r056401642a9c557f5264d490154b71b14454721e -r6ece2b192fc90bb8ad6ce27a457d8691fb36b12b
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsCalculation.cs	(.../TestWaveConditionsCalculation.cs)	(revision 056401642a9c557f5264d490154b71b14454721e)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsCalculation.cs	(.../TestWaveConditionsCalculation.cs)	(revision 6ece2b192fc90bb8ad6ce27a457d8691fb36b12b)
@@ -20,8 +20,11 @@
 // All rights reserved.
 
 using Core.Common.Base;
+using Core.Common.Base.Geometry;
 using Ringtoets.Common.Data;
+using Ringtoets.Common.Data.TestUtil;
 using Ringtoets.Revetment.Data;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
 namespace Ringtoets.Revetment.TestUtil
 {
@@ -32,11 +35,28 @@
     public class TestWaveConditionsCalculation : Observable, IWaveConditionsCalculation
     {
         /// <summary>
+        /// Creates a new instance of <see cref="TestWaveConditionsCalculation"/>.
+        /// </summary>
+        public TestWaveConditionsCalculation()
+        {
+            Name = RingtoetsCommonDataResources.Calculation_DefaultName;
+            InputParameters = new WaveConditionsInput
+            {
+                ForeshoreProfile = new TestForeshoreProfile(new[]
+                {
+                    new Point2D(0.0, 0.0),
+                    new Point2D(1.0, 1.0),
+                    new Point2D(2.0, 2.0)
+                })
+            };
+        }
+
+        /// <summary>
         /// Gets or sets an object that represents some output of this calculation.
         /// </summary>
         public object Output { get; set; }
 
-        public WaveConditionsInput InputParameters { get; set; }
+        public WaveConditionsInput InputParameters { get; }
 
         public bool HasOutput
         {
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs
===================================================================
diff -u -r056401642a9c557f5264d490154b71b14454721e -r6ece2b192fc90bb8ad6ce27a457d8691fb36b12b
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs	(.../WaveConditionsInputViewTest.cs)	(revision 056401642a9c557f5264d490154b71b14454721e)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs	(.../WaveConditionsInputViewTest.cs)	(revision 6ece2b192fc90bb8ad6ce27a457d8691fb36b12b)
@@ -102,6 +102,29 @@
         }
 
         [Test]
+        public void Data_SetToNull_ChartDataCleared()
+        {
+            // Setup
+            using (var view = new WaveConditionsInputView
+            {
+                Data = new TestWaveConditionsCalculation()
+            })
+            {
+                // Precondition
+                Assert.AreEqual(1, view.Chart.Data.Collection.Count());
+                Assert.AreEqual("Nieuwe berekening", view.Chart.ChartTitle);
+
+                // Call
+                view.Data = null;
+
+                // Assert
+                Assert.IsNull(view.Data);
+                Assert.IsNull(view.Chart.Data);
+                Assert.AreEqual(string.Empty, view.Chart.ChartTitle);
+            }
+        }
+
+        [Test]
         public void Data_SetChartData_ChartDataSet()
         {
             // Setup
@@ -111,16 +134,7 @@
             {
                 var calculation = new TestWaveConditionsCalculation
                 {
-                    Name = calculationName,
-                    InputParameters = new WaveConditionsInput
-                    {
-                        ForeshoreProfile = new TestForeshoreProfile(new[]
-                        {
-                            new Point2D(0.0, 0.0),
-                            new Point2D(1.0, 1.0),
-                            new Point2D(2.0, 2.0)
-                        })
-                    }
+                    Name = calculationName
                 };
 
                 // Call