diff --git a/test/DemaConsulting.ReqStream.Tests/ContextTests.cs b/test/DemaConsulting.ReqStream.Tests/ContextTests.cs
index cdcad5a..f61fd43 100644
--- a/test/DemaConsulting.ReqStream.Tests/ContextTests.cs
+++ b/test/DemaConsulting.ReqStream.Tests/ContextTests.cs
@@ -469,8 +469,8 @@ public void Context_Create_WithRequirementsPattern_ExpandsGlobPattern()
             using var context = Context.Create(["--requirements", "*.yaml"]);
 
             Assert.HasCount(2, context.RequirementsFiles);
-            Assert.IsTrue(context.RequirementsFiles.Any(f => f.EndsWith("req1.yaml")));
-            Assert.IsTrue(context.RequirementsFiles.Any(f => f.EndsWith("req2.yaml")));
+            Assert.ContainsSingle(f => f.EndsWith("req1.yaml"), context.RequirementsFiles);
+            Assert.ContainsSingle(f => f.EndsWith("req2.yaml"), context.RequirementsFiles);
             Assert.AreEqual(0, context.ExitCode);
         }
         finally
@@ -500,8 +500,8 @@ public void Context_Create_WithTestsPattern_ExpandsGlobPattern()
             using var context = Context.Create(["--tests", "*.trx"]);
 
             Assert.HasCount(2, context.TestFiles);
-            Assert.IsTrue(context.TestFiles.Any(f => f.EndsWith("test1.trx")));
-            Assert.IsTrue(context.TestFiles.Any(f => f.EndsWith("test2.trx")));
+            Assert.ContainsSingle(f => f.EndsWith("test1.trx"), context.TestFiles);
+            Assert.ContainsSingle(f => f.EndsWith("test2.trx"), context.TestFiles);
             Assert.AreEqual(0, context.ExitCode);
         }
         finally
diff --git a/test/DemaConsulting.ReqStream.Tests/RequirementsReadTests.cs b/test/DemaConsulting.ReqStream.Tests/RequirementsReadTests.cs
index a89b731..4f7b63d 100644
--- a/test/DemaConsulting.ReqStream.Tests/RequirementsReadTests.cs
+++ b/test/DemaConsulting.ReqStream.Tests/RequirementsReadTests.cs
@@ -786,17 +786,10 @@ public void Requirements_Read_MultipleFilesWithDuplicateIds_ThrowsException()
         File.WriteAllText(file1Path, file1Yaml);
         File.WriteAllText(file2Path, file2Yaml);
 
-        try
-        {
-            Requirements.Read(file1Path, file2Path);
-            Assert.Fail("Expected InvalidOperationException was not thrown");
-        }
-        catch (InvalidOperationException ex)
-        {
-            Assert.Contains("SYS-SEC-001", ex.Message);
-            Assert.Contains("Duplicate requirement ID", ex.Message);
-            Assert.Contains(file2Path, ex.Message);
-        }
+        var ex = Assert.ThrowsExactly<InvalidOperationException>(() => Requirements.Read(file1Path, file2Path));
+        Assert.Contains("SYS-SEC-001", ex.Message);
+        Assert.Contains("Duplicate requirement ID", ex.Message);
+        Assert.Contains(file2Path, ex.Message);
     }
 
     /// <summary>