diff --git a/tests/Dns.Tests/DigestRegistryTest.cs b/tests/Dns.Tests/DigestRegistryTest.cs
index a2bfaeb..2f7b44a 100644
--- a/tests/Dns.Tests/DigestRegistryTest.cs
+++ b/tests/Dns.Tests/DigestRegistryTest.cs
@@ -6,5 +6,5 @@ namespace DnsTests;
 public class DigestRegistryTest
 {
     [Test]
-    public async Task Exists() => await Assert.That(DigestRegistry.Digests).HasCount().NotEqualTo(0);
+    public async Task Exists() => await Assert.That(DigestRegistry.Digests).Count().IsNotEqualTo(0);
 }
\ No newline at end of file
diff --git a/tests/Dns.Tests/Dns.Tests.csproj b/tests/Dns.Tests/Dns.Tests.csproj
index 4ec4bb1..6a02bfc 100644
--- a/tests/Dns.Tests/Dns.Tests.csproj
+++ b/tests/Dns.Tests/Dns.Tests.csproj
@@ -16,7 +16,7 @@
         </PackageReference>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" PrivateAssets="all" />
         <PackageReference Include="SimpleBase" Version="5.6.0" />
-        <PackageReference Include="TUnit" Version="1.2.11" />
+        <PackageReference Include="TUnit" Version="1.3.15" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/tests/Dns.Tests/DomainNameTest.cs b/tests/Dns.Tests/DomainNameTest.cs
index 03c7519..562a009 100644
--- a/tests/Dns.Tests/DomainNameTest.cs
+++ b/tests/Dns.Tests/DomainNameTest.cs
@@ -10,7 +10,7 @@ public async Task Standard()
     {
         var name = new DomainName("my.example.org");
 
-        await Assert.That(name.Labels).HasCount(3);
+        await Assert.That(name.Labels).Count().IsEqualTo(3);
         await Assert.That(name.Labels[0]).IsEqualTo("my");
         await Assert.That(name.Labels[1]).IsEqualTo("example");
         await Assert.That(name.Labels[2]).IsEqualTo("org");
@@ -23,7 +23,7 @@ public async Task TopLevelDomain()
     {
         var name = new DomainName("org");
 
-        await Assert.That(name.Labels).HasCount(1);
+        await Assert.That(name.Labels).Count().IsEqualTo(1);
         await Assert.That(name.Labels[0]).IsEqualTo("org");
 
         await Assert.That(name).IsEquatableOrEqualTo("org");
@@ -34,7 +34,7 @@ public async Task Root()
     {
         var name = new DomainName("");
 
-        await Assert.That(name.Labels).HasCount().Zero();
+        await Assert.That(name.Labels).Count().IsEqualTo(0);
         await Assert.That(name).IsEquatableOrEqualTo("");
     }
 
@@ -43,7 +43,7 @@ public async Task EscapedDotCharacter()
     {
         var name = new DomainName(@"my\.example.org");
 
-        await Assert.That(name.Labels).HasCount(2);
+        await Assert.That(name.Labels).Count().IsEqualTo(2);
         await Assert.That(name.Labels[0]).IsEqualTo("my.example");
         await Assert.That(name.Labels[1]).IsEqualTo("org");
         await Assert.That(name).IsEquatableOrEqualTo(@"my\.example.org");
@@ -54,7 +54,7 @@ public async Task EscapedDotDigits()
     {
         var name = new DomainName(@"my\046example.org");
 
-        await Assert.That(name.Labels).HasCount(2);
+        await Assert.That(name.Labels).Count().IsEqualTo(2);
         await Assert.That(name.Labels[0]).IsEqualTo("my.example");
         await Assert.That(name.Labels[1]).IsEqualTo("org");
         await Assert.That(name).IsEquatableOrEqualTo(@"my\.example.org");
@@ -64,17 +64,17 @@ public async Task EscapedDotDigits()
     public async Task ImplicitParsingOfString()
     {
         DomainName name = @"my\046example.org";
-        await Assert.That(name.Labels).HasCount(2);
+        await Assert.That(name.Labels).Count().IsEqualTo(2);
         await Assert.That(name.Labels[0]).IsEqualTo("my.example");
         await Assert.That(name.Labels[1]).IsEqualTo("org");
 
         name = @"my\.example.org";
-        await Assert.That(name.Labels).HasCount(2);
+        await Assert.That(name.Labels).Count().IsEqualTo(2);
         await Assert.That(name.Labels[0]).IsEqualTo("my.example");
         await Assert.That(name.Labels[1]).IsEqualTo("org");
 
         name = "my.example.org";
-        await Assert.That(name.Labels).HasCount(3);
+        await Assert.That(name.Labels).Count().IsEqualTo(3);
         await Assert.That(name.Labels[0]).IsEqualTo("my");
         await Assert.That(name.Labels[1]).IsEqualTo("example");
         await Assert.That(name.Labels[2]).IsEqualTo("org");
@@ -85,7 +85,7 @@ public async Task FromLabels()
     {
         var name = new DomainName("my.example", "org");
 
-        await Assert.That(name.Labels).HasCount(2);
+        await Assert.That(name.Labels).Count().IsEqualTo(2);
         await Assert.That(name.Labels[0]).IsEqualTo("my.example");
         await Assert.That(name.Labels[1]).IsEqualTo("org");
         await Assert.That(name).IsEquatableOrEqualTo(@"my\.example.org");
diff --git a/tests/Dns.Tests/MessageTest.cs b/tests/Dns.Tests/MessageTest.cs
index 5daf9dc..015dabd 100644
--- a/tests/Dns.Tests/MessageTest.cs
+++ b/tests/Dns.Tests/MessageTest.cs
@@ -33,10 +33,10 @@ public async Task DecodeQuery()
         msg.Read(bytes, 0, bytes.Length);
 
         await Assert.That(msg.Id).IsEqualTo((ushort)0);
-        await Assert.That(msg.Questions).HasCount(1);
-        await Assert.That(msg.Answers).HasCount().Zero();
-        await Assert.That(msg.AuthorityRecords).HasCount().Zero();
-        await Assert.That(msg.AdditionalRecords).HasCount().Zero();
+        await Assert.That(msg.Questions).Count().IsEqualTo(1);
+        await Assert.That(msg.Answers).Count().IsEqualTo(0);
+        await Assert.That(msg.AuthorityRecords).Count().IsEqualTo(0);
+        await Assert.That(msg.AdditionalRecords).Count().IsEqualTo(0);
 
         var question = msg.Questions[0];
         await Assert.That(question.Name).IsEquatableOrEqualTo("appletv.local");
@@ -64,10 +64,10 @@ public async Task DecodeResponse()
 
         await Assert.That(msg.IsResponse).IsTrue();
         await Assert.That(msg.AA).IsTrue();
-        await Assert.That(msg.Questions).HasCount().Zero();
-        await Assert.That(msg.Answers).HasCount(1);
-        await Assert.That(msg.AuthorityRecords).HasCount().Zero();
-        await Assert.That(msg.AdditionalRecords).HasCount(2);
+        await Assert.That(msg.Questions).Count().IsEqualTo(0);
+        await Assert.That(msg.Answers).Count().IsEqualTo(1);
+        await Assert.That(msg.AuthorityRecords).Count().IsEqualTo(0);
+        await Assert.That(msg.AdditionalRecords).Count().IsEqualTo(2);
 
         await Assert.That(msg.Answers[0].Name).IsEquatableOrEqualTo("appletv.local");
         await Assert.That(msg.Answers[0].Type).IsEqualTo(DnsType.A);
@@ -133,7 +133,7 @@ public async Task Response()
         await Assert.That(response.IsResponse).IsTrue();
         await Assert.That(response.Id).IsEqualTo(query.Id);
         await Assert.That(response.Opcode).IsEqualTo(query.Opcode);
-        await Assert.That(response.Questions).HasCount(1);
+        await Assert.That(response.Questions).Count().IsEqualTo(1);
         await Assert.That(response.Questions[0]).IsEqualTo(query.Questions[0]);
     }
 
@@ -163,10 +163,10 @@ public async Task Roundtrip()
         await Assert.That(actual.Id).IsEqualTo(expected.Id);
         await Assert.That(actual.IsQuery).IsEqualTo(expected.IsQuery);
         await Assert.That(actual.IsResponse).IsEqualTo(expected.IsResponse);
-        await Assert.That(actual.Questions).HasCount(1);
-        await Assert.That(actual.Answers).HasCount(1);
-        await Assert.That(actual.AuthorityRecords).HasCount(1);
-        await Assert.That(actual.AdditionalRecords).HasCount(1);
+        await Assert.That(actual.Questions).Count().IsEqualTo(1);
+        await Assert.That(actual.Answers).Count().IsEqualTo(1);
+        await Assert.That(actual.AuthorityRecords).Count().IsEqualTo(1);
+        await Assert.That(actual.AdditionalRecords).Count().IsEqualTo(1);
     }
 
     [Test]
@@ -174,7 +174,7 @@ public async Task ExtendedOpcode()
     {
         var expected = new Message { Opcode = (MessageOperation)0xfff };
         await Assert.That(expected.Opcode).IsEqualTo((MessageOperation)0xfff);
-        await Assert.That(expected.AdditionalRecords.OfType<OPTRecord>()).HasCount(1);
+        await Assert.That(expected.AdditionalRecords.OfType<OPTRecord>()).Count().IsEqualTo(1);
 
         var actual = (Message)new Message().Read(expected.ToByteArray());
         await Assert.That(actual.Opcode).IsEqualTo(expected.Opcode);
@@ -230,8 +230,8 @@ public async Task Truncation_AdditionalRecords()
         msg.Truncate(originalLength);
         
         await Assert.That(originalLength).IsEqualTo(msg.Length());
-        await Assert.That(msg.AdditionalRecords).HasCount(1);
-        await Assert.That(msg.AuthorityRecords).HasCount(1);
+        await Assert.That(msg.AdditionalRecords).Count().IsEqualTo(1);
+        await Assert.That(msg.AuthorityRecords).Count().IsEqualTo(1);
         await Assert.That(msg.TC).IsFalse();
     }
 
@@ -248,8 +248,8 @@ public async Task AuthorityRecords()
         msg.Truncate(originalLength);
         
         await Assert.That(originalLength).IsEqualTo(msg.Length());
-        await Assert.That(msg.AdditionalRecords).HasCount().Zero();
-        await Assert.That(msg.AuthorityRecords).HasCount(1);
+        await Assert.That(msg.AdditionalRecords).Count().IsEqualTo(0);
+        await Assert.That(msg.AuthorityRecords).Count().IsEqualTo(1);
         await Assert.That(msg.TC).IsFalse();
     }
 
@@ -278,15 +278,15 @@ public async Task Dnssec_Bit()
     {
         var message = new Message();
         await Assert.That(message.DO).IsFalse();
-        await Assert.That(message.AdditionalRecords.OfType<OPTRecord>()).HasCount().Zero();
+        await Assert.That(message.AdditionalRecords.OfType<OPTRecord>()).Count().IsEqualTo(0);
 
         message.DO = false;
         await Assert.That(message.DO).IsFalse();
-        await Assert.That(message.AdditionalRecords.OfType<OPTRecord>()).HasCount(1);
+        await Assert.That(message.AdditionalRecords.OfType<OPTRecord>()).Count().IsEqualTo(1);
 
         message.DO = true;
         await Assert.That(message.DO).IsTrue();
-        await Assert.That(message.AdditionalRecords.OfType<OPTRecord>()).HasCount(1);
+        await Assert.That(message.AdditionalRecords.OfType<OPTRecord>()).Count().IsEqualTo(1);
     }
 
     [Test]
diff --git a/tests/Dns.Tests/OPTRecordTest.cs b/tests/Dns.Tests/OPTRecordTest.cs
index e00b6d7..477002b 100644
--- a/tests/Dns.Tests/OPTRecordTest.cs
+++ b/tests/Dns.Tests/OPTRecordTest.cs
@@ -16,7 +16,7 @@ public async Task Defaults()
         await Assert.That(opt.Opcode8).IsEqualTo((byte)0);
         await Assert.That(opt.Version).IsEqualTo((byte)0);
         await Assert.That(opt.DO).IsFalse();
-        await Assert.That(opt.Options).HasCount().Zero();
+        await Assert.That(opt.Options).Count().IsEqualTo(0);
     }
 
     [Test]
diff --git a/tests/Dns.Tests/PresentationReaderTest.cs b/tests/Dns.Tests/PresentationReaderTest.cs
index ffd2053..cb83927 100644
--- a/tests/Dns.Tests/PresentationReaderTest.cs
+++ b/tests/Dns.Tests/PresentationReaderTest.cs
@@ -190,7 +190,7 @@ @ PTR localhost
         await Assert.That(resource.TTL).IsEqualTo(ResourceRecord.DefaultTTL);
         await Assert.That(resource).IsTypeOf<PTRRecord>();
         await Assert.That(resource.Name).IsNotNull();
-        await Assert.That(resource.Name!.Labels).HasCount(1);
+        await Assert.That(resource.Name!.Labels).Count().IsEqualTo(1);
     }
 
     [Test]
@@ -254,7 +254,7 @@ public async Task ReadResourceWithPreviousEscapedDomain()
         await Assert.That(a.TTL).IsEqualTo(ResourceRecord.DefaultTTL);
         await Assert.That(a).IsTypeOf<ARecord>();
         await Assert.That(a.Name).IsNotNull();
-        await Assert.That(a.Name!.Labels).HasCount(2);
+        await Assert.That(a.Name!.Labels).Count().IsEqualTo(2);
 
         var aaaa = reader.ReadResourceRecord();
         await  Assert.That(aaaa).IsNotNull();
@@ -264,7 +264,7 @@ public async Task ReadResourceWithPreviousEscapedDomain()
         await Assert.That(aaaa.TTL).IsEqualTo(ResourceRecord.DefaultTTL);
         await Assert.That(aaaa).IsTypeOf<AAAARecord>();
         await Assert.That(aaaa.Name).IsNotNull();
-        await Assert.That(aaaa.Name!.Labels).HasCount(2);
+        await Assert.That(aaaa.Name!.Labels).Count().IsEqualTo(2);
     }
 
     [Test]
