diff --git a/Directory.Packages.props b/Directory.Packages.props
index 6c81a17..9586c2a 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -10,8 +10,8 @@
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.300" />
     <PackageVersion Include="MinVer" Version="7.0.0" />
     <PackageVersion Include="System.Reactive" Version="6.1.0" />
-    <PackageVersion Include="TUnit" Version="1.56.35" />
-    <PackageVersion Include="TUnit.Mocks" Version="1.56.35" />
-    <PackageVersion Include="TUnit.Mocks.Logging" Version="1.56.35" />
+    <PackageVersion Include="TUnit" Version="1.58.0" />
+    <PackageVersion Include="TUnit.Mocks" Version="1.58.0" />
+    <PackageVersion Include="TUnit.Mocks.Logging" Version="1.58.0" />
   </ItemGroup>
 </Project>
diff --git a/tests/DotNetQuery.Blazor.Tests/packages.lock.json b/tests/DotNetQuery.Blazor.Tests/packages.lock.json
index 23c4b69..360bbf8 100644
--- a/tests/DotNetQuery.Blazor.Tests/packages.lock.json
+++ b/tests/DotNetQuery.Blazor.Tests/packages.lock.json
@@ -41,24 +41,24 @@
       },
       "TUnit": {
         "type": "Direct",
-        "requested": "[1.56.35, )",
-        "resolved": "1.56.35",
-        "contentHash": "MIDfuoxsk98sKfipS6aTGddpBcDWL/7LPIvrzzS/meTmQPzNAyFpR0GopHjrBqddlf0O+e92GBSojb6LrFuQRA==",
+        "requested": "[1.58.0, )",
+        "resolved": "1.58.0",
+        "contentHash": "J6PqaN0o1jDYMJE15WjB7FU71zM25YOeFGasX7+kPOjqW6tRPQZqj6GN5qlL1uNE9+pdVp8GyDvZON9cVEofJg==",
         "dependencies": {
           "Microsoft.Testing.Extensions.CodeCoverage": "18.8.0",
           "Microsoft.Testing.Extensions.Telemetry": "2.2.3",
           "Microsoft.Testing.Extensions.TrxReport": "2.2.3",
-          "TUnit.Assertions": "1.56.35",
-          "TUnit.Engine": "1.56.35"
+          "TUnit.Assertions": "1.58.0",
+          "TUnit.Engine": "1.58.0"
         }
       },
       "TUnit.Mocks": {
         "type": "Direct",
-        "requested": "[1.56.35, )",
-        "resolved": "1.56.35",
-        "contentHash": "Yp42cSJL61f8wxjXB9zlSOheFs+gAXQrn2hx51YUlgM3t4yxKs/aPGLBy9QxpD/0kzHBOvhBUBrjXqRq5KnYDg==",
+        "requested": "[1.58.0, )",
+        "resolved": "1.58.0",
+        "contentHash": "0XCKudKExK7cw7O0vyhQm7yv4vRbdgWLqNpagcHdXsOGYBAASsj5IRku6brjx/YsukyHRuadWmivfrMYh0DuVw==",
         "dependencies": {
-          "TUnit.Core": "1.56.35"
+          "TUnit.Core": "1.58.0"
         }
       },
       "AngleSharp": {
@@ -432,24 +432,24 @@
       },
       "TUnit.Assertions": {
         "type": "Transitive",
-        "resolved": "1.56.35",
-        "contentHash": "VMkboWqU/yXm7dI9U4K79gtBxcivtZqcpOh3HsAIpcaJ9ax1iMg/M/MJlmRojKHi7cpBGW4YTQR+FJbPg7DuBg=="
+        "resolved": "1.58.0",
+        "contentHash": "d3eXdaxQWwUxCWSaYVXO+CM3wfNdIcdTMr2QOWsZYq8zb480YBItzAUVRFutEvEEdm5PAU2MX5dESFEzPix9Hg=="
       },
       "TUnit.Core": {
         "type": "Transitive",
-        "resolved": "1.56.35",
-        "contentHash": "9F6zv7LM+BBPG9Sav7RwQfDNL9E/GTfMzg0gOJEF5+/aRDthW1KicFBxmhoH1eoXPtV/mq6d8IZybxzQ5WRcbg=="
+        "resolved": "1.58.0",
+        "contentHash": "ktHxqXkdxMRZxPDveLgwbp3BcMwifPCd7pla8NhtVXG0743ZGiISNleo8mCQWxyOFST06BvOPzp/GEyPqo0cng=="
       },
       "TUnit.Engine": {
         "type": "Transitive",
-        "resolved": "1.56.35",
-        "contentHash": "5mI0jzwiOB/PjIbk0E0pdu7PZCIPlbca9os203wkiDbAPhcsojiduO11MZmBULW51+r/8sYgt6L7MunvHtkfSQ==",
+        "resolved": "1.58.0",
+        "contentHash": "Yihegpz5CaG582bnwt/WRczTkrgue8HzwCkQONVGM0lPLCyWQ6beSq9EHidIQE3GaQs/hNlzeJD1TYW5JPmkIg==",
         "dependencies": {
           "EnumerableAsyncProcessor": "3.8.4",
           "Microsoft.Testing.Extensions.TrxReport.Abstractions": "2.2.3",
           "Microsoft.Testing.Platform": "2.2.3",
           "Microsoft.Testing.Platform.MSBuild": "2.2.3",
-          "TUnit.Core": "1.56.35"
+          "TUnit.Core": "1.58.0"
         }
       },
       "dotnetquery.blazor": {
diff --git a/tests/DotNetQuery.Core.Tests/packages.lock.json b/tests/DotNetQuery.Core.Tests/packages.lock.json
index 60b17e9..d715b29 100644
--- a/tests/DotNetQuery.Core.Tests/packages.lock.json
+++ b/tests/DotNetQuery.Core.Tests/packages.lock.json
@@ -30,34 +30,34 @@
       },
       "TUnit": {
         "type": "Direct",
-        "requested": "[1.56.35, )",
-        "resolved": "1.56.35",
-        "contentHash": "MIDfuoxsk98sKfipS6aTGddpBcDWL/7LPIvrzzS/meTmQPzNAyFpR0GopHjrBqddlf0O+e92GBSojb6LrFuQRA==",
+        "requested": "[1.58.0, )",
+        "resolved": "1.58.0",
+        "contentHash": "J6PqaN0o1jDYMJE15WjB7FU71zM25YOeFGasX7+kPOjqW6tRPQZqj6GN5qlL1uNE9+pdVp8GyDvZON9cVEofJg==",
         "dependencies": {
           "Microsoft.Testing.Extensions.CodeCoverage": "18.8.0",
           "Microsoft.Testing.Extensions.Telemetry": "2.2.3",
           "Microsoft.Testing.Extensions.TrxReport": "2.2.3",
-          "TUnit.Assertions": "1.56.35",
-          "TUnit.Engine": "1.56.35"
+          "TUnit.Assertions": "1.58.0",
+          "TUnit.Engine": "1.58.0"
         }
       },
       "TUnit.Mocks": {
         "type": "Direct",
-        "requested": "[1.56.35, )",
-        "resolved": "1.56.35",
-        "contentHash": "Yp42cSJL61f8wxjXB9zlSOheFs+gAXQrn2hx51YUlgM3t4yxKs/aPGLBy9QxpD/0kzHBOvhBUBrjXqRq5KnYDg==",
+        "requested": "[1.58.0, )",
+        "resolved": "1.58.0",
+        "contentHash": "0XCKudKExK7cw7O0vyhQm7yv4vRbdgWLqNpagcHdXsOGYBAASsj5IRku6brjx/YsukyHRuadWmivfrMYh0DuVw==",
         "dependencies": {
-          "TUnit.Core": "1.56.35"
+          "TUnit.Core": "1.58.0"
         }
       },
       "TUnit.Mocks.Logging": {
         "type": "Direct",
-        "requested": "[1.56.35, )",
-        "resolved": "1.56.35",
-        "contentHash": "naFHlJmVz4mz0zltmwK16+3hl81cREv2NKOeLbfa4Swu4mhR9oTNv86BGgctvwzj0FjdTU4JYdif+4cjkX44Sg==",
+        "requested": "[1.58.0, )",
+        "resolved": "1.58.0",
+        "contentHash": "gVYSfnoOqEr4z4yK4d6+jfgmNt77GaXvouAFmwV1ThPwjvaW4qOZCijEcHB2LPCOnaZFAFy957x0IFyhtE5Mfw==",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "10.0.9",
-          "TUnit.Mocks": "1.56.35"
+          "TUnit.Mocks": "1.58.0"
         }
       },
       "EnumerableAsyncProcessor": {
@@ -154,24 +154,24 @@
       },
       "TUnit.Assertions": {
         "type": "Transitive",
-        "resolved": "1.56.35",
-        "contentHash": "VMkboWqU/yXm7dI9U4K79gtBxcivtZqcpOh3HsAIpcaJ9ax1iMg/M/MJlmRojKHi7cpBGW4YTQR+FJbPg7DuBg=="
+        "resolved": "1.58.0",
+        "contentHash": "d3eXdaxQWwUxCWSaYVXO+CM3wfNdIcdTMr2QOWsZYq8zb480YBItzAUVRFutEvEEdm5PAU2MX5dESFEzPix9Hg=="
       },
       "TUnit.Core": {
         "type": "Transitive",
-        "resolved": "1.56.35",
-        "contentHash": "9F6zv7LM+BBPG9Sav7RwQfDNL9E/GTfMzg0gOJEF5+/aRDthW1KicFBxmhoH1eoXPtV/mq6d8IZybxzQ5WRcbg=="
+        "resolved": "1.58.0",
+        "contentHash": "ktHxqXkdxMRZxPDveLgwbp3BcMwifPCd7pla8NhtVXG0743ZGiISNleo8mCQWxyOFST06BvOPzp/GEyPqo0cng=="
       },
       "TUnit.Engine": {
         "type": "Transitive",
-        "resolved": "1.56.35",
-        "contentHash": "5mI0jzwiOB/PjIbk0E0pdu7PZCIPlbca9os203wkiDbAPhcsojiduO11MZmBULW51+r/8sYgt6L7MunvHtkfSQ==",
+        "resolved": "1.58.0",
+        "contentHash": "Yihegpz5CaG582bnwt/WRczTkrgue8HzwCkQONVGM0lPLCyWQ6beSq9EHidIQE3GaQs/hNlzeJD1TYW5JPmkIg==",
         "dependencies": {
           "EnumerableAsyncProcessor": "3.8.4",
           "Microsoft.Testing.Extensions.TrxReport.Abstractions": "2.2.3",
           "Microsoft.Testing.Platform": "2.2.3",
           "Microsoft.Testing.Platform.MSBuild": "2.2.3",
-          "TUnit.Core": "1.56.35"
+          "TUnit.Core": "1.58.0"
         }
       },
       "dotnetquery.core": {
diff --git a/tests/DotNetQuery.Extensions.DependencyInjection.Tests/packages.lock.json b/tests/DotNetQuery.Extensions.DependencyInjection.Tests/packages.lock.json
index 7248f92..4656564 100644
--- a/tests/DotNetQuery.Extensions.DependencyInjection.Tests/packages.lock.json
+++ b/tests/DotNetQuery.Extensions.DependencyInjection.Tests/packages.lock.json
@@ -30,15 +30,15 @@
       },
       "TUnit": {
         "type": "Direct",
-        "requested": "[1.56.35, )",
-        "resolved": "1.56.35",
-        "contentHash": "MIDfuoxsk98sKfipS6aTGddpBcDWL/7LPIvrzzS/meTmQPzNAyFpR0GopHjrBqddlf0O+e92GBSojb6LrFuQRA==",
+        "requested": "[1.58.0, )",
+        "resolved": "1.58.0",
+        "contentHash": "J6PqaN0o1jDYMJE15WjB7FU71zM25YOeFGasX7+kPOjqW6tRPQZqj6GN5qlL1uNE9+pdVp8GyDvZON9cVEofJg==",
         "dependencies": {
           "Microsoft.Testing.Extensions.CodeCoverage": "18.8.0",
           "Microsoft.Testing.Extensions.Telemetry": "2.2.3",
           "Microsoft.Testing.Extensions.TrxReport": "2.2.3",
-          "TUnit.Assertions": "1.56.35",
-          "TUnit.Engine": "1.56.35"
+          "TUnit.Assertions": "1.58.0",
+          "TUnit.Engine": "1.58.0"
         }
       },
       "EnumerableAsyncProcessor": {
@@ -135,24 +135,24 @@
       },
       "TUnit.Assertions": {
         "type": "Transitive",
-        "resolved": "1.56.35",
-        "contentHash": "VMkboWqU/yXm7dI9U4K79gtBxcivtZqcpOh3HsAIpcaJ9ax1iMg/M/MJlmRojKHi7cpBGW4YTQR+FJbPg7DuBg=="
+        "resolved": "1.58.0",
+        "contentHash": "d3eXdaxQWwUxCWSaYVXO+CM3wfNdIcdTMr2QOWsZYq8zb480YBItzAUVRFutEvEEdm5PAU2MX5dESFEzPix9Hg=="
       },
       "TUnit.Core": {
         "type": "Transitive",
-        "resolved": "1.56.35",
-        "contentHash": "9F6zv7LM+BBPG9Sav7RwQfDNL9E/GTfMzg0gOJEF5+/aRDthW1KicFBxmhoH1eoXPtV/mq6d8IZybxzQ5WRcbg=="
+        "resolved": "1.58.0",
+        "contentHash": "ktHxqXkdxMRZxPDveLgwbp3BcMwifPCd7pla8NhtVXG0743ZGiISNleo8mCQWxyOFST06BvOPzp/GEyPqo0cng=="
       },
       "TUnit.Engine": {
         "type": "Transitive",
-        "resolved": "1.56.35",
-        "contentHash": "5mI0jzwiOB/PjIbk0E0pdu7PZCIPlbca9os203wkiDbAPhcsojiduO11MZmBULW51+r/8sYgt6L7MunvHtkfSQ==",
+        "resolved": "1.58.0",
+        "contentHash": "Yihegpz5CaG582bnwt/WRczTkrgue8HzwCkQONVGM0lPLCyWQ6beSq9EHidIQE3GaQs/hNlzeJD1TYW5JPmkIg==",
         "dependencies": {
           "EnumerableAsyncProcessor": "3.8.4",
           "Microsoft.Testing.Extensions.TrxReport.Abstractions": "2.2.3",
           "Microsoft.Testing.Platform": "2.2.3",
           "Microsoft.Testing.Platform.MSBuild": "2.2.3",
-          "TUnit.Core": "1.56.35"
+          "TUnit.Core": "1.58.0"
         }
       },
       "dotnetquery.core": {