diff --git a/YAXLibTests/CustomTypeInspectorTests.cs b/YAXLibTests/CustomTypeInspectorTests.cs
index c316b37..74215d3 100644
--- a/YAXLibTests/CustomTypeInspectorTests.cs
+++ b/YAXLibTests/CustomTypeInspectorTests.cs
@@ -43,15 +43,15 @@ public void SkipPublishYearPropertySerializationTest()
 
         var result = serializer.Serialize(Book.GetSampleInstance());
 
-        Assert.AreEqual(
-            """
+        Assert.That(
+result, Is.EqualTo("""
             <!-- This example demonstrates serializing a very simple class -->
             <Book>
               <Title>Inside C#</Title>
               <Author>Tom Archer &amp; Andrew Whitechapel</Author>
               <Price>30.5</Price>
             </Book>
-            """, result);
+            """));
     }
 
     [Test]
diff --git a/YAXLibTests/DeserializationTestBase.cs b/YAXLibTests/DeserializationTestBase.cs
index fd7c593..ff5c510 100644
--- a/YAXLibTests/DeserializationTestBase.cs
+++ b/YAXLibTests/DeserializationTestBase.cs
@@ -37,8 +37,8 @@ private void PerformTest(object obj)
     private void PerformTestWithEquals(object obj)
     {
         var serializer = SerializeDeserialize(obj, out var gottonObject);
-        Assert.AreEqual(0, serializer.ParsingErrors.Count);
-        Assert.AreEqual(obj, gottonObject);
+        Assert.That(serializer.ParsingErrors.Count, Is.EqualTo(0));
+        Assert.That(gottonObject, Is.EqualTo(obj));
     }
 
     private object? GetTheTwoStringsAndReturn(object obj, out string originalString, out string? gottonString,
@@ -371,7 +371,7 @@ public void MoreComplexBookTwoResumedDeserializationTest()
             { ExceptionHandlingPolicies = YAXExceptionHandlingPolicies.DoNotThrow });
         serializer.SetDeserializationBaseObject(book);
         var bookResult = (MoreComplexBook2?) serializer.Deserialize(result);
-        Assert.AreNotEqual(bookResult?.ToString(), initialToString);
+        Assert.That(bookResult?.ToString(), Is.Not.EqualTo(initialToString));
     }
 
     [Test]
@@ -531,11 +531,8 @@ public void AttributeForKeyInDictionaryPropertyTest()
 
         var deserializedContainer = (DictionaryContainerSample?) ser.Deserialize(input);
 
-        Assert.IsNotNull(deserializedContainer?.Items);
-        Assert.IsTrue(deserializedContainer?.Items.Count == container.Items.Count,
-            "Expected Count: {0}. Actual Count: {1}",
-            container.Items.Count,
-            deserializedContainer?.Items.Count);
+        Assert.That(deserializedContainer?.Items, Is.Not.Null);
+        Assert.That(deserializedContainer?.Items.Count == container.Items.Count, $"Expected Count: {container.Items.Count}. Actual Count: {deserializedContainer?.Items.Count}");
     }
 
     [Test]
@@ -550,10 +547,7 @@ public void DeserializingADictionaryDerivedInstance()
         var deserializedInstance = (DictionarySample?) ser.Deserialize(input);
 
         Assert.That(deserializedInstance, Is.Not.Null);
-        Assert.IsTrue(deserializedInstance?.Count == inst.Count,
-            "Expected Count: {0}. Actual Count: {1}",
-            inst.Count,
-            deserializedInstance?.Count);
+        Assert.That(deserializedInstance?.Count == inst.Count, $"Expected Count: {inst.Count}. Actual Count: {deserializedInstance?.Count}");
     }
 
     [Test]
@@ -620,7 +614,7 @@ public void DeserializeIndirectSelfReferringObjectWhenThrowUponSerializingCyclin
         var deserializedInstance = (IndirectSelfReferringObject?) ser.Deserialize(input);
 
         Assert.That(deserializedInstance, Is.Not.Null);
-        Assert.IsNull(deserializedInstance?.Child?.Parent);
+        Assert.That(deserializedInstance?.Child?.Parent, Is.Null);
     }
 
     [Test]
@@ -638,7 +632,7 @@ public void DeserializeDirectSelfReferringObjectWhenDontThrowUponSerializingCycl
         var deserializedInstance = (DirectSelfReferringObject?) ser.Deserialize(input);
 
         Assert.That(deserializedInstance, Is.Not.Null);