@@ -281,7 +281,7 @@ public async Task ReadResourceWithLeadingEscapedDomainName()
         await Assert.That(a.TTL).IsEqualTo(ResourceRecord.DefaultTTL);
         await Assert.That(a).IsTypeOf<ARecord>();
         await Assert.That(a.Name).IsNotNull();
-        await Assert.That(a.Name!.Labels).HasCount(2);
+        await Assert.That(a.Name!.Labels).Count().IsEqualTo(2);
     }
 
     [Test]
@@ -319,7 +319,7 @@ example.com.  IN  SOA   ns.example.com. username.example.com. ( 2007120710 1 2 4
             resources.Add(r);
         }
 
-        await Assert.That(resources).HasCount(15);
+        await Assert.That(resources).Count().IsEqualTo(15);
     }
 
     [Test]
@@ -327,7 +327,7 @@ public async Task ReadResourceData()
     {
         var reader = new PresentationReader(new StringReader("\\# 0"));
         var rdata = reader.ReadResourceData();
-        await Assert.That(rdata).HasCount().Zero();
+        await Assert.That(rdata).Count().IsEqualTo(0);
 
         reader = new PresentationReader(new StringReader("\\# 3 abcdef"));
         rdata = reader.ReadResourceData();
diff --git a/tests/Dns.Tests/Resolving/CachedNameServerTest.cs b/tests/Dns.Tests/Resolving/CachedNameServerTest.cs
index c0b43dc..699e9a3 100644
--- a/tests/Dns.Tests/Resolving/CachedNameServerTest.cs
+++ b/tests/Dns.Tests/Resolving/CachedNameServerTest.cs
@@ -113,13 +113,13 @@ public async Task Pruning_Background()
         };
         
         var res = await cache.ResolveAsync(query, TestContext.Current!.Execution.CancellationToken);
