Index: Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/DesignWaterLevelCalculationServiceConfigTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/DesignWaterLevelCalculationServiceConfigTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/DesignWaterLevelCalculationServiceConfigTest.cs	(revision c6176d50a690c3ff5ee1c4b2902dcabc2e270201)
@@ -0,0 +1,65 @@
+// 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;
+using NUnit.Framework;
+
+namespace Ringtoets.Common.Service.TestUtil.Test
+{
+    [TestFixture]
+    public class DesignWaterLevelCalculationServiceConfigTest
+    {
+        [Test]
+        public void Constructor_NewInstanceCanBeDisposed()
+        {
+            // Call
+            var service = new DesignWaterLevelCalculationServiceConfig();
+
+            // Assert
+            Assert.IsInstanceOf<IDisposable>(service);
+            Assert.DoesNotThrow(() => service.Dispose());
+        }
+
+        [Test]
+        public void Constructor_SetsTestWaveConditionsCalculationService()
+        {
+            // Call
+            using (new DesignWaterLevelCalculationServiceConfig())
+            {
+                // Assert
+                Assert.IsInstanceOf<TestDesignWaterLevelCalculationService>(DesignWaterLevelCalculationService.Instance);
+            }
+        }
+
+        [Test]
+        public void Dispose_Always_ResetsDesignWaterLevelCalculationServiceToPreviousValue()
+        {
+            // Setup
+            var expectedService = DesignWaterLevelCalculationService.Instance;
+
+            // Call
+            using (new DesignWaterLevelCalculationServiceConfig()) {}
+
+            // Assert
+            Assert.AreSame(expectedService, DesignWaterLevelCalculationService.Instance);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/Ringtoets.Common.Service.TestUtil.Test.csproj
===================================================================
diff -u -rd9fc827247231ca9d40e18e9f989a8bd978cb53b -rc6176d50a690c3ff5ee1c4b2902dcabc2e270201
--- Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/Ringtoets.Common.Service.TestUtil.Test.csproj	(.../Ringtoets.Common.Service.TestUtil.Test.csproj)	(revision d9fc827247231ca9d40e18e9f989a8bd978cb53b)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/Ringtoets.Common.Service.TestUtil.Test.csproj	(.../Ringtoets.Common.Service.TestUtil.Test.csproj)	(revision c6176d50a690c3ff5ee1c4b2902dcabc2e270201)
@@ -39,20 +39,57 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="DesignWaterLevelCalculationServiceConfigTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TestDesignWaterLevelCalculationServiceTest.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\..\..\build\Copying.licenseheader">
       <Link>Copying.licenseheader</Link>
     </None>
+    <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
+      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
+      <Name>Core.Common.Base</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Utils\Core.Common.Utils.csproj">
+      <Project>{F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}</Project>
+      <Name>Core.Common.Utils</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Calculation\Ringtoets.HydraRing.Calculation.csproj">
+      <Project>{888d4097-8bc2-4703-9fb1-8744c94d525e}</Project>
+      <Name>Ringtoets.HydraRing.Calculation</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\HydraRing\src\Ringtoets.HydraRing.Data\Ringtoets.HydraRing.Data.csproj">
+      <Project>{70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2}</Project>
+      <Name>Ringtoets.HydraRing.Data</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Ringtoets.Common.Service\Ringtoets.Common.Service.csproj">
+      <Project>{D951D6DA-FE83-4920-9FDB-63BF96480B54}</Project>
+      <Name>Ringtoets.Common.Service</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.Common.Service.TestUtil\Ringtoets.Common.Service.TestUtil.csproj">
+      <Project>{73E7E100-C015-4874-A548-AD6E33E7955E}</Project>
+      <Name>Ringtoets.Common.Service.TestUtil</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/TestDesignWaterLevelCalculationServiceTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/TestDesignWaterLevelCalculationServiceTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/TestDesignWaterLevelCalculationServiceTest.cs	(revision c6176d50a690c3ff5ee1c4b2902dcabc2e270201)
@@ -0,0 +1,161 @@
+// 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;
+using Core.Common.Utils;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Service.MessageProviders;
+using Ringtoets.HydraRing.Calculation.Data.Output;
+using Ringtoets.HydraRing.Data;
+
+namespace Ringtoets.Common.Service.TestUtil.Test
+{
+    [TestFixture]
+    public class TestDesignWaterLevelCalculationServiceTest
+    {
+        [Test]
+        public void Validate_Always_ReturnTrue()
+        {
+            // Setup
+            var service = new TestDesignWaterLevelCalculationService();
+
+            // Call
+            bool validated = service.Validate(string.Empty, String.Empty);
+
+            // Assert
+            Assert.IsTrue(validated);
+        }
+
+        [Test]
+        public void Calculate_SetCalculationConvergenceOutputDefault_ReturnsExpectedValue()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
+            var hydraulicBoundaryLocationMock = mockRepository.StrictMock<IHydraulicBoundaryLocation>();
+
+            mockRepository.ReplayAll();
+            var service = new TestDesignWaterLevelCalculationService();
+            const double norm = 12.34;
+
+            // Call
+            ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
+                                                                         hydraulicBoundaryLocationMock,
+                                                                         string.Empty,
+                                                                         string.Empty, norm);
+
+            // Assert
+            var expectedOutput = new ReliabilityIndexCalculationOutput(norm, StatisticsConverter.NormToBeta(norm));
+            AssertReliabilityIndexCalculationOutput(expectedOutput, output);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void Calculate_SetCalculationConvergenceOutputCalculatedConverged_ReturnsExpectedValue()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
+            var hydraulicBoundaryLocationMock = mockRepository.StrictMock<IHydraulicBoundaryLocation>();
+
+            mockRepository.ReplayAll();
+            var service = new TestDesignWaterLevelCalculationService
+            {
+                SetCalculationConvergenceOutput = CalculationConvergence.CalculatedConverged
+            };
+            const double norm = 12.34;
+
+            // Call
+            ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
+                                                                         hydraulicBoundaryLocationMock,
+                                                                         string.Empty,
+                                                                         string.Empty, norm);
+
+            // Assert
+            Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
+            var expectedOutput = new ReliabilityIndexCalculationOutput(norm, StatisticsConverter.NormToBeta(norm));
+            AssertReliabilityIndexCalculationOutput(expectedOutput, output);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void Calculate_SetCalculationConvergenceOutputNotCalculated_ReturnsNull()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
+            var hydraulicBoundaryLocationMock = mockRepository.StrictMock<IHydraulicBoundaryLocation>();
+
+            mockRepository.ReplayAll();
+            var service = new TestDesignWaterLevelCalculationService
+            {
+                SetCalculationConvergenceOutput = CalculationConvergence.NotCalculated
+            };
+            const double norm = 12.34;
+
+            // Call
+            ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
+                                                                         hydraulicBoundaryLocationMock,
+                                                                         string.Empty,
+                                                                         string.Empty, norm);
+
+            // Assert
+            Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
+            Assert.IsNull(output);
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        public void Calculate_SetCalculationConvergenceOutputCalculatedNotConverged_ReturnsExpectedValue()
+        {
+            // Setup
+            var mockRepository = new MockRepository();
+            var calculationMessageProviderMock = mockRepository.StrictMock<ICalculationMessageProvider>();
+            var hydraulicBoundaryLocationMock = mockRepository.StrictMock<IHydraulicBoundaryLocation>();
+
+            mockRepository.ReplayAll();
+            var service = new TestDesignWaterLevelCalculationService
+            {
+                SetCalculationConvergenceOutput = CalculationConvergence.CalculatedNotConverged
+            };
+            const double norm = 12.34;
+
+            // Call
+            ReliabilityIndexCalculationOutput output = service.Calculate(calculationMessageProviderMock,
+                                                                         hydraulicBoundaryLocationMock,
+                                                                         string.Empty,
+                                                                         string.Empty, norm);
+
+            // Assert
+            Assert.AreSame(calculationMessageProviderMock, service.MessageProvider);
+            var expectedOutput = new ReliabilityIndexCalculationOutput(norm, norm);
+            AssertReliabilityIndexCalculationOutput(expectedOutput, output);
+            mockRepository.VerifyAll();
+        }
+
+        private static void AssertReliabilityIndexCalculationOutput(ReliabilityIndexCalculationOutput expected, ReliabilityIndexCalculationOutput actual)
+        {
+            Assert.AreEqual(expected.CalculatedReliabilityIndex, actual.CalculatedReliabilityIndex);
+            Assert.AreEqual(expected.Result, actual.Result, 1e-6);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/packages.config
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/packages.config	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.TestUtil.Test/packages.config	(revision c6176d50a690c3ff5ee1c4b2902dcabc2e270201)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+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.
+-->
+<packages>
+  <package id="NUnit" version="2.6.4" targetFramework="net40" />
+</packages>
\ No newline at end of file
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/WaveConditionsCalculationServiceConfigTest.cs
===================================================================
diff -u -r5b3041efe0fd2d334984d6c730815242b30229aa -rc6176d50a690c3ff5ee1c4b2902dcabc2e270201
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/WaveConditionsCalculationServiceConfigTest.cs	(.../WaveConditionsCalculationServiceConfigTest.cs)	(revision 5b3041efe0fd2d334984d6c730815242b30229aa)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.TestUtil.Test/WaveConditionsCalculationServiceConfigTest.cs	(.../WaveConditionsCalculationServiceConfigTest.cs)	(revision c6176d50a690c3ff5ee1c4b2902dcabc2e270201)
@@ -39,7 +39,7 @@
         }
 
         [Test]
-        public void Constructor_SetsTestFactoryForPipingCalculatorService()
+        public void Constructor_SetsTestWaveConditionsCalculationService()
         {
             // Call
             using (new WaveConditionsCalculationServiceConfig())
@@ -50,7 +50,7 @@
         }
 
         [Test]
-        public void Dispose_Always_ResetsFactoryToPreviousValue()
+        public void Dispose_Always_ResetsWaveConditionsCalculationServiceToPreviousValue()
         {
             // Setup
             var expectedService = WaveConditionsCalculationService.Instance;