-        Assert.IsNull(deserializedInstance?.Next?.Next);
+        Assert.That(deserializedInstance?.Next?.Next, Is.Null);
     }
 
     [Test]
@@ -656,7 +650,7 @@ public void DeserializeDirectSelfReferringObjectWithSelfCycleWhenThrowUponSerial
         var deserializedInstance = (DirectSelfReferringObject?) ser.Deserialize(input);
 
         Assert.That(deserializedInstance, Is.Not.Null);
-        Assert.IsNull(deserializedInstance?.Next);
+        Assert.That(deserializedInstance?.Next, Is.Null);
     }
 
     [Test]
@@ -670,7 +664,7 @@ public void
         var result = ser.Serialize(CalculatedPropertiesCanCauseInfiniteLoop.GetSampleInstance());
 
         var deserializedInstance = ser.Deserialize(result);
-        Assert.IsNotNull(deserializedInstance);
+        Assert.That(deserializedInstance, Is.Not.Null);
     }
 
     [Test]
@@ -680,7 +674,7 @@ public void MaxRecursionPreventsInfiniteLoop()
         var ser = CreateSerializer<CalculatedPropertiesCanCauseInfiniteLoop>(options);
         var result = ser.Serialize(CalculatedPropertiesCanCauseInfiniteLoop.GetSampleInstance());
         var deserializedInstance = ser.Deserialize(result) as CalculatedPropertiesCanCauseInfiniteLoop;
-        Assert.IsNotNull(deserializedInstance);
+        Assert.That(deserializedInstance, Is.Not.Null);
         Assert.That(ser.Options.MaxRecursion, Is.EqualTo(10));
         Assert.That(deserializedInstance?.Data, Is.EqualTo(2.0M));
         Assert.That(ser.GetRecursionCount(), Is.EqualTo(0));
diff --git a/YAXLibTests/ExceptionTests.cs b/YAXLibTests/ExceptionTests.cs
index ddf7dcf..22bb89c 100644
--- a/YAXLibTests/ExceptionTests.cs
+++ b/YAXLibTests/ExceptionTests.cs
@@ -28,8 +28,8 @@ public void AttributeAlreadyExistsExceptionTest()
             serializer.Serialize(ClassWithDuplicateYaxAttribute.GetSampleInstance());
         });
 
-        Assert.AreEqual("test", ex?.AttrName);
-        StringAssert.Contains("'test'", ex?.Message);
+        Assert.That(ex?.AttrName, Is.EqualTo("test"));
+        Assert.That(ex?.Message, Does.Contain("'test'"));
     }
 
     [Test]
@@ -54,7 +54,7 @@ public void MalformedXmlStringThatThrows()
         });
 
         // YAXBadlyFormedXML exception doesn't need YAXSerializationOptions.DisplayLineInfoInExceptions to get the line numbers
-        Assert.True(ex!.HasLineInfo);
+        Assert.That(ex!.HasLineInfo, Is.True);
         Assert.That(ex.LineNumber, Is.EqualTo(7));
         Assert.That(ex.LinePosition, Is.EqualTo(3));
         Assert.That(ex.Message, Does.Contain("not properly formatted"));
@@ -194,10 +194,10 @@ public void MalformedInputWithLineNumbersTest()
             });
             serializer.Deserialize(bookXml);
         });
-        Assert.True(ex?.HasLineInfo);
-        Assert.AreEqual(6, ex?.LineNumber);
-        Assert.AreEqual(4, ex?.LinePosition);
-        StringAssert.Contains("The format of the value specified for the property", ex?.Message);
+        Assert.That(ex?.HasLineInfo, Is.True);
+        Assert.That(ex?.LineNumber, Is.EqualTo(6));
+        Assert.That(ex?.LinePosition, Is.EqualTo(4));
+        Assert.That(ex?.Message, Does.Contain("The format of the value specified for the property"));
     }
 
     [Test]
@@ -222,10 +222,10 @@ public void MalformedInputWithoutLineNumbersTest()
             });
             serializer.Deserialize(bookXml);
         });