-        await Assert.That(res.Answers).HasCount(1);
+        await Assert.That(res.Answers).Count().IsEqualTo(1);
 
         var cts = cache.PruneContinuously(TimeSpan.FromMilliseconds(200));
         await Task.Delay(TimeSpan.FromSeconds(1), TestContext.Current.Execution.CancellationToken);
         await cts.CancelAsync();
         await Task.Delay(TimeSpan.FromMilliseconds(40), TestContext.Current.Execution.CancellationToken);
         res = await cache.ResolveAsync(query, TestContext.Current.Execution.CancellationToken);
-        await Assert.That(res.Answers).HasCount().Zero();
+        await Assert.That(res.Answers).Count().IsEqualTo(0);
     }
 }
\ No newline at end of file
diff --git a/tests/Dns.Tests/Resolving/CatalogTest.cs b/tests/Dns.Tests/Resolving/CatalogTest.cs
index a877be5..754c41c 100644
--- a/tests/Dns.Tests/Resolving/CatalogTest.cs
+++ b/tests/Dns.Tests/Resolving/CatalogTest.cs
@@ -139,19 +139,19 @@ public async Task RemoveZone()
         var reader = new PresentationReader(stringReader);
         var zone = catalog.IncludeZone(reader);
         await Assert.That(zone.Name).IsEquatableOrEqualTo("example.com");
