Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -r07a46ee6b118477f20faa868af070602f2c2de96 -r7359c7f8081ff1deb0e17dd50b856e156c85ac1c
--- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs)	(revision 07a46ee6b118477f20faa868af070602f2c2de96)
+++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs	(.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs)	(revision 7359c7f8081ff1deb0e17dd50b856e156c85ac1c)
@@ -144,7 +144,7 @@
                                                                                                      assessmentSection);
 
             // Assert
-            string expectedMessage = $"The value of argument 'calculationType' ({(int) calculation.InputParameters.CalculationType}) " +
+            string expectedMessage = $"The value of argument 'calculationType' ({calculation.InputParameters.CalculationType}) " +
                                      $"is invalid for Enum type '{nameof(GrassCoverErosionOutwardsWaveConditionsCalculationType)}'.";
             string paramName = TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(Call, expectedMessage)
                                          .ParamName;
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyMethodCreatorTest.cs
===================================================================
diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r7359c7f8081ff1deb0e17dd50b856e156c85ac1c
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyMethodCreatorTest.cs	(.../SerializableAssemblyMethodCreatorTest.cs)	(revision c36b47c2e1e8cf948767cca33f80ad735f370ad0)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssemblyMethodCreatorTest.cs	(.../SerializableAssemblyMethodCreatorTest.cs)	(revision 7359c7f8081ff1deb0e17dd50b856e156c85ac1c)
@@ -41,7 +41,7 @@
             TestDelegate call = () => SerializableAssemblyMethodCreator.Create(assemblyMethod);
 
             // Assert
-            string message = $"The value of argument 'assemblyMethod' ({(int) assemblyMethod}) is invalid for Enum type '{nameof(ExportableAssemblyMethod)}'.";
+            string message = $"The value of argument 'assemblyMethod' ({assemblyMethod}) is invalid for Enum type '{nameof(ExportableAssemblyMethod)}'.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(call, message);
         }
 
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionCategoryGroupCreatorTest.cs
===================================================================
diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r7359c7f8081ff1deb0e17dd50b856e156c85ac1c
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionCategoryGroupCreatorTest.cs	(.../SerializableAssessmentSectionCategoryGroupCreatorTest.cs)	(revision c36b47c2e1e8cf948767cca33f80ad735f370ad0)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableAssessmentSectionCategoryGroupCreatorTest.cs	(.../SerializableAssessmentSectionCategoryGroupCreatorTest.cs)	(revision 7359c7f8081ff1deb0e17dd50b856e156c85ac1c)
@@ -42,7 +42,7 @@
             TestDelegate call = () => SerializableAssessmentSectionCategoryGroupCreator.Create(groupInput);
 
             // Assert
-            string message = $"The value of argument 'categoryGroup' ({(int) groupInput}) is invalid for Enum type '{nameof(AssessmentSectionAssemblyCategoryGroup)}'.";
+            string message = $"The value of argument 'categoryGroup' ({groupInput}) is invalid for Enum type '{nameof(AssessmentSectionAssemblyCategoryGroup)}'.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(call, message);
         }
 
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismCategoryGroupCreatorTest.cs
===================================================================
diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r7359c7f8081ff1deb0e17dd50b856e156c85ac1c
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismCategoryGroupCreatorTest.cs	(.../SerializableFailureMechanismCategoryGroupCreatorTest.cs)	(revision c36b47c2e1e8cf948767cca33f80ad735f370ad0)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismCategoryGroupCreatorTest.cs	(.../SerializableFailureMechanismCategoryGroupCreatorTest.cs)	(revision 7359c7f8081ff1deb0e17dd50b856e156c85ac1c)
@@ -42,7 +42,7 @@
             TestDelegate call = () => SerializableFailureMechanismCategoryGroupCreator.Create(groupInput);
 
             // Assert
-            string message = $"The value of argument 'categoryGroup' ({(int) groupInput}) is invalid for Enum type '{nameof(FailureMechanismAssemblyCategoryGroup)}'.";
+            string message = $"The value of argument 'categoryGroup' ({groupInput}) is invalid for Enum type '{nameof(FailureMechanismAssemblyCategoryGroup)}'.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(call, message);
         }
 
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismGroupCreatorTest.cs
===================================================================
diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r7359c7f8081ff1deb0e17dd50b856e156c85ac1c
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismGroupCreatorTest.cs	(.../SerializableFailureMechanismGroupCreatorTest.cs)	(revision c36b47c2e1e8cf948767cca33f80ad735f370ad0)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismGroupCreatorTest.cs	(.../SerializableFailureMechanismGroupCreatorTest.cs)	(revision 7359c7f8081ff1deb0e17dd50b856e156c85ac1c)
@@ -41,7 +41,7 @@
             TestDelegate call = () => SerializableFailureMechanismGroupCreator.Create(failureMechanismGroup);
 
             // Assert
