Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/DesignWaterLevelCalculationsContextTest.cs
===================================================================
diff -u -ra6c8ce99232f4695f07c75d8bee5a7a101be46b3 -r4100889a7adfd83736d1b63dd19745b9708bc98c
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/DesignWaterLevelCalculationsContextTest.cs	(.../DesignWaterLevelCalculationsContextTest.cs)	(revision a6c8ce99232f4695f07c75d8bee5a7a101be46b3)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/DesignWaterLevelCalculationsContextTest.cs	(.../DesignWaterLevelCalculationsContextTest.cs)	(revision 4100889a7adfd83736d1b63dd19745b9708bc98c)
@@ -96,7 +96,9 @@
         }
 
         [Test]
-        public void Constructor_CategoryBoundaryNameNull_ThrowsArgumentException()
+        [TestCase(null)]
+        [TestCase("")]
+        public void Constructor_CategoryBoundaryNameInvalid_ThrowsArgumentException(string categoryBoundaryName)
         {
             // Setup
             var mockRepository = new MockRepository();
@@ -107,32 +109,13 @@
             TestDelegate call = () => new DesignWaterLevelCalculationsContext(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                                               assessmentSection,
                                                                               () => 0.01,
-                                                                              null);
+                                                                              categoryBoundaryName);
 
             // Assert
             var exception = Assert.Throws<ArgumentException>(call);
             Assert.AreEqual("'categoryBoundaryName' must have a value.", exception.Message);
         }
 
-        [Test]
-        public void Constructor_CategoryBoundaryNameEmpty_ThrowsArgumentException()
-        {
-            // Setup
-            var mockRepository = new MockRepository();
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
-
-            // Call
-            TestDelegate call = () => new DesignWaterLevelCalculationsContext(new ObservableList<HydraulicBoundaryLocationCalculation>(),
-                                                                              assessmentSection,
-                                                                              () => 0.01,
-                                                                              string.Empty);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentException>(call);
-            Assert.AreEqual("'categoryBoundaryName' must have a value.", exception.Message);
-        }
-
         [TestFixture]
         private class DesignWaterLevelCalculationsContextEqualsTest
             : EqualsTestFixture<DesignWaterLevelCalculationsContext, DerivedDesignWaterLevelCalculationsContext>
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/WaveHeightCalculationsContextTest.cs
===================================================================
diff -u -rd1f9d5bcdee552dd29c64194d455de245db0190d -r4100889a7adfd83736d1b63dd19745b9708bc98c
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/WaveHeightCalculationsContextTest.cs	(.../WaveHeightCalculationsContextTest.cs)	(revision d1f9d5bcdee552dd29c64194d455de245db0190d)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PresentationObjects/WaveHeightCalculationsContextTest.cs	(.../WaveHeightCalculationsContextTest.cs)	(revision 4100889a7adfd83736d1b63dd19745b9708bc98c)
@@ -96,7 +96,9 @@
         }
 
         [Test]
-        public void Constructor_CategoryBoundaryNameNull_ThrowsArgumentException()
+        [TestCase(null)]
+        [TestCase("")]
+        public void Constructor_CategoryBoundaryNameInvalid_ThrowsArgumentException(string categoryBoundaryName)
         {
             // Setup
             var mockRepository = new MockRepository();
@@ -107,32 +109,13 @@
             TestDelegate call = () => new WaveHeightCalculationsContext(new ObservableList<HydraulicBoundaryLocationCalculation>(),
                                                                         assessmentSection,
                                                                         () => 0.01,
-                                                                        null);
+                                                                        categoryBoundaryName);
 
             // Assert
             var exception = Assert.Throws<ArgumentException>(call);
             Assert.AreEqual("'categoryBoundaryName' must have a value.", exception.Message);
         }
 