-        await Assert.That(catalog).HasCount(7);
+        await Assert.That(catalog).Count().IsEqualTo(7);
 
         using var textReader = new StringReader(ExampleDotOrgZoneText);
         reader = new PresentationReader(textReader);
         zone = catalog.IncludeZone(reader);
         await Assert.That(zone.Name).IsEquatableOrEqualTo("example.org");
-        await Assert.That(catalog).HasCount(14);
+        await Assert.That(catalog).Count().IsEqualTo(14);
 
         catalog.RemoveZone("example.org");
-        await Assert.That(catalog).HasCount(7);
+        await Assert.That(catalog).Count().IsEqualTo(7);
 
         catalog.RemoveZone("example.com");
-        await Assert.That(catalog).HasCount().Zero();
+        await Assert.That(catalog).Count().IsEqualTo(0);
     }
 
     [Test]
@@ -199,7 +199,7 @@ public async Task AddResource_Same()
         var n2 = catalog.Add(a);
         await Assert.That(n1).IsSameReferenceAs(n2);
         await Assert.That(n1.Resources).Contains(a);
-        await Assert.That(n1.Resources).HasCount(1);
+        await Assert.That(n1.Resources).Count().IsEqualTo(1);
     }
 
     [Test]
@@ -217,7 +217,7 @@ public async Task AddResource_Duplicate()
         await Assert.That(n1).IsSameReferenceAs(n2);
         await Assert.That(n1.Resources).Contains(a);
         await Assert.That(n1.Resources).Contains(b);
-        await Assert.That(n1.Resources).HasCount(1);
+        await Assert.That(n1.Resources).Count().IsEqualTo(1);
     }
 
     [Test]
@@ -238,7 +238,7 @@ public async Task AddResource_Latest()
         await Assert.That(n1).IsSameReferenceAs(n2);
         await Assert.That(n1.Resources).Contains(a);
         await Assert.That(n1.Resources).Contains(b);
-        await Assert.That(n1.Resources).HasCount(1);
+        await Assert.That(n1.Resources).Count().IsEqualTo(1);
         await Assert.That(n1.Resources.First().CreationTime).IsEqualTo(b.CreationTime);
         await Assert.That(n1.Resources.First().TTL).IsEqualTo(b.TTL);
     }
@@ -316,7 +316,7 @@ public async Task Include()
         await Assert.That(catalog).ContainsKey("com");
 
         var node = catalog["COM"];
-        await Assert.That(node.Resources).HasCount(3);
+        await Assert.That(node.Resources).Count().IsEqualTo(3);
     }
 
     [Test]
diff --git a/tests/Dns.Tests/Resolving/NameServerTest.cs b/tests/Dns.Tests/Resolving/NameServerTest.cs
index 8e3b513..a093455 100644
--- a/tests/Dns.Tests/Resolving/NameServerTest.cs
+++ b/tests/Dns.Tests/Resolving/NameServerTest.cs
@@ -28,7 +28,7 @@ public async Task Simple()
         await Assert.That(response.IsResponse).IsTrue();
         await Assert.That(response.Status).IsEqualTo(MessageStatus.NoError);
         await Assert.That(response.AA).IsTrue();
-        await Assert.That(response.Answers).HasCount(1);
+        await Assert.That(response.Answers).Count().IsEqualTo(1);
         await Assert.That(response.Answers[0].Type).IsEqualTo(DnsType.A);
     }
 
@@ -42,7 +42,7 @@ public async Task Missing_Name()
         await Assert.That(response.IsResponse).IsTrue();
         await Assert.That(response.Status).IsEqualTo(MessageStatus.NameError);
 
-        await Assert.That(response.AuthorityRecords).HasCount().GreaterThan(0);
+        await Assert.That(response.AuthorityRecords).Count().IsGreaterThan(0);
         var authority = response.AuthorityRecords.OfType<SOARecord>().First();
         await Assert.That(authority.Name).IsEquatableOrEqualTo("example.com");
     }
@@ -79,7 +79,7 @@ public async Task AnyType()
         await Assert.That(response.IsResponse).IsTrue();
         await Assert.That(response.Status).IsEqualTo(MessageStatus.NoError);
         await Assert.That(response.AA).IsTrue();
-        await Assert.That(response.Answers).HasCount(2);
+        await Assert.That(response.Answers).Count().IsEqualTo(2);
     }
 
     [Test]
@@ -92,7 +92,7 @@ public async Task AnyClass()
         await Assert.That(response.IsResponse).IsTrue();
         await Assert.That(response.Status).IsEqualTo(MessageStatus.NoError);
         await Assert.That(response.AA).IsFalse();
-        await Assert.That(response.Answers).HasCount(1);
+        await Assert.That(response.Answers).Count().IsEqualTo(1);
     }
 
     [Test]
@@ -106,7 +106,7 @@ public async Task Alias()
         await Assert.That(response.AA).IsTrue();
         await Assert.That(response.Status).IsEqualTo(MessageStatus.NoError);
 
