Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingDistributionPropertiesBaseTest.cs
===================================================================
diff -u -rf8998df0ea8c1228216bbb00ed9178058af4af67 -r2abaaf908070732e84673348cca9df2a600b8450
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingDistributionPropertiesBaseTest.cs	(.../ConfirmingDistributionPropertiesBaseTest.cs)	(revision f8998df0ea8c1228216bbb00ed9178058af4af67)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingDistributionPropertiesBaseTest.cs	(.../ConfirmingDistributionPropertiesBaseTest.cs)	(revision 2abaaf908070732e84673348cca9df2a600b8450)
@@ -261,7 +261,8 @@
 
             // Assert
             const string expectedMessage = "Mean is set to be read-only.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, expectedMessage);
+            string actualMessage = Assert.Throws<InvalidOperationException>(test).Message;
+            Assert.AreEqual(expectedMessage, actualMessage);
             mocks.VerifyAll();
         }
 
@@ -279,7 +280,10 @@
 
             var newMeanValue = new RoundedDouble(3, 20);
             var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester<RoundedDouble>(
-                input, calculation, newMeanValue, new [] { observerableMock });
+                input, calculation, newMeanValue, new[]
+                {
+                    observerableMock
+                });
 
             var properties = new SimpleDistributionProperties(DistributionPropertiesReadOnly.None, distribution, calculation, input, handler)
             {
@@ -317,7 +321,8 @@
 
             // Assert
             const string expectedMessage = "StandardDeviation is set to be read-only.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, expectedMessage);
+            string actualMessage = Assert.Throws<InvalidOperationException>(test).Message;
+            Assert.AreEqual(expectedMessage, actualMessage);
             mocks.VerifyAll();
         }
 
@@ -335,7 +340,10 @@
 
             var newStandardDeviationValue = new RoundedDouble(3, 20);
             var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester<RoundedDouble>(
-                input, calculation, newStandardDeviationValue, new[] { observerableMock });
+                input, calculation, newStandardDeviationValue, new[]
+                {
+                    observerableMock
+                });
 
             var properties = new SimpleDistributionProperties(DistributionPropertiesReadOnly.None, distribution, calculation, input, handler)
             {
@@ -355,7 +363,9 @@
             ICalculationInput,
             ICalculation>
         {
-            public SimpleDistributionProperties(DistributionPropertiesReadOnly propertiesReadOnly, IDistribution distribution, ICalculation calculation, ICalculationInput input, ICalculationInputPropertyChangeHandler handler)
+            public SimpleDistributionProperties(DistributionPropertiesReadOnly propertiesReadOnly,
+                                                IDistribution distribution, ICalculation calculation,
+                                                ICalculationInput input, ICalculationInputPropertyChangeHandler handler)
                 : base(propertiesReadOnly, distribution, calculation, input, handler) {}
 
             public override string DistributionType