Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/LogNormalDistributionPropertiesTest.cs
===================================================================
diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -r9050ad5f3a80e630b2fcc092942a40d6343286a0
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/LogNormalDistributionPropertiesTest.cs	(.../LogNormalDistributionPropertiesTest.cs)	(revision ce31448a066c084f755439f3e7d453bfb042b291)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/LogNormalDistributionPropertiesTest.cs	(.../LogNormalDistributionPropertiesTest.cs)	(revision 9050ad5f3a80e630b2fcc092942a40d6343286a0)
@@ -54,7 +54,7 @@
             var properties = new LogNormalDistributionProperties();
 
             // Assert
-            Assert.IsInstanceOf<DistributionProperties>(properties);
+            Assert.IsInstanceOf<DistributionPropertiesBase<LogNormalDistribution>>(properties);
             Assert.IsNull(properties.Data);
             Assert.AreEqual("Lognormaal", properties.DistributionType);
         }
@@ -67,7 +67,7 @@
             mockRepository.ReplayAll();
 
             // Call
-            var properties = new LogNormalDistributionProperties(observerableMock, DistributionPropertiesReadOnly.None);
+            var properties = new LogNormalDistributionProperties(DistributionPropertiesReadOnly.None, observerableMock);
 
             // Assert
             Assert.IsNull(properties.Data);
@@ -76,53 +76,26 @@
         }
 
         [Test]
-        [TestCase(DistributionPropertiesReadOnly.None)]
+        [TestCase(DistributionPropertiesReadOnly.Mean)]
         [TestCase(DistributionPropertiesReadOnly.StandardDeviation)]
-        public void SetProperties_EditableMeanWithoutObserverable_ThrowsArgumentException(DistributionPropertiesReadOnly propertiesReadOnly)
+        [TestCase(DistributionPropertiesReadOnly.None)]
+        public void Constructor_NoObservableSetWhileChangesPossible_ThrowArgumentException(
+            DistributionPropertiesReadOnly flags)
         {
-            // Setup
-            var properties = new LogNormalDistributionProperties(null, propertiesReadOnly)
-            {
-                Data = new LogNormalDistribution(2)
-            };
-
             // Call
-            TestDelegate test = () => properties.Mean = new RoundedDouble(2, 20);
+            TestDelegate call = () => new LogNormalDistributionProperties(flags, null);
 
             // Assert
-            const string expectedMessage = "No observerable object set.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, expectedMessage);
+            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, "Observable must be specified unless no property can be set.");
         }
 
         [Test]
-        [TestCase(DistributionPropertiesReadOnly.All)]
-        [TestCase(DistributionPropertiesReadOnly.Mean)]
-        public void SetProperties_ReadOnlyMeanWithObserverable_ThrowsArgumentException(DistributionPropertiesReadOnly propertiesReadOnly)
-        {
-            // Setup
-            var observerableMock = mockRepository.StrictMock<IObservable>();
-            mockRepository.ReplayAll();
-            var properties = new LogNormalDistributionProperties(observerableMock, propertiesReadOnly)
-            {
-                Data = new LogNormalDistribution(2)
-            };
-
-            // Call
-            TestDelegate test = () => properties.Mean = new RoundedDouble(2, 20);
-
-            // Assert
-            const string expectedMessage = "Mean is set to be read-only.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, expectedMessage);
-            mockRepository.VerifyAll();
-        }
-
-        [Test]
         public void SetProperties_MeanWithObserverable_ValueSetNotifyObservers()
         {
             // Setup
             var observerableMock = mockRepository.StrictMock<IObservable>();
             observerableMock.Expect(o => o.NotifyObservers()).Repeat.Once();
-            var properties = new LogNormalDistributionProperties(observerableMock, DistributionPropertiesReadOnly.None)
+            var properties = new LogNormalDistributionProperties(DistributionPropertiesReadOnly.None, observerableMock)
             {
                 Data = new LogNormalDistribution(2)
             };
@@ -138,33 +111,14 @@
         }
 
         [Test]
-        [TestCase(DistributionPropertiesReadOnly.None)]
-        [TestCase(DistributionPropertiesReadOnly.Mean)]
-        public void SetProperties_EditableStandardDeviationWithoutObserverable_ThrowsArgumentException(DistributionPropertiesReadOnly propertiesReadOnly)
-        {
-            // Setup
-            var properties = new LogNormalDistributionProperties(null, propertiesReadOnly)
-            {
-                Data = new LogNormalDistribution(2)
-            };
-
-            // Call
-            TestDelegate test = () => properties.StandardDeviation = new RoundedDouble(2, 20);
-
-            // Assert
-            const string expectedMessage = "No observerable object set.";
-            TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(test, expectedMessage);
-        }
-
-        [Test]
         [TestCase(DistributionPropertiesReadOnly.All)]
         [TestCase(DistributionPropertiesReadOnly.StandardDeviation)]
         public void SetProperties_ReadOnlyStandardDeviationWithObserverable_ThrowsArgumentException(DistributionPropertiesReadOnly propertiesReadOnly)
         {
             // Setup
             var observerableMock = mockRepository.StrictMock<IObservable>();
             mockRepository.ReplayAll();
-            var properties = new LogNormalDistributionProperties(observerableMock, propertiesReadOnly)
+            var properties = new LogNormalDistributionProperties(propertiesReadOnly, observerableMock)
             {
                 Data = new LogNormalDistribution(2)
             };
@@ -185,7 +139,7 @@
             var observerableMock = mockRepository.StrictMock<IObservable>();
             observerableMock.Expect(o => o.NotifyObservers()).Repeat.Once();
             mockRepository.ReplayAll();
-            var properties = new LogNormalDistributionProperties(observerableMock, DistributionPropertiesReadOnly.None)
+            var properties = new LogNormalDistributionProperties(DistributionPropertiesReadOnly.None, observerableMock)
             {
                 Data = new LogNormalDistribution(2)
             };
@@ -207,7 +161,7 @@
             mockRepository.ReplayAll();
 
             // Call
-            var properties = new LogNormalDistributionProperties(observerableMock, DistributionPropertiesReadOnly.None);
+            var properties = new LogNormalDistributionProperties(DistributionPropertiesReadOnly.None, observerableMock);
 
             // Assert
             var dynamicPropertyBag = new DynamicPropertyBag(properties);