-        await Assert.That(response.Answers).HasCount(2);
+        await Assert.That(response.Answers).Count().IsEqualTo(2);
         await Assert.That(response.Answers[0].Type).IsEqualTo(DnsType.CNAME);
         await Assert.That(response.Answers[1].Type).IsEqualTo(DnsType.A);
     }
@@ -125,10 +125,10 @@ public async Task Alias_BadZoneTarget()
         await Assert.That(response.AA).IsTrue();
         await Assert.That(response.Status).IsEqualTo(MessageStatus.NameError);
 
-        await Assert.That(response.Answers).HasCount(1);
+        await Assert.That(response.Answers).Count().IsEqualTo(1);
         await Assert.That(response.Answers[0].Type).IsEqualTo(DnsType.CNAME);
 
-        await Assert.That(response.AuthorityRecords).HasCount(1);
+        await Assert.That(response.AuthorityRecords).Count().IsEqualTo(1);
         var authority = response.AuthorityRecords.OfType<SOARecord>().First();
         await Assert.That(authority.Name).IsEquatableOrEqualTo("example.com");
     }
@@ -147,10 +147,10 @@ public async Task Alias_BadInterZoneTarget()
         await Assert.That(response.AA).IsTrue();
         await Assert.That(response.Status).IsEqualTo(MessageStatus.NameError);
 
-        await Assert.That(response.Answers).HasCount(1);
+        await Assert.That(response.Answers).Count().IsEqualTo(1);
         await Assert.That(response.Answers[0].Type).IsEqualTo(DnsType.CNAME);
 
-        await Assert.That(response.AuthorityRecords).HasCount().Zero();
+        await Assert.That(response.AuthorityRecords).Count().IsEqualTo(0);
     }
 
     [Test]
@@ -164,7 +164,7 @@ public async Task MultipleQuestions_AnswerAny()
         await Assert.That(response.IsResponse).IsTrue();
         await Assert.That(response.Status).IsEqualTo(MessageStatus.NoError);
         await Assert.That(response.AA).IsTrue();
-        await Assert.That(response.Answers).HasCount(1);
+        await Assert.That(response.Answers).Count().IsEqualTo(1);
     }
 
     [Test]
@@ -181,7 +181,7 @@ public async Task MultipleQuestions_SomeQuestionNoAnswer_AnswerAny()
         await Assert.That(response.IsResponse).IsTrue();
         await Assert.That(response.Status).IsEqualTo(MessageStatus.NoError);
         await Assert.That(response.AA).IsTrue();
-        await Assert.That(response.Answers).HasCount(1);
+        await Assert.That(response.Answers).Count().IsEqualTo(1);
     }
 
     [Test]
@@ -196,7 +196,7 @@ public async Task MultipleQuestions_AnswerAll()
         await Assert.That(response.IsResponse).IsTrue();
         await Assert.That(response.Status).IsEqualTo(MessageStatus.NoError);
         await Assert.That(response.AA).IsTrue();
-        await Assert.That(response.Answers).HasCount(2);
+        await Assert.That(response.Answers).Count().IsEqualTo(2);
     }
 
     [Test]
@@ -213,8 +213,8 @@ public async Task MultipleQuestions_SomeQuestionNoAnswer_AnswerAll()
         await Assert.That(response.IsResponse).IsTrue();
         await Assert.That(response.Status).IsEqualTo(MessageStatus.NoError);
         await Assert.That(response.AA).IsTrue();
-        await Assert.That(response.Answers).HasCount(2);
-        await Assert.That(response.AuthorityRecords).HasCount(3);
+        await Assert.That(response.Answers).Count().IsEqualTo(2);
+        await Assert.That(response.AuthorityRecords).Count().IsEqualTo(3);
     }
 
     [Test]
@@ -228,9 +228,9 @@ public async Task AdditionalRecords_PTR_WithAddresses()
         await Assert.That(response.IsResponse).IsTrue();
         await Assert.That(response.Status).IsEqualTo(MessageStatus.NoError);
         await Assert.That(response.AA).IsTrue();
-        await Assert.That(response.Answers).HasCount(1);
+        await Assert.That(response.Answers).Count().IsEqualTo(1);
 
-        await Assert.That(response.AdditionalRecords).HasCount(2);
+        await Assert.That(response.AdditionalRecords).Count().IsEqualTo(2);
         await Assert.That(response.AdditionalRecords[0].Type).IsEqualTo(DnsType.A);
         await Assert.That(response.AdditionalRecords[0].Name).IsEquatableOrEqualTo("ns1.example.org");
     }
@@ -246,7 +246,7 @@ public async Task AdditionalRecords_PTR_WithSRV()
         await Assert.That(response.IsResponse).IsTrue();
         await Assert.That(response.Status).IsEqualTo(MessageStatus.NoError);
         await Assert.That(response.AA).IsTrue();
-        await Assert.That(response.Answers).HasCount(1);
+        await Assert.That(response.Answers).Count().IsEqualTo(1);
 
         await Assert.That(response.AdditionalRecords.Any(static a => a.Type == DnsType.SRV)).IsTrue();
         await Assert.That(response.AdditionalRecords.Any(static a => a.Type == DnsType.TXT)).IsTrue();
@@ -264,9 +264,9 @@ public async Task AdditionalRecords_NS()
         await Assert.That(response.IsResponse).IsTrue();
         await Assert.That(response.Status).IsEqualTo(MessageStatus.NoError);
         await Assert.That(response.AA).IsTrue();
-        await Assert.That(response.Answers).HasCount(2);
+        await Assert.That(response.Answers).Count().IsEqualTo(2);
 