-        [Test]
-        public void Constructor_CategoryBoundaryNameEmpty_ThrowsArgumentException()
-        {
-            // Setup
-            var mockRepository = new MockRepository();
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
-
-            // Call
-            TestDelegate call = () => new WaveHeightCalculationsContext(new ObservableList<HydraulicBoundaryLocationCalculation>(),
-                                                                        assessmentSection,
-                                                                        () => 0.01,
-                                                                        string.Empty);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentException>(call);
-            Assert.AreEqual("'categoryBoundaryName' must have a value.", exception.Message);
-        }
-
         [TestFixture]
         private class WaveHeightCalculationsContextEqualsTest
             : EqualsTestFixture<WaveHeightCalculationsContext, DerivedWaveHeightCalculationsContext>
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/DesignWaterLevelCalculationMessageProviderTest.cs
===================================================================
diff -u -rb9037bb177bc4f59fe1029d51c7dbc8d8665ed57 -r4100889a7adfd83736d1b63dd19745b9708bc98c
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/DesignWaterLevelCalculationMessageProviderTest.cs	(.../DesignWaterLevelCalculationMessageProviderTest.cs)	(revision b9037bb177bc4f59fe1029d51c7dbc8d8665ed57)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/DesignWaterLevelCalculationMessageProviderTest.cs	(.../DesignWaterLevelCalculationMessageProviderTest.cs)	(revision 4100889a7adfd83736d1b63dd19745b9708bc98c)
@@ -29,28 +29,19 @@
     public class DesignWaterLevelCalculationMessageProviderTest
     {
         [Test]
-        public void Constructor_CategoryBoundaryNameNull_ThrowsArgumentException()
+        [TestCase(null)]
+        [TestCase("")]
+        public void Constructor_CategoryBoundaryNameInvalid_ThrowsArgumentException(string categoryBoundaryName)
         {
             // Call
-            TestDelegate call = () => new DesignWaterLevelCalculationMessageProvider(null);
+            TestDelegate call = () => new DesignWaterLevelCalculationMessageProvider(categoryBoundaryName);
 
             // Assert
             var exception = Assert.Throws<ArgumentException>(call);
             Assert.AreEqual("'categoryBoundaryName' must have a value.", exception.Message);
         }
 
         [Test]
-        public void Constructor_CategoryBoundaryNameEmpty_ThrowsArgumentException()
-        {
-            // Call
-            TestDelegate call = () => new DesignWaterLevelCalculationMessageProvider("");
-
-            // Assert
-            var exception = Assert.Throws<ArgumentException>(call);
-            Assert.AreEqual("'categoryBoundaryName' must have a value.", exception.Message);
-        }
-
-        [Test]
         public void Constructor_ExpectedValues()
         {
             // Call
Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/WaveHeightCalculationMessageProviderTest.cs
===================================================================
diff -u -rb9037bb177bc4f59fe1029d51c7dbc8d8665ed57 -r4100889a7adfd83736d1b63dd19745b9708bc98c
--- Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/WaveHeightCalculationMessageProviderTest.cs	(.../WaveHeightCalculationMessageProviderTest.cs)	(revision b9037bb177bc4f59fe1029d51c7dbc8d8665ed57)
+++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/MessageProviders/WaveHeightCalculationMessageProviderTest.cs	(.../WaveHeightCalculationMessageProviderTest.cs)	(revision 4100889a7adfd83736d1b63dd19745b9708bc98c)
@@ -29,28 +29,19 @@
     public class WaveHeightCalculationMessageProviderTest
     {
         [Test]
-        public void Constructor_CategoryBoundaryNameNull_ThrowsArgumentException()
+        [TestCase(null)]
+        [TestCase("")]
+        public void Constructor_CategoryBoundaryNameInvalid_ThrowsArgumentException(string categoryBoundaryName)
         {
             // Call
-            TestDelegate call = () => new WaveHeightCalculationMessageProvider(null);
+            TestDelegate call = () => new WaveHeightCalculationMessageProvider(categoryBoundaryName);
 
             // Assert
             var exception = Assert.Throws<ArgumentException>(call);
             Assert.AreEqual("'categoryBoundaryName' must have a value.", exception.Message);
         }
 
         [Test]
-        public void Constructor_CategoryBoundaryNameEmpty_ThrowsArgumentException()
-        {
-            // Call
-            TestDelegate call = () => new WaveHeightCalculationMessageProvider("");
-
-            // Assert
-            var exception = Assert.Throws<ArgumentException>(call);
-            Assert.AreEqual("'categoryBoundaryName' must have a value.", exception.Message);
-        }
-
-        [Test]
         public void Constructor_ExpectedValues()
         {
             // Call
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PresentationObjects/DuneLocationCalculationsContextTest.cs
===================================================================
diff -u -re5e17b215166c0d4451d922e477cc4d0a4c15205 -r4100889a7adfd83736d1b63dd19745b9708bc98c
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PresentationObjects/DuneLocationCalculationsContextTest.cs	(.../DuneLocationCalculationsContextTest.cs)	(revision e5e17b215166c0d4451d922e477cc4d0a4c15205)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/PresentationObjects/DuneLocationCalculationsContextTest.cs	(.../DuneLocationCalculationsContextTest.cs)	(revision 4100889a7adfd83736d1b63dd19745b9708bc98c)
@@ -122,7 +122,9 @@
         }
 
         [Test]
-        public void Constructor_CategoryBoundaryNameNull_ThrowsArgumentException()
+        [TestCase(null)]
+        [TestCase("")]
+        public void Constructor_CategoryBoundaryNameInvalid_ThrowsArgumentException(string categoryBoundaryName)
         {
             // Setup
             var mockRepository = new MockRepository();
@@ -134,31 +136,11 @@
                                                                           new DuneErosionFailureMechanism(),
                                                                           assessmentSection,
                                                                           () => 0.01,
-                                                                          null);
+                                                                          categoryBoundaryName);
 
             // Assert
             var exception = Assert.Throws<ArgumentException>(call);
             Assert.AreEqual("'categoryBoundaryName' must have a value.", exception.Message);
         }
-
-        [Test]
-        public void Constructor_CategoryBoundaryNameEmpty_ThrowsArgumentException()
-        {
-            // Setup
-            var mockRepository = new MockRepository();
-            var assessmentSection = mockRepository.Stub<IAssessmentSection>();
-            mockRepository.ReplayAll();
-
-            // Call
-            TestDelegate call = () => new DuneLocationCalculationsContext(new ObservableList<DuneLocationCalculation>(),
-                                                                          new DuneErosionFailureMechanism(),
-                                                                          assessmentSection,
-                                                                          () => 0.01,
-                                                                          string.Empty);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentException>(call);
-            Assert.AreEqual("'categoryBoundaryName' must have a value.", exception.Message);
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs
===================================================================
diff -u -rd6855f87324d4f1f85dcd46e2a89b8c25f0ba81b -r4100889a7adfd83736d1b63dd19745b9708bc98c
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs	(.../DuneLocationCalculationsViewTest.cs)	(revision d6855f87324d4f1f85dcd46e2a89b8c25f0ba81b)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneLocationCalculationsViewTest.cs	(.../DuneLocationCalculationsViewTest.cs)	(revision 4100889a7adfd83736d1b63dd19745b9708bc98c)
@@ -148,7 +148,9 @@
         }
 
         [Test]
-        public void Constructor_CategoryBoundaryNameNull_ThrowsArgumentException()
+        [TestCase(null)]
+        [TestCase("")]
+        public void Constructor_CategoryBoundaryNameInvalid_ThrowsArgumentException(string categoryBoundaryName)
         {
             // Setup
             var assessmentSection = mocks.Stub<IAssessmentSection>();
@@ -159,33 +161,14 @@
                                                                        new DuneErosionFailureMechanism(),
                                                                        assessmentSection,
                                                                        () => 0.01,
-                                                                       null);
+                                                                       categoryBoundaryName);
 
             // Assert
             const string expectedMessage = "'categoryBoundaryName' must have a value.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
         }
 
         [Test]
