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