-        await Assert.That(response.AdditionalRecords).HasCount(2);
+        await Assert.That(response.AdditionalRecords).Count().IsEqualTo(2);
         await Assert.That(response.AdditionalRecords.All(static r => r.Type == DnsType.A)).IsTrue();
     }
 
@@ -281,9 +281,9 @@ public async Task AdditionalRecords_SOA()
         await Assert.That(response.IsResponse).IsTrue();
         await Assert.That(response.Status).IsEqualTo(MessageStatus.NoError);
         await Assert.That(response.AA).IsTrue();
-        await Assert.That(response.Answers).HasCount(1);
+        await Assert.That(response.Answers).Count().IsEqualTo(1);
 
-        await Assert.That(response.AdditionalRecords).HasCount(2);
+        await Assert.That(response.AdditionalRecords).Count().IsEqualTo(2);
         await Assert.That(response.AdditionalRecords[0].Type).IsEqualTo(DnsType.A);
         await Assert.That(response.AdditionalRecords[0].Name).IsEquatableOrEqualTo("ns1.example.org");
     }
@@ -299,7 +299,7 @@ public async Task AdditionalRecords_SRV()
         await Assert.That(response.IsResponse).IsTrue();
         await Assert.That(response.Status).IsEqualTo(MessageStatus.NoError);
         await Assert.That(response.AA).IsTrue();
-        await Assert.That(response.Answers).HasCount(1);
+        await Assert.That(response.Answers).Count().IsEqualTo(1);
 
         await Assert.That(response.AdditionalRecords.OfType<TXTRecord>().Any()).IsTrue();
         await Assert.That(response.AdditionalRecords.OfType<ARecord>().Any()).IsTrue();
@@ -316,7 +316,7 @@ public async Task AdditionalRecords_A()
         await Assert.That(response.IsResponse).IsTrue();
         await Assert.That(response.Status).IsEqualTo(MessageStatus.NoError);
         await Assert.That(response.AA).IsTrue();
-        await Assert.That(response.Answers).HasCount(1);
+        await Assert.That(response.Answers).Count().IsEqualTo(1);
         await Assert.That(response.Answers).All(static r => r.Type == DnsType.A);
 
         await Assert.That(response.AdditionalRecords).Any(static r => r.Name == "example.com" && r.Type == DnsType.AAAA);
@@ -333,7 +333,7 @@ public async Task AdditionalRecords_AAAA()
         await Assert.That(response.IsResponse).IsTrue();
         await Assert.That(response.Status).IsEqualTo(MessageStatus.NoError);
         await Assert.That(response.AA).IsTrue();
-        await Assert.That(response.Answers).HasCount(1);
+        await Assert.That(response.Answers).Count().IsEqualTo(1);
         await Assert.That(response.Answers).All(static r => r.Type == DnsType.AAAA);
 
         await Assert.That(response.AdditionalRecords).Any(static r => r.Name == "example.com" && r.Type == DnsType.A);
@@ -352,9 +352,9 @@ public async Task AdditionalRecords_NoDuplicates()
         await Assert.That(response.IsResponse).IsTrue();
         await Assert.That(response.Status).IsEqualTo(MessageStatus.NoError);
         await Assert.That(response.AA).IsTrue();
-        await Assert.That(response.Answers).HasCount(4);
+        await Assert.That(response.Answers).Count().IsEqualTo(4);
 
-        await Assert.That(response.AdditionalRecords).HasCount().Zero();
+        await Assert.That(response.AdditionalRecords).Count().IsEqualTo(0);
     }
 
     [Test]
diff --git a/tests/Dns.Tests/Resolving/NodeTest.cs b/tests/Dns.Tests/Resolving/NodeTest.cs
index f215d7e..ee40e8a 100644
--- a/tests/Dns.Tests/Resolving/NodeTest.cs
+++ b/tests/Dns.Tests/Resolving/NodeTest.cs
@@ -12,7 +12,7 @@ public async Task Defaults()
         var node = new Node();
 
         await Assert.That(node.Name).IsEqualTo(DomainName.Root);
-        await Assert.That(node.Resources).HasCount().Zero();
+        await Assert.That(node.Resources).Count().IsEqualTo(0);
         await Assert.That(node.ToString()).IsEqualTo("");
     }
 
@@ -29,6 +29,6 @@ public async Task DuplicateResources()
         node.Resources.Add(b);
         node.Resources.Add(a);
         node.Resources.Add(b);
-        await Assert.That(node.Resources).HasCount(1);
+        await Assert.That(node.Resources).Count().IsEqualTo(1);
     }
 }
\ No newline at end of file
diff --git a/tests/Dns.Tests/Resolving/SecureNameServerTest.cs b/tests/Dns.Tests/Resolving/SecureNameServerTest.cs
index d380918..4e6187b 100644
--- a/tests/Dns.Tests/Resolving/SecureNameServerTest.cs
+++ b/tests/Dns.Tests/Resolving/SecureNameServerTest.cs
@@ -70,12 +70,12 @@ public async Task SecureQueryHasSignature()
         await Assert.That(response.AA).IsTrue();
         await Assert.That(response.DO).IsTrue();
 
-        await Assert.That(response.Answers).HasCount(2);
-        await Assert.That(response.Answers.OfType<MXRecord>()).HasCount(1);
-        await Assert.That(response.Answers.OfType<RRSIGRecord>()).HasCount(1);
+        await Assert.That(response.Answers).Count().IsEqualTo(2);
+        await Assert.That(response.Answers.OfType<MXRecord>()).Count().IsEqualTo(1);
+        await Assert.That(response.Answers.OfType<RRSIGRecord>()).Count().IsEqualTo(1);
 
