Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -ra760d63747f5c44e99f4e747ace1b4e51c040362 -r1e784991112abbd6c3fb52f3b8808b7423851812
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision a760d63747f5c44e99f4e747ace1b4e51c040362)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj	(.../Application.Ringtoets.Storage.csproj)	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -117,6 +117,7 @@
     <Compile Include="DbContext\VersionEntity.cs">
       <DependentUpon>RingtoetsEntities.tt</DependentUpon>
     </Compile>
+    <Compile Include="Read\CalculationGroupEntityReadExtentions.cs" />
     <Compile Include="Read\FailureMechanismEntityReadExtensions.cs" />
     <Compile Include="Read\FailureMechanismSectionEntityReadExtensions.cs" />
     <Compile Include="Read\FailureMechanismSectionPointEntityReadExtensions.cs" />
@@ -160,6 +161,7 @@
     <Compile Include="SqLiteConnectionStringBuilder.cs" />
     <Compile Include="StorageSqLite.cs" />
     <Compile Include="Update\AssessmentSectionUpdateExtensions.cs" />
+    <Compile Include="Update\CalculationGroupUpdateExtensions.cs" />
     <Compile Include="Update\GrassCoverErosionInwardsFailureMechanismUpdateExtensions.cs" />
     <Compile Include="Update\FailureMechanismBaseUpdateExtensions.cs" />
     <Compile Include="Update\RingtoetsPipingSurfaceLineUpdateExtensions.cs" />
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/CalculationGroupEntityReadExtentions.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/CalculationGroupEntityReadExtentions.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/CalculationGroupEntityReadExtentions.cs	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -0,0 +1,79 @@
+// 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 System.Collections;
+
+using Application.Ringtoets.Storage.DbContext;
+
+using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Integration.Data;
+
+namespace Application.Ringtoets.Storage.Read
+{
+    /// <summary>
+    /// This class defines extension methods for read operations for an <see cref="CalculationGroup"/> based on the
+    /// <see cref="CalculationGroupEntity"/>.
+    /// </summary>
+    internal static class CalculationGroupEntityReadExtentions
+    {
+        /// <summary>
+        /// Read the <see cref="CalculationGroupEntity"/> and use the information to construct
+        /// a <see cref="CalculationGroup"/>.
+        /// </summary>
+        /// <param name="entity">The <see cref="CalculationGroupEntity"/> to create 
+        /// <see cref="CalculationGroup"/> for.</param>
+        /// <param name="collector">The object keeping track of read operations.</param>
+        /// <returns>A new <see cref="AssessmentSection"/>.</returns>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="collector"/> is <c>null</c>.</exception>
+        internal static CalculationGroup Read(this CalculationGroupEntity entity, ReadConversionCollector collector)
+        {
+            if (collector == null)
+            {
+                throw new ArgumentNullException("collector");
+            }
+            var group = new CalculationGroup(entity.Name, Convert.ToBoolean(entity.IsEditable))
+            {
+                StorageId = entity.CalculationGroupEntityId
+            };
+            foreach (object childEntity in GetChildEntitiesInOrder(entity))
+            {
+                var childCalculationGroupEntity = childEntity as CalculationGroupEntity;
+                if (childCalculationGroupEntity != null)
+                {
+                    group.Children.Add(childCalculationGroupEntity.Read(collector));
+                }
+            }
+
+            return group;
+        }
+
+        private static IEnumerable GetChildEntitiesInOrder(CalculationGroupEntity entity)
+        {
+            var sortedList = new SortedList();
+            foreach (CalculationGroupEntity groupEntity in entity.CalculationGroupEntity1)
+            {
+                sortedList.Add(groupEntity.Order, groupEntity);
+            }
+            return sortedList.Values;
+        }
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/CalculationGroupUpdateExtensions.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/CalculationGroupUpdateExtensions.cs	(revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/CalculationGroupUpdateExtensions.cs	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -0,0 +1,114 @@
+// 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 System.Linq;
+
+using Application.Ringtoets.Storage.Create;
+using Application.Ringtoets.Storage.DbContext;
+using Application.Ringtoets.Storage.Exceptions;
+using Application.Ringtoets.Storage.Properties;
+
+using Ringtoets.Common.Data.Calculation;
+
+namespace Application.Ringtoets.Storage.Update
+{
+    /// <summary>
+    /// Extension methods for <see cref="CalculationGroup"/> related to updating an <see cref="CalculationGroupEntity"/>.
+    /// </summary>
+    internal static class CalculationGroupUpdateExtensions
+    {
+        /// <summary>
+        /// Updates a <see cref="CalculationGroupEntity"/> in the database based on the
+        /// information of the <see cref="CalculationGroup"/>.
+        /// </summary>
+        /// <param name="calculationGroup">The calculation group to update the database entity for.</param>
+        /// <param name="registry">The object keeping track of update operations.</param>
+        /// <param name="context">The context to obtain the existing entity from.</param>
+        /// <exception cref="ArgumentNullException">Thrown when either:
+        /// <list type="bullet">
+        /// <item><paramref name="registry"/> is <c>null</c></item>
+        /// <item><paramref name="context"/> is <c>null</c></item>
+        /// </list></exception>
+        internal static void Update(this CalculationGroup calculationGroup, PersistenceRegistry registry, IRingtoetsEntities context)
+        {
+            if (registry == null)
+            {
+                throw new ArgumentNullException("registry");
+            }
+            if (context == null)
+            {
+                throw new ArgumentNullException("context");
+            }
+
+            var entity = GetCorrespondingCalculationGroupEntity(calculationGroup, context);
+            if (calculationGroup.IsNameEditable)
+            {
+                entity.Name = calculationGroup.Name;
+            }
+            UpdateChildren(entity, calculationGroup, registry, context);
+
+            registry.Register(entity, calculationGroup);
+        }
+
+        private static void UpdateChildren(CalculationGroupEntity entity, CalculationGroup calculationGroup, PersistenceRegistry registry, IRingtoetsEntities context)
+        {
+            for (int i = 0; i < calculationGroup.Children.Count; i++)
+            {
+                ICalculationBase calculationBase = calculationGroup.Children[i];
+                var childGroup = calculationBase as CalculationGroup;
+                if (childGroup != null)
+                {
+                    if (childGroup.IsNew())
+                    {
+                        entity.CalculationGroupEntity1.Add(childGroup.Create(registry, i));
+                    }
+                    else
+                    {
+                        childGroup.Update(registry, context);
+                        CalculationGroupEntity childGroupEntity = context.CalculationGroupEntities.First(cge => cge.CalculationGroupEntityId == childGroup.StorageId);
+                        childGroupEntity.Order = i;
+                        if (!entity.CalculationGroupEntity1.Contains(childGroupEntity))
+                        {
+                            childGroupEntity.CalculationGroupEntity2.CalculationGroupEntity1.Remove(childGroupEntity);
+                            entity.CalculationGroupEntity1.Add(childGroupEntity);
+                        }
+                    }
+                }
+            }
+        }
+
+        private static CalculationGroupEntity GetCorrespondingCalculationGroupEntity(CalculationGroup calculationGroup, IRingtoetsEntities context)
+        {
+            try
+            {
+                return context.CalculationGroupEntities.Single(cge => cge.CalculationGroupEntityId == calculationGroup.StorageId);
+            }
+            catch (InvalidOperationException e)
+            {
+                string message = string.Format(Resources.Error_Entity_Not_Found_0_1,
+                                               typeof(CalculationGroupEntity).Name,
+                                               calculationGroup.StorageId);
+                throw new EntityNotFoundException(message, e);
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -ra760d63747f5c44e99f4e747ace1b4e51c040362 -r1e784991112abbd6c3fb52f3b8808b7423851812
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision a760d63747f5c44e99f4e747ace1b4e51c040362)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj	(.../Application.Ringtoets.Storage.Test.csproj)	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -98,6 +98,7 @@
     <Compile Include="Create\StochasticSoilModelCreateExtensionsTest.cs" />
     <Compile Include="Create\StochasticSoilProfileCreateExtensionsTest.cs" />
     <Compile Include="Read\AssessmentSectionEntityTest.cs" />
+    <Compile Include="Read\CalculationGroupEntityReadExtentionsTest.cs" />
     <Compile Include="Read\FailureMechanismEntityTest.cs" />
     <Compile Include="Read\FailureMechanismSectionEntityTest.cs" />
     <Compile Include="Read\FailureMechanismSectionPointEntityTest.cs" />
@@ -118,6 +119,7 @@
     <Compile Include="SqLiteConnectionStringBuilderTest.cs" />
     <Compile Include="StorageSqLiteTest.cs" />
     <Compile Include="Update\AssessmentSectionUpdateExtensionsTest.cs" />
+    <Compile Include="Update\CalculationGroupUpdateExtensionsTest.cs" />
     <Compile Include="Update\GrassCoverErosionInwardsFailureMechanismUpdateExtensionsTest.cs" />
     <Compile Include="Update\FailureMechanismBaseUpdateExtensionsTest.cs" />
     <Compile Include="Update\FailureMechanismSectionUpdateExtensionsTest.cs" />
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs
===================================================================
diff -u -ra760d63747f5c44e99f4e747ace1b4e51c040362 -r1e784991112abbd6c3fb52f3b8808b7423851812
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs	(.../PersistenceRegistryTest.cs)	(revision a760d63747f5c44e99f4e747ace1b4e51c040362)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs	(.../PersistenceRegistryTest.cs)	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -793,7 +793,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.Create(mocks);
+            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             var orphanedEntity = new ProjectEntity
@@ -826,7 +826,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.Create(mocks);
+            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             var orphanedEntity = new AssessmentSectionEntity
@@ -859,7 +859,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.Create(mocks);
+            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.CreateStub(mocks);
             var failureMechanismStub = mocks.Stub<IFailureMechanism>();
             mocks.ReplayAll();
 
@@ -893,7 +893,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.Create(mocks);
+            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             var orphanedEntity = new FailureMechanismSectionEntity
@@ -926,7 +926,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.Create(mocks);
+            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             var orphanedEntity = new HydraulicLocationEntity
@@ -959,7 +959,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.Create(mocks);
+            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             var orphanedEntity = new CalculationGroupEntity
@@ -992,7 +992,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.Create(mocks);
+            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             var orphanedEntity = new StochasticSoilModelEntity
@@ -1025,7 +1025,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.Create(mocks);
+            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             var orphanedEntity = new StochasticSoilProfileEntity
@@ -1058,7 +1058,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.Create(mocks);
+            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             var orphanedEntity = new SoilProfileEntity
@@ -1094,7 +1094,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.Create(mocks);
+            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             var orphanedEntity = new SoilLayerEntity
@@ -1130,7 +1130,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.Create(mocks);
+            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             var orphanedEntity = new SurfaceLineEntity
@@ -1166,7 +1166,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.Create(mocks);
+            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             var orphanedEntity = new SurfaceLinePointEntity
@@ -1202,7 +1202,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.Create(mocks);
+            IRingtoetsEntities dbContext = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             var orphanedEntity = new CharacteristicPointEntity
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs
===================================================================
diff -u
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs	(revision 0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -0,0 +1,155 @@
+// 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 System.Linq;
+
+using Application.Ringtoets.Storage.DbContext;
+using Application.Ringtoets.Storage.Read;
+
+using NUnit.Framework;
+
+using Ringtoets.Common.Data.Calculation;
+
+namespace Application.Ringtoets.Storage.Test.Read
+{
+    [TestFixture]
+    public class CalculationGroupEntityReadExtentionsTest
+    {
+        [Test]
+        public void Read_ReadConversionCollectorIsNull_ThrowArgumentNullException()
+        {
+            // Setup
+            var entity = new CalculationGroupEntity();
+
+            // Call
+            TestDelegate call = () => entity.Read(null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("collector", paramName);
+        }
+
+        [Test]
+        [TestCase(123, "A", 1)]
+        [TestCase(1, "b", 0)]
+        public void Read_EntityWithoutChildren_CreateCalculationGroupWithoutChildren(
+            long id, string name, byte isEditable)
+        {
+            // Setup
+            var entity = new CalculationGroupEntity
+            {
+                CalculationGroupEntityId = id,
+                Name = name,
+                IsEditable = isEditable,
+            };
+
+            var collector = new ReadConversionCollector();
+
+            // Call
+            CalculationGroup group = entity.Read(collector);
+
+            // Assert
+            Assert.AreEqual(id, group.StorageId);
+            Assert.AreEqual(name, group.Name);
+            Assert.AreEqual(Convert.ToBoolean(isEditable), group.IsNameEditable);
+            CollectionAssert.IsEmpty(group.Children);
+        }
+
+        [Test]
+        public void Read_EntityWithChildGroups_CreateCalculationGroupWithChildGroups()
+        {
+            // Setup
+            var rootGroupEntity = new CalculationGroupEntity
+            {
+                CalculationGroupEntityId = 1,
+                Name = "A",
+                CalculationGroupEntity1 =
+                {
+                    new CalculationGroupEntity
+                    {
+                        CalculationGroupEntityId = 2,
+                        Name = "AA",
+                        IsEditable = 1,
+                        Order = 0
+                    },
+                    new CalculationGroupEntity
+                    {
+                        CalculationGroupEntityId = 3,
+                        Name = "AB",
+                        IsEditable = 0,
+                        CalculationGroupEntity1 =
+                        {
+                            new CalculationGroupEntity
+                            {
+                                CalculationGroupEntityId = 4,
+                                Name = "ABA",
+                                IsEditable = 0,
+                                Order = 0
+                            },
+                            new CalculationGroupEntity
+                            {
+                                CalculationGroupEntityId = 5,
+                                Name = "ABB",
+                                IsEditable = 1,
+                                Order = 1
+                            }
+                        },
+                        Order = 1
+                    }
+                }
+            };
+
+            var collector = new ReadConversionCollector();
+
+            // Call
+            var rootGroup = rootGroupEntity.Read(collector);
+
+            // Assert
+            Assert.AreEqual(1, rootGroup.StorageId);
+            Assert.AreEqual("A", rootGroup.Name);
+            Assert.IsFalse(rootGroup.IsNameEditable);
+
+            ICalculationBase[] rootChildren = rootGroup.Children.ToArray();
+            var rootChildGroup1 = (CalculationGroup)rootChildren[0];
+            Assert.AreEqual("AA", rootChildGroup1.Name);
+            Assert.AreEqual(2, rootChildGroup1.StorageId);
+            Assert.IsTrue(rootChildGroup1.IsNameEditable);
+            CollectionAssert.IsEmpty(rootChildGroup1.Children);
+            var rootChildGroup2 = (CalculationGroup)rootChildren[1];
+            Assert.AreEqual("AB", rootChildGroup2.Name);
+            Assert.AreEqual(3, rootChildGroup2.StorageId);
+            Assert.IsFalse(rootChildGroup2.IsNameEditable);
+
+            ICalculationBase[] rootChildGroup2Children = rootChildGroup2.Children.ToArray();
+            var rootChildGroup1Child1 = (CalculationGroup)rootChildGroup2Children[0];
+            Assert.AreEqual("ABA", rootChildGroup1Child1.Name);
+            Assert.AreEqual(4, rootChildGroup1Child1.StorageId);
+            Assert.IsFalse(rootChildGroup1Child1.IsNameEditable);
+            CollectionAssert.IsEmpty(rootChildGroup1Child1.Children);
+            var rootChildGroup1Child2 = (CalculationGroup)rootChildGroup2Children[1];
+            Assert.AreEqual("ABB", rootChildGroup1Child2.Name);
+            Assert.AreEqual(5, rootChildGroup1Child2.StorageId);
+            Assert.IsTrue(rootChildGroup1Child2.IsNameEditable);
+            CollectionAssert.IsEmpty(rootChildGroup1Child2.Children);
+        }
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/AssessmentSectionUpdateExtensionsTest.cs
===================================================================
diff -u -r71123d9c364c97a5ef2eec81acd1bf877a1297b0 -r1e784991112abbd6c3fb52f3b8808b7423851812
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/AssessmentSectionUpdateExtensionsTest.cs	(.../AssessmentSectionUpdateExtensionsTest.cs)	(revision 71123d9c364c97a5ef2eec81acd1bf877a1297b0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/AssessmentSectionUpdateExtensionsTest.cs	(.../AssessmentSectionUpdateExtensionsTest.cs)	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -103,7 +103,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -134,7 +134,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -171,7 +171,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -204,7 +204,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -247,7 +247,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -287,7 +287,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -345,7 +345,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -388,7 +388,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -430,7 +430,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
             var section = InitializeCreatedDikeAssessmentSection();
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/CalculationGroupUpdateExtensionsTest.cs
===================================================================
diff -u
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/CalculationGroupUpdateExtensionsTest.cs	(revision 0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/CalculationGroupUpdateExtensionsTest.cs	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -0,0 +1,363 @@
+// 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 System.Linq;
+
+using Application.Ringtoets.Storage.Create;
+using Application.Ringtoets.Storage.DbContext;
+using Application.Ringtoets.Storage.Exceptions;
+using Application.Ringtoets.Storage.TestUtil;
+using Application.Ringtoets.Storage.Update;
+
+using NUnit.Framework;
+
+using Rhino.Mocks;
+
+using Ringtoets.Common.Data.Calculation;
+
+namespace Application.Ringtoets.Storage.Test.Update
+{
+    [TestFixture]
+    public class CalculationGroupUpdateExtensionsTest
+    {
+        [Test]
+        public void Update_PersistenceRegistryIsNull_ThrowArgumentNullException()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            IRingtoetsEntities rintoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
+            mocks.ReplayAll();
+
+            var calculationGroup = new CalculationGroup
+            {
+                StorageId = 1
+            };
+
+            // Call
+            TestDelegate call = () => calculationGroup.Update(null, rintoetsEntities);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("registry", paramName);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Update_RingtoetsEntitiesIsNull_ThrowArgumentNullException()
+        {
+            // Setup
+            var calculationGroup = new CalculationGroup
+            {
+                StorageId = 1
+            };
+
+            var registry = new PersistenceRegistry();
+
+            // Call
+            TestDelegate call = () => calculationGroup.Update(registry, null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(call).ParamName;
+            Assert.AreEqual("context", paramName);
+        }
+
+        [Test]
+        public void Update_GroupHasntBeenSaved_ThrowEntityNotFoundException()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            IRingtoetsEntities ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
+            mocks.ReplayAll();
+
+            var calculationGroup = new CalculationGroup
+            {
+                StorageId = 3
+            };
+
+            var registry = new PersistenceRegistry();
+
+            // Call
+            TestDelegate call = () => calculationGroup.Update(registry, ringtoetsEntities);
+
+            // Assert
+            string message = Assert.Throws<EntityNotFoundException>(call).Message;
+            Assert.AreEqual("Het object 'CalculationGroupEntity' met id '3' is niet gevonden.", message);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Update_GroupPropertiesChanged_EntityUpdated()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            IRingtoetsEntities ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
+            mocks.ReplayAll();
+
+            CalculationGroup calculationGroup = CreateCalculationGroupWithoutChildren(true);
+
+            var groupEntity = new CalculationGroupEntity
+            {
+                CalculationGroupEntityId = calculationGroup.StorageId,
+                IsEditable = Convert.ToByte(calculationGroup.IsNameEditable),
+                Name = "<original name>"
+            };
+            ringtoetsEntities.CalculationGroupEntities.Add(groupEntity);
+
+            var registry = new PersistenceRegistry();
+
+            // Call
+            calculationGroup.Update(registry, ringtoetsEntities);
+
+            // Assert
+            Assert.AreEqual(calculationGroup.Name, groupEntity.Name);
+
+            CollectionAssert.IsEmpty(groupEntity.CalculationGroupEntity1,
+                "No changes to the children expected.");
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Update_ChildGroupsReordered_EntitiesUpdated()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            IRingtoetsEntities ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
+            mocks.ReplayAll();
+
+            CalculationGroup calculationGroup = CreateCalculationGroupWith2ChildGroups();
+
+            var childGroup1 = new CalculationGroupEntity
+            {
+                CalculationGroupEntityId = ((CalculationGroup)calculationGroup.Children[0]).StorageId,
+                Name = "A",
+                Order = 1
+            };
+            var childGroup2 = new CalculationGroupEntity
+            {
+                CalculationGroupEntityId = ((CalculationGroup)calculationGroup.Children[1]).StorageId,
+                Name = "A",
+                Order = 0
+            };
+            var groupEntity = new CalculationGroupEntity
+            {
+                CalculationGroupEntityId = calculationGroup.StorageId,
+                IsEditable = Convert.ToByte(calculationGroup.IsNameEditable),
+                Name = "<original name>",
+                CalculationGroupEntity1 =
+                {
+                    childGroup1,
+                    childGroup2
+                }
+            };
+            ringtoetsEntities.CalculationGroupEntities.Add(groupEntity);
+            ringtoetsEntities.CalculationGroupEntities.Add(childGroup1);
+            ringtoetsEntities.CalculationGroupEntities.Add(childGroup2);
+
+            var registry = new PersistenceRegistry();
+
+            // Call
+            calculationGroup.Update(registry, ringtoetsEntities);
+
+            // Assert
+            Assert.AreEqual(0, childGroup1.Order);
+            Assert.AreEqual(calculationGroup.Children[0].Name, childGroup1.Name);
+            Assert.AreEqual(1, childGroup2.Order);
+            Assert.AreEqual(calculationGroup.Children[1].Name, childGroup2.Name);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Update_ChildGroupInserted_EntitiesUpdatedAndNewEntityCreated()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            IRingtoetsEntities ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
+            mocks.ReplayAll();
+
+            CalculationGroup calculationGroup = CreateCalculationGroupWith2ChildGroups();
+            
+            var childGroup1 = CreateExpectedEmptyGroupEntity((CalculationGroup)calculationGroup.Children[0], 0);
+            var childGroup2 = CreateExpectedEmptyGroupEntity((CalculationGroup)calculationGroup.Children[1], 1);
+            var groupEntity = new CalculationGroupEntity
+            {
+                CalculationGroupEntityId = calculationGroup.StorageId,
+                IsEditable = Convert.ToByte(calculationGroup.IsNameEditable),
+                Name = "<original name>",
+                CalculationGroupEntity1 =
+                {
+                    childGroup1,
+                    childGroup2
+                }
+            };
+            ringtoetsEntities.CalculationGroupEntities.Add(groupEntity);
+            ringtoetsEntities.CalculationGroupEntities.Add(childGroup1);
+            ringtoetsEntities.CalculationGroupEntities.Add(childGroup2);
+
+            var insertedGroup = new CalculationGroup("<newly inserted group>", false);
+            const int insertedIndex = 1;
+            calculationGroup.Children.Insert(insertedIndex, insertedGroup);
+
+            var registry = new PersistenceRegistry();
+
+            // Call
+            calculationGroup.Update(registry, ringtoetsEntities);
+
+            // Assert
+            CalculationGroupEntity[] updatedChildGroupEntities = groupEntity.CalculationGroupEntity1
+                                                                            .OrderBy(cge => cge.Order)
+                                                                            .ToArray();
+            Assert.AreEqual(3, updatedChildGroupEntities.Length);
+            Assert.AreSame(childGroup1, updatedChildGroupEntities[0]);
+            Assert.AreEqual(0, childGroup1.Order);
+            Assert.AreEqual(calculationGroup.Children[0].Name, childGroup1.Name);
+
+            var newGroupEntity = updatedChildGroupEntities[insertedIndex];
+            Assert.AreEqual(insertedIndex, newGroupEntity.Order);
+            Assert.AreEqual(insertedGroup.Name, newGroupEntity.Name);
+            Assert.AreEqual(0, newGroupEntity.IsEditable);
+
+            Assert.AreSame(childGroup2, updatedChildGroupEntities[2]);
+            Assert.AreEqual(2, childGroup2.Order);
+            Assert.AreEqual(calculationGroup.Children[2].Name, childGroup2.Name);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Update_ChildGroupAdded_RootEntitiyUpdatedAndNewEntityCreated()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            IRingtoetsEntities ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
+            mocks.ReplayAll();
+
+            CalculationGroup calculationGroup = CreateCalculationGroupWithoutChildren(true);
+
+            var rootGroupEntity = CreateExpectedEmptyGroupEntity(calculationGroup, 0);
+            ringtoetsEntities.CalculationGroupEntities.Add(rootGroupEntity);
+
+            var newGroup = new CalculationGroup("<newly added group>", false);
+            calculationGroup.Children.Add(newGroup);
+
+            var registry = new PersistenceRegistry();
+
+            // Call
+            calculationGroup.Update(registry, ringtoetsEntities);
+
+            // Assert
+            CalculationGroupEntity[] updatedChildGroupEntities = rootGroupEntity.CalculationGroupEntity1
+                                                                                .OrderBy(cge => cge.Order)
+                                                                                .ToArray();
+            Assert.AreEqual(1, updatedChildGroupEntities.Length);
+            var newGroupEntity = updatedChildGroupEntities[0];
+            Assert.AreEqual(0, newGroupEntity.Order);
+            Assert.AreEqual(newGroup.Name, newGroupEntity.Name);
+            Assert.AreEqual(0, newGroupEntity.IsEditable);
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Update_ExistingChildGroupDragged_EntitiesUpdated()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            IRingtoetsEntities ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
+            mocks.ReplayAll();
+
+
+            var draggedGroup = new CalculationGroup("<Dragged group>", false)
+            {
+                StorageId = 876
+            };
+            CalculationGroup calculationGroup = CreateCalculationGroupWith2ChildGroups();
+            ((CalculationGroup)calculationGroup.Children[0]).Children.Add(draggedGroup);
+
+            var childGroup1Entity = CreateExpectedEmptyGroupEntity((CalculationGroup)calculationGroup.Children[0], 0);
+            var childGroup2Entity = CreateExpectedEmptyGroupEntity((CalculationGroup)calculationGroup.Children[1], 1);
+            var fillerGroupEntity = CreateExpectedEmptyGroupEntity(new CalculationGroup(), 0);
+            childGroup2Entity.CalculationGroupEntity1.Add(fillerGroupEntity);
+            var draggedGroupEntity = CreateExpectedEmptyGroupEntity(draggedGroup, 1);
+            childGroup2Entity.CalculationGroupEntity1.Add(draggedGroupEntity);
+            draggedGroupEntity.CalculationGroupEntity2 = childGroup2Entity;
+
+            var rootGroupEntity = CreateExpectedEmptyGroupEntity(calculationGroup, 0);
+            rootGroupEntity.CalculationGroupEntity1.Add(childGroup1Entity);
+            rootGroupEntity.CalculationGroupEntity1.Add(childGroup2Entity);
+
+            ringtoetsEntities.CalculationGroupEntities.Add(rootGroupEntity);
+            ringtoetsEntities.CalculationGroupEntities.Add(childGroup1Entity);
+            ringtoetsEntities.CalculationGroupEntities.Add(childGroup2Entity);
+            ringtoetsEntities.CalculationGroupEntities.Add(fillerGroupEntity);
+            ringtoetsEntities.CalculationGroupEntities.Add(draggedGroupEntity);
+
+            var registry = new PersistenceRegistry();
+
+            // Call
+            calculationGroup.Update(registry, ringtoetsEntities);
+
+            // Assert
+            Assert.AreEqual(0, draggedGroupEntity.Order);
+            CollectionAssert.Contains(childGroup1Entity.CalculationGroupEntity1, draggedGroupEntity);
+            CollectionAssert.DoesNotContain(childGroup2Entity.CalculationGroupEntity1, draggedGroupEntity);
+
+            Assert.AreEqual(0, fillerGroupEntity.Order);
+            mocks.VerifyAll();
+        }
+
+        private static CalculationGroup CreateCalculationGroupWithoutChildren(bool isNameEditable)
+        {
+            return new CalculationGroup("<GroupWithoutChildren>", isNameEditable)
+            {
+                StorageId = 5689467
+            };
+        }
+
+        private CalculationGroup CreateCalculationGroupWith2ChildGroups()
+        {
+            return new CalculationGroup("<GroupWithTwoChildGroups", true)
+            {
+                StorageId = 4857,
+                Children =
+                {
+                    new CalculationGroup("<Child1>", true)
+                    {
+                        StorageId = 98
+                    },
+                    new CalculationGroup("<Child2>", true)
+                    {
+                        StorageId = 65
+                    }
+                }
+            };
+        }
+
+        private CalculationGroupEntity CreateExpectedEmptyGroupEntity(CalculationGroup group, int order)
+        {
+            return new CalculationGroupEntity
+            {
+                CalculationGroupEntityId = group.StorageId,
+                Name = group.Name,
+                IsEditable = Convert.ToByte(group.IsNameEditable),
+                Order = order
+            };
+        }
+    }
+}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/FailureMechanismBaseUpdateExtensionsTest.cs
===================================================================
diff -u -r0b923cebc12005d3fec5e5b6830276f1a758928b -r1e784991112abbd6c3fb52f3b8808b7423851812
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/FailureMechanismBaseUpdateExtensionsTest.cs	(.../FailureMechanismBaseUpdateExtensionsTest.cs)	(revision 0b923cebc12005d3fec5e5b6830276f1a758928b)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/FailureMechanismBaseUpdateExtensionsTest.cs	(.../FailureMechanismBaseUpdateExtensionsTest.cs)	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -97,7 +97,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -128,7 +128,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -189,7 +189,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             long testId = new Random(21).Next();
@@ -219,7 +219,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             long testId = new Random(21).Next();
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/FailureMechanismSectionUpdateExtensionsTest.cs
===================================================================
diff -u -r71123d9c364c97a5ef2eec81acd1bf877a1297b0 -r1e784991112abbd6c3fb52f3b8808b7423851812
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/FailureMechanismSectionUpdateExtensionsTest.cs	(.../FailureMechanismSectionUpdateExtensionsTest.cs)	(revision 71123d9c364c97a5ef2eec81acd1bf877a1297b0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/FailureMechanismSectionUpdateExtensionsTest.cs	(.../FailureMechanismSectionUpdateExtensionsTest.cs)	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -97,7 +97,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -128,7 +128,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -161,7 +161,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
             
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/GrassCoverErosionInwardsFailureMechanismUpdateExtensionsTest.cs
===================================================================
diff -u -r71123d9c364c97a5ef2eec81acd1bf877a1297b0 -r1e784991112abbd6c3fb52f3b8808b7423851812
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/GrassCoverErosionInwardsFailureMechanismUpdateExtensionsTest.cs	(.../GrassCoverErosionInwardsFailureMechanismUpdateExtensionsTest.cs)	(revision 71123d9c364c97a5ef2eec81acd1bf877a1297b0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/GrassCoverErosionInwardsFailureMechanismUpdateExtensionsTest.cs	(.../GrassCoverErosionInwardsFailureMechanismUpdateExtensionsTest.cs)	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -98,7 +98,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -129,7 +129,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -161,7 +161,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -195,7 +195,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/HydraulicBoundaryLocationUpdateExtensionsTest.cs
===================================================================
diff -u -r71123d9c364c97a5ef2eec81acd1bf877a1297b0 -r1e784991112abbd6c3fb52f3b8808b7423851812
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/HydraulicBoundaryLocationUpdateExtensionsTest.cs	(.../HydraulicBoundaryLocationUpdateExtensionsTest.cs)	(revision 71123d9c364c97a5ef2eec81acd1bf877a1297b0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/HydraulicBoundaryLocationUpdateExtensionsTest.cs	(.../HydraulicBoundaryLocationUpdateExtensionsTest.cs)	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -95,7 +95,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -126,7 +126,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/PipingFailureMechanismUpdateExtensionsTest.cs
===================================================================
diff -u -r71123d9c364c97a5ef2eec81acd1bf877a1297b0 -r1e784991112abbd6c3fb52f3b8808b7423851812
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/PipingFailureMechanismUpdateExtensionsTest.cs	(.../PipingFailureMechanismUpdateExtensionsTest.cs)	(revision 71123d9c364c97a5ef2eec81acd1bf877a1297b0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/PipingFailureMechanismUpdateExtensionsTest.cs	(.../PipingFailureMechanismUpdateExtensionsTest.cs)	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -99,7 +99,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -130,7 +130,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -162,7 +162,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -198,7 +198,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -244,7 +244,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             var failureMechanism = new PipingFailureMechanism
@@ -278,7 +278,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             const long surfaceLineId = 23;
@@ -325,7 +325,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -356,7 +356,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/PipingSoilLayerUpdateExtensionsTest.cs
===================================================================
diff -u -r71123d9c364c97a5ef2eec81acd1bf877a1297b0 -r1e784991112abbd6c3fb52f3b8808b7423851812
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/PipingSoilLayerUpdateExtensionsTest.cs	(.../PipingSoilLayerUpdateExtensionsTest.cs)	(revision 71123d9c364c97a5ef2eec81acd1bf877a1297b0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/PipingSoilLayerUpdateExtensionsTest.cs	(.../PipingSoilLayerUpdateExtensionsTest.cs)	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -95,7 +95,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -128,7 +128,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/PipingSoilProfileUpdateExtensionsTest.cs
===================================================================
diff -u -r71123d9c364c97a5ef2eec81acd1bf877a1297b0 -r1e784991112abbd6c3fb52f3b8808b7423851812
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/PipingSoilProfileUpdateExtensionsTest.cs	(.../PipingSoilProfileUpdateExtensionsTest.cs)	(revision 71123d9c364c97a5ef2eec81acd1bf877a1297b0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/PipingSoilProfileUpdateExtensionsTest.cs	(.../PipingSoilProfileUpdateExtensionsTest.cs)	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -97,7 +97,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -134,7 +134,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -174,7 +174,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/ProjectUpdateExtensionsTest.cs
===================================================================
diff -u -r71123d9c364c97a5ef2eec81acd1bf877a1297b0 -r1e784991112abbd6c3fb52f3b8808b7423851812
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/ProjectUpdateExtensionsTest.cs	(.../ProjectUpdateExtensionsTest.cs)	(revision 71123d9c364c97a5ef2eec81acd1bf877a1297b0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/ProjectUpdateExtensionsTest.cs	(.../ProjectUpdateExtensionsTest.cs)	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -95,7 +95,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -126,7 +126,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -166,7 +166,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -198,7 +198,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -231,7 +231,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             var project = new Project
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/RingtoetsPipingSurfaceLineUpdateExtensionsTest.cs
===================================================================
diff -u -rb9859f12b82129952b46518de9d4377b26c58335 -r1e784991112abbd6c3fb52f3b8808b7423851812
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/RingtoetsPipingSurfaceLineUpdateExtensionsTest.cs	(.../RingtoetsPipingSurfaceLineUpdateExtensionsTest.cs)	(revision b9859f12b82129952b46518de9d4377b26c58335)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/RingtoetsPipingSurfaceLineUpdateExtensionsTest.cs	(.../RingtoetsPipingSurfaceLineUpdateExtensionsTest.cs)	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -46,7 +46,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            IRingtoetsEntities context = RingtoetsEntitiesHelper.Create(mocks);
+            IRingtoetsEntities context = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             RingtoetsPipingSurfaceLine surfaceLine = CreateSavedSurfaceLineWithData();
@@ -81,7 +81,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var context = RingtoetsEntitiesHelper.Create(mocks);
+            var context = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             var collector = new PersistenceRegistry();
@@ -107,7 +107,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var context = RingtoetsEntitiesHelper.Create(mocks);
+            var context = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             RingtoetsPipingSurfaceLine surfaceLine = CreateSavedSurfaceLineWithoutGeometry();
@@ -141,7 +141,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var context = RingtoetsEntitiesHelper.Create(mocks);
+            var context = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             RingtoetsPipingSurfaceLine surfaceLine = CreateSavedSurfaceLineWithGeometry();
@@ -186,7 +186,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var context = RingtoetsEntitiesHelper.Create(mocks);
+            var context = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             RingtoetsPipingSurfaceLine surfaceLine = CreateSavedSurfaceLineWithGeometry();
@@ -252,7 +252,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var context = RingtoetsEntitiesHelper.Create(mocks);
+            var context = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             RingtoetsPipingSurfaceLine surfaceLine = CreateSavedSurfaceLineWithGeometry();
@@ -300,7 +300,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var context = RingtoetsEntitiesHelper.Create(mocks);
+            var context = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             RingtoetsPipingSurfaceLine surfaceLine = CreateSavedSurfaceLineWithData();
@@ -399,7 +399,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var context = RingtoetsEntitiesHelper.Create(mocks);
+            var context = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             RingtoetsPipingSurfaceLine surfaceLine = CreateSavedSurfaceLineWithGeometry();
@@ -451,7 +451,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var context = RingtoetsEntitiesHelper.Create(mocks);
+            var context = RingtoetsEntitiesHelper.CreateStub(mocks);
             mocks.ReplayAll();
 
             RingtoetsPipingSurfaceLine surfaceLine = CreateSavedSurfaceLineWithData();
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/StandAloneFailureMechanismUpdateExtensionsTest.cs
===================================================================
diff -u -r219f8633c1b5b24f9e9aec3e903734fa94775f0e -r1e784991112abbd6c3fb52f3b8808b7423851812
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/StandAloneFailureMechanismUpdateExtensionsTest.cs	(.../StandAloneFailureMechanismUpdateExtensionsTest.cs)	(revision 219f8633c1b5b24f9e9aec3e903734fa94775f0e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/StandAloneFailureMechanismUpdateExtensionsTest.cs	(.../StandAloneFailureMechanismUpdateExtensionsTest.cs)	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -97,7 +97,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -128,7 +128,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -160,7 +160,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -191,7 +191,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/StochasticSoilModelUpdateExtensionsTest.cs
===================================================================
diff -u -r71123d9c364c97a5ef2eec81acd1bf877a1297b0 -r1e784991112abbd6c3fb52f3b8808b7423851812
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/StochasticSoilModelUpdateExtensionsTest.cs	(.../StochasticSoilModelUpdateExtensionsTest.cs)	(revision 71123d9c364c97a5ef2eec81acd1bf877a1297b0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/StochasticSoilModelUpdateExtensionsTest.cs	(.../StochasticSoilModelUpdateExtensionsTest.cs)	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -98,7 +98,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -131,7 +131,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -166,7 +166,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
             
@@ -203,7 +203,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/StochasticSoilProfileUpdateExtensionsTest.cs
===================================================================
diff -u -r71123d9c364c97a5ef2eec81acd1bf877a1297b0 -r1e784991112abbd6c3fb52f3b8808b7423851812
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/StochasticSoilProfileUpdateExtensionsTest.cs	(.../StochasticSoilProfileUpdateExtensionsTest.cs)	(revision 71123d9c364c97a5ef2eec81acd1bf877a1297b0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/StochasticSoilProfileUpdateExtensionsTest.cs	(.../StochasticSoilProfileUpdateExtensionsTest.cs)	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -97,7 +97,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -129,7 +129,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
@@ -163,7 +163,7 @@
         {
             // Setup
             MockRepository mocks = new MockRepository();
-            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+            var ringtoetsEntities = RingtoetsEntitiesHelper.CreateStub(mocks);
 
             mocks.ReplayAll();
 
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsEntitiesHelper.cs
===================================================================
diff -u -r7c766c291e763a54ef8ce4e2b9cadabda9e8296d -r1e784991112abbd6c3fb52f3b8808b7423851812
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsEntitiesHelper.cs	(.../RingtoetsEntitiesHelper.cs)	(revision 7c766c291e763a54ef8ce4e2b9cadabda9e8296d)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsEntitiesHelper.cs	(.../RingtoetsEntitiesHelper.cs)	(revision 1e784991112abbd6c3fb52f3b8808b7423851812)
@@ -34,7 +34,7 @@
         /// </summary>
         /// <param name="mockRepository">The mock repository.</param>
         /// <returns>A stubbed <see cref="IRingtoetsEntities"/> implementation.</returns>
-        public static IRingtoetsEntities Create(MockRepository mockRepository)
+        public static IRingtoetsEntities CreateStub(MockRepository mockRepository)
         {
             DbSet<ProjectEntity> projectsSet = CreateEmptyTestDbSet<ProjectEntity>();
             DbSet<HydraulicLocationEntity> hydraylicLocationsSet = CreateEmptyTestDbSet<HydraulicLocationEntity>();