-        public void Constructor_CategoryBoundaryNameEmpty_ThrowsArgumentException()
-        {
-            // Setup
-            var assessmentSection = mocks.Stub<IAssessmentSection>();
-            mocks.ReplayAll();
-
-            // Call
-            TestDelegate call = () => new DuneLocationCalculationsView(new ObservableList<DuneLocationCalculation>(),
-                                                                       new DuneErosionFailureMechanism(),
-                                                                       assessmentSection,
-                                                                       () => 0.01,
-                                                                       string.Empty);
-
-            // Assert
-            const string expectedMessage = "'categoryBoundaryName' must have a value.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
-        }
-
-        [Test]
         public void Constructor_ExpectedValues()
         {
             // Setup
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs
===================================================================
diff -u -r5ca2648fbf46c3960765d1919068bdb58ef5e145 -r4100889a7adfd83736d1b63dd19745b9708bc98c
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs	(.../DuneLocationCalculationActivityFactoryTest.cs)	(revision 5ca2648fbf46c3960765d1919068bdb58ef5e145)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityFactoryTest.cs	(.../DuneLocationCalculationActivityFactoryTest.cs)	(revision 4100889a7adfd83736d1b63dd19745b9708bc98c)
@@ -64,45 +64,5 @@
             var exception = Assert.Throws<ArgumentNullException>(test);
             Assert.AreEqual("assessmentSection", exception.ParamName);
         }