-        await Assert.That(response.AuthorityRecords).HasCount(3);
-        await Assert.That(response.AuthorityRecords.OfType<NSRecord>()).HasCount(2);
-        await Assert.That(response.AuthorityRecords.OfType<RRSIGRecord>()).HasCount(1);
+        await Assert.That(response.AuthorityRecords).Count().IsEqualTo(3);
+        await Assert.That(response.AuthorityRecords.OfType<NSRecord>()).Count().IsEqualTo(2);
+        await Assert.That(response.AuthorityRecords.OfType<RRSIGRecord>()).Count().IsEqualTo(1);
     }
 }
\ No newline at end of file
diff --git a/tests/Dns.Tests/ResourceRecordTest.cs b/tests/Dns.Tests/ResourceRecordTest.cs
index c4ca917..f994d75 100644
--- a/tests/Dns.Tests/ResourceRecordTest.cs
+++ b/tests/Dns.Tests/ResourceRecordTest.cs
@@ -38,7 +38,7 @@ public async Task Data()
     {
         var rr = new ResourceRecord();
 
-        await Assert.That(rr.GetData()).HasCount().Zero();
+        await Assert.That(rr.GetData()).Count().IsEqualTo(0);
     }
 
     [Test]
@@ -46,7 +46,7 @@ public async Task Data_DerivedClass()
     {
         var a = new ARecord { Address = IPAddress.Parse("127.0.0.1") };
 
-        await Assert.That(a.GetData()).HasCount().NotEqualTo(0);
+        await Assert.That(a.GetData()).Count().IsNotEqualTo(0);
     }
 
     [Test]
