Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssemblyTest.cs
===================================================================
diff -u -r6405d29291fd0a248baa49eac46911b0c9bb35af -r2f2055ad087e60f1c66914d69df623279b14bd95
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssemblyTest.cs	(.../SerializableAssemblyTest.cs)	(revision 6405d29291fd0a248baa49eac46911b0c9bb35af)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssemblyTest.cs	(.../SerializableAssemblyTest.cs)	(revision 2f2055ad087e60f1c66914d69df623279b14bd95)
@@ -100,9 +100,7 @@
         }
 
         [Test]
-        [TestCase(" ")]
-        [TestCase("")]
-        [TestCase(" InvalidId")]
+        [TestCaseSource(typeof(InvalidIdTestHelper), nameof(InvalidIdTestHelper.InvalidIdCases))]
         public void Constructor_InvalidId_ThrowsArgumentNullException(string invalidId)
         {
             // Setup
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentProcessTest.cs
===================================================================
diff -u -r1815be6776a818b0d390819ca63f89d3c5b78063 -r2f2055ad087e60f1c66914d69df623279b14bd95
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentProcessTest.cs	(.../SerializableAssessmentProcessTest.cs)	(revision 1815be6776a818b0d390819ca63f89d3c5b78063)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentProcessTest.cs	(.../SerializableAssessmentProcessTest.cs)	(revision 2f2055ad087e60f1c66914d69df623279b14bd95)
@@ -70,9 +70,7 @@
         }
 
         [Test]
-        [TestCase(" ")]
-        [TestCase("")]
-        [TestCase(" InvalidId")]
+        [TestCaseSource(typeof(InvalidIdTestHelper), nameof(InvalidIdTestHelper.InvalidIdCases))]
         public void Constructor_InvalidId_ThrowsArgumentNullException(string invalidId)
         {
             // Call
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentSectionTest.cs
===================================================================
diff -u -rf567b2b8e99d56ee71cdb33116f85c0c918cc59e -r2f2055ad087e60f1c66914d69df623279b14bd95
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentSectionTest.cs	(.../SerializableAssessmentSectionTest.cs)	(revision f567b2b8e99d56ee71cdb33116f85c0c918cc59e)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssessmentSectionTest.cs	(.../SerializableAssessmentSectionTest.cs)	(revision 2f2055ad087e60f1c66914d69df623279b14bd95)
@@ -75,9 +75,7 @@
         }
 
         [Test]
-        [TestCase(" ")]
-        [TestCase("")]
-        [TestCase(" InvalidId")]
+        [TestCaseSource(typeof(InvalidIdTestHelper), nameof(InvalidIdTestHelper.InvalidIdCases))]
         public void Constructor_InvalidId_ThrowsArgumentNullException(string invalidId)
         {
             // Setup
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableCombinedFailureMechanismSectionAssemblyTest.cs
===================================================================
diff -u -r6e81e14b714b8842795eadb1995a824320d67554 -r2f2055ad087e60f1c66914d69df623279b14bd95
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableCombinedFailureMechanismSectionAssemblyTest.cs	(.../SerializableCombinedFailureMechanismSectionAssemblyTest.cs)	(revision 6e81e14b714b8842795eadb1995a824320d67554)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableCombinedFailureMechanismSectionAssemblyTest.cs	(.../SerializableCombinedFailureMechanismSectionAssemblyTest.cs)	(revision 2f2055ad087e60f1c66914d69df623279b14bd95)
@@ -78,9 +78,7 @@
         }
 
         [Test]
-        [TestCase(" ")]
-        [TestCase("")]
-        [TestCase(" InvalidId")]
+        [TestCaseSource(typeof(InvalidIdTestHelper), nameof(InvalidIdTestHelper.InvalidIdCases))]
         public void Constructor_InvalidId_ThrowsArgumentNullException(string invalidId)
         {
             // Call
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionAssemblyTest.cs
===================================================================
diff -u -r273ffc28990ebc5fccfc3f97fba875873b4c35ae -r2f2055ad087e60f1c66914d69df623279b14bd95
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionAssemblyTest.cs	(.../SerializableFailureMechanismSectionAssemblyTest.cs)	(revision 273ffc28990ebc5fccfc3f97fba875873b4c35ae)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionAssemblyTest.cs	(.../SerializableFailureMechanismSectionAssemblyTest.cs)	(revision 2f2055ad087e60f1c66914d69df623279b14bd95)
@@ -78,9 +78,7 @@
         }
 
         [Test]
