Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicLocationConfigurationSettingsTest.cs
===================================================================
diff -u -rcacdc06a5ebb830176ce5b8a9af661036849d381 -r91b1add51add98f13fcb62329808ed838d07d371
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicLocationConfigurationSettingsTest.cs	(.../HydraulicLocationConfigurationSettingsTest.cs)	(revision cacdc06a5ebb830176ce5b8a9af661036849d381)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicLocationConfigurationSettingsTest.cs	(.../HydraulicLocationConfigurationSettingsTest.cs)	(revision 91b1add51add98f13fcb62329808ed838d07d371)
@@ -38,7 +38,7 @@
             // Assert
             Assert.IsNull(settings.FilePath);
             Assert.IsNull(settings.ScenarioName);
-            Assert.Zero(settings.Year);
+            Assert.AreEqual(0, settings.Year);
             Assert.IsNull(settings.Scope);
             Assert.IsNull(settings.SeaLevel);
             Assert.IsNull(settings.RiverDischarge);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil.Test/ReadHydraulicBoundaryDatabaseTestFactoryTest.cs
===================================================================
diff -u -r2d3643574102dc0984b0550529268ed9a395a11e -r91b1add51add98f13fcb62329808ed838d07d371
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil.Test/ReadHydraulicBoundaryDatabaseTestFactoryTest.cs	(.../ReadHydraulicBoundaryDatabaseTestFactoryTest.cs)	(revision 2d3643574102dc0984b0550529268ed9a395a11e)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil.Test/ReadHydraulicBoundaryDatabaseTestFactoryTest.cs	(.../ReadHydraulicBoundaryDatabaseTestFactoryTest.cs)	(revision 91b1add51add98f13fcb62329808ed838d07d371)
@@ -61,7 +61,7 @@
             ReadHydraulicBoundaryDatabase readDatabase = ReadHydraulicBoundaryDatabaseTestFactory.Create(locations);
 
             // Assert
-            Assert.NotZero(readDatabase.TrackId);
+            Assert.AreNotEqual(0, readDatabase.TrackId);
             Assert.AreEqual("version", readDatabase.Version);
             Assert.AreSame(locations, readDatabase.Locations);
         }
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs
===================================================================
diff -u -r9fc9b8a4905a7420454e1bde2279f90d954501db -r91b1add51add98f13fcb62329808ed838d07d371
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs	(.../HydraulicBoundaryDatabasePropertiesTest.cs)	(revision 9fc9b8a4905a7420454e1bde2279f90d954501db)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryDatabasePropertiesTest.cs	(.../HydraulicBoundaryDatabasePropertiesTest.cs)	(revision 91b1add51add98f13fcb62329808ed838d07d371)
@@ -100,7 +100,7 @@
             Assert.IsEmpty(properties.HrdFilePath);
             Assert.IsEmpty(properties.HlcdFilePath);
             Assert.IsEmpty(properties.ScenarioName);
-            Assert.Zero(properties.Year);
+            Assert.AreEqual(0, properties.Year);
             Assert.IsEmpty(properties.Scope);
             Assert.IsEmpty(properties.SeaLevel);
             Assert.IsEmpty(properties.RiverDischarge);
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs
===================================================================
diff -u -rca3b023aa7da2e5f0018d8bb5a9a5049c9585aaa -r91b1add51add98f13fcb62329808ed838d07d371
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs	(.../ExportableAssessmentSectionFactoryTest.cs)	(revision ca3b023aa7da2e5f0018d8bb5a9a5049c9585aaa)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Factories/ExportableAssessmentSectionFactoryTest.cs	(.../ExportableAssessmentSectionFactoryTest.cs)	(revision 91b1add51add98f13fcb62329808ed838d07d371)
@@ -156,8 +156,8 @@
                 var calculatorFactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance;
                 FailureMechanismSectionAssemblyCalculatorStub failureMechanismSectionAssemblyCalculator = calculatorFactory.LastCreatedFailureMechanismSectionAssemblyCalculator;
                 Assert.IsNull(failureMechanismSectionAssemblyCalculator.ManualAssemblyCategoriesInput);
-                Assert.Zero(failureMechanismSectionAssemblyCalculator.ManualAssemblyNInput);
-                Assert.Zero(failureMechanismSectionAssemblyCalculator.ManualAssemblyProbabilityInput);
+                Assert.AreEqual(0, failureMechanismSectionAssemblyCalculator.ManualAssemblyNInput);
+                Assert.AreEqual(0, failureMechanismSectionAssemblyCalculator.ManualAssemblyProbabilityInput);
             }
         }
 
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -r49f69c96ae5f4b3569f2acfd343e517c1c43b140 -r91b1add51add98f13fcb62329808ed838d07d371
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 49f69c96ae5f4b3569f2acfd343e517c1c43b140)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs	(.../AssessmentSectionEntityReadExtensionsTest.cs)	(revision 91b1add51add98f13fcb62329808ed838d07d371)
@@ -111,7 +111,7 @@
             HydraulicLocationConfigurationSettings settings = hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings;
             Assert.IsNull(settings.FilePath);
             Assert.IsNull(settings.ScenarioName);
-            Assert.Zero(settings.Year);
+            Assert.AreEqual(0, settings.Year);
             Assert.IsNull(settings.Scope);
             Assert.IsNull(settings.SeaLevel);
             Assert.IsNull(settings.RiverDischarge);