-
-        [Test]
-        public void CreateCalculationActivities_CategoryBoundaryNameNull_ThrowsArgumentException()
-        {
-            // Setup
-            var mockRepository = new MockRepository();
-            var assessmentSection = mockRepository.StrictMock<IAssessmentSection>();
-            mockRepository.ReplayAll();
-
-            // Call
-            TestDelegate test = () => DuneLocationCalculationActivityFactory.CreateCalculationActivities(Enumerable.Empty<DuneLocationCalculation>(),
-                                                                                                         assessmentSection,
-                                                                                                         double.NaN,
-                                                                                                         null);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentException>(test);
-            Assert.AreEqual("'categoryBoundaryName' must have a value.", exception.Message);
-            mockRepository.VerifyAll();
-        }
-
-        [Test]
-        public void CreateCalculationActivities_CategoryBoundaryNameEmpty_ThrowsArgumentException()
-        {
-            // Setup
-            var mockRepository = new MockRepository();
-            var assessmentSection = mockRepository.StrictMock<IAssessmentSection>();
-            mockRepository.ReplayAll();
-
-            // Call
-            TestDelegate test = () => DuneLocationCalculationActivityFactory.CreateCalculationActivities(Enumerable.Empty<DuneLocationCalculation>(),
-                                                                                                         assessmentSection,
-                                                                                                         double.NaN,
-                                                                                                         string.Empty);
-
-            // Assert
-            var exception = Assert.Throws<ArgumentException>(test);
-            Assert.AreEqual("'categoryBoundaryName' must have a value.", exception.Message);
-            mockRepository.VerifyAll();
-        }
     }
 }
\ No newline at end of file
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationMessageProviderTest.cs
===================================================================
diff -u -r01b1f8e552b18947a822af16bd1553f86212e3c1 -r4100889a7adfd83736d1b63dd19745b9708bc98c
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationMessageProviderTest.cs	(.../DuneLocationCalculationMessageProviderTest.cs)	(revision 01b1f8e552b18947a822af16bd1553f86212e3c1)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationMessageProviderTest.cs	(.../DuneLocationCalculationMessageProviderTest.cs)	(revision 4100889a7adfd83736d1b63dd19745b9708bc98c)
@@ -29,28 +29,19 @@
     public class DuneLocationCalculationMessageProviderTest
     {
         [Test]
-        public void Constructor_CategoryBoundaryNameNull_ThrowsArgumentException()
+        [TestCase(null)]
+        [TestCase("")]
+        public void Constructor_CategoryBoundaryNameInvalid_ThrowsArgumentException(string categoryBoundaryName)
         {
             // Call
-            TestDelegate call = () => new DuneLocationCalculationMessageProvider(null);
+            TestDelegate call = () => new DuneLocationCalculationMessageProvider(categoryBoundaryName);
 
             // Assert
             var exception = Assert.Throws<ArgumentException>(call);
             Assert.AreEqual("'categoryBoundaryName' must have a value.", exception.Message);
         }
 
         [Test]
-        public void Constructor_CategoryBoundaryNameEmpty_ThrowsArgumentException()
-        {
-            // Call
-            TestDelegate call = () => new DuneLocationCalculationMessageProvider("");
-
-            // Assert
-            var exception = Assert.Throws<ArgumentException>(call);
-            Assert.AreEqual("'categoryBoundaryName' must have a value.", exception.Message);
-        }
-
-        [Test]
         public void Constructor_ExpectedValues()
         {
             // Call