-        Assert.False(ex?.HasLineInfo);
-        Assert.AreEqual(0, ex?.LineNumber);
-        Assert.AreEqual(0, ex?.LinePosition);
-        StringAssert.Contains("The format of the value specified for the property", ex?.Message);
+        Assert.That(ex?.HasLineInfo, Is.False);
+        Assert.That(ex?.LineNumber, Is.EqualTo(0));
+        Assert.That(ex?.LinePosition, Is.EqualTo(0));
+        Assert.That(ex?.Message, Does.Contain("The format of the value specified for the property"));
     }
 
     [Test]
@@ -239,10 +239,10 @@ public void ObjectTypeMismatchExceptionTest()
             serializer.Serialize(new ClassWithDuplicateYaxAttribute());
         });
 
-        Assert.AreEqual(typeof(Book), ex?.ExpectedType);
-        Assert.AreEqual(typeof(ClassWithDuplicateYaxAttribute), ex?.ReceivedType);
-        StringAssert.Contains("'Book'", ex?.Message);
-        StringAssert.Contains("'ClassWithDuplicateYaxAttribute'", ex?.Message);
+        Assert.That(ex?.ExpectedType, Is.EqualTo(typeof(Book)));
+        Assert.That(ex?.ReceivedType, Is.EqualTo(typeof(ClassWithDuplicateYaxAttribute)));
+        Assert.That(ex?.Message, Does.Contain("'Book'"));
+        Assert.That(ex?.Message, Does.Contain("'ClassWithDuplicateYaxAttribute'"));
     }
 
 
@@ -268,9 +268,9 @@ public void ElementValueMissingWithLineNumbersTest()
             });
             serializer.Deserialize(bookXml);
         });
-        Assert.True(ex?.HasLineInfo);
-        Assert.AreEqual(2, ex?.LineNumber);
-        Assert.AreEqual(2, ex?.LinePosition);
+        Assert.That(ex?.HasLineInfo, Is.True);
+        Assert.That(ex?.LineNumber, Is.EqualTo(2));
+        Assert.That(ex?.LinePosition, Is.EqualTo(2));
     }
 
     [Test]
@@ -296,9 +296,9 @@ public void ElementMissingWithLineNumbersTest()
             });
             serializer.Deserialize(collectionXml);
         });
-        Assert.True(ex?.HasLineInfo);
-        Assert.AreEqual(2, ex?.LineNumber);
-        Assert.AreEqual(2, ex?.LinePosition);
+        Assert.That(ex?.HasLineInfo, Is.True);
+        Assert.That(ex?.LineNumber, Is.EqualTo(2));
+        Assert.That(ex?.LinePosition, Is.EqualTo(2));
     }
 
     [Test]
@@ -322,9 +322,9 @@ public void DefaultValueCannotBeAssignedWithLineNumbersTest()
             });
             serializer.Deserialize(bookXml);
         });
-        Assert.True(ex?.HasLineInfo);
-        Assert.AreEqual(1, ex?.LineNumber);
-        Assert.AreEqual(2, ex?.LinePosition);
+        Assert.That(ex?.HasLineInfo, Is.True);
+        Assert.That(ex?.LineNumber, Is.EqualTo(1));
+        Assert.That(ex?.LinePosition, Is.EqualTo(2));
     }
 
     [Test]
@@ -334,7 +334,7 @@ public void BadLocationExceptionLegacyConstructor()
 
         Exception? ex =
             Assert.Throws<YAXBadLocationException>(code: () => throw new YAXBadLocationException(testName));
-        StringAssert.Contains(testName, ex?.Message);
+        Assert.That(ex?.Message, Does.Contain(testName));
     }
 
     [Test]
@@ -343,7 +343,7 @@ public void AttributeAlreadyExistsExceptionLegacyConstructor()
         var testName = "Test";
         var ex = Assert.Throws<YAXAttributeAlreadyExistsException>(code: () =>
             throw new YAXAttributeAlreadyExistsException(testName));
-        StringAssert.Contains(testName, ex?.Message);
+        Assert.That(ex?.Message, Does.Contain(testName));
     }
 
     [Test]
@@ -352,7 +352,7 @@ public void AttributeMissingExceptionLegacyConstructor()
         var testName = "Test";
         var ex = Assert.Throws<YAXAttributeMissingException>(code: () =>
             throw new YAXAttributeMissingException(testName));
-        StringAssert.Contains(testName, ex?.Message);
+        Assert.That(ex?.Message, Does.Contain(testName));
     }
 
     [Test]
