Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
===================================================================
diff -u -rdd33f3b9d039c570742b8233da23326538c848cf -rc6af9c015b4572e21e0631a3474ee9a447a81596
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision dd33f3b9d039c570742b8233da23326538c848cf)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj	(.../Ringtoets.HydraRing.Calculation.csproj)	(revision c6af9c015b4572e21e0631a3474ee9a447a81596)
@@ -67,10 +67,6 @@
       <Name>Core.Common.Version</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\Ringtoets.HydraRing.Data\Ringtoets.HydraRing.Data.csproj">
-      <Project>{70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2}</Project>
-      <Name>Ringtoets.HydraRing.Data</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Hydraulics/AssessmentLevelCalculationTest.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Hydraulics/AssessmentLevelCalculationTest.cs	(revision 0)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Hydraulics/AssessmentLevelCalculationTest.cs	(revision c6af9c015b4572e21e0631a3474ee9a447a81596)
@@ -0,0 +1,55 @@
+// 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 NUnit.Framework;
+using Ringtoets.HydraRing.Calculation.Data;
+using Ringtoets.HydraRing.Calculation.Hydraulics;
+
+namespace Ringtoets.HydraRing.Calculation.Test.Hydraulics
+{
+    [TestFixture]
+    public class AssessmentLevelCalculationTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Call
+            var assessmentLevelCalculation = new AssessmentLevelCalculation(1, 2.2);
+
+            // Assert
+            Assert.AreEqual(1, assessmentLevelCalculation.HydraulicBoundaryLocationId);
+            Assert.AreEqual(HydraRingFailureMechanismType.AssessmentLevel, assessmentLevelCalculation.FailureMechanismType);
+            CollectionAssert.IsEmpty(assessmentLevelCalculation.ProfilePoints);
+            Assert.AreEqual(2.2, assessmentLevelCalculation.Beta);
+            Assert.AreEqual(1, assessmentLevelCalculation.Variables.Count());
+
+            var assessmentLevelVariable = assessmentLevelCalculation.Variables.First();
+            Assert.AreEqual(26, assessmentLevelVariable.VariableId);
+            Assert.AreEqual(HydraRingDistributionType.Deterministic, assessmentLevelVariable.DistributionType);
+            Assert.AreEqual(0.0, assessmentLevelVariable.Value);
+            Assert.AreEqual(HydraRingDeviationType.Standard, assessmentLevelVariable.DeviationType);
+            Assert.IsNaN(assessmentLevelVariable.Mean);
+            Assert.IsNaN(assessmentLevelVariable.Variability);
+            Assert.IsNaN(assessmentLevelVariable.Shift);
+        }
+    }
+}
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Hydraulics/HydraulicCalculationTest.cs
===================================================================
diff -u
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Hydraulics/HydraulicCalculationTest.cs	(revision 0)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Hydraulics/HydraulicCalculationTest.cs	(revision c6af9c015b4572e21e0631a3474ee9a447a81596)
@@ -0,0 +1,66 @@
+// 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 NUnit.Framework;
+using Ringtoets.HydraRing.Calculation.Data;
+using Ringtoets.HydraRing.Calculation.Hydraulics;
+
+namespace Ringtoets.HydraRing.Calculation.Test.Hydraulics
+{
+    [TestFixture]
+    public class HydraulicCalculationTest
+    {
+        [Test]
+        public void Constructor_ExpectedValues()
+        {
+            // Call
+            var hydraulicCalculation = new HydraulicCalculationImplementation(1, 2.2);
+
+            // Assert
+            Assert.AreEqual(1, hydraulicCalculation.HydraulicBoundaryLocationId);
+            Assert.AreEqual(HydraRingFailureMechanismType.DikesPiping, hydraulicCalculation.FailureMechanismType);
+            CollectionAssert.IsEmpty(hydraulicCalculation.Variables);
+            CollectionAssert.IsEmpty(hydraulicCalculation.ProfilePoints);
+            Assert.AreEqual(2.2, hydraulicCalculation.Beta);
+        }
+
+        private class HydraulicCalculationImplementation : HydraulicCalculation
+        {
+            public HydraulicCalculationImplementation(int hydraulicBoundaryLocationId, double beta) : base(hydraulicBoundaryLocationId, beta) {}
+
+            public override HydraRingFailureMechanismType FailureMechanismType
+            {
+                get
+                {
+                    return HydraRingFailureMechanismType.DikesPiping;
+                }
+            }
+
+            public override HydraRingDikeSection DikeSection
+            {
+                get
+                {
+                    return new HydraRingDikeSection(1, "Name", 2.2, 3.3, 4.4, 5.5, 6.6, 7.7);
+                }
+            }
+        }
+    }
+}
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj
===================================================================
diff -u -r59b1c01f9c155ff608c09769f19fd0158dea38e8 -rc6af9c015b4572e21e0631a3474ee9a447a81596
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj	(.../Ringtoets.HydraRing.Calculation.Test.csproj)	(revision 59b1c01f9c155ff608c09769f19fd0158dea38e8)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj	(.../Ringtoets.HydraRing.Calculation.Test.csproj)	(revision c6af9c015b4572e21e0631a3474ee9a447a81596)
@@ -54,6 +54,8 @@
     <Compile Include="Data\HydraRingProfilePointTest.cs" />
     <Compile Include="Data\HydraRingVariableTest.cs" />
     <Compile Include="HydraRingConfigurationIntegrationTest.cs" />
+    <Compile Include="Hydraulics\AssessmentLevelCalculationTest.cs" />
+    <Compile Include="Hydraulics\HydraulicCalculationTest.cs" />
     <Compile Include="Settings\FailureMechanismDefaultsProviderTest.cs" />
     <Compile Include="Settings\FailureMechanismDefaultsTest.cs" />
     <Compile Include="Settings\FailureMechanismSettingsProviderTest.cs" />
@@ -74,10 +76,6 @@
       <Project>{888d4097-8bc2-4703-9fb1-8744c94d525e}</Project>
       <Name>Ringtoets.HydraRing.Calculation</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\Ringtoets.HydraRing.Data\Ringtoets.HydraRing.Data.csproj">
-      <Project>{70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2}</Project>
-      <Name>Ringtoets.HydraRing.Data</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">