Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ImportInfos/HeightStructuresContextImportInfoTest.cs
===================================================================
diff -u -r9b0d18547885c18342a9ab149538b137f0b004d0 -r2d6ee27d724d879326635b641904ce2e25097aa9
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ImportInfos/HeightStructuresContextImportInfoTest.cs	(.../HeightStructuresContextImportInfoTest.cs)	(revision 9b0d18547885c18342a9ab149538b137f0b004d0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ImportInfos/HeightStructuresContextImportInfoTest.cs	(.../HeightStructuresContextImportInfoTest.cs)	(revision 2d6ee27d724d879326635b641904ce2e25097aa9)
@@ -47,7 +47,7 @@
     [TestFixture]
     public class HeightStructuresContextImportInfoTest : NUnitFormTest
     {
-        private static IEnumerable<TestCaseData> CalculationsThatWhereOutputShouldNotBeRemoved
+        private static IEnumerable<TestCaseData> CalculationsWhereOutputShouldNotBeRemoved
         {
             get
             {
@@ -68,7 +68,7 @@
             }
         }
 
-        private static IEnumerable<TestCaseData> CalculationsThatWhereOutputShouldBeRemoved
+        private static IEnumerable<TestCaseData> CalculationsWhereOutputShouldBeRemoved
         {
             get
             {
@@ -310,8 +310,8 @@
         }
 
         [Test]
-        [TestCaseSource(nameof(CalculationsThatWhereOutputShouldNotBeRemoved))]
-        public void VerifyUpdates_CalculationWithoutOutputs_ReturnsTrue(StructuresCalculation<HeightStructuresInput> calculation)
+        [TestCaseSource(nameof(CalculationsWhereOutputShouldNotBeRemoved))]
+        public void VerifyUpdates_CalculationsWhereOutputShouldNotBeRemoved_ReturnsTrue(StructuresCalculation<HeightStructuresInput> calculation)
         {
             // Setup
             var mocks = new MockRepository();
@@ -351,8 +351,8 @@
         }
 
         [Test]
-        [TestCaseSource(nameof(CalculationsThatWhereOutputShouldBeRemoved))]
-        public void VerifyUpdates_CalculationsThatWhereOutputShouldBeRemoved_ReturnsExpectedInquiryMessage(
+        [TestCaseSource(nameof(CalculationsWhereOutputShouldBeRemoved))]
+        public void VerifyUpdates_CalculationsWhereOutputShouldBeRemoved_ReturnsExpectedInquiryMessage(
             StructuresCalculation<HeightStructuresInput> calculation,
             IEnumerable<TestHeightStructure> importedStructures,
             bool isActionConfirmed)
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/StructureIdEqualityComparerTest.cs
===================================================================
diff -u -rdf53f0268b7c15f000796a38436b2c40069b9b07 -r2d6ee27d724d879326635b641904ce2e25097aa9
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/StructureIdEqualityComparerTest.cs	(.../StructureIdEqualityComparerTest.cs)	(revision df53f0268b7c15f000796a38436b2c40069b9b07)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/StructureIdEqualityComparerTest.cs	(.../StructureIdEqualityComparerTest.cs)	(revision 2d6ee27d724d879326635b641904ce2e25097aa9)
@@ -30,6 +30,22 @@
     [TestFixture]
     public class StructureIdEqualityComparerTest
     {
+        private static IEnumerable<TestCaseData> SameIdDifferentProperties
+        {
+            get
+            {
+                var reference = new TestStructure();
+                yield return new TestCaseData(new TestStructure(reference.Id,
+                                                                new Point2D(1, 1)));
+                yield return new TestCaseData(new TestStructure(reference.Id,
+                                                                "different name"));
+                yield return new TestCaseData(new TestStructure(reference.Id,
+                                                                reference.Name,
+                                                                reference.Location,
+                                                                RoundedDouble.NaN));
+            }
+        }
+
         [Test]
         public void Equals_SameInstance_ReturnTrue()
         {
@@ -61,22 +77,6 @@
             Assert.IsTrue(secondEqualsFirst);
         }
 
-        private static IEnumerable<TestCaseData> SameIdDifferentProperties
-        {
-            get
-            {
-                var reference = new TestStructure();
-                yield return new TestCaseData(new TestStructure(reference.Id, 
-                    new Point2D(1,1)));
-                yield return new TestCaseData(new TestStructure(reference.Id, 
-                    "different name"));
-                yield return new TestCaseData(new TestStructure(reference.Id, 
-                    reference.Name, 
-                    reference.Location, 
-                    RoundedDouble.NaN));
-            }
-        }
-
         [Test]
         [TestCaseSource(nameof(SameIdDifferentProperties))]
         public void Equals_SameId_ReturnTrue(TestStructure secondStructure)
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/UpdateInfos/HeightStructuresContextUpdateInfoTest.cs
===================================================================
diff -u -r9b0d18547885c18342a9ab149538b137f0b004d0 -r2d6ee27d724d879326635b641904ce2e25097aa9
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/UpdateInfos/HeightStructuresContextUpdateInfoTest.cs	(.../HeightStructuresContextUpdateInfoTest.cs)	(revision 9b0d18547885c18342a9ab149538b137f0b004d0)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/UpdateInfos/HeightStructuresContextUpdateInfoTest.cs	(.../HeightStructuresContextUpdateInfoTest.cs)	(revision 2d6ee27d724d879326635b641904ce2e25097aa9)
@@ -49,7 +49,7 @@
         private UpdateInfo updateInfo;
         private HeightStructuresPlugin plugin;
 
-        private static IEnumerable<TestCaseData> CalculationsThatWhereOutputShouldBeRemoved
+        private static IEnumerable<TestCaseData> CalculationsWhereOutputShouldBeRemoved
         {
             get
             {
@@ -113,7 +113,7 @@
             }
         }
 
-        private static IEnumerable<TestCaseData> CalculationsThatWhereOutputShouldNotBeRemoved
+        private static IEnumerable<TestCaseData> CalculationsWhereOutputShouldNotBeRemoved
         {
             get
             {
@@ -264,8 +264,8 @@
         }
 
         [Test]
-        [TestCaseSource(nameof(CalculationsThatWhereOutputShouldNotBeRemoved))]
-        public void VerifyUpdates_CalculationsThatWhereOutputShouldNotBeRemoved_ReturnsTrue(
+        [TestCaseSource(nameof(CalculationsWhereOutputShouldNotBeRemoved))]
+        public void VerifyUpdates_CalculationsWhereOutputShouldNotBeRemoved_ReturnsTrue(
             StructuresCalculation<HeightStructuresInput> calculation)
         {
             // Setup
@@ -306,8 +306,8 @@
         }
 
         [Test]
-        [TestCaseSource(nameof(CalculationsThatWhereOutputShouldBeRemoved))]
-        public void VerifyUpdates_CalculationsThatWhereOutputShouldBeRemoved_ReturnsExpectedInquiryMessage(
+        [TestCaseSource(nameof(CalculationsWhereOutputShouldBeRemoved))]
+        public void VerifyUpdates_CalculationsWhereOutputShouldBeRemoved_ReturnsExpectedInquiryMessage(
             StructuresCalculation<HeightStructuresInput> calculation,
             IEnumerable<TestHeightStructure> importedStructures,
             bool isActionConfirmed)