@@ -361,7 +361,7 @@ public void ElementValueMissingExceptionLegacyConstructor()
         var testName = "Test";
         var ex = Assert.Throws<YAXElementValueMissingException>(code: () =>
             throw new YAXElementValueMissingException(testName));
-        StringAssert.Contains(testName, ex?.Message);
+        Assert.That(ex?.Message, Does.Contain(testName));
     }
 
     [Test]
@@ -370,7 +370,7 @@ public void ElementMissingExceptionLegacyConstructor()
         var testName = "Test";
         var ex = Assert.Throws<YAXElementMissingException>(code: () =>
             throw new YAXElementMissingException(testName));
-        StringAssert.Contains(testName, ex?.Message);
+        Assert.That(ex?.Message, Does.Contain(testName));
     }
 
     [Test]
@@ -380,8 +380,8 @@ public void MalformedInputLegacyConstructor()
         var testInput = "BadInput";
         var ex = Assert.Throws<YAXBadlyFormedInput>(code: () =>
             throw new YAXBadlyFormedInput(testName, testInput));
-        StringAssert.Contains(testName, ex?.Message);
-        StringAssert.Contains(testInput, ex?.Message);
+        Assert.That(ex?.Message, Does.Contain(testName));
+        Assert.That(ex?.Message, Does.Contain(testInput));
     }
 
     [Test]
@@ -390,7 +390,7 @@ public void PropertyCannotBeAssignedToLegacyConstructor()
         var testName = "Test";
         var ex = Assert.Throws<YAXPropertyCannotBeAssignedTo>(code: () =>
             throw new YAXPropertyCannotBeAssignedTo(testName));
-        StringAssert.Contains(testName, ex?.Message);
+        Assert.That(ex?.Message, Does.Contain(testName));
     }
 
     [Test]
@@ -400,8 +400,8 @@ public void CannotAddObjectToCollectionLegacyConstructor()
         var testValue = 1;
         var ex = Assert.Throws<YAXCannotAddObjectToCollection>(code: () =>
             throw new YAXCannotAddObjectToCollection(testName, testValue));
-        StringAssert.Contains(testName, ex?.Message);
-        StringAssert.Contains(testValue.ToString(), ex?.Message);
+        Assert.That(ex?.Message, Does.Contain(testName));
+        Assert.That(ex?.Message, Does.Contain(testValue.ToString()));
     }
 
     [Test]
@@ -411,8 +411,8 @@ public void DefaultValueCannotBeAssignedLegacyConstructor()
         var testValue = 1;
         var ex = Assert.Throws<YAXDefaultValueCannotBeAssigned>(code: () =>
             throw new YAXDefaultValueCannotBeAssigned(testName, testValue, CultureInfo.InvariantCulture));
-        StringAssert.Contains(testName, ex?.Message);
-        StringAssert.Contains(testValue.ToString(), ex?.Message);
+        Assert.That(ex?.Message, Does.Contain(testName));
+        Assert.That(ex?.Message, Does.Contain(testValue.ToString()));
     }
 
     [Test]
@@ -420,7 +420,7 @@ public void MalformedXmlLegacyConstructor()
     {
         var testName = "Test";
         var ex = Assert.Throws<YAXBadlyFormedXML>(() => { throw new YAXBadlyFormedXML(new Exception(testName)); });
-        StringAssert.Contains(testName, ex?.Message);
+        Assert.That(ex?.Message, Does.Contain(testName));
     }
 
     [Test]
@@ -429,7 +429,7 @@ public void CannotSerializeSelfReferentialTypesLegacyConstructor()
         var testType = typeof(string);
         var ex = Assert.Throws<YAXCannotSerializeSelfReferentialTypes>(code: () =>
             throw new YAXCannotSerializeSelfReferentialTypes(testType));
-        StringAssert.Contains(testType.Name, ex?.Message);
+        Assert.That(ex?.Message, Does.Contain(testType.Name));
     }
 
     [Test]
@@ -439,8 +439,8 @@ public void ObjectTypeMismatchLegacyConstructor()
         var testType2 = typeof(int);
         var ex = Assert.Throws<YAXObjectTypeMismatch>(code: () =>
             throw new YAXObjectTypeMismatch(testType, testType2));
-        StringAssert.Contains(testType.Name, ex?.Message);
-        StringAssert.Contains(testType2.Name, ex?.Message);
+        Assert.That(ex?.Message, Does.Contain(testType.Name));
+        Assert.That(ex?.Message, Does.Contain(testType2.Name));
     }
 
     [Test]
