Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticFaultTreePipingOutputPropertiesTest.cs
===================================================================
diff -u -r9885f0e3a0e8b9d13ad802a76baf8db1228d2b72 -r408d5bb8e059eecee9b322b41479fe6fda9382f6
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticFaultTreePipingOutputPropertiesTest.cs	(.../ProbabilisticFaultTreePipingOutputPropertiesTest.cs)	(revision 9885f0e3a0e8b9d13ad802a76baf8db1228d2b72)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticFaultTreePipingOutputPropertiesTest.cs	(.../ProbabilisticFaultTreePipingOutputPropertiesTest.cs)	(revision 408d5bb8e059eecee9b322b41479fe6fda9382f6)
@@ -62,7 +62,7 @@
         }
 
         [Test]
-        public void Constructor_WithParameters_ExpectedValues()
+        public void Constructor_WithData_ExpectedValues()
         {
             // Setup
             PartialProbabilisticFaultTreePipingOutput output = PipingTestDataGenerator.GetRandomPartialProbabilisticFaultTreePipingOutput();
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingOutputPropertiesTest.cs
===================================================================
diff -u -r9885f0e3a0e8b9d13ad802a76baf8db1228d2b72 -r408d5bb8e059eecee9b322b41479fe6fda9382f6
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingOutputPropertiesTest.cs	(.../ProbabilisticPipingOutputPropertiesTest.cs)	(revision 9885f0e3a0e8b9d13ad802a76baf8db1228d2b72)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticPipingOutputPropertiesTest.cs	(.../ProbabilisticPipingOutputPropertiesTest.cs)	(revision 408d5bb8e059eecee9b322b41479fe6fda9382f6)
@@ -54,7 +54,7 @@
         }
 
         [Test]
-        public void Constructor_WithParameters_ExpectedValues()
+        public void Constructor_WithData_ExpectedValues()
         {
             // Setup
             PartialProbabilisticPipingOutput<TestTopLevelIllustrationPoint> output = PipingTestDataGenerator.GetRandomPartialProbabilisticPipingOutput();
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticSubMechanismPipingOutputPropertiesTest.cs
===================================================================
diff -u -r9885f0e3a0e8b9d13ad802a76baf8db1228d2b72 -r408d5bb8e059eecee9b322b41479fe6fda9382f6
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticSubMechanismPipingOutputPropertiesTest.cs	(.../ProbabilisticSubMechanismPipingOutputPropertiesTest.cs)	(revision 9885f0e3a0e8b9d13ad802a76baf8db1228d2b72)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/Probabilistic/ProbabilisticSubMechanismPipingOutputPropertiesTest.cs	(.../ProbabilisticSubMechanismPipingOutputPropertiesTest.cs)	(revision 408d5bb8e059eecee9b322b41479fe6fda9382f6)
@@ -62,7 +62,7 @@
         }
 
         [Test]
-        public void Constructor_WithParameters_ExpectedValues()
+        public void Constructor_WithData_ExpectedValues()
         {
             // Setup
             PartialProbabilisticSubMechanismPipingOutput output = PipingTestDataGenerator.GetRandomPartialProbabilisticSubMechanismPipingOutput();
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/ProbabilisticFaultTreePipingOutputViewTest.cs
===================================================================
diff -u -rc4b0663c2ee423e2fdf08b374299c5f6326c0dbb -r408d5bb8e059eecee9b322b41479fe6fda9382f6
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/ProbabilisticFaultTreePipingOutputViewTest.cs	(.../ProbabilisticFaultTreePipingOutputViewTest.cs)	(revision c4b0663c2ee423e2fdf08b374299c5f6326c0dbb)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/ProbabilisticFaultTreePipingOutputViewTest.cs	(.../ProbabilisticFaultTreePipingOutputViewTest.cs)	(revision 408d5bb8e059eecee9b322b41479fe6fda9382f6)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Threading;
 using NUnit.Framework;
 using Riskeer.Common.Data.TestUtil.IllustrationPoints;
 using Riskeer.Common.Forms.Views;
@@ -29,7 +28,6 @@
 namespace Riskeer.Piping.Forms.Test.Views
 {
     [TestFixture]
-    [Apartment(ApartmentState.STA)]
     public class ProbabilisticFaultTreePipingOutputViewTest
     {
         [Test]
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/ProbabilisticSubMechanismPipingOutputViewTest.cs
===================================================================
diff -u -r490dd2a8094c31d61e77723ef8f9cbe9e9305d63 -r408d5bb8e059eecee9b322b41479fe6fda9382f6
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/ProbabilisticSubMechanismPipingOutputViewTest.cs	(.../ProbabilisticSubMechanismPipingOutputViewTest.cs)	(revision 490dd2a8094c31d61e77723ef8f9cbe9e9305d63)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/ProbabilisticSubMechanismPipingOutputViewTest.cs	(.../ProbabilisticSubMechanismPipingOutputViewTest.cs)	(revision 408d5bb8e059eecee9b322b41479fe6fda9382f6)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System.Threading;
 using NUnit.Framework;
 using Riskeer.Common.Data.TestUtil.IllustrationPoints;
 using Riskeer.Common.Forms.Views;
@@ -29,7 +28,6 @@
 namespace Riskeer.Piping.Forms.Test.Views
 {
     [TestFixture]
-    [Apartment(ApartmentState.STA)]
     public class ProbabilisticSubMechanismPipingOutputViewTest
     {
         [Test]