Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs
===================================================================
diff -u -rcaa64ef94fa8e30074f269de2fe0aad3c482c690 -r4e8d24a03bda23a2c393b76c95da11f3c8df5e4d
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs	(.../PipingCalculationsView.cs)	(revision caa64ef94fa8e30074f269de2fe0aad3c482c690)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingCalculationsView.cs	(.../PipingCalculationsView.cs)	(revision 4e8d24a03bda23a2c393b76c95da11f3c8df5e4d)
@@ -149,6 +149,7 @@
         {
             AssessmentSection = null;
             PipingFailureMechanism = null;
+            ApplicationSelection = null;
 
             if (disposing && (components != null))
             {
@@ -167,7 +168,7 @@
             {
                 DataPropertyName = "Name",
                 HeaderText = Resources.PipingCalculation_Name_DisplayName,
-                Name = "column_Name",
+                Name = "column_Name"
             };
 
             soilProfileColumn = new DataGridViewComboBoxColumn
@@ -185,7 +186,7 @@
                 HeaderText = Resources.PipingInput_HydraulicBoundaryLocation_DisplayName,
                 Name = "column_HydraulicBoundaryLocation",
                 ValueMember = "This",
-                DisplayMember = "DisplayName",
+                DisplayMember = "DisplayName"
             };
 
             var dampingFactorExitMeanColumn = new DataGridViewTextBoxColumn
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj
===================================================================
diff -u -r08ab7af115b5bbad87eaffb9bc1b1c4379ec8738 -r4e8d24a03bda23a2c393b76c95da11f3c8df5e4d
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision 08ab7af115b5bbad87eaffb9bc1b1c4379ec8738)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj	(.../Ringtoets.Piping.Forms.Test.csproj)	(revision 4e8d24a03bda23a2c393b76c95da11f3c8df5e4d)
@@ -103,6 +103,7 @@
     <Compile Include="UITypeEditors\PipingInputContextSoilProfileSelectionEditorTest.cs" />
     <Compile Include="UITypeEditors\PipingInputContextSurfaceLineSelectionEditorTest.cs" />
     <Compile Include="Views\PipingFailureMechanismResultViewTest.cs" />
+    <Compile Include="Views\PipingCalculationsViewTest.cs" />
     <Compile Include="Views\PipingFailureMechanismViewTest.cs" />
   </ItemGroup>
   <ItemGroup>
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs
===================================================================
diff -u
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(revision 0)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs	(revision 4e8d24a03bda23a2c393b76c95da11f3c8df5e4d)
@@ -0,0 +1,130 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Linq;
+using System.Windows.Forms;
+using Core.Common.Controls.Views;
+using Core.Common.Gui.Selection;
+using NUnit.Extensions.Forms;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data;
+using Ringtoets.Piping.Data;
+using Ringtoets.Piping.Forms.Views;
+
+namespace Ringtoets.Piping.Forms.Test.Views
+{
+    [TestFixture]
+    public class PipingCalculationsViewTest
+    {
+        private Form testForm;
+
+        [SetUp]
+        public void Setup()
+        {
+            testForm = new Form();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            testForm.Dispose();
+        }
+
+        [Test]
+        public void Constructor_DefaultValues()
+        {
+            // Call
+            var pipingCalculationsView = new PipingCalculationsView();
+
+            // Assert
+            Assert.IsInstanceOf<UserControl>(pipingCalculationsView);
+            Assert.IsInstanceOf<IView>(pipingCalculationsView);
+            Assert.IsNull(pipingCalculationsView.Data);
+            Assert.IsNull(pipingCalculationsView.PipingFailureMechanism);
+            Assert.IsNull(pipingCalculationsView.AssessmentSection);
+            Assert.IsNull(pipingCalculationsView.ApplicationSelection);
+        }
+
+        [Test]
+        public void Constructor_DataGridViewCorrectlyInitialized()
+        {
+            // Setup
+            var pipingCalculationsView = new PipingCalculationsView();
+
+            // Call
+            ShowPipingCalculationsView(pipingCalculationsView);
+
+            // Assert
+            var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject;
+
+            Assert.AreEqual(7, dataGridView.ColumnCount);
+
+            foreach (var column in dataGridView.Columns.OfType<DataGridViewComboBoxColumn>())
+            {
+                Assert.AreEqual("This", column.ValueMember);
+                Assert.AreEqual("DisplayName", column.DisplayMember);
+            }
+
+            foreach (var column in dataGridView.Columns.OfType<DataGridViewColumn>())
+            {
+                Assert.AreEqual(DataGridViewAutoSizeColumnMode.AllCells, column.AutoSizeMode);
+                Assert.AreEqual(DataGridViewContentAlignment.MiddleCenter, column.HeaderCell.Style.Alignment);
+            }
+        }
+
+        [Test]
+        public void Dispose_ViewWithAdditionalPropertiesSet_AdditionalPropertiesSetToNull()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var pipingFailureMechanism = mocks.StrictMock<PipingFailureMechanism>();
+            var assessmentSection = mocks.StrictMock<AssessmentSectionBase>();
+            var applicationSelection = mocks.StrictMock<IApplicationSelection>();
+
+            var pipingCalculationsView = new PipingCalculationsView
+            {
+                PipingFailureMechanism = pipingFailureMechanism,
+                AssessmentSection = assessmentSection,
+                ApplicationSelection = applicationSelection
+            };
+
+            // Precondition
+            Assert.IsNotNull(pipingCalculationsView.PipingFailureMechanism);
+            Assert.IsNotNull(pipingCalculationsView.AssessmentSection);
+            Assert.IsNotNull(pipingCalculationsView.ApplicationSelection);
+
+            // Call
+            pipingCalculationsView.Dispose();
+
+            // Assert
+            Assert.IsNull(pipingCalculationsView.PipingFailureMechanism);
+            Assert.IsNull(pipingCalculationsView.AssessmentSection);
+            Assert.IsNull(pipingCalculationsView.ApplicationSelection);
+        }
+
+        private void ShowPipingCalculationsView(PipingCalculationsView pipingCalculationsView)
+        {
+            testForm.Controls.Add(pipingCalculationsView);
+            testForm.Show();
+        }
+    }
+}
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs
===================================================================
diff -u -r5b575c7019f5ec9d0db2784fda5cb5c7b4df9a90 -r4e8d24a03bda23a2c393b76c95da11f3c8df5e4d
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 5b575c7019f5ec9d0db2784fda5cb5c7b4df9a90)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs	(.../PipingFailureMechanismViewTest.cs)	(revision 4e8d24a03bda23a2c393b76c95da11f3c8df5e4d)
@@ -121,7 +121,7 @@
             // Assert
             Assert.AreSame(pipingContext, view.Data);
             Assert.IsInstanceOf<MapDataCollection>(map.Data);
-            var mapData = map.Data as MapDataCollection;
+            var mapData = map.Data;
             Assert.IsNotNull(mapData);
 
             Assert.AreEqual(6, mapData.List.Count);