@@ -448,6 +448,6 @@ public void PolymorphicExceptionLegacyConstructor()
     {
         var testName = "Test";
         var ex = Assert.Throws<YAXPolymorphicException>(code: () => throw new YAXPolymorphicException(testName));
-        StringAssert.Contains(testName, ex?.Message);
+        Assert.That(ex?.Message, Does.Contain(testName));
     }
-}
\ No newline at end of file
+}
diff --git a/YAXLibTests/GenericDeserializationTests.cs b/YAXLibTests/GenericDeserializationTests.cs
index 557fd2d..650be6d 100644
--- a/YAXLibTests/GenericDeserializationTests.cs
+++ b/YAXLibTests/GenericDeserializationTests.cs
@@ -57,7 +57,7 @@ public void GenericDeserializationTest()
                 """;
         var serializer = new YAXSerializer<Book>();
         var got = serializer.Deserialize(xml);
-        Assert.NotNull(got);
-        Assert.AreEqual(got, Book.GetSampleInstance());
+        Assert.That(got, Is.Not.Null);
+        Assert.That(Book.GetSampleInstance(), Is.EqualTo(got));
     }
-}
\ No newline at end of file
+}
diff --git a/YAXLibTests/GenericSerializationTests.cs b/YAXLibTests/GenericSerializationTests.cs
index bc23aeb..31072ec 100644
--- a/YAXLibTests/GenericSerializationTests.cs
+++ b/YAXLibTests/GenericSerializationTests.cs
@@ -75,7 +75,7 @@ public void GenericDeserializationTest()
                 """;
         var serializer = new YAXSerializer<Book>();
         var got = serializer.Deserialize(xml);
-        Assert.NotNull(got);
-        Assert.AreEqual(got, Book.GetSampleInstance());
+        Assert.That(got, Is.Not.Null);
+        Assert.That(Book.GetSampleInstance(), Is.EqualTo(got));
     }
 }
\ No newline at end of file
diff --git a/YAXLibTests/NumericMinMaxTests.cs b/YAXLibTests/NumericMinMaxTests.cs
index 166c7ce..982a54f 100644
--- a/YAXLibTests/NumericMinMaxTests.cs
+++ b/YAXLibTests/NumericMinMaxTests.cs
@@ -29,13 +29,13 @@ public void TestDoubleMax()
             var d = 0.55;
             var xml = ser.Serialize(d);
             var deserializedInstance = ser.Deserialize(xml);
-            Assert.AreEqual(d, deserializedInstance);
+            Assert.That(deserializedInstance, Is.EqualTo(d));
 
             d = double.MaxValue;
             xml = ser.Serialize(d);
             deserializedInstance = ser.Deserialize(xml);
             // Causes a System.OverflowException {"Value was either too large or too small for a Double."}
-            Assert.AreEqual(d, deserializedInstance);
+            Assert.That(deserializedInstance, Is.EqualTo(d));
         }
         catch (Exception ex)
         {
@@ -56,7 +56,7 @@ public void TestDoubleMin()
             var d = double.MinValue;
             var xml = ser.Serialize(d);
             var deserializedInstance = ser.Deserialize(xml);
-            Assert.AreEqual(d, deserializedInstance);
+            Assert.That(deserializedInstance, Is.EqualTo(d));
         }
         catch (Exception ex)
         {
@@ -78,7 +78,7 @@ public void TestSingleMax()
             var f = float.MaxValue;
             var xml = ser.Serialize(f);
             var deserializedInstance = ser.Deserialize(xml);
-            Assert.AreEqual(f, deserializedInstance);
+            Assert.That(deserializedInstance, Is.EqualTo(f));
         }
         catch (Exception ex)
         {
@@ -99,7 +99,7 @@ public void TestSingleMin()
             var f = float.MinValue;
             var xml = ser.Serialize(f);
             var deserializedInstance = ser.Deserialize(xml);
-            Assert.AreEqual(f, deserializedInstance);
+            Assert.That(deserializedInstance, Is.EqualTo(f));
         }
         catch (Exception ex)
         {
diff --git a/YAXLibTests/Pooling/CollectionPoolTests.cs b/YAXLibTests/Pooling/CollectionPoolTests.cs
index 709c672..8e44e59 100644
--- a/YAXLibTests/Pooling/CollectionPoolTests.cs
+++ b/YAXLibTests/Pooling/CollectionPoolTests.cs
@@ -49,7 +49,7 @@ public void Get_PooledObject()
         var list = cp.Get();
         cp.Return(list);
         cp.Get(out var list2);
-        Assert.AreSame(list, list2);
+        Assert.That(list2, Is.SameAs(list));
     }
 
     [Test]