-            string message = $"The value of argument 'failureMechanismGroup' ({(int) failureMechanismGroup}) is invalid for Enum type '{nameof(ExportableFailureMechanismGroup)}'.";
+            string message = $"The value of argument 'failureMechanismGroup' ({failureMechanismGroup}) is invalid for Enum type '{nameof(ExportableFailureMechanismGroup)}'.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(call, message);
         }
 
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismSectionCategoryGroupCreatorTest.cs
===================================================================
diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r7359c7f8081ff1deb0e17dd50b856e156c85ac1c
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismSectionCategoryGroupCreatorTest.cs	(.../SerializableFailureMechanismSectionCategoryGroupCreatorTest.cs)	(revision c36b47c2e1e8cf948767cca33f80ad735f370ad0)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismSectionCategoryGroupCreatorTest.cs	(.../SerializableFailureMechanismSectionCategoryGroupCreatorTest.cs)	(revision 7359c7f8081ff1deb0e17dd50b856e156c85ac1c)
@@ -42,7 +42,7 @@
             TestDelegate call = () => SerializableFailureMechanismSectionCategoryGroupCreator.Create(groupInput);
 
             // Assert
-            string message = $"The value of argument 'categoryGroup' ({(int) groupInput}) is invalid for Enum type '{nameof(FailureMechanismSectionAssemblyCategoryGroup)}'.";
+            string message = $"The value of argument 'categoryGroup' ({groupInput}) is invalid for Enum type '{nameof(FailureMechanismSectionAssemblyCategoryGroup)}'.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(call, message);
         }
 
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismTypeCreatorTest.cs
===================================================================
diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r7359c7f8081ff1deb0e17dd50b856e156c85ac1c
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismTypeCreatorTest.cs	(.../SerializableFailureMechanismTypeCreatorTest.cs)	(revision c36b47c2e1e8cf948767cca33f80ad735f370ad0)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Creators/SerializableFailureMechanismTypeCreatorTest.cs	(.../SerializableFailureMechanismTypeCreatorTest.cs)	(revision 7359c7f8081ff1deb0e17dd50b856e156c85ac1c)
@@ -41,7 +41,7 @@
             TestDelegate call = () => SerializableFailureMechanismTypeCreator.Create(failureMechanismType);
 
             // Assert
-            string message = $"The value of argument 'failureMechanismType' ({(int) failureMechanismType}) is invalid for Enum type '{nameof(ExportableFailureMechanismType)}'.";
+            string message = $"The value of argument 'failureMechanismType' ({failureMechanismType}) is invalid for Enum type '{nameof(ExportableFailureMechanismType)}'.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(call, message);
         }
 
Index: Riskeer/Revetment/src/Riskeer.Revetment.Data/WaveConditionsInputHelper.cs
===================================================================
diff -u -r023acb8e66cd1950889e7221138f9abc0f89e17f -r7359c7f8081ff1deb0e17dd50b856e156c85ac1c
--- Riskeer/Revetment/src/Riskeer.Revetment.Data/WaveConditionsInputHelper.cs	(.../WaveConditionsInputHelper.cs)	(revision 023acb8e66cd1950889e7221138f9abc0f89e17f)
+++ Riskeer/Revetment/src/Riskeer.Revetment.Data/WaveConditionsInputHelper.cs	(.../WaveConditionsInputHelper.cs)	(revision 7359c7f8081ff1deb0e17dd50b856e156c85ac1c)
@@ -137,7 +137,7 @@
         /// <item><see cref="WaveConditionsInput.HydraulicBoundaryLocation"/> equals <c>null</c>.</item>
         /// </list>
         /// </returns>
-        /// <exception cref="NullReferenceException">Thrown when any input parameter is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
         /// <exception cref="InvalidEnumArgumentException">Thrown when <see cref="WaveConditionsInput.WaterLevelType"/>
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <see cref="WaveConditionsInput.WaterLevelType"/>
@@ -188,7 +188,7 @@
         /// <param name="assessmentSection">The assessment section the wave conditions input belongs to.</param>
         /// <returns>A target probability, or <see cref="double.NaN"/> when <see cref="WaveConditionsInput.WaterLevelType"/>
         /// equals <see cref="WaveConditionsInputWaterLevelType.None"/>.</returns>
-        /// <exception cref="NullReferenceException">Thrown when any input parameter is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
         /// <exception cref="InvalidEnumArgumentException">Thrown when <see cref="WaveConditionsInput.WaterLevelType"/>
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <see cref="WaveConditionsInput.WaterLevelType"/>
@@ -239,7 +239,7 @@
         /// <item>no assessment level is calculated door the selected <see cref="WaveConditionsInput.HydraulicBoundaryLocation"/>.</item>
         /// </list>
         /// </returns>
-        /// <exception cref="NullReferenceException">Thrown when any input parameter is <c>null</c>.</exception>
+        /// <exception cref="ArgumentNullException">Thrown when any input parameter is <c>null</c>.</exception>
         /// <exception cref="InvalidEnumArgumentException">Thrown when <see cref="WaveConditionsInput.WaterLevelType"/>
         /// is an invalid value.</exception>
         /// <exception cref="NotSupportedException">Thrown when <see cref="WaveConditionsInput.WaterLevelType"/>