-        [TestCase(" ")]
-        [TestCase("")]
-        [TestCase(" InvalidId")]
+        [TestCaseSource(typeof(InvalidIdTestHelper), nameof(InvalidIdTestHelper.InvalidIdCases))]
         public void Constructor_InvalidId_ThrowsArgumentNullException(string invalidId)
         {
             // Setup
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionCollectionTest.cs
===================================================================
diff -u -r5a7fbd8f43c609641b0a1398e2cab204a46542bf -r2f2055ad087e60f1c66914d69df623279b14bd95
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionCollectionTest.cs	(.../SerializableFailureMechanismSectionCollectionTest.cs)	(revision 5a7fbd8f43c609641b0a1398e2cab204a46542bf)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionCollectionTest.cs	(.../SerializableFailureMechanismSectionCollectionTest.cs)	(revision 2f2055ad087e60f1c66914d69df623279b14bd95)
@@ -67,9 +67,7 @@
         }
 
         [Test]
-        [TestCase(" ")]
-        [TestCase("")]
-        [TestCase(" InvalidId")]
+        [TestCaseSource(typeof(InvalidIdTestHelper), nameof(InvalidIdTestHelper.InvalidIdCases))]
         public void ConstructorWithFailureMechanism_InvalidId_ThrowsArgumentNullException(string invalidId)
         {
             // Call
@@ -129,9 +127,7 @@
         }
 
         [Test]
-        [TestCase(" ")]
-        [TestCase("")]
-        [TestCase(" InvalidId")]
+        [TestCaseSource(typeof(InvalidIdTestHelper), nameof(InvalidIdTestHelper.InvalidIdCases))]
         public void ConstructorWithTotalAssemblyResult_InvalidId_ThrowsArgumentNullException(string invalidId)
         {
             // Call
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionTest.cs
===================================================================
diff -u -r9506617567a9aa2e19952f96e1a7f04842d61f62 -r2f2055ad087e60f1c66914d69df623279b14bd95
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionTest.cs	(.../SerializableFailureMechanismSectionTest.cs)	(revision 9506617567a9aa2e19952f96e1a7f04842d61f62)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionTest.cs	(.../SerializableFailureMechanismSectionTest.cs)	(revision 2f2055ad087e60f1c66914d69df623279b14bd95)
@@ -90,9 +90,7 @@
         }
 
         [Test]
-        [TestCase(" ")]
-        [TestCase("")]
-        [TestCase(" InvalidId")]
+        [TestCaseSource(typeof(InvalidIdTestHelper), nameof(InvalidIdTestHelper.InvalidIdCases))]
         public void Constructor_InvalidId_ThrowsArgumentNullException(string invalidId)
         {
             // Setup
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismTest.cs
===================================================================
diff -u -r687840aefa58fd0ebd096f2a600ae0c36caadd76 -r2f2055ad087e60f1c66914d69df623279b14bd95
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismTest.cs	(.../SerializableFailureMechanismTest.cs)	(revision 687840aefa58fd0ebd096f2a600ae0c36caadd76)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismTest.cs	(.../SerializableFailureMechanismTest.cs)	(revision 2f2055ad087e60f1c66914d69df623279b14bd95)
@@ -83,9 +83,7 @@
         }
 
         [Test]
-        [TestCase(" ")]
-        [TestCase("")]
-        [TestCase(" InvalidId")]
+        [TestCaseSource(typeof(InvalidIdTestHelper), nameof(InvalidIdTestHelper.InvalidIdCases))]
         public void Constructor_InvalidId_ThrowsArgumentNullException(string invalidId)
         {
             // Setup
Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableTotalAssemblyResultTest.cs
===================================================================
diff -u -r9c2c56fafb538c2367a09f52ff602d2bfba82f70 -r2f2055ad087e60f1c66914d69df623279b14bd95
--- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableTotalAssemblyResultTest.cs	(.../SerializableTotalAssemblyResultTest.cs)	(revision 9c2c56fafb538c2367a09f52ff602d2bfba82f70)
+++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableTotalAssemblyResultTest.cs	(.../SerializableTotalAssemblyResultTest.cs)	(revision 2f2055ad087e60f1c66914d69df623279b14bd95)
@@ -76,9 +76,7 @@
         }
 
         [Test]
-        [TestCase(" ")]
-        [TestCase("")]
-        [TestCase(" InvalidId")]
+        [TestCaseSource(typeof(InvalidIdTestHelper), nameof(InvalidIdTestHelper.InvalidIdCases))]
         public void Constructor_InvalidId_ThrowsArgumentNullException(string invalidId)
         {
             // Call