diff --git a/YAXLibTests/Pooling/SerializerPoolTests.cs b/YAXLibTests/Pooling/SerializerPoolTests.cs
index 156e59a..e6750ab 100644
--- a/YAXLibTests/Pooling/SerializerPoolTests.cs
+++ b/YAXLibTests/Pooling/SerializerPoolTests.cs
@@ -51,7 +51,7 @@ public void Get_PooledObject()
         var serializer = sp.Get();
         sp.Return(serializer);
         sp.Get(out var sb2);
-        Assert.AreSame(serializer, sb2);
+        Assert.That(sb2, Is.SameAs(serializer));
     }
 
     [Test]
diff --git a/YAXLibTests/ReflectionUtilsTest.cs b/YAXLibTests/ReflectionUtilsTest.cs
index 71b808c..e656826 100644
--- a/YAXLibTests/ReflectionUtilsTest.cs
+++ b/YAXLibTests/ReflectionUtilsTest.cs
@@ -203,21 +203,21 @@ public void GetSetPropertyValues()
     [Test]
     public void GetDefaultValueTest()
     {
-        Assert.IsTrue(Equals(ReflectionUtils.GetDefaultValue(typeof(string)), null));
-        Assert.IsTrue(Equals(ReflectionUtils.GetDefaultValue(typeof(bool)), default(bool)));
-        Assert.IsTrue(Equals(ReflectionUtils.GetDefaultValue(typeof(char)), default(char)));
-        Assert.IsTrue(Equals(ReflectionUtils.GetDefaultValue(typeof(sbyte)), default(sbyte)));
-        Assert.IsTrue(Equals(ReflectionUtils.GetDefaultValue(typeof(byte)), default(byte)));
-        Assert.IsTrue(Equals(ReflectionUtils.GetDefaultValue(typeof(short)), default(short)));
-        Assert.IsTrue(Equals(ReflectionUtils.GetDefaultValue(typeof(ushort)), default(ushort)));
-        Assert.IsTrue(Equals(ReflectionUtils.GetDefaultValue(typeof(int)), default(int)));
-        Assert.IsTrue(Equals(ReflectionUtils.GetDefaultValue(typeof(uint)), default(uint)));
-        Assert.IsTrue(Equals(ReflectionUtils.GetDefaultValue(typeof(long)), default(long)));
-        Assert.IsTrue(Equals(ReflectionUtils.GetDefaultValue(typeof(ulong)), default(ulong)));
-        Assert.IsTrue(Equals(ReflectionUtils.GetDefaultValue(typeof(float)), default(float)));
-        Assert.IsTrue(Equals(ReflectionUtils.GetDefaultValue(typeof(double)), default(double)));
-        Assert.IsTrue(Equals(ReflectionUtils.GetDefaultValue(typeof(decimal)), default(decimal)));
-        Assert.IsTrue(Equals(ReflectionUtils.GetDefaultValue(typeof(DateTime)), default(DateTime)));
-        Assert.IsTrue(Equals(ReflectionUtils.GetDefaultValue(typeof(DBNull)), DBNull.Value));
+        Assert.That(Equals(ReflectionUtils.GetDefaultValue(typeof(string)), null));
+        Assert.That(Equals(ReflectionUtils.GetDefaultValue(typeof(bool)), default(bool)));
+        Assert.That(Equals(ReflectionUtils.GetDefaultValue(typeof(char)), default(char)));
+        Assert.That(Equals(ReflectionUtils.GetDefaultValue(typeof(sbyte)), default(sbyte)));
+        Assert.That(Equals(ReflectionUtils.GetDefaultValue(typeof(byte)), default(byte)));
+        Assert.That(Equals(ReflectionUtils.GetDefaultValue(typeof(short)), default(short)));
+        Assert.That(Equals(ReflectionUtils.GetDefaultValue(typeof(ushort)), default(ushort)));
+        Assert.That(Equals(ReflectionUtils.GetDefaultValue(typeof(int)), default(int)));
+        Assert.That(Equals(ReflectionUtils.GetDefaultValue(typeof(uint)), default(uint)));
+        Assert.That(Equals(ReflectionUtils.GetDefaultValue(typeof(long)), default(long)));
+        Assert.That(Equals(ReflectionUtils.GetDefaultValue(typeof(ulong)), default(ulong)));
+        Assert.That(Equals(ReflectionUtils.GetDefaultValue(typeof(float)), default(float)));
+        Assert.That(Equals(ReflectionUtils.GetDefaultValue(typeof(double)), default(double)));
+        Assert.That(Equals(ReflectionUtils.GetDefaultValue(typeof(decimal)), default(decimal)));
+        Assert.That(Equals(ReflectionUtils.GetDefaultValue(typeof(DateTime)), default(DateTime)));
+        Assert.That(Equals(ReflectionUtils.GetDefaultValue(typeof(DBNull)), DBNull.Value));
     }
 }