Index: Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputHelperTest.cs
===================================================================
diff -u -rcfab785127fbc85d91c6bb2f259777e537448630 -r7359c7f8081ff1deb0e17dd50b856e156c85ac1c
--- Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputHelperTest.cs	(.../WaveConditionsInputHelperTest.cs)	(revision cfab785127fbc85d91c6bb2f259777e537448630)
+++ Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputHelperTest.cs	(.../WaveConditionsInputHelperTest.cs)	(revision 7359c7f8081ff1deb0e17dd50b856e156c85ac1c)
@@ -77,7 +77,7 @@
             void Call() => WaveConditionsInputHelper.SetWaterLevelType(new AssessmentSectionCategoryWaveConditionsInput(), normType);
 
             // Assert
-            var expectedMessage = $"The value of argument 'normType' ({(int) normType}) is invalid for Enum type '{nameof(NormType)}'.";
+            var expectedMessage = $"The value of argument 'normType' ({normType}) is invalid for Enum type '{nameof(NormType)}'.";
             var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(Call, expectedMessage);
             Assert.AreEqual("normType", exception.ParamName);
         }
@@ -124,7 +124,7 @@
             void Call() => WaveConditionsInputHelper.SetWaterLevelType(new FailureMechanismCategoryWaveConditionsInput(), normType);
 
             // Assert
-            var expectedMessage = $"The value of argument 'normType' ({(int) normType}) is invalid for Enum type '{nameof(NormType)}'.";
+            var expectedMessage = $"The value of argument 'normType' ({normType}) is invalid for Enum type '{nameof(NormType)}'.";
             var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(Call, expectedMessage);
             Assert.AreEqual("normType", exception.ParamName);
         }
@@ -182,7 +182,7 @@
             void Call() => WaveConditionsInputHelper.GetHydraulicBoundaryLocationCalculation(waveConditionsInput, new AssessmentSectionStub());
 
             // Assert
-            var expectedMessage = $"The value of argument 'WaterLevelType' ({(int) waterLevelType}) is invalid for Enum type '{nameof(WaveConditionsInputWaterLevelType)}'.";
+            var expectedMessage = $"The value of argument 'WaterLevelType' ({waterLevelType}) is invalid for Enum type '{nameof(WaveConditionsInputWaterLevelType)}'.";
             var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(Call, expectedMessage);
             Assert.AreEqual("WaterLevelType", exception.ParamName);
         }
@@ -252,7 +252,7 @@
             void Call() => WaveConditionsInputHelper.GetTargetProbability(waveConditionsInput, new AssessmentSectionStub());
 
             // Assert
-            var expectedMessage = $"The value of argument 'WaterLevelType' ({(int) waterLevelType}) is invalid for Enum type '{nameof(WaveConditionsInputWaterLevelType)}'.";
+            var expectedMessage = $"The value of argument 'WaterLevelType' ({waterLevelType}) is invalid for Enum type '{nameof(WaveConditionsInputWaterLevelType)}'.";
             var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(Call, expectedMessage);
             Assert.AreEqual("WaterLevelType", exception.ParamName);
         }
@@ -315,7 +315,7 @@
             void Call() => WaveConditionsInputHelper.GetAssessmentLevel(waveConditionsInput, new AssessmentSectionStub());
 
             // Assert
-            var expectedMessage = $"The value of argument 'WaterLevelType' ({(int) waterLevelType}) is invalid for Enum type '{nameof(WaveConditionsInputWaterLevelType)}'.";
+            var expectedMessage = $"The value of argument 'WaterLevelType' ({waterLevelType}) is invalid for Enum type '{nameof(WaveConditionsInputWaterLevelType)}'.";
             var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(Call, expectedMessage);
             Assert.AreEqual("WaterLevelType", exception.ParamName);
         }
Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs
===================================================================
diff -u -r6293498b178f6ac33b2c451a013758cc5f01acd8 -r7359c7f8081ff1deb0e17dd50b856e156c85ac1c
--- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs)	(revision 6293498b178f6ac33b2c451a013758cc5f01acd8)
+++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs	(.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs)	(revision 7359c7f8081ff1deb0e17dd50b856e156c85ac1c)
@@ -133,7 +133,7 @@
                                                                                                failureMechanism.GeneralInput);
 
             // Assert
-            string expectedMessage = $"The value of argument 'calculationType' ({(int) calculation.InputParameters.CalculationType}) " +
+            string expectedMessage = $"The value of argument 'calculationType' ({calculation.InputParameters.CalculationType}) " +
                                      $"is invalid for Enum type '{nameof(StabilityStoneCoverWaveConditionsCalculationType)}'.";
             string paramName = TestHelper.AssertThrowsArgumentExceptionAndTestMessage<InvalidEnumArgumentException>(Call, expectedMessage)
                                          .ParamName;