Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationTest.cs
===================================================================
diff -u -rd2f9b4f26f69988ea1c55caaa58af0831152458f -r7e310cacb9c4875ce8e2d60af68a46c4c8b55041
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationTest.cs	(.../GrassCoverErosionInwardsCalculationTest.cs)	(revision d2f9b4f26f69988ea1c55caaa58af0831152458f)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsCalculationTest.cs	(.../GrassCoverErosionInwardsCalculationTest.cs)	(revision 7e310cacb9c4875ce8e2d60af68a46c4c8b55041)
@@ -72,14 +72,13 @@
 
             // Assert
             Assert.IsInstanceOf<ICalculation>(calculation);
-
+            Assert.IsInstanceOf<Observable>(calculation);
             Assert.AreEqual("Nieuwe berekening", calculation.Name);
-            Assert.IsInstanceOf<GrassCoverErosionInwardsInput>(calculation.InputParameters);
+            Assert.IsNotNull(calculation.InputParameters);
             Assert.IsFalse(calculation.HasOutput);
             Assert.IsNull(calculation.Comments);
             Assert.IsNull(calculation.Output);
-            Assert.IsInstanceOf<Observable>(calculation);
-            Assert.AreEqual(normProbabilityInput, calculation.NormProbabilityInput);
+            Assert.AreSame(normProbabilityInput, calculation.NormProbabilityInput);
             AssertDemoInput(calculation.InputParameters);
         }
 
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs
===================================================================
diff -u -r20231cfee041a316978347564bd1fddbb41b9ffc -r7e310cacb9c4875ce8e2d60af68a46c4c8b55041
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs	(.../HeightStructuresCalculation.cs)	(revision 20231cfee041a316978347564bd1fddbb41b9ffc)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs	(.../HeightStructuresCalculation.cs)	(revision 7e310cacb9c4875ce8e2d60af68a46c4c8b55041)
@@ -21,6 +21,7 @@
 
 using Core.Common.Base;
 using Ringtoets.Common.Data.Calculation;
+using Ringtoets.HeightStructures.Data.Properties;
 
 namespace Ringtoets.HeightStructures.Data
 {
@@ -35,6 +36,7 @@
         public HeightStructuresCalculation()
         {
             InputParameters = new HeightStructuresInput();
+            Name = Resources.HeightStructuresCalculation_DefaultName;
         }
 
         /// <summary>
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r7b50f68c9261f081536c340c6926925ff7281c1a -r7e310cacb9c4875ce8e2d60af68a46c4c8b55041
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 7b50f68c9261f081536c340c6926925ff7281c1a)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 7e310cacb9c4875ce8e2d60af68a46c4c8b55041)
@@ -61,6 +61,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Nieuwe berekening.
+        /// </summary>
+        internal static string HeightStructuresCalculation_DefaultName {
+            get {
+                return ResourceManager.GetString("HeightStructuresCalculation_DefaultName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to HTKW.
         /// </summary>
         internal static string HeightStructuresFailureMechanism_Code {
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/Resources.resx
===================================================================
diff -u -r7b50f68c9261f081536c340c6926925ff7281c1a -r7e310cacb9c4875ce8e2d60af68a46c4c8b55041
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/Resources.resx	(.../Resources.resx)	(revision 7b50f68c9261f081536c340c6926925ff7281c1a)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/Resources.resx	(.../Resources.resx)	(revision 7e310cacb9c4875ce8e2d60af68a46c4c8b55041)
@@ -123,4 +123,7 @@
   <data name="HeightStructuresFailureMechanism_DisplayName" xml:space="preserve">
     <value>Kunstwerken - Hoogte kunstwerk</value>
   </data>
+  <data name="HeightStructuresCalculation_DefaultName" xml:space="preserve">
+    <value>Nieuwe berekening</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs
===================================================================
diff -u
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs	(revision 0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresCalculationTest.cs	(revision 7e310cacb9c4875ce8e2d60af68a46c4c8b55041)
@@ -0,0 +1,46 @@
+// 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 Core.Common.Base;
+using NUnit.Framework;
+using Ringtoets.Common.Data.Calculation;
+
+namespace Ringtoets.HeightStructures.Data.Test
+{
+    [TestFixture]
+    public class HeightStructuresCalculationTest
+    {
+        [Test]
+        public void Constructor_DefaultPropertyValuesAreSet()
+        {
+            // Call
+            var calculation = new HeightStructuresCalculation();
+
+            // Assert
+            Assert.IsInstanceOf<ICalculation>(calculation);
+            Assert.IsInstanceOf<Observable>(calculation);
+            Assert.AreEqual("Nieuwe berekening", calculation.Name);
+            Assert.IsNotNull(calculation.InputParameters);
+            Assert.IsNull(calculation.Comments);
+            Assert.IsFalse(calculation.HasOutput);
+        }
+    }
+}
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/Ringtoets.HeightStructures.Data.Test.csproj
===================================================================
diff -u -r213b20e92891887167ab4b031ca4a4b6250a4c2a -r7e310cacb9c4875ce8e2d60af68a46c4c8b55041
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/Ringtoets.HeightStructures.Data.Test.csproj	(.../Ringtoets.HeightStructures.Data.Test.csproj)	(revision 213b20e92891887167ab4b031ca4a4b6250a4c2a)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/Ringtoets.HeightStructures.Data.Test.csproj	(.../Ringtoets.HeightStructures.Data.Test.csproj)	(revision 7e310cacb9c4875ce8e2d60af68a46c4c8b55041)
@@ -49,6 +49,7 @@
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="HeightStructuresCalculationTest.cs" />
     <Compile Include="HeightStructuresFailureMechanismTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>