diff --git a/YAXLibTests/SerializationTestBase.cs b/YAXLibTests/SerializationTestBase.cs
index 853446e..0788e9f 100644
--- a/YAXLibTests/SerializationTestBase.cs
+++ b/YAXLibTests/SerializationTestBase.cs
@@ -392,7 +392,7 @@ public void DictionaryWithNullValue()
 
         var got = serializer.Serialize(d);
         var gotDes = (Dictionary<string, object>?) serializer.Deserialize(got);
-        Assert.AreEqual(d[theKey], gotDes?[theKey]);
+        Assert.That(gotDes?[theKey], Is.EqualTo(d[theKey]));
     }
 
     /// <summary>
@@ -410,14 +410,14 @@ public void DictionaryWithNullValueShouldNotCrash()
         });
 
         var got = serializer.Serialize(d);
-        Assert.AreEqual("""
+        Assert.That(got, Is.EqualTo("""
             <DictionaryOfStringObject>
               <KeyValuePairOfStringObject>
                 <Key>TheKey</Key>
                 <Value />
               </KeyValuePairOfStringObject>
             </DictionaryOfStringObject>
-            """, got);
+            """));
     }
 
     [Test]
@@ -2269,7 +2269,7 @@ public void AttributeForClassTest()
                 </container>
                 """;
 
-        Assert.That(expectedResult, Is.EqualTo(result));
+        Assert.That(result, Is.EqualTo(expectedResult));
     }
 
     [Test]
@@ -2316,7 +2316,7 @@ public void DictionaryKeyValueAsContentTest()
                   </DicValueAsContentKeyAsElement>
                 </DictionaryKeyValueAsContent>
                 """;
-        Assert.That(expectedResult, Is.EqualTo(result));
+        Assert.That(result, Is.EqualTo(expectedResult));
     }
 
     [Test]
@@ -2334,7 +2334,7 @@ public void AttributeForKeyInDictionaryTest()
                 </TheItems>
                 """;
 
-        Assert.AreEqual(expectedResult, result);
+        Assert.That(result, Is.EqualTo(expectedResult));
     }
 
     [Test]
@@ -2354,7 +2354,7 @@ public void AttributeForKeyInDictionaryPropertyTest()
                 </container>
                 """;
 
-        Assert.AreEqual(expectedResult, result);
+        Assert.That(result, Is.EqualTo(expectedResult));
     }
 
     [Test]
@@ -2376,7 +2376,7 @@ public void CollectionWithExtraPropertiesTest()
                 </CollectionWithExtraProperties>
                 """;
 
-        Assert.AreEqual(expectedResult, result);
+        Assert.That(result, Is.EqualTo(expectedResult));
     }
 
     [Test]
@@ -2394,7 +2394,7 @@ public void CollectionWithExtraPropertiesAttributedAsNotCollectionTest()
                 </CollectionWithExtraPropertiesAttributedAsNotCollection>
                 """;
 
-        Assert.AreEqual(expectedResult, result);
+        Assert.That(result, Is.EqualTo(expectedResult));
     }
 
     [Test]
@@ -2424,7 +2424,7 @@ public void DictionaryWithExtraPropertiesTest()
                 </DictionaryWithExtraProperties>
                 """;
 
-        Assert.AreEqual(expectedResult, result);
+        Assert.That(result, Is.EqualTo(expectedResult));
     }
 
     [Test]
@@ -2442,7 +2442,7 @@ public void DictionaryWithExtraPropertiesAttributedAsNotCollectionTest()
                 </DictionaryWithExtraPropertiesAttributedAsNotCollection>
                 """;
 