diff --git a/tests/Dns.Tests/ResourceRegistryTest.cs b/tests/Dns.Tests/ResourceRegistryTest.cs
index ba68fa6..f3cd384 100644
--- a/tests/Dns.Tests/ResourceRegistryTest.cs
+++ b/tests/Dns.Tests/ResourceRegistryTest.cs
@@ -7,7 +7,7 @@ namespace DnsTests;
 public class ResourceRegistryTest
 {
     [Test]
-    public async Task Exists() => await Assert.That(ResourceRegistry.Records).HasCount().NotEqualTo(0);
+    public async Task Exists() => await Assert.That(ResourceRegistry.Records).Count().IsNotEqualTo(0);
 
     [Test]
     public async Task Create()
diff --git a/tests/Dns.Tests/SecureAlgorithmRegistryTest.cs b/tests/Dns.Tests/SecureAlgorithmRegistryTest.cs
index 57caa34..b4b36a0 100644
--- a/tests/Dns.Tests/SecureAlgorithmRegistryTest.cs
+++ b/tests/Dns.Tests/SecureAlgorithmRegistryTest.cs
@@ -8,7 +8,7 @@ namespace DnsTests;
 public class SecurityAlgorithmRegistryTest
 {
     [Test]
-    public async Task Exists() => await Assert.That(SecurityAlgorithmRegistry.Algorithms).HasCount().NotEqualTo(0);
+    public async Task Exists() => await Assert.That(SecurityAlgorithmRegistry.Algorithms).Count().IsNotEqualTo(0);
 
     [Test]
     public async Task RSASHA1()
diff --git a/tests/Dns.Tests/UpdateMessageTest.cs b/tests/Dns.Tests/UpdateMessageTest.cs
index bf7a8d7..f697155 100644
--- a/tests/Dns.Tests/UpdateMessageTest.cs
+++ b/tests/Dns.Tests/UpdateMessageTest.cs
@@ -12,15 +12,15 @@ public async Task Defaults()
     {
         var m = new UpdateMessage();
         
-        await Assert.That(m.AdditionalResources).HasCount().Zero();
+        await Assert.That(m.AdditionalResources).Count().IsEqualTo(0);
         await Assert.That(m.Id).IsEqualTo((ushort)0);
         await Assert.That(m.IsResponse).IsFalse();
         await Assert.That(m.IsUpdate).IsTrue();
         await Assert.That(m.Opcode).IsEqualTo(MessageOperation.Update);
-        await Assert.That(m.Prerequisites).HasCount().Zero();
+        await Assert.That(m.Prerequisites).Count().IsEqualTo(0);
         await Assert.That(m.QR).IsFalse();
         await Assert.That(m.Status).IsEqualTo(MessageStatus.NoError);
-        await Assert.That(m.Updates).HasCount().Zero();
+        await Assert.That(m.Updates).Count().IsEqualTo(0);
         await Assert.That(m.Z).IsEqualTo(0);
         await Assert.That(m.Zone).IsNotNull();
         await Assert.That(m.Zone.Type).IsEqualTo(DnsType.SOA);
diff --git a/tests/Dns.Tests/UpdatePrerequisiteListTest.cs b/tests/Dns.Tests/UpdatePrerequisiteListTest.cs
index 42348c7..6b6d43b 100644
--- a/tests/Dns.Tests/UpdatePrerequisiteListTest.cs
+++ b/tests/Dns.Tests/UpdatePrerequisiteListTest.cs
@@ -12,7 +12,7 @@ public async Task MustExist_Name()
     {
         var prerequisites = new UpdatePrerequisiteList()
             .MustExist("www.example.org");
-        await Assert.That(prerequisites).HasCount(1);
+        await Assert.That(prerequisites).Count().IsEqualTo(1);
         var p = prerequisites[0];
 
         await Assert.That(p).IsNotNull();
@@ -28,7 +28,7 @@ public async Task MustExist_Name_Type()
     {
         var prerequisites = new UpdatePrerequisiteList()
             .MustExist("www.example.org", DnsType.A);
-        await Assert.That(prerequisites).HasCount(1);
+        await Assert.That(prerequisites).Count().IsEqualTo(1);
         var p = prerequisites[0];
 
         await Assert.That(p).IsNotNull();
@@ -44,7 +44,7 @@ public async Task MustExist_Name_Typename()
     {
         var prerequisites = new UpdatePrerequisiteList()
             .MustExist<ARecord>("www.example.org");
-        await Assert.That(prerequisites).HasCount(1);
+        await Assert.That(prerequisites).Count().IsEqualTo(1);
         var p = prerequisites[0];
 
         await Assert.That(p).IsNotNull();
@@ -66,7 +66,7 @@ public async Task MustExist_ResourceRecord()
         };
         var prerequisites = new UpdatePrerequisiteList()
             .MustExist(rr);
-        await Assert.That(prerequisites).HasCount(1);
+        await Assert.That(prerequisites).Count().IsEqualTo(1);
         var p = prerequisites[0];
 
         await Assert.That(p).IsNotNull();
@@ -83,7 +83,7 @@ public async Task MustNotExist_Name()
     {
         var prerequisites = new UpdatePrerequisiteList()
             .MustNotExist("www.example.org");
-        await Assert.That(prerequisites).HasCount(1);
+        await Assert.That(prerequisites).Count().IsEqualTo(1);
         var p = prerequisites[0];
 
         await Assert.That(p).IsNotNull();
@@ -99,7 +99,7 @@ public async Task MustNotExist_Name_Type()
     {
         var prerequisites = new UpdatePrerequisiteList()
             .MustNotExist("www.example.org", DnsType.A);
-        await Assert.That(prerequisites).HasCount(1);
+        await Assert.That(prerequisites).Count().IsEqualTo(1);
         var p = prerequisites[0];
 
         await Assert.That(p).IsNotNull();
@@ -115,7 +115,7 @@ public async Task MustNotExist_Name_Typename()
     {
         var prerequisites = new UpdatePrerequisiteList()
             .MustNotExist<ARecord>("www.example.org");
-        await Assert.That(prerequisites).HasCount(1);
+        await Assert.That(prerequisites).Count().IsEqualTo(1);
         var p = prerequisites[0];
 
         await Assert.That(p).IsNotNull();
diff --git a/tests/Dns.Tests/UpdateResourceListTest.cs b/tests/Dns.Tests/UpdateResourceListTest.cs
index a75d0fa..51dd999 100644
--- a/tests/Dns.Tests/UpdateResourceListTest.cs
+++ b/tests/Dns.Tests/UpdateResourceListTest.cs
@@ -19,7 +19,7 @@ public async Task AddResource()
 
         var updates = new UpdateResourceList()
             .AddResource(rr);
-        await Assert.That(updates).HasCount(1);
+        await Assert.That(updates).Count().IsEqualTo(1);
         var p = updates[0];
 
         await Assert.That(p).IsNotNull();
@@ -36,7 +36,7 @@ public async Task DeleteResource_Name()
     {
         var updates = new UpdateResourceList()
             .DeleteResource("www.example.org");
-        await Assert.That(updates).HasCount(1);
+        await Assert.That(updates).Count().IsEqualTo(1);
         var p = updates[0];
 
         await Assert.That(p).IsNotNull();
@@ -52,7 +52,7 @@ public async Task DeleteResource_Name_Type()
     {
         var updates = new UpdateResourceList()
             .DeleteResource("www.example.org", DnsType.A);
-        await Assert.That(updates).HasCount(1);
+        await Assert.That(updates).Count().IsEqualTo(1);
         var p = updates[0];
 
         await Assert.That(p).IsNotNull();
@@ -68,7 +68,7 @@ public async Task DeleteResource_Name_Typename()
     {
         var updates = new UpdateResourceList()
             .DeleteResource<ARecord>("www.example.org");
-        await Assert.That(updates).HasCount(1);
+        await Assert.That(updates).Count().IsEqualTo(1);
         var p = updates[0];
 
         await Assert.That(p).IsNotNull();
@@ -91,7 +91,7 @@ public async Task DeleteResource()
 
         var updates = new UpdateResourceList()
             .DeleteResource(rr);
-        await Assert.That(updates).HasCount(1);
+        await Assert.That(updates).Count().IsEqualTo(1);
         var p = updates[0];
 
         await Assert.That(p).IsNotNull();
diff --git a/tests/Mdns.Tests/Mdns.Tests.csproj b/tests/Mdns.Tests/Mdns.Tests.csproj
index 95a1629..c269d3f 100644
--- a/tests/Mdns.Tests/Mdns.Tests.csproj
+++ b/tests/Mdns.Tests/Mdns.Tests.csproj
@@ -15,7 +15,7 @@
         </PackageReference>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" PrivateAssets="all" />
         <PackageReference Include="Moq" Version="4.20.72" />
-        <PackageReference Include="TUnit" Version="1.2.11" />
+        <PackageReference Include="TUnit" Version="1.3.15" />
     </ItemGroup>
     
     <ItemGroup>
diff --git a/tests/Mdns.Tests/ServiceProfileTest.cs b/tests/Mdns.Tests/ServiceProfileTest.cs
index a62a2e3..5adfda0 100644
--- a/tests/Mdns.Tests/ServiceProfileTest.cs
+++ b/tests/Mdns.Tests/ServiceProfileTest.cs
@@ -95,7 +95,7 @@ public async Task TTLs()
     public async Task Subtypes()
     {
         var service = new ServiceProfile("x", "_sdtest._udp", 1024);
-        await Assert.That(service.Subtypes).HasCount().Zero();
+        await Assert.That(service.Subtypes).Count().IsEqualTo(0);
     }
 
     [Test]