Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/ProjectUpdateExtensionsTest.cs
===================================================================
diff -u -rb6432b2cbcb2db9bd326d9f006fb2d8b2528d263 -rbc9552772d4e6a6bd786dfcaef808da1964e8c53
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/ProjectUpdateExtensionsTest.cs	(.../ProjectUpdateExtensionsTest.cs)	(revision b6432b2cbcb2db9bd326d9f006fb2d8b2528d263)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/ProjectUpdateExtensionsTest.cs	(.../ProjectUpdateExtensionsTest.cs)	(revision bc9552772d4e6a6bd786dfcaef808da1964e8c53)
@@ -38,7 +38,13 @@
             var project = new Project();
 
             // Call
-            TestDelegate test = () => project.Update(null, new RingtoetsEntities());
+            TestDelegate test = () =>
+            {
+                using (var ringtoetsEntities = new RingtoetsEntities())
+                {
+                    project.Update(null, ringtoetsEntities);
+                }
+            };
 
             // Assert
             var paramName = Assert.Throws<ArgumentNullException>(test).ParamName;
@@ -52,7 +58,13 @@
             var project = new Project();
 
             // Call
-            TestDelegate test = () => project.Update(new UpdateConversionCollector(), new RingtoetsEntities());
+            TestDelegate test = () =>
+            {
+                using (var ringtoetsEntities = new RingtoetsEntities())
+                {
+                    project.Update(new UpdateConversionCollector(), ringtoetsEntities);
+                }
+            };
 
             // Assert
             Assert.Throws<EntityNotFoundException>(test);
@@ -67,9 +79,10 @@
 
             mocks.ReplayAll();
 
+            var storageId = 1;
             var project = new Project
             {
-                StorageId = 1
+                StorageId = storageId
             };
 
             ringtoetsEntities.ProjectEntities.Add(new ProjectEntity
@@ -81,7 +94,9 @@
             TestDelegate test = () => project.Update(new UpdateConversionCollector(), ringtoetsEntities);
 
             // Assert
-            Assert.Throws<EntityNotFoundException>(test);
+            var expectedMessage = String.Format("Het object 'ProjectEntity' met id '{0}' is niet gevonden.", storageId);
+            EntityNotFoundException exception = Assert.Throws<EntityNotFoundException>(test);
+            Assert.AreEqual(expectedMessage, exception.Message);
 
             mocks.VerifyAll();
         }
@@ -95,26 +110,34 @@
 
             mocks.ReplayAll();
 
+            var storageId = 1;
             var project = new Project
             {
-                StorageId = 1
+                StorageId = storageId
             };
 
             ringtoetsEntities.ProjectEntities.Add(new ProjectEntity
             {
-                ProjectEntityId = 1
+                ProjectEntityId = storageId
             });
             ringtoetsEntities.ProjectEntities.Add(new ProjectEntity
             {
-                ProjectEntityId = 1
+                ProjectEntityId = storageId
             });
 
             // Call
             TestDelegate test = () => project.Update(new UpdateConversionCollector(), ringtoetsEntities);
 
             // Assert
-            Assert.Throws<EntityNotFoundException>(test);
+            var expectedMessage = String.Format("Het object 'ProjectEntity' met id '{0}' is niet gevonden.", storageId);
+            var expectedInnerMessage = "Sequence contains more than one matching element";
 
+            EntityNotFoundException exception = Assert.Throws<EntityNotFoundException>(test);
+            Assert.AreEqual(expectedMessage, exception.Message);
+
+            Assert.IsInstanceOf<InvalidOperationException>(exception.InnerException);
+            Assert.AreEqual(expectedInnerMessage, exception.InnerException.Message);
+
             mocks.VerifyAll();
         }