-        Assert.AreEqual(expectedResult, result);
+        Assert.That(result, Is.EqualTo(expectedResult));
     }
 
     [Test]
@@ -2500,7 +2500,7 @@ public void ListOfPolymorphicObjectsTest()
                   <sample yaxlib:realtype="YAXLibTests.SampleClasses.PolymorphicTwoSample" />
                 </samples>
                 """;
-        Assert.AreEqual(expectedResult, result);
+        Assert.That(result, Is.EqualTo(expectedResult));
     }
 
     [Test]
@@ -2517,7 +2517,7 @@ public void OneLetterPathTest()
                 </OneLetterAlias>
                 """;
 
-        Assert.AreEqual(expectedResult, result);
+        Assert.That(result, Is.EqualTo(expectedResult));
     }
 
     [Test]
@@ -2534,7 +2534,7 @@ public void IndexerPropertiesAreNotSerialized()
                 </IndexerSample>
                 """;
 
-        Assert.AreEqual(expectedResult, result);
+        Assert.That(result, Is.EqualTo(expectedResult));
     }
 
     [Test]
@@ -2561,7 +2561,7 @@ public void SingleLetterPropertyNamesAreSerializedProperly()
                 </SingleLetterPropertyNames>
                 """;
 
-        Assert.AreEqual(expectedResult, result);
+        Assert.That(result, Is.EqualTo(expectedResult));
     }
 
     [Test]
@@ -2577,7 +2577,7 @@ public void DelegatesAndFunctionPointersMustBeIgnored()
                 </DelegateInstances>
                 """;
 
-        Assert.AreEqual(expectedResult, result);
+        Assert.That(result, Is.EqualTo(expectedResult));
     }
 
     [Test]
@@ -2597,7 +2597,7 @@ public void RepetitiveReferencesAreNotLoop()
                   </RefB>
                 </RepetitiveReferenceIsNotLoop>
                 """;
-        Assert.AreEqual(expectedResult, result);
+        Assert.That(result, Is.EqualTo(expectedResult));
     }
 
     [Test]
@@ -2617,7 +2617,7 @@ public void SelfReferringTypeIsNotNecessarilyASelfReferringObject()
                 </DirectSelfReferringObject>
                 """;
 
-        Assert.AreEqual(expectedResult, result);
+        Assert.That(result, Is.EqualTo(expectedResult));
     }
 
     [Test]
@@ -2650,7 +2650,7 @@ public void SerializingAnIndirectSelfReferringTypeWithougLoopMustPass()
                 </IndirectSelfReferringObject>
                 """;
 
-        Assert.AreEqual(expectedResult, result);
+        Assert.That(result, Is.EqualTo(expectedResult));
     }
 
     [Test]
@@ -2686,7 +2686,7 @@ public void
                 </IndirectSelfReferringObject>
                 """;
 
-        Assert.AreEqual(expectedResult, result);
+        Assert.That(result, Is.EqualTo(expectedResult));
     }
 
     [Test]
@@ -2727,7 +2727,7 @@ public void
                 </DirectSelfReferringObject>
                 """;
 
-        Assert.AreEqual(expectedResult, result);
+        Assert.That(result, Is.EqualTo(expectedResult));
     }
 
     [Test]
@@ -2764,7 +2764,7 @@ public void
                 </DirectSelfReferringObject>
                 """;
 
-        Assert.AreEqual(expectedResult, result);
+        Assert.That(result, Is.EqualTo(expectedResult));
     }
 
     [Test]
@@ -2800,7 +2800,7 @@ public void
                 </CalculatedPropertiesCanCauseInfiniteLoop>
                 """;
 
-        Assert.AreEqual(expectedResult, result);
+        Assert.That(result, Is.EqualTo(expectedResult));
     }
 
     [Test]
diff --git a/YAXLibTests/YAXLibTests.csproj b/YAXLibTests/YAXLibTests.csproj
index 1236ca1..ff1a531 100644
--- a/YAXLibTests/YAXLibTests.csproj
+++ b/YAXLibTests/YAXLibTests.csproj
@@ -13,6 +13,10 @@
     <PackageReference Include="FluentAssertions" Version="6.12.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.1.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
   </ItemGroup>