diff --git a/NetSdrClientAppTests/NetSdrMessageHelperTests.cs b/NetSdrClientAppTests/NetSdrMessageHelperTests.cs
index 947765c..d4b0270 100644
--- a/NetSdrClientAppTests/NetSdrMessageHelperTests.cs
+++ b/NetSdrClientAppTests/NetSdrMessageHelperTests.cs
@@ -120,7 +120,7 @@ public void GetSamples_ValidInput_ReturnsCorrectIntegers()
             // Assert
             Assert.Multiple(() =>
             {
-                Assert.That(samples.Count, Is.EqualTo(3));
+                Assert.That(samples, Has.Count.EqualTo(3));
                 Assert.That(samples[0], Is.EqualTo(1));
                 Assert.That(samples[1], Is.EqualTo(2));
                 Assert.That(samples[2], Is.EqualTo(255));
@@ -172,7 +172,7 @@ public void GetSamples_8BitSamples_HandlesPrefixBytes()
             var samples = NetSdrMessageHelper.GetSamples(sampleSizeBits, body).ToList();
 
             Assert.Multiple(() => {
-                Assert.That(samples.Count, Is.EqualTo(3));
+                Assert.That(samples, Has.Count.EqualTo(3));
                 Assert.That(samples[0], Is.EqualTo(1));
                 Assert.That(samples[2], Is.EqualTo(3));
             });
@@ -187,10 +187,10 @@ public void GetSamples_24BitSamples_HandlesPrefixBytes()
             var samples = NetSdrMessageHelper.GetSamples(sampleSizeBits, body).ToList();
 
             Assert.Multiple(() => {
-                Assert.That(samples.Count, Is.EqualTo(2));
+                Assert.That(samples, Has.Count.EqualTo(2));
                 Assert.That(samples[0], Is.EqualTo(1));
                 Assert.That(samples[1], Is.EqualTo(2));
             });
         }
     }
-}
\ No newline at end of file
+}