Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/PipingFailureMechanismUpdateExtensionsTest.cs
===================================================================
diff -u -rb6432b2cbcb2db9bd326d9f006fb2d8b2528d263 -rbc9552772d4e6a6bd786dfcaef808da1964e8c53
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/PipingFailureMechanismUpdateExtensionsTest.cs	(.../PipingFailureMechanismUpdateExtensionsTest.cs)	(revision b6432b2cbcb2db9bd326d9f006fb2d8b2528d263)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/PipingFailureMechanismUpdateExtensionsTest.cs	(.../PipingFailureMechanismUpdateExtensionsTest.cs)	(revision bc9552772d4e6a6bd786dfcaef808da1964e8c53)
@@ -33,37 +33,82 @@
             var failureMechanism = new PipingFailureMechanism();
 
             // Call
-            TestDelegate test = () => failureMechanism.Update(null, new RingtoetsEntities());
+            TestDelegate test = () =>
+            {
+                using (var ringtoetsEntities = new RingtoetsEntities())
+                {
+                    failureMechanism.Update(null, ringtoetsEntities);
+                }
+            };
 
             // Assert
             var paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
             Assert.AreEqual("collector", paramName);
         }
 
         [Test]
-        public void Update_ContextWithNoHydraulicBoundaryLocation_EntityNotFoundException()
+        public void Update_ContextWithNoPipingFailureMechanism_EntityNotFoundException()
         {
             // Setup
             var failureMechanism = new PipingFailureMechanism();
 
             // Call
-            TestDelegate test = () => failureMechanism.Update(new UpdateConversionCollector(), new RingtoetsEntities());
+            TestDelegate test = () =>
+            {
+                using (var ringtoetsEntities = new RingtoetsEntities())
+                {
+                    failureMechanism.Update(new UpdateConversionCollector(), ringtoetsEntities);
+                }
+            };
 
             // Assert
-            Assert.Throws<EntityNotFoundException>(test);
+            var expectedMessage = String.Format("Het object 'FailureMechanismEntity' met id '{0}' is niet gevonden.", 0);
+            EntityNotFoundException exception = Assert.Throws<EntityNotFoundException>(test);
+            Assert.AreEqual(expectedMessage, exception.Message);
         }
 
         [Test]
-        public void Update_ContextWithHydraulicBoundaryLocation_PropertiesUpdated()
+        public void Update_ContextWithNoPipingFailureMechanismWithId_EntityNotFoundException()
         {
             // Setup
             MockRepository mocks = new MockRepository();
             var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
 
             mocks.ReplayAll();
 
+            var storageId = 1;
             var failureMechanism = new PipingFailureMechanism
             {
+                StorageId = storageId
+            };
+
+            ringtoetsEntities.FailureMechanismEntities.Add(new FailureMechanismEntity
+            {
+                FailureMechanismEntityId = 2
+            });
+
+            // Call
+            TestDelegate test = () => failureMechanism.Update(new UpdateConversionCollector(), ringtoetsEntities);
+
+            // Assert
+            var expectedMessage = String.Format("Het object 'FailureMechanismEntity' met id '{0}' is niet gevonden.", storageId);
+            EntityNotFoundException exception = Assert.Throws<EntityNotFoundException>(test);
+            Assert.AreEqual(expectedMessage, exception.Message);
+
+            mocks.VerifyAll();
+        }
+
+        [Test]
+        public void Update_ContextWithPipingFailureMechanism_PropertiesUpdated()
+        {
+            // Setup
+            MockRepository mocks = new MockRepository();
+            var ringtoetsEntities = RingtoetsEntitiesHelper.Create(mocks);
+
+            mocks.ReplayAll();
+
+            var failureMechanism = new PipingFailureMechanism
+            {
                 StorageId = 1,
                 IsRelevant = true
             };