Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/AssessmentSectionUpdateExtensionsTest.cs
===================================================================
diff -u -rae6f0c6b534ca650e160ae6d9c0bc90369d25c68 -rfe68c3f7cae5946b93d9e27eb532b176a6b26b84
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/AssessmentSectionUpdateExtensionsTest.cs	(.../AssessmentSectionUpdateExtensionsTest.cs)	(revision ae6f0c6b534ca650e160ae6d9c0bc90369d25c68)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/AssessmentSectionUpdateExtensionsTest.cs	(.../AssessmentSectionUpdateExtensionsTest.cs)	(revision fe68c3f7cae5946b93d9e27eb532b176a6b26b84)
@@ -150,6 +150,10 @@
                 Composition = (short) AssessmentSectionComposition.Dike
             };
             ringtoetsEntities.AssessmentSectionEntities.Add(entity);
+            ringtoetsEntities.CalculationGroupEntities.Add(new CalculationGroupEntity
+            {
+                CalculationGroupEntityId = section.PipingFailureMechanism.CalculationsGroup.StorageId
+            });
             FillWithFailureMechanismEntities(ringtoetsEntities.FailureMechanismEntities);
 
             // Call
@@ -188,6 +192,10 @@
                 AssessmentSectionEntityId = 1
             };
             ringtoetsEntities.AssessmentSectionEntities.Add(entity);
+            ringtoetsEntities.CalculationGroupEntities.Add(new CalculationGroupEntity
+            {
+                CalculationGroupEntityId = section.PipingFailureMechanism.CalculationsGroup.StorageId
+            });
             FillWithFailureMechanismEntities(ringtoetsEntities.FailureMechanismEntities);
 
             // Call
@@ -229,6 +237,10 @@
                 }
             };
             ringtoetsEntities.AssessmentSectionEntities.Add(entity);
+            ringtoetsEntities.CalculationGroupEntities.Add(new CalculationGroupEntity
+            {
+                CalculationGroupEntityId = section.PipingFailureMechanism.CalculationsGroup.StorageId
+            });
             ringtoetsEntities.ReferenceLinePointEntities.Add(referenceLinePointEntity);
             FillWithFailureMechanismEntities(ringtoetsEntities.FailureMechanismEntities);
 
@@ -269,6 +281,10 @@
                 AssessmentSectionEntityId = 1
             };
             ringtoetsEntities.AssessmentSectionEntities.Add(entity);
+            ringtoetsEntities.CalculationGroupEntities.Add(new CalculationGroupEntity
+            {
+                CalculationGroupEntityId = section.PipingFailureMechanism.CalculationsGroup.StorageId
+            });
             FillWithFailureMechanismEntities(ringtoetsEntities.FailureMechanismEntities);
 
             // Call
@@ -323,6 +339,10 @@
                 }
             };
             ringtoetsEntities.AssessmentSectionEntities.Add(entity);
+            ringtoetsEntities.CalculationGroupEntities.Add(new CalculationGroupEntity
+            {
+                CalculationGroupEntityId = section.PipingFailureMechanism.CalculationsGroup.StorageId
+            });
             FillWithFailureMechanismEntities(ringtoetsEntities.FailureMechanismEntities);
             ringtoetsEntities.HydraulicLocationEntities.Add(hydraulicLocationEntity);
 
@@ -368,6 +388,10 @@
                 }
             };
             ringtoetsEntities.AssessmentSectionEntities.Add(entity);
+            ringtoetsEntities.CalculationGroupEntities.Add(new CalculationGroupEntity
+            {
+                CalculationGroupEntityId = section.PipingFailureMechanism.CalculationsGroup.StorageId
+            });
             ringtoetsEntities.FailureMechanismEntities.Add(failureMechanismEntity);
             FillWithFailureMechanismEntities(ringtoetsEntities.FailureMechanismEntities);
 
@@ -410,6 +434,10 @@
                 }
             };
             ringtoetsEntities.AssessmentSectionEntities.Add(entity);
+            ringtoetsEntities.CalculationGroupEntities.Add(new CalculationGroupEntity
+            {
+                CalculationGroupEntityId = section.PipingFailureMechanism.CalculationsGroup.StorageId
+            });
             ringtoetsEntities.FailureMechanismEntities.Add(failureMechanismEntity);
             FillWithFailureMechanismEntities(ringtoetsEntities.FailureMechanismEntities);
 
@@ -476,6 +504,10 @@
                 }
             };
             ringtoetsEntities.AssessmentSectionEntities.Add(entity);
+            ringtoetsEntities.CalculationGroupEntities.Add(new CalculationGroupEntity
+            {
+                CalculationGroupEntityId = section.PipingFailureMechanism.CalculationsGroup.StorageId
+            });
 
             ringtoetsEntities.FailureMechanismEntities.Add(macrostabilityInwardsEntity);
             ringtoetsEntities.FailureMechanismEntities.Add(macrostabilityOutwardsEntity);
@@ -542,7 +574,11 @@
                 StorageId = 1,
                 PipingFailureMechanism =
                 {
-                    StorageId = failureMechanismId++
+                    StorageId = failureMechanismId++,
+                    CalculationsGroup =
+                    {
+                        StorageId = 1
+                    }
                 },
                 GrassCoverErosionInwards =
                 {