From 726a246a6d37124fdf7b77df18ebe7cd77a93c64 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Wed, 28 Jan 2026 09:45:39 +0000
Subject: [PATCH 01/12] Moving Jeebs extensions tests to match project layout -
 #531

---
 .../{_ => Extensions}/DateTimeExtensions/EndOfDay_Tests.cs        | 0
 .../{_ => Extensions}/DateTimeExtensions/FirstDayOfMonth_Tests.cs | 0
 .../{_ => Extensions}/DateTimeExtensions/FirstDayOfWeek_Tests.cs  | 0
 .../{_ => Extensions}/DateTimeExtensions/LastDayOfMonth_Tests.cs  | 0
 .../{_ => Extensions}/DateTimeExtensions/LastDayOfWeek_Tests.cs   | 0
 .../{_ => Extensions}/DateTimeExtensions/StartOfDay_Tests.cs      | 0
 .../DateTimeExtensions/ToSortableString_Tests.cs                  | 0
 .../DateTimeExtensions/ToStandardString_Tests.cs                  | 0
 .../{_ => Extensions}/ResultExtensions/LogAsync_Tests.cs          | 0
 .../{_ => Extensions}/ResultExtensions/LogBoolAsync_Tests.cs      | 0
 .../{_ => Extensions}/ResultExtensions/LogBool_Tests.cs           | 0
 tests/Tests.Jeebs/{_ => Extensions}/ResultExtensions/Log_Tests.cs | 0
 .../TypeExtensions/ImplementsGenericClass_Tests.cs                | 0
 .../TypeExtensions/ImplementsGenericInterface_Tests.cs            | 0
 .../{_ => Extensions}/TypeExtensions/Implements_Tests0.cs         | 0
 .../{_ => Extensions}/TypeExtensions/Implements_Tests1.cs         | 0
 16 files changed, 0 insertions(+), 0 deletions(-)
 rename tests/Tests.Jeebs/{_ => Extensions}/DateTimeExtensions/EndOfDay_Tests.cs (100%)
 rename tests/Tests.Jeebs/{_ => Extensions}/DateTimeExtensions/FirstDayOfMonth_Tests.cs (100%)
 rename tests/Tests.Jeebs/{_ => Extensions}/DateTimeExtensions/FirstDayOfWeek_Tests.cs (100%)
 rename tests/Tests.Jeebs/{_ => Extensions}/DateTimeExtensions/LastDayOfMonth_Tests.cs (100%)
 rename tests/Tests.Jeebs/{_ => Extensions}/DateTimeExtensions/LastDayOfWeek_Tests.cs (100%)
 rename tests/Tests.Jeebs/{_ => Extensions}/DateTimeExtensions/StartOfDay_Tests.cs (100%)
 rename tests/Tests.Jeebs/{_ => Extensions}/DateTimeExtensions/ToSortableString_Tests.cs (100%)
 rename tests/Tests.Jeebs/{_ => Extensions}/DateTimeExtensions/ToStandardString_Tests.cs (100%)
 rename tests/Tests.Jeebs/{_ => Extensions}/ResultExtensions/LogAsync_Tests.cs (100%)
 rename tests/Tests.Jeebs/{_ => Extensions}/ResultExtensions/LogBoolAsync_Tests.cs (100%)
 rename tests/Tests.Jeebs/{_ => Extensions}/ResultExtensions/LogBool_Tests.cs (100%)
 rename tests/Tests.Jeebs/{_ => Extensions}/ResultExtensions/Log_Tests.cs (100%)
 rename tests/Tests.Jeebs/{_ => Extensions}/TypeExtensions/ImplementsGenericClass_Tests.cs (100%)
 rename tests/Tests.Jeebs/{_ => Extensions}/TypeExtensions/ImplementsGenericInterface_Tests.cs (100%)
 rename tests/Tests.Jeebs/{_ => Extensions}/TypeExtensions/Implements_Tests0.cs (100%)
 rename tests/Tests.Jeebs/{_ => Extensions}/TypeExtensions/Implements_Tests1.cs (100%)

diff --git a/tests/Tests.Jeebs/_/DateTimeExtensions/EndOfDay_Tests.cs b/tests/Tests.Jeebs/Extensions/DateTimeExtensions/EndOfDay_Tests.cs
similarity index 100%
rename from tests/Tests.Jeebs/_/DateTimeExtensions/EndOfDay_Tests.cs
rename to tests/Tests.Jeebs/Extensions/DateTimeExtensions/EndOfDay_Tests.cs
diff --git a/tests/Tests.Jeebs/_/DateTimeExtensions/FirstDayOfMonth_Tests.cs b/tests/Tests.Jeebs/Extensions/DateTimeExtensions/FirstDayOfMonth_Tests.cs
similarity index 100%
rename from tests/Tests.Jeebs/_/DateTimeExtensions/FirstDayOfMonth_Tests.cs
rename to tests/Tests.Jeebs/Extensions/DateTimeExtensions/FirstDayOfMonth_Tests.cs
diff --git a/tests/Tests.Jeebs/_/DateTimeExtensions/FirstDayOfWeek_Tests.cs b/tests/Tests.Jeebs/Extensions/DateTimeExtensions/FirstDayOfWeek_Tests.cs
similarity index 100%
rename from tests/Tests.Jeebs/_/DateTimeExtensions/FirstDayOfWeek_Tests.cs
rename to tests/Tests.Jeebs/Extensions/DateTimeExtensions/FirstDayOfWeek_Tests.cs
diff --git a/tests/Tests.Jeebs/_/DateTimeExtensions/LastDayOfMonth_Tests.cs b/tests/Tests.Jeebs/Extensions/DateTimeExtensions/LastDayOfMonth_Tests.cs
similarity index 100%
rename from tests/Tests.Jeebs/_/DateTimeExtensions/LastDayOfMonth_Tests.cs
rename to tests/Tests.Jeebs/Extensions/DateTimeExtensions/LastDayOfMonth_Tests.cs
diff --git a/tests/Tests.Jeebs/_/DateTimeExtensions/LastDayOfWeek_Tests.cs b/tests/Tests.Jeebs/Extensions/DateTimeExtensions/LastDayOfWeek_Tests.cs
similarity index 100%
rename from tests/Tests.Jeebs/_/DateTimeExtensions/LastDayOfWeek_Tests.cs
rename to tests/Tests.Jeebs/Extensions/DateTimeExtensions/LastDayOfWeek_Tests.cs
diff --git a/tests/Tests.Jeebs/_/DateTimeExtensions/StartOfDay_Tests.cs b/tests/Tests.Jeebs/Extensions/DateTimeExtensions/StartOfDay_Tests.cs
similarity index 100%
rename from tests/Tests.Jeebs/_/DateTimeExtensions/StartOfDay_Tests.cs
rename to tests/Tests.Jeebs/Extensions/DateTimeExtensions/StartOfDay_Tests.cs
diff --git a/tests/Tests.Jeebs/_/DateTimeExtensions/ToSortableString_Tests.cs b/tests/Tests.Jeebs/Extensions/DateTimeExtensions/ToSortableString_Tests.cs
similarity index 100%
rename from tests/Tests.Jeebs/_/DateTimeExtensions/ToSortableString_Tests.cs
rename to tests/Tests.Jeebs/Extensions/DateTimeExtensions/ToSortableString_Tests.cs
diff --git a/tests/Tests.Jeebs/_/DateTimeExtensions/ToStandardString_Tests.cs b/tests/Tests.Jeebs/Extensions/DateTimeExtensions/ToStandardString_Tests.cs
similarity index 100%
rename from tests/Tests.Jeebs/_/DateTimeExtensions/ToStandardString_Tests.cs
rename to tests/Tests.Jeebs/Extensions/DateTimeExtensions/ToStandardString_Tests.cs
diff --git a/tests/Tests.Jeebs/_/ResultExtensions/LogAsync_Tests.cs b/tests/Tests.Jeebs/Extensions/ResultExtensions/LogAsync_Tests.cs
similarity index 100%
rename from tests/Tests.Jeebs/_/ResultExtensions/LogAsync_Tests.cs
rename to tests/Tests.Jeebs/Extensions/ResultExtensions/LogAsync_Tests.cs
diff --git a/tests/Tests.Jeebs/_/ResultExtensions/LogBoolAsync_Tests.cs b/tests/Tests.Jeebs/Extensions/ResultExtensions/LogBoolAsync_Tests.cs
similarity index 100%
rename from tests/Tests.Jeebs/_/ResultExtensions/LogBoolAsync_Tests.cs
rename to tests/Tests.Jeebs/Extensions/ResultExtensions/LogBoolAsync_Tests.cs
diff --git a/tests/Tests.Jeebs/_/ResultExtensions/LogBool_Tests.cs b/tests/Tests.Jeebs/Extensions/ResultExtensions/LogBool_Tests.cs
similarity index 100%
rename from tests/Tests.Jeebs/_/ResultExtensions/LogBool_Tests.cs
rename to tests/Tests.Jeebs/Extensions/ResultExtensions/LogBool_Tests.cs
diff --git a/tests/Tests.Jeebs/_/ResultExtensions/Log_Tests.cs b/tests/Tests.Jeebs/Extensions/ResultExtensions/Log_Tests.cs
similarity index 100%
rename from tests/Tests.Jeebs/_/ResultExtensions/Log_Tests.cs
rename to tests/Tests.Jeebs/Extensions/ResultExtensions/Log_Tests.cs
diff --git a/tests/Tests.Jeebs/_/TypeExtensions/ImplementsGenericClass_Tests.cs b/tests/Tests.Jeebs/Extensions/TypeExtensions/ImplementsGenericClass_Tests.cs
similarity index 100%
rename from tests/Tests.Jeebs/_/TypeExtensions/ImplementsGenericClass_Tests.cs
rename to tests/Tests.Jeebs/Extensions/TypeExtensions/ImplementsGenericClass_Tests.cs
diff --git a/tests/Tests.Jeebs/_/TypeExtensions/ImplementsGenericInterface_Tests.cs b/tests/Tests.Jeebs/Extensions/TypeExtensions/ImplementsGenericInterface_Tests.cs
similarity index 100%
rename from tests/Tests.Jeebs/_/TypeExtensions/ImplementsGenericInterface_Tests.cs
rename to tests/Tests.Jeebs/Extensions/TypeExtensions/ImplementsGenericInterface_Tests.cs
diff --git a/tests/Tests.Jeebs/_/TypeExtensions/Implements_Tests0.cs b/tests/Tests.Jeebs/Extensions/TypeExtensions/Implements_Tests0.cs
similarity index 100%
rename from tests/Tests.Jeebs/_/TypeExtensions/Implements_Tests0.cs
rename to tests/Tests.Jeebs/Extensions/TypeExtensions/Implements_Tests0.cs
diff --git a/tests/Tests.Jeebs/_/TypeExtensions/Implements_Tests1.cs b/tests/Tests.Jeebs/Extensions/TypeExtensions/Implements_Tests1.cs
similarity index 100%
rename from tests/Tests.Jeebs/_/TypeExtensions/Implements_Tests1.cs
rename to tests/Tests.Jeebs/Extensions/TypeExtensions/Implements_Tests1.cs

From fdde59499818466fe0f8f87d396de10d1cba0069 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Wed, 28 Jan 2026 10:19:05 +0000
Subject: [PATCH 02/12] Don't suggest primary constructors in tests - #531

---
 tests/.editorconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/.editorconfig b/tests/.editorconfig
index 47127de6c..ab2d01d94 100644
--- a/tests/.editorconfig
+++ b/tests/.editorconfig
@@ -39,6 +39,9 @@ dotnet_diagnostic.IDE0053.severity = none
 # IDE0058: Expression value is never used
 dotnet_diagnostic.IDE0058.severity = none
 
+# IDE0290: Use primary constructor
+dotnet_diagnostic.IDE0290.severity = none
+
 # IDE1006: Naming Styles
 dotnet_diagnostic.IDE1006.severity = none
 

From 1c8b46a41e6343ba9d61393cf04296c8211218b5 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Wed, 28 Jan 2026 17:41:32 +0000
Subject: [PATCH 03/12] Using Record.Exception - #531

---
 .../_/CompareExtensions/ToOperator_Tests.cs   |  4 +-
 .../TypeHandlers/Json/Parse_Tests.cs          |  8 ++--
 .../_/CompareExtensions/ToOperator_Tests.cs   |  4 +-
 .../_/CompareExtensions/ToOperator_Tests.cs   |  4 +-
 .../_/CompareExtensions/ToOperator_Tests.cs   |  4 +-
 .../QueryBuilderWithFrom/CheckTable_Tests.cs  |  4 +-
 .../_/QueryBuilderWithFrom/Join_Tests.cs      |  4 +-
 .../_/QueryBuilderWithFrom/Where_Tests.cs     |  4 +-
 .../QueryPartsBuilderWithEntity/Map_Tests.cs  |  5 +--
 .../AssertCollection_Tests.cs                 | 12 +++---
 .../AssertEqualJson_Tests.cs                  |  8 ++--
 .../FluentQueryHelper/AssertEqual_Tests.cs    |  4 +-
 .../FluentQueryHelper/AssertExecute_Tests.cs  | 15 ++++---
 .../AssertGenericArgument_Tests.cs            | 16 ++++----
 .../AssertMethodName_Tests.cs                 |  4 +-
 .../AssertPropertyExpression_Tests.cs         |  8 ++--
 .../FluentQueryHelper/AssertWhereIn_Tests.cs  | 15 ++++---
 .../AssertWhereNotIn_Tests.cs                 | 15 ++++---
 .../FluentQueryHelper/AssertWhere_Tests.cs    | 40 +++++++++++--------
 .../Map/_/EntityMapper/Map_Tests.cs           | 24 +++++------
 .../TypeHandlers/Guid/Parse_Tests.cs          |  4 +-
 .../TypeHandlers/Json/Parse_Tests.cs          |  8 ++--
 .../TypeHandlers/Boolean/SetValue_Tests.cs    |  4 +-
 23 files changed, 117 insertions(+), 101 deletions(-)

diff --git a/tests/Tests.Jeebs.Data.Clients.MySql/_/CompareExtensions/ToOperator_Tests.cs b/tests/Tests.Jeebs.Data.Clients.MySql/_/CompareExtensions/ToOperator_Tests.cs
index c2cababd1..8c204cc9b 100644
--- a/tests/Tests.Jeebs.Data.Clients.MySql/_/CompareExtensions/ToOperator_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Clients.MySql/_/CompareExtensions/ToOperator_Tests.cs
@@ -135,9 +135,9 @@ public void Other_Throws_UnrecognisedSearchOperatorException(int input)
 		var value = (Compare)input;
 
 		// Act
-		var action = void () => value.ToOperator();
+		var result = Record.Exception(() => value.ToOperator());
 
 		// Assert
-		Assert.Throws<UnrecognisedSearchOperatorException>(action);
+		Assert.IsType<UnrecognisedSearchOperatorException>(result);
 	}
 }
diff --git a/tests/Tests.Jeebs.Data.Clients.PostgreSql/TypeHandlers/Json/Parse_Tests.cs b/tests/Tests.Jeebs.Data.Clients.PostgreSql/TypeHandlers/Json/Parse_Tests.cs
index b586c5220..540b7ed11 100644
--- a/tests/Tests.Jeebs.Data.Clients.PostgreSql/TypeHandlers/Json/Parse_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Clients.PostgreSql/TypeHandlers/Json/Parse_Tests.cs
@@ -18,10 +18,10 @@ public void Null_Or_Whitespace_Throws_JsonException(string input)
 		var handler = new JsonbTypeHandler<Test>();
 
 		// Act
-		var action = void () => handler.Parse(input);
+		var result = Record.Exception(() => handler.Parse(input));
 
 		// Assert
-		Assert.Throws<JsonException>(action);
+		Assert.IsType<JsonException>(result);
 	}
 
 	[Fact]
@@ -32,10 +32,10 @@ public void InvalidJson_Throws_JsonException()
 		var input = Rnd.Str;
 
 		// Act
-		var action = void () => handler.Parse(input);
+		var result = Record.Exception(() => handler.Parse(input));
 
 		// Assert
-		var ex = Assert.Throws<FailureException>(action);
+		var ex = Assert.IsType<FailureException>(result);
 		Assert.IsType<JsonException>(ex.InnerException);
 	}
 
diff --git a/tests/Tests.Jeebs.Data.Clients.PostgreSql/_/CompareExtensions/ToOperator_Tests.cs b/tests/Tests.Jeebs.Data.Clients.PostgreSql/_/CompareExtensions/ToOperator_Tests.cs
index 29f44a72b..b8b2ecc3d 100644
--- a/tests/Tests.Jeebs.Data.Clients.PostgreSql/_/CompareExtensions/ToOperator_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Clients.PostgreSql/_/CompareExtensions/ToOperator_Tests.cs
@@ -135,9 +135,9 @@ public void Other_Throws_UnrecognisedSearchOperatorException(int input)
 		var value = (Compare)input;
 
 		// Act
-		var action = void () => value.ToOperator();
+		var result = Record.Exception(() => value.ToOperator());
 
 		// Assert
-		Assert.Throws<UnrecognisedSearchOperatorException>(action);
+		Assert.IsType<UnrecognisedSearchOperatorException>(result);
 	}
 }
diff --git a/tests/Tests.Jeebs.Data.Clients.SqlServer/_/CompareExtensions/ToOperator_Tests.cs b/tests/Tests.Jeebs.Data.Clients.SqlServer/_/CompareExtensions/ToOperator_Tests.cs
index b030b4a3a..408814f08 100644
--- a/tests/Tests.Jeebs.Data.Clients.SqlServer/_/CompareExtensions/ToOperator_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Clients.SqlServer/_/CompareExtensions/ToOperator_Tests.cs
@@ -135,9 +135,9 @@ public void Other_Throws_UnrecognisedSearchOperatorException(int input)
 		var value = (Compare)input;
 
 		// Act
-		var action = void () => value.ToOperator();
+		var result = Record.Exception(() => value.ToOperator());
 
 		// Assert
-		Assert.Throws<UnrecognisedSearchOperatorException>(action);
+		Assert.IsType<UnrecognisedSearchOperatorException>(result);
 	}
 }
diff --git a/tests/Tests.Jeebs.Data.Clients.Sqlite/_/CompareExtensions/ToOperator_Tests.cs b/tests/Tests.Jeebs.Data.Clients.Sqlite/_/CompareExtensions/ToOperator_Tests.cs
index 7cd96fe9f..ea5c0df35 100644
--- a/tests/Tests.Jeebs.Data.Clients.Sqlite/_/CompareExtensions/ToOperator_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Clients.Sqlite/_/CompareExtensions/ToOperator_Tests.cs
@@ -135,9 +135,9 @@ public void Other_Throws_UnrecognisedSearchOperatorException(int input)
 		var value = (Compare)input;
 
 		// Act
-		var action = void () => value.ToOperator();
+		var result = Record.Exception(() => value.ToOperator());
 
 		// Assert
-		Assert.Throws<UnrecognisedSearchOperatorException>(action);
+		Assert.IsType<UnrecognisedSearchOperatorException>(result);
 	}
 }
diff --git a/tests/Tests.Jeebs.Data.Query/_/QueryBuilderWithFrom/CheckTable_Tests.cs b/tests/Tests.Jeebs.Data.Query/_/QueryBuilderWithFrom/CheckTable_Tests.cs
index 63761ab1d..86e8b7e0f 100644
--- a/tests/Tests.Jeebs.Data.Query/_/QueryBuilderWithFrom/CheckTable_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Query/_/QueryBuilderWithFrom/CheckTable_Tests.cs
@@ -16,10 +16,10 @@ public void Table_Not_Added_Throws_Exception()
 		var builder = new QueryBuilderWithFrom(table);
 
 		// Act
-		var action = void () => builder.CheckTable<TestTable, TestException<TestTable>>();
+		var result = Record.Exception(() => builder.CheckTable<TestTable, TestException<TestTable>>());
 
 		// Assert
-		Assert.Throws<TestException<TestTable>>(action);
+		Assert.IsType<TestException<TestTable>>(result);
 	}
 
 	[Fact]
diff --git a/tests/Tests.Jeebs.Data.Query/_/QueryBuilderWithFrom/Join_Tests.cs b/tests/Tests.Jeebs.Data.Query/_/QueryBuilderWithFrom/Join_Tests.cs
index 67397ab50..b4fb33f65 100644
--- a/tests/Tests.Jeebs.Data.Query/_/QueryBuilderWithFrom/Join_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Query/_/QueryBuilderWithFrom/Join_Tests.cs
@@ -18,10 +18,10 @@ public void From_Table_Not_Added_Throws_JoinFromTableNotAddedException()
 		var builder = new QueryBuilderWithFrom(table);
 
 		// Act
-		var action = void () => builder.Join<TestTable0, TestTable0>(QueryJoin.Inner, t => t.Foo, t => t.Foo);
+		var result = Record.Exception(() => builder.Join<TestTable0, TestTable0>(QueryJoin.Inner, t => t.Foo, t => t.Foo));
 
 		// Assert
-		Assert.Throws<JoinFromTableNotAddedException<TestTable0>>(action);
+		Assert.IsType<JoinFromTableNotAddedException<TestTable0>>(result);
 	}
 
 	[Fact]
diff --git a/tests/Tests.Jeebs.Data.Query/_/QueryBuilderWithFrom/Where_Tests.cs b/tests/Tests.Jeebs.Data.Query/_/QueryBuilderWithFrom/Where_Tests.cs
index 47917b4b8..161af9b79 100644
--- a/tests/Tests.Jeebs.Data.Query/_/QueryBuilderWithFrom/Where_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Query/_/QueryBuilderWithFrom/Where_Tests.cs
@@ -17,10 +17,10 @@ public void Table_Not_Added_Throws_WhereTableNotAddedException()
 		var builder = new QueryBuilderWithFrom(table);
 
 		// Act
-		var action = void () => builder.Where<TestTable>(t => t.Foo, Compare.Equal, Rnd.Str);
+		var result = Record.Exception(() => builder.Where<TestTable>(t => t.Foo, Compare.Equal, Rnd.Str));
 
 		// Assert
-		Assert.Throws<WhereTableNotAddedException<TestTable>>(action);
+		Assert.IsType<WhereTableNotAddedException<TestTable>>(result);
 	}
 
 	[Fact]
diff --git a/tests/Tests.Jeebs.Data.Query/_/QueryPartsBuilderWithEntity/Map_Tests.cs b/tests/Tests.Jeebs.Data.Query/_/QueryPartsBuilderWithEntity/Map_Tests.cs
index e50e1f61c..7acc03d05 100644
--- a/tests/Tests.Jeebs.Data.Query/_/QueryPartsBuilderWithEntity/Map_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Query/_/QueryPartsBuilderWithEntity/Map_Tests.cs
@@ -1,7 +1,6 @@
 // Jeebs Unit Tests
 // Copyright (c) bfren - licensed under https://mit.bfren.dev/2013
 
-using Jeebs.Data.Map;
 using Wrap.Exceptions;
 
 namespace Jeebs.Data.Query.QueryPartsBuilderWithEntity_Tests;
@@ -29,9 +28,9 @@ public void Entity_Not_Mapped_Throws_MsgException_With_Msg()
 		v.Mapper.GetTableMapFor<TestEntity>().Returns(FailGen.Create());
 
 		// Act
-		var action = ITableMap () => builder.Map.Value;
+		var result = Record.Exception(() => builder.Map.Value);
 
 		// Assert
-		Assert.Throws<FailureException>(action);
+		Assert.IsType<FailureException>(result);
 	}
 }
diff --git a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertCollection_Tests.cs b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertCollection_Tests.cs
index d0386231b..dd0493704 100644
--- a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertCollection_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertCollection_Tests.cs
@@ -16,10 +16,10 @@ public void Collection_And_Inspectors_Different_Lengths__Throws_CollectionExcept
 		var inspectors = Enumerable.Repeat((string _) => { }, Rnd.Int).ToArray();
 
 		// Act
-		var action = () => FluentQueryHelper.AssertCollection(collection, inspectors);
+		var result = Record.Exception(() => FluentQueryHelper.AssertCollection(collection, inspectors));
 
 		// Assert
-		Assert.Throws<CollectionException>(action);
+		Assert.IsType<CollectionException>(result);
 	}
 
 	[Fact]
@@ -30,10 +30,10 @@ public void Inspector_Throws_FluentQueryHelperException__Catches_And_Rethrows()
 		var inspectors = new Action<long>[] { _ => throw new EqualTypeException() };
 
 		// Act
-		var action = () => FluentQueryHelper.AssertCollection(collection, inspectors);
+		var result = Record.Exception(() => FluentQueryHelper.AssertCollection(collection, inspectors));
 
 		// Assert
-		Assert.Throws<EqualTypeException>(action);
+		Assert.IsType<EqualTypeException>(result);
 	}
 
 	[Fact]
@@ -44,9 +44,9 @@ public void Inspector_Throws_Exception__Catches_And_Throws_As_CollectionExceptio
 		var inspectors = new Action<long>[] { _ => throw new InvalidOperationException() };
 
 		// Act
-		var action = () => FluentQueryHelper.AssertCollection(collection, inspectors);
+		var result = Record.Exception(() => FluentQueryHelper.AssertCollection(collection, inspectors));
 
 		// Assert
-		Assert.Throws<CollectionException>(action);
+		Assert.IsType<CollectionException>(result);
 	}
 }
diff --git a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertEqualJson_Tests.cs b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertEqualJson_Tests.cs
index 57372a685..92c830212 100644
--- a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertEqualJson_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertEqualJson_Tests.cs
@@ -31,10 +31,10 @@ public void Different_Property_Names__Equal_Values__Throws_EqualJsonException()
 		var v1 = new { v1 = value };
 
 		// Act
-		var action = () => FluentQueryHelper.AssertEqualJson(v0, v1);
+		var result = Record.Exception(() => FluentQueryHelper.AssertEqualJson(v0, v1));
 
 		// Assert
-		var ex = Assert.Throws<EqualJsonException>(action);
+		var ex = Assert.IsType<EqualJsonException>(result);
 		Assert.Equal($"Expected '{v0}' but value was '{v1}'.", ex.Message);
 	}
 
@@ -46,10 +46,10 @@ public void Same_Property_Names__Different_Values__Throws_EqualJsonException()
 		var v1 = new { v1 = Rnd.Str };
 
 		// Act
-		var action = () => FluentQueryHelper.AssertEqualJson(v0, v1);
+		var result = Record.Exception(() => FluentQueryHelper.AssertEqualJson(v0, v1));
 
 		// Assert
-		var ex = Assert.Throws<EqualJsonException>(action);
+		var ex = Assert.IsType<EqualJsonException>(result);
 		Assert.Equal($"Expected '{v0}' but value was '{v1}'.", ex.Message);
 	}
 }
diff --git a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertEqual_Tests.cs b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertEqual_Tests.cs
index 87ef3f01b..632d48488 100644
--- a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertEqual_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertEqual_Tests.cs
@@ -28,10 +28,10 @@ public void Not_Equal__Throws_EqualTypeException()
 		var v1 = Rnd.Str;
 
 		// Act
-		var action = () => FluentQueryHelper.AssertEqual(v0, v1);
+		var result = Record.Exception(() => FluentQueryHelper.AssertEqual(v0, v1));
 
 		// Assert
-		var ex = Assert.Throws<EqualTypeException>(action);
+		var ex = Assert.IsType<EqualTypeException>(result);
 		Assert.Equal($"Expected '{v0}' but value was '{v1}'.", ex.Message);
 	}
 }
diff --git a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertExecute_Tests.cs b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertExecute_Tests.cs
index 93e06b4f3..15bc28b15 100644
--- a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertExecute_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertExecute_Tests.cs
@@ -44,12 +44,13 @@ public async Task Incorrect_Method__Throws_MethodNameException()
 		// Arrange
 		var fluent = Create();
 		await fluent.CountAsync();
+		var action = (ICall c) => FluentQueryHelper.AssertExecute<TestEntity, TestId>(c, x => x.Id, true);
 
 		// Act
-		var action = (ICall c) => FluentQueryHelper.AssertExecute<TestEntity, TestId>(c, x => x.Id, true);
+		var result = Record.Exception(() => fluent.AssertCalls(action));
 
 		// Assert
-		Assert.Throws<MethodNameException>(() => fluent.AssertCalls(action));
+		Assert.IsType<MethodNameException>(result);
 	}
 
 	[Fact]
@@ -58,12 +59,13 @@ public async Task Incorrect_Generic_Argument__Throws_GenericArgumentException()
 		// Arrange
 		var fluent = Create();
 		await fluent.ExecuteAsync(x => x.Id);
+		var action = (ICall c) => FluentQueryHelper.AssertExecute<TestEntity, string>(c, nameof(TestEntity.Id), false);
 
 		// Act
-		var action = (ICall c) => FluentQueryHelper.AssertExecute<TestEntity, string>(c, nameof(TestEntity.Id), false);
+		var result = Record.Exception(() => fluent.AssertCalls(action));
 
 		// Assert
-		Assert.Throws<GenericArgumentException>(() => fluent.AssertCalls(action));
+		Assert.IsType<GenericArgumentException>(result);
 	}
 
 	[Fact]
@@ -72,11 +74,12 @@ public async Task Not_Property_Expression__Throws_PropertyExpressionException()
 		// Arrange
 		var fluent = Create();
 		await fluent.ExecuteAsync<TestId>(nameof(TestEntity.Id));
+		var action = (ICall c) => FluentQueryHelper.AssertExecute<TestEntity, TestId>(c, x => x.Id, false);
 
 		// Act
-		var action = (ICall c) => FluentQueryHelper.AssertExecute<TestEntity, TestId>(c, x => x.Id, false);
+		var result = Record.Exception(() => fluent.AssertCalls(action));
 
 		// Assert
-		Assert.Throws<PropertyExpressionException>(() => fluent.AssertCalls(action));
+		Assert.IsType<PropertyExpressionException>(result);
 	}
 }
diff --git a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertGenericArgument_Tests.cs b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertGenericArgument_Tests.cs
index ef7afcae0..86a6cef60 100644
--- a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertGenericArgument_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertGenericArgument_Tests.cs
@@ -41,10 +41,10 @@ public void Incorrect_Type__Throws_GenericArgumentException()
 			.Returns(method);
 
 		// Act
-		var action = () => FluentQueryHelper.AssertGenericArgument<Guid>(call);
+		var result = Record.Exception(() => FluentQueryHelper.AssertGenericArgument<Guid>(call));
 
 		// Assert
-		var ex = Assert.Throws<GenericArgumentException>(action);
+		var ex = Assert.IsType<GenericArgumentException>(result);
 		Assert.Contains($"Expected type '{typeof(Guid)}' but found '{typeof(string)}'.", ex.Message);
 	}
 
@@ -54,16 +54,16 @@ public void No_Generic_Arguments__Throws_GenericArgumentException()
 		// Arrange
 		var method = Substitute.ForPartsOf<MethodInfo>();
 		method.Configure().GetGenericArguments()
-			.Returns(Array.Empty<Type>());
+			.Returns([]);
 		var call = Substitute.For<ICall>();
 		call.GetMethodInfo()
 			.Returns(method);
 
 		// Act
-		var action = () => FluentQueryHelper.AssertGenericArgument<string>(call);
+		var result = Record.Exception(() => FluentQueryHelper.AssertGenericArgument<string>(call));
 
 		// Assert
-		var ex = Assert.Throws<GenericArgumentException>(action);
+		var ex = Assert.IsType<GenericArgumentException>(result);
 		Assert.Equal("Expected one generic argument but found none.", ex.Message);
 	}
 
@@ -74,16 +74,16 @@ public void Too_Many_Generic_Arguments__Throws_GenericArgumentException()
 		var method = Substitute.ForPartsOf<MethodInfo>();
 		var args = Rnd.NumberF.GetInt32(2, 10);
 		method.Configure().GetGenericArguments()
-			.Returns(Enumerable.Repeat(typeof(string), args).ToArray());
+			.Returns([.. Enumerable.Repeat(typeof(string), args)]);
 		var call = Substitute.For<ICall>();
 		call.GetMethodInfo()
 			.Returns(method);
 
 		// Act
-		var action = () => FluentQueryHelper.AssertGenericArgument<string>(call);
+		var result = Record.Exception(() => FluentQueryHelper.AssertGenericArgument<string>(call));
 
 		// Assert
-		var ex = Assert.Throws<GenericArgumentException>(action);
+		var ex = Assert.IsType<GenericArgumentException>(result);
 		Assert.Equal($"Expected one generic argument but found {args}.", ex.Message);
 	}
 }
diff --git a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertMethodName_Tests.cs b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertMethodName_Tests.cs
index 3da3f2f9e..3e4dee68e 100644
--- a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertMethodName_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertMethodName_Tests.cs
@@ -41,9 +41,9 @@ public void Not_Equal__Throws_MethodNameException()
 			.Returns(method);
 
 		// Act
-		var action = () => FluentQueryHelper.AssertMethodName(call, Rnd.Str);
+		var result = Record.Exception(() => FluentQueryHelper.AssertMethodName(call, Rnd.Str));
 
 		// Assert
-		Assert.Throws<MethodNameException>(action);
+		Assert.IsType<MethodNameException>(result);
 	}
 }
diff --git a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertPropertyExpression_Tests.cs b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertPropertyExpression_Tests.cs
index e26fc4d90..d68dbf624 100644
--- a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertPropertyExpression_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertPropertyExpression_Tests.cs
@@ -28,10 +28,10 @@ public void Not_Expression__Throws_PropertyExpressionException()
 		// Arrange
 
 		// Act
-		var action = () => FluentQueryHelper.AssertPropertyExpression<Test, string>(Rnd.Str, Rnd.Str);
+		var result = Record.Exception(() => FluentQueryHelper.AssertPropertyExpression<Test, string>(Rnd.Str, Rnd.Str));
 
 		// Assert
-		var ex = Assert.Throws<PropertyExpressionException>(action);
+		var ex = Assert.IsType<PropertyExpressionException>(result);
 		Assert.Equal($"Expected a property expression but received '{typeof(string)}'.", ex.Message);
 	}
 
@@ -43,10 +43,10 @@ public void Not_Equal__Throws_PropertyExpressionException()
 		Expression<Func<Test, string>> actual = x => x.Foo;
 
 		// Act
-		var action = () => FluentQueryHelper.AssertPropertyExpression<Test, string>(expected, actual);
+		var result = Record.Exception(() => FluentQueryHelper.AssertPropertyExpression<Test, string>(expected, actual));
 
 		// Assert
-		var ex = Assert.Throws<PropertyExpressionException>(action);
+		var ex = Assert.IsType<PropertyExpressionException>(result);
 		Assert.Equal($"Expected property with name '{expected}' but received '{nameof(Test.Foo)}'.", ex.Message);
 	}
 
diff --git a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhereIn_Tests.cs b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhereIn_Tests.cs
index c22769bc3..9793c46bb 100644
--- a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhereIn_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhereIn_Tests.cs
@@ -29,12 +29,13 @@ public void Incorrect_Method__Throws_MethodNameException()
 		// Arrange
 		var fluent = Create();
 		fluent.Maximum(Rnd.ULng);
+		var action = (ICall c) => FluentQueryHelper.AssertWhereIn<TestEntity, long>(c, x => x.Bar, [Rnd.Lng, Rnd.Lng]);
 
 		// Act
-		var action = (ICall c) => FluentQueryHelper.AssertWhereIn<TestEntity, long>(c, x => x.Bar, [Rnd.Lng, Rnd.Lng]);
+		var result = Record.Exception(() => fluent.AssertCalls(action));
 
 		// Assert
-		Assert.Throws<MethodNameException>(() => fluent.AssertCalls(action));
+		Assert.IsType<MethodNameException>(result);
 	}
 
 	[Fact]
@@ -44,12 +45,13 @@ public void Incorrect_Generic_Argument__Throws_GenericArgumentException()
 		var fluent = Create();
 		var values = new[] { Rnd.Str, Rnd.Str };
 		fluent.WhereIn(x => x.Foo, values);
+		var action = (ICall c) => FluentQueryHelper.AssertWhereIn<TestEntity, long>(c, x => x.Bar, [Rnd.Lng, Rnd.Lng]);
 
 		// Act
-		var action = (ICall c) => FluentQueryHelper.AssertWhereIn<TestEntity, long>(c, x => x.Bar, [Rnd.Lng, Rnd.Lng]);
+		var result = Record.Exception(() => fluent.AssertCalls(action));
 
 		// Assert
-		Assert.Throws<GenericArgumentException>(() => fluent.AssertCalls(action));
+		Assert.IsType<GenericArgumentException>(result);
 	}
 
 	[Fact]
@@ -59,11 +61,12 @@ public void Values_Not_Equal__Throws_EqualTypeException()
 		var fluent = Create();
 		var values = new[] { Rnd.Str, Rnd.Str };
 		fluent.WhereIn(x => x.Foo, values);
+		var action = (ICall c) => FluentQueryHelper.AssertWhereIn<TestEntity, string>(c, x => x.Foo, [Rnd.Str, Rnd.Str]);
 
 		// Act
-		var action = (ICall c) => FluentQueryHelper.AssertWhereIn<TestEntity, string>(c, x => x.Foo, [Rnd.Str, Rnd.Str]);
+		var result = Record.Exception(() => fluent.AssertCalls(action));
 
 		// Assert
-		Assert.Throws<EqualTypeException>(() => fluent.AssertCalls(action));
+		Assert.IsType<EqualTypeException>(result);
 	}
 }
diff --git a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhereNotIn_Tests.cs b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhereNotIn_Tests.cs
index b62ba21de..4ff2f3239 100644
--- a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhereNotIn_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhereNotIn_Tests.cs
@@ -29,12 +29,13 @@ public void Incorrect_Method__Throws_MethodNameException()
 		// Arrange
 		var fluent = Create();
 		fluent.Maximum(Rnd.ULng);
+		var action = (ICall c) => FluentQueryHelper.AssertWhereNotIn<TestEntity, long>(c, x => x.Bar, [Rnd.Lng, Rnd.Lng]);
 
 		// Act
-		var action = (ICall c) => FluentQueryHelper.AssertWhereNotIn<TestEntity, long>(c, x => x.Bar, [Rnd.Lng, Rnd.Lng]);
+		var result = Record.Exception(() => fluent.AssertCalls(action));
 
 		// Assert
-		Assert.Throws<MethodNameException>(() => fluent.AssertCalls(action));
+		Assert.IsType<MethodNameException>(result);
 	}
 
 	[Fact]
@@ -44,12 +45,13 @@ public void Incorrect_Generic_Argument__Throws_GenericArgumentException()
 		var fluent = Create();
 		var values = new[] { Rnd.Str, Rnd.Str };
 		fluent.WhereNotIn(x => x.Foo, values);
+		var action = (ICall c) => FluentQueryHelper.AssertWhereNotIn<TestEntity, long>(c, x => x.Bar, [Rnd.Lng, Rnd.Lng]);
 
 		// Act
-		var action = (ICall c) => FluentQueryHelper.AssertWhereNotIn<TestEntity, long>(c, x => x.Bar, [Rnd.Lng, Rnd.Lng]);
+		var result = Record.Exception(() => fluent.AssertCalls(action));
 
 		// Assert
-		Assert.Throws<GenericArgumentException>(() => fluent.AssertCalls(action));
+		Assert.IsType<GenericArgumentException>(result);
 	}
 
 	[Fact]
@@ -59,11 +61,12 @@ public void Values_Not_Equal__Throws_EqualTypeException()
 		var fluent = Create();
 		var values = new[] { Rnd.Str, Rnd.Str };
 		fluent.WhereNotIn(x => x.Foo, values);
+		var action = (ICall c) => FluentQueryHelper.AssertWhereNotIn<TestEntity, string>(c, x => x.Foo, [Rnd.Str, Rnd.Str]);
 
 		// Act
-		var action = (ICall c) => FluentQueryHelper.AssertWhereNotIn<TestEntity, string>(c, x => x.Foo, [Rnd.Str, Rnd.Str]);
+		var result = Record.Exception(() => fluent.AssertCalls(action));
 
 		// Assert
-		Assert.Throws<EqualTypeException>(() => fluent.AssertCalls(action));
+		Assert.IsType<EqualTypeException>(result);
 	}
 }
diff --git a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhere_Tests.cs b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhere_Tests.cs
index 36afd88cf..0016d4af3 100644
--- a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhere_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhere_Tests.cs
@@ -63,14 +63,16 @@ public void Incorrect_Method__Throws_MethodNameException()
 		// Arrange
 		var fluent = Create();
 		fluent.Maximum(Rnd.ULng);
-
-		// Act
 		var a0 = (ICall c) => FluentQueryHelper.AssertWhere<TestEntity, string>(c, x => x.Foo, Compare.Equal, Rnd.Str);
 		var a1 = (ICall c) => FluentQueryHelper.AssertWhere(c, Rnd.Str, Rnd.Str);
 
+		// Act
+		var r0 = Record.Exception(() => fluent.AssertCalls(a0));
+		var r1 = Record.Exception(() => fluent.AssertCalls(a1));
+
 		// Assert
-		Assert.Throws<MethodNameException>(() => fluent.AssertCalls(a0));
-		Assert.Throws<MethodNameException>(() => fluent.AssertCalls(a1));
+		Assert.IsType<MethodNameException>(r0);
+		Assert.IsType<MethodNameException>(r1);
 	}
 
 	[Fact]
@@ -81,12 +83,13 @@ public void Incorrect_Generic_Argument__Throws_GenericArgumentException()
 		var compare = Compare.Like;
 		var value = Rnd.Str;
 		fluent.Where(x => x.Foo, compare, value);
+		var action = (ICall c) => FluentQueryHelper.AssertWhere<TestEntity, long>(c, nameof(TestEntity.Foo), compare, Rnd.Lng);
 
 		// Act
-		var action = (ICall c) => FluentQueryHelper.AssertWhere<TestEntity, long>(c, nameof(TestEntity.Foo), compare, Rnd.Lng);
+		var result = Record.Exception(() => fluent.AssertCalls(action));
 
 		// Assert
-		Assert.Throws<GenericArgumentException>(() => fluent.AssertCalls(action));
+		Assert.IsType<GenericArgumentException>(result);
 	}
 
 	[Fact]
@@ -97,12 +100,13 @@ public void No_Generic_Argument__Throws_GenericArgumentException()
 		var compare = Compare.Like;
 		var value = Rnd.Str;
 		fluent.Where(nameof(TestEntity.Foo), compare, value);
+		var action = (ICall c) => FluentQueryHelper.AssertWhere<TestEntity, string>(c, x => x.Foo, compare, value);
 
 		// Act
-		var action = (ICall c) => FluentQueryHelper.AssertWhere<TestEntity, string>(c, x => x.Foo, compare, value);
+		var result = Record.Exception(() => fluent.AssertCalls(action));
 
 		// Assert
-		Assert.Throws<GenericArgumentException>(() => fluent.AssertCalls(action));
+		Assert.IsType<GenericArgumentException>(result);
 	}
 
 	[Fact]
@@ -113,12 +117,13 @@ public void Compare_Not_Equal__Throws_EqualTypeException()
 		var c0 = Compare.Is;
 		var c1 = Compare.IsNot;
 		fluent.Where(x => x.Foo, c0, Rnd.Str);
+		var action = (ICall c) => FluentQueryHelper.AssertWhere<TestEntity, string>(c, x => x.Foo, c1, Rnd.Str);
 
 		// Act
-		var action = (ICall c) => FluentQueryHelper.AssertWhere<TestEntity, string>(c, x => x.Foo, c1, Rnd.Str);
+		var result = Record.Exception(() => fluent.AssertCalls(action));
 
 		// Assert
-		Assert.Throws<EqualTypeException>(() => fluent.AssertCalls(action));
+		Assert.IsType<EqualTypeException>(result);
 	}
 
 	[Fact]
@@ -130,12 +135,13 @@ public void Value_Not_Equal__Throws_EqualTypeException()
 		var v1 = Rnd.Lng;
 		var compare = Compare.LessThanOrEqual;
 		fluent.Where(x => x.Bar, compare, v0);
+		var action = (ICall c) => FluentQueryHelper.AssertWhere<TestEntity, long>(c, x => x.Bar, compare, v1);
 
 		// Act
-		var action = (ICall c) => FluentQueryHelper.AssertWhere<TestEntity, long>(c, x => x.Bar, compare, v1);
+		var result = Record.Exception(() => fluent.AssertCalls(action));
 
 		// Assert
-		Assert.Throws<EqualTypeException>(() => fluent.AssertCalls(action));
+		Assert.IsType<EqualTypeException>(result);
 	}
 
 	[Fact]
@@ -145,12 +151,13 @@ public void Clause_Not_Equal_Throws_EqualTypeException()
 		var fluent = Create();
 		var parameters = new { value = Rnd.Guid };
 		fluent.Where(Rnd.Str, parameters);
+		var action = (ICall c) => FluentQueryHelper.AssertWhere(c, Rnd.Str, parameters);
 
 		// Act
-		var action = (ICall c) => FluentQueryHelper.AssertWhere(c, Rnd.Str, parameters);
+		var result = Record.Exception(() => fluent.AssertCalls(action));
 
 		// Assert
-		Assert.Throws<EqualTypeException>(() => fluent.AssertCalls(action));
+		Assert.IsType<EqualTypeException>(result);
 	}
 
 	[Fact]
@@ -160,11 +167,12 @@ public void Parameters_Not_Equal__Throws_EqualJsonException()
 		var fluent = Create();
 		var clause = Rnd.Str;
 		fluent.Where(clause, Rnd.Lng);
+		var action = (ICall c) => FluentQueryHelper.AssertWhere(c, clause, Rnd.Lng);
 
 		// Act
-		var action = (ICall c) => FluentQueryHelper.AssertWhere(c, clause, Rnd.Lng);
+		var result = Record.Exception(() => fluent.AssertCalls(action));
 
 		// Assert
-		Assert.Throws<EqualJsonException>(() => fluent.AssertCalls(action));
+		Assert.IsType<EqualJsonException>(result);
 	}
 }
diff --git a/tests/Tests.Jeebs.Data/Map/_/EntityMapper/Map_Tests.cs b/tests/Tests.Jeebs.Data/Map/_/EntityMapper/Map_Tests.cs
index 912f58e80..8e5a9ef3c 100644
--- a/tests/Tests.Jeebs.Data/Map/_/EntityMapper/Map_Tests.cs
+++ b/tests/Tests.Jeebs.Data/Map/_/EntityMapper/Map_Tests.cs
@@ -32,10 +32,10 @@ public void Table_Missing_Column_Throws_InvalidTableMapException()
 		var field = nameof(Foo.Bar0);
 
 		// Act
-		var action = void () => mapper.Map<Foo, FooTableWithoutBar0>(new());
+		var result = Record.Exception(() => mapper.Map<Foo, FooTableWithoutBar0>(new()));
 
 		// Assert
-		var ex = Assert.Throws<InvalidTableMapException>(action);
+		var ex = Assert.IsType<InvalidTableMapException>(result);
 		Assert.Single(ex.Errors).AssertMessage(
 			"The definition of table '{Table}' is missing field '{Field}'.",
 			table, field
@@ -51,10 +51,10 @@ public void Entity_Missing_Property_Throws_InvalidTableMapException()
 		var property = nameof(FooTableWithBar2.Bar2);
 
 		// Act
-		var action = void () => mapper.Map<Foo, FooTableWithBar2>(new());
+		var result = Record.Exception(() => mapper.Map<Foo, FooTableWithBar2>(new()));
 
 		// Assert
-		var ex = Assert.Throws<InvalidTableMapException>(action);
+		var ex = Assert.IsType<InvalidTableMapException>(result);
 		Assert.Single(ex.Errors).AssertMessage(
 			"The definition of entity '{Entity}' is missing property '{Property}'.",
 			entity, property
@@ -69,10 +69,10 @@ public void Missing_Id_Property_Attribute_Throws_UnableToFindIdColumnException()
 		var name = nameof(FooTableWithoutIdAttribute);
 
 		// Act
-		var action = void () => mapper.Map<Foo, FooTableWithoutIdAttribute>(new());
+		var result = Record.Exception(() => mapper.Map<Foo, FooTableWithoutIdAttribute>(new()));
 
 		// Assert
-		var ex = Assert.Throws<InvalidTableMapException>(action);
+		var ex = Assert.IsType<InvalidTableMapException>(result);
 		Assert.Single(ex.Errors).AssertMessage("Unable to get Id column from table '{Name}': Cannot get single value from an empty list.", name);
 	}
 
@@ -84,10 +84,10 @@ public void Multiple_Id_Properties_Throws_UnableToFindIdColumnException()
 		var name = nameof(FooTableWithMultipleIdAttributes);
 
 		// Act
-		var action = void () => svc.Map<Foo, FooTableWithMultipleIdAttributes>(new());
+		var result = Record.Exception(() => svc.Map<Foo, FooTableWithMultipleIdAttributes>(new()));
 
 		// Assert
-		var ex = Assert.Throws<InvalidTableMapException>(action);
+		var ex = Assert.IsType<InvalidTableMapException>(result);
 		Assert.Single(ex.Errors).AssertMessage(
 			"Unable to get Id column from table '{Name}': Cannot get single value from a list with multiple values.",
 			name
@@ -103,10 +103,10 @@ public void Missing_Version_Property_Attribute_Throws_UnableToFindVersionColumnE
 		var table = nameof(FooTableWithoutVersionAttribute);
 
 		// Act
-		var action = void () => mapper.Map<FooWithVersion, FooTableWithoutVersionAttribute>(new());
+		var result = Record.Exception(() => mapper.Map<FooWithVersion, FooTableWithoutVersionAttribute>(new()));
 
 		// Assert
-		var ex = Assert.Throws<InvalidTableMapException>(action);
+		var ex = Assert.IsType<InvalidTableMapException>(result);
 		Assert.Single(ex.Errors).AssertMessage(
 			"Unable to get single column with attribute '{Attribute}' from table '{Table}': Cannot get single value from an empty list.",
 			attribute, table
@@ -122,10 +122,10 @@ public void Multiple_Version_Properties_Throws_UnableToFindVersionColumnExceptio
 		var table = nameof(FooTableWithMultipleVersionAttributes);
 
 		// Act
-		var action = void () => svc.Map<FooWithVersion, FooTableWithMultipleVersionAttributes>(new());
+		var result = Record.Exception(() => svc.Map<FooWithVersion, FooTableWithMultipleVersionAttributes>(new()));
 
 		// Assert
-		var ex = Assert.Throws<InvalidTableMapException>(action);
+		var ex = Assert.IsType<InvalidTableMapException>(result);
 		Assert.Single(ex.Errors).AssertMessage(
 			"Unable to get single column with attribute '{Attribute}' from table '{Table}': Cannot get single value from a list with multiple values.",
 			attribute, table
diff --git a/tests/Tests.Jeebs.Data/TypeHandlers/Guid/Parse_Tests.cs b/tests/Tests.Jeebs.Data/TypeHandlers/Guid/Parse_Tests.cs
index 7febd3667..d04e5d751 100644
--- a/tests/Tests.Jeebs.Data/TypeHandlers/Guid/Parse_Tests.cs
+++ b/tests/Tests.Jeebs.Data/TypeHandlers/Guid/Parse_Tests.cs
@@ -31,10 +31,10 @@ public void Invalid_Guid_Throws_FormatException(object input)
 		var handler = new GuidTypeHandler();
 
 		// Act
-		var action = void () => handler.Parse(input);
+		var result = Record.Exception(() => handler.Parse(input));
 
 		// Assert
-		Assert.Throws<FormatException>(action);
+		Assert.IsType<FormatException>(result);
 	}
 
 	[Fact]
diff --git a/tests/Tests.Jeebs.Data/TypeHandlers/Json/Parse_Tests.cs b/tests/Tests.Jeebs.Data/TypeHandlers/Json/Parse_Tests.cs
index 4545fa593..294119385 100644
--- a/tests/Tests.Jeebs.Data/TypeHandlers/Json/Parse_Tests.cs
+++ b/tests/Tests.Jeebs.Data/TypeHandlers/Json/Parse_Tests.cs
@@ -17,10 +17,10 @@ public void Null_Or_Whitespace_Throws_JsonException(string input)
 		var handler = new JsonTypeHandler<Test>();
 
 		// Act
-		var action = void () => handler.Parse(input);
+		var result = Record.Exception(() => handler.Parse(input));
 
 		// Assert
-		Assert.Throws<JsonException>(action);
+		Assert.IsType<JsonException>(result);
 	}
 
 	[Fact]
@@ -31,10 +31,10 @@ public void InvalidJson_Throws_JsonException()
 		var input = Rnd.Str;
 
 		// Act
-		var action = void () => handler.Parse(input);
+		var result = Record.Exception(() => handler.Parse(input));
 
 		// Assert
-		Assert.Throws<JsonException>(action);
+		Assert.IsType<JsonException>(result);
 	}
 
 	[Fact]
diff --git a/tests/Tests.Jeebs.WordPress/TypeHandlers/Boolean/SetValue_Tests.cs b/tests/Tests.Jeebs.WordPress/TypeHandlers/Boolean/SetValue_Tests.cs
index fa039d8a4..c520d1579 100644
--- a/tests/Tests.Jeebs.WordPress/TypeHandlers/Boolean/SetValue_Tests.cs
+++ b/tests/Tests.Jeebs.WordPress/TypeHandlers/Boolean/SetValue_Tests.cs
@@ -48,9 +48,9 @@ public void Invalid_Column_Throws_InvalidOperationException(bool input)
 		parameter.SourceColumn.Returns(column);
 
 		// Act
-		var action = void () => handler.SetValue(parameter, input);
+		var result = Record.Exception(() => handler.SetValue(parameter, input));
 
 		// Assert
-		Assert.Throws<InvalidOperationException>(action);
+		Assert.IsType<InvalidOperationException>(result);
 	}
 }

From 72b6acc07ed73e924b8dbcf16aa0d58f542fa2d6 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Thu, 29 Jan 2026 15:23:41 +0000
Subject: [PATCH 04/12] Updating packages - #531

---
 Directory.Packages.props | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 0308a6631..d8ec0f4f1 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -31,7 +31,7 @@
     <PackageVersion Include="Npgsql" Version="10.0.1" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
     <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
-    <PackageVersion Include="Rnd" Version="10.1.2" />
+    <PackageVersion Include="Rnd" Version="10.2.0" />
     <PackageVersion Include="Serilog" Version="4.3.0" />
     <PackageVersion Include="Serilog.Extensions.Hosting" Version="10.0.0" />
     <PackageVersion Include="Serilog.Sinks.Async" Version="2.1.0" />
@@ -45,10 +45,10 @@
     <PackageVersion Include="System.Data.SQLite.Core" Version="1.0.119" />
     <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.15.0" />
     <PackageVersion Include="System.Text.Json" Version="10.0.2" />
-    <PackageVersion Include="Wrap" Version="1.0.0" />
-    <PackageVersion Include="Wrap.Id.Dapper" Version="1.0.0" />
-    <PackageVersion Include="Wrap.Id.Mvc" Version="1.0.0" />
-    <PackageVersion Include="Wrap.Testing" Version="1.0.0" />
+    <PackageVersion Include="Wrap" Version="1.1.0-beta.3" />
+    <PackageVersion Include="Wrap.Id.Dapper" Version="1.1.0-beta.3" />
+    <PackageVersion Include="Wrap.Id.Mvc" Version="1.1.0-beta.3" />
+    <PackageVersion Include="Wrap.Testing" Version="1.1.0-beta.3" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
     <PackageVersion Include="xunit.v3" Version="3.2.2" />
     <PackageVersion Include="xunit.v3.assert" Version="3.2.2" />

From 5e34f56dc9da7ac785eb6a67565431013bb4145b Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Thu, 29 Jan 2026 15:24:12 +0000
Subject: [PATCH 05/12] Removing StringF.Format - moved to Wrap - #531

---
 src/Jeebs/Functions/String/StringF.Format.cs  | 105 ------------------
 src/Jeebs/Functions/StringF.cs                |   9 --
 .../StringExtensions/FormatWith_Tests.cs      |   2 +-
 .../Functions/_/StringF/Format_Tests.cs       |  36 ------
 4 files changed, 1 insertion(+), 151 deletions(-)
 delete mode 100644 src/Jeebs/Functions/String/StringF.Format.cs
 delete mode 100644 src/Jeebs/Functions/StringF.cs
 delete mode 100644 tests/Tests.Jeebs/Functions/_/StringF/Format_Tests.cs

diff --git a/src/Jeebs/Functions/String/StringF.Format.cs b/src/Jeebs/Functions/String/StringF.Format.cs
deleted file mode 100644
index df886d744..000000000
--- a/src/Jeebs/Functions/String/StringF.Format.cs
+++ /dev/null
@@ -1,105 +0,0 @@
-// Jeebs Rapid Application Development
-// Copyright (c) bfren - licensed under https://mit.bfren.dev/2013
-
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using System.Text.RegularExpressions;
-
-namespace Jeebs.Functions;
-
-public static partial class StringF
-{
-	/// <summary>
-	/// If <paramref name="obj"/> is not null, use string.Format() -
-	/// otherwise, return <paramref name="formatString"/>.
-	/// </summary>
-	/// <typeparam name="T">Object type.</typeparam>
-	/// <param name="formatString">Format string.</param>
-	/// <param name="obj">Object (nullable).</param>
-	/// <param name="ifNull">String to use when <paramref name="obj"/> is null.</param>
-	/// <returns>Formatted string.</returns>
-	public static string Format<T>(string formatString, T obj, string? ifNull) =>
-		obj switch
-		{
-			T x =>
-				string.Format(F.DefaultCulture, formatString, x),
-
-			_ =>
-				ifNull ?? formatString
-		};
-
-	/// <summary>
-	/// Works like string.Format() but with named as well as numbered placeholders.
-	/// <para>Source is Array: values will be inserted in order (regardless of placeholder values).</para>
-	/// <para>Source is Object: property names must match placeholders or they will be left in place.</para>
-	/// </summary>
-	/// <remarks>
-	/// Inspired by http://james.newtonking.com/archive/2008/03/29/formatwith-2-0-string-formatting-with-named-variables,
-	/// (significantly) altered to work without requiring DataBinder.
-	/// </remarks>
-	/// <typeparam name="T">Source type.</typeparam>
-	/// <param name="formatString">String to format.</param>
-	/// <param name="source">Source object to use for template values.</param>
-	/// <returns>Formatted string.</returns>
-	public static string Format<T>(string formatString, T source)
-	{
-		// Return original if source is null or if it is an empty array
-		if (source is null)
-		{
-			return formatString;
-		}
-		else if (source is Array arr && arr.Length == 0)
-		{
-			return formatString;
-		}
-
-		// Thanks James Newton-King!
-		var r = TemplateMatcherRegex();
-
-		var values = new List<object>();
-		var replaceIndex = 0; // keeps track of replace loop so we can match named template values with an array source
-		var rewrittenFormat = r.Replace(formatString, (m) =>
-		{
-			var startGroup = m.Groups["start"];
-			var templateGroup = m.Groups["template"];
-			var formatGroup = m.Groups["format"];
-			var endGroup = m.Groups["end"];
-
-			// This is the value inside the braces, e.g. "0" in "{0}" or "A" in "{A}"
-			// Remove any @ symbols from the start - used by Serilog to denote an object format
-			// but breaks the following
-			var template = templateGroup.Value.TrimStart('@');
-
-			// Switch on the source type, using variety of methods to get this template's value
-			var flags = BindingFlags.IgnoreCase | BindingFlags.Public | BindingFlags.Instance;
-			var value = source switch
-			{
-				// Source array - get next item in array
-				Array arr when replaceIndex < arr.Length && arr.GetValue(replaceIndex++) is object val =>
-					val,
-
-				// Source object - get matching property value
-				{ } obj when typeof(T).GetProperty(template, flags)?.GetValue(obj) is object val =>
-					val,
-
-				// Nothing has matched yet so to be safe put the template back
-				_ =>
-					$"{{{template}}}"
-			};
-
-			values.Add(value);
-
-			// Recreate format using zero-based string
-			return new string('{', startGroup.Captures.Count)
-				+ (values.Count - 1)
-				+ formatGroup.Value
-				+ new string('}', endGroup.Captures.Count);
-		});
-
-		return string.Format(F.DefaultCulture, rewrittenFormat, [.. values]);
-	}
-
-	[GeneratedRegex("(?<start>\\{)+(?<template>[\\w\\.\\[\\]@]+)(?<format>:[^}]+)?(?<end>\\})+", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant)]
-	private static partial Regex TemplateMatcherRegex();
-}
diff --git a/src/Jeebs/Functions/StringF.cs b/src/Jeebs/Functions/StringF.cs
deleted file mode 100644
index 0c19d400b..000000000
--- a/src/Jeebs/Functions/StringF.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-// Jeebs Rapid Application Development
-// Copyright (c) bfren - licensed under https://mit.bfren.dev/2013
-
-namespace Jeebs.Functions;
-
-/// <summary>
-/// String functions.
-/// </summary>
-public static partial class StringF { }
diff --git a/tests/Tests.Jeebs/Extensions/StringExtensions/FormatWith_Tests.cs b/tests/Tests.Jeebs/Extensions/StringExtensions/FormatWith_Tests.cs
index 8004f623c..1efffe090 100644
--- a/tests/Tests.Jeebs/Extensions/StringExtensions/FormatWith_Tests.cs
+++ b/tests/Tests.Jeebs/Extensions/StringExtensions/FormatWith_Tests.cs
@@ -36,7 +36,7 @@ public void Replace_Unordered_Numbered_Values()
 		var result = format.FormatWith(values);
 
 		// Assert
-		Assert.Equal($"{n0} , {n1} , {n2}", result);
+		Assert.Equal($"{n1} , {n0} , {n2}", result);
 	}
 
 	[Fact]
diff --git a/tests/Tests.Jeebs/Functions/_/StringF/Format_Tests.cs b/tests/Tests.Jeebs/Functions/_/StringF/Format_Tests.cs
deleted file mode 100644
index 2850b2f6c..000000000
--- a/tests/Tests.Jeebs/Functions/_/StringF/Format_Tests.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-// Jeebs Unit Tests
-// Copyright (c) bfren - licensed under https://mit.bfren.dev/2013
-
-namespace Jeebs.Functions.StringF_Tests;
-
-public class Format_Tests
-{
-	[Fact]
-	public void Returns_IfNull_If_Object_Is_Null()
-	{
-		// Arrange
-		object? obj = null;
-		var format = Rnd.Str;
-		var value = Rnd.Str;
-
-		// Act
-		var result = StringF.Format(format, obj, value);
-
-		// Assert
-		Assert.Equal(value, result);
-	}
-
-	[Fact]
-	public void Returns_String_Format_If_Object_Is_Not_Null()
-	{
-		// Arrange
-		const string format = "[{0}]";
-		var value = Rnd.Str;
-
-		// Act
-		var result = StringF.Format(format, value, null);
-
-		// Assert
-		Assert.Equal(string.Format(format, value), result);
-	}
-}

From 452f89fdbac8d6116c475d3232334cfad07acf0b Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Thu, 29 Jan 2026 15:24:35 +0000
Subject: [PATCH 06/12] Using new Rnd properties in tests - #531

---
 .../_/MySqlDbClient/GetQuery_Tests.cs         |  6 ++--
 .../_/PostgreSqlDbClient/GetQuery_Tests.cs    |  6 ++--
 .../_/SqlServerDbClient/GetQuery_Tests.cs     |  6 ++--
 .../_/SqliteDbClient/GetQuery_Tests.cs        |  6 ++--
 .../QueryOptions/ToParts_Tests.cs             |  4 +--
 .../- Test Abstracts -/QueryOptions/_Setup.cs |  4 +--
 .../QueryPartsBuilder/Create_Tests.cs         | 10 +++----
 .../_/QueryBuilderWithFrom/Maximum_Tests.cs   |  2 +-
 .../_/QueryBuilderWithFrom/Skip_Tests.cs      |  2 +-
 .../_/QueryOptions/_Setup.cs                  |  4 +--
 .../FluentQueryHelper/AssertSort_Tests.cs     |  2 +-
 .../FluentQueryHelper/AssertWhereIn_Tests.cs  |  2 +-
 .../AssertWhereNotIn_Tests.cs                 |  2 +-
 .../FluentQueryHelper/AssertWhere_Tests.cs    |  2 +-
 .../Query/_/FluentQuery/Maximum_Tests.cs      |  2 +-
 .../Query/_/FluentQuery/Skip_Tests.cs         |  2 +-
 .../Query/_/QueryParts/Constructor_Tests.cs   |  4 +--
 .../_/DbQuery/QueryAsync_Tests.cs             | 12 ++++----
 .../_/DbQuery/_DbQuery_Setup.cs               |  2 +-
 .../ParseAttachmentPostId_Tests.cs            |  2 +-
 .../TermCustomField/ParseTermId_Tests.cs      |  2 +-
 .../Entities/Id_Tests.cs                      |  2 +-
 .../GetFilePathAsync_Tests.cs                 |  6 ++--
 .../QueryAttachmentsF/GetQuery_Tests.cs       |  4 +--
 .../QueryPostsF/ApplyContentFilters_Tests.cs  |  8 +++---
 .../QueryPostsF/GetPreviousAndNext_Tests.cs   | 28 +++++++++----------
 26 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/tests/Tests.Jeebs.Data.Clients.MySql/_/MySqlDbClient/GetQuery_Tests.cs b/tests/Tests.Jeebs.Data.Clients.MySql/_/MySqlDbClient/GetQuery_Tests.cs
index 53cadc69c..e751f6c42 100644
--- a/tests/Tests.Jeebs.Data.Clients.MySql/_/MySqlDbClient/GetQuery_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Clients.MySql/_/MySqlDbClient/GetQuery_Tests.cs
@@ -386,7 +386,7 @@ public void With_Parts_Adds_Limit()
 	{
 		// Arrange
 		var (client, v) = MySqlDbClient_Setup.Get();
-		var max = Rnd.ULng;
+		var max = Rnd.UInt64;
 		var parts = new QueryParts(v.Table) { Maximum = max };
 		var expected = $"SELECT * FROM `{v.Schema}.{v.Name}` LIMIT {max};";
 
@@ -402,8 +402,8 @@ public void With_Parts_Adds_Limit_And_Offset()
 	{
 		// Arrange
 		var (client, v) = MySqlDbClient_Setup.Get();
-		var skip = Rnd.ULng;
-		var max = Rnd.ULng;
+		var skip = Rnd.UInt64;
+		var max = Rnd.UInt64;
 		var parts = new QueryParts(v.Table) { Skip = skip, Maximum = max };
 		var expected = $"SELECT * FROM `{v.Schema}.{v.Name}` LIMIT {skip}, {max};";
 
diff --git a/tests/Tests.Jeebs.Data.Clients.PostgreSql/_/PostgreSqlDbClient/GetQuery_Tests.cs b/tests/Tests.Jeebs.Data.Clients.PostgreSql/_/PostgreSqlDbClient/GetQuery_Tests.cs
index 450c51a77..52dbea4c4 100644
--- a/tests/Tests.Jeebs.Data.Clients.PostgreSql/_/PostgreSqlDbClient/GetQuery_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Clients.PostgreSql/_/PostgreSqlDbClient/GetQuery_Tests.cs
@@ -386,7 +386,7 @@ public void With_Parts_Adds_Limit()
 	{
 		// Arrange
 		var (client, v) = PostgreSqlDbClient_Setup.Get();
-		var max = Rnd.ULng;
+		var max = Rnd.UInt64;
 		var parts = new QueryParts(v.Table) { Maximum = max };
 		var expected = $"SELECT * FROM {v.Schema}.{v.Name} LIMIT {max};";
 
@@ -402,8 +402,8 @@ public void With_Parts_Adds_Limit_And_Offset()
 	{
 		// Arrange
 		var (client, v) = PostgreSqlDbClient_Setup.Get();
-		var skip = Rnd.ULng;
-		var max = Rnd.ULng;
+		var skip = Rnd.UInt64;
+		var max = Rnd.UInt64;
 		var parts = new QueryParts(v.Table) { Skip = skip, Maximum = max };
 		var expected = $"SELECT * FROM {v.Schema}.{v.Name} LIMIT {max} OFFSET {skip};";
 
diff --git a/tests/Tests.Jeebs.Data.Clients.SqlServer/_/SqlServerDbClient/GetQuery_Tests.cs b/tests/Tests.Jeebs.Data.Clients.SqlServer/_/SqlServerDbClient/GetQuery_Tests.cs
index cfa6a6d2d..d59f1853b 100644
--- a/tests/Tests.Jeebs.Data.Clients.SqlServer/_/SqlServerDbClient/GetQuery_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Clients.SqlServer/_/SqlServerDbClient/GetQuery_Tests.cs
@@ -386,7 +386,7 @@ public void With_Parts_Adds_Limit()
 	{
 		// Arrange
 		var (client, v) = SqlServerDbClient_Setup.Get();
-		var max = Rnd.ULng;
+		var max = Rnd.UInt64;
 		var parts = new QueryParts(v.Table) { Maximum = max };
 		var expected = $"SELECT * FROM [{v.Schema}].[{v.Name}] OFFSET 0 ROWS FETCH NEXT {max} ROWS ONLY";
 
@@ -402,8 +402,8 @@ public void With_Parts_Adds_Limit_And_Offset()
 	{
 		// Arrange
 		var (client, v) = SqlServerDbClient_Setup.Get();
-		var skip = Rnd.ULng;
-		var max = Rnd.ULng;
+		var skip = Rnd.UInt64;
+		var max = Rnd.UInt64;
 		var parts = new QueryParts(v.Table) { Skip = skip, Maximum = max };
 		var expected = $"SELECT * FROM [{v.Schema}].[{v.Name}] OFFSET {skip} ROWS FETCH NEXT {max} ROWS ONLY";
 
diff --git a/tests/Tests.Jeebs.Data.Clients.Sqlite/_/SqliteDbClient/GetQuery_Tests.cs b/tests/Tests.Jeebs.Data.Clients.Sqlite/_/SqliteDbClient/GetQuery_Tests.cs
index 4227dd3a7..f09255f71 100644
--- a/tests/Tests.Jeebs.Data.Clients.Sqlite/_/SqliteDbClient/GetQuery_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Clients.Sqlite/_/SqliteDbClient/GetQuery_Tests.cs
@@ -386,7 +386,7 @@ public void With_Parts_Adds_Limit()
 	{
 		// Arrange
 		var (client, v) = SqliteDbClient_Setup.Get();
-		var max = Rnd.ULng;
+		var max = Rnd.UInt64;
 		var parts = new QueryParts(v.Table) { Maximum = max };
 		var expected = $"SELECT * FROM \"{v.Schema}.{v.Name}\" LIMIT {max};";
 
@@ -402,8 +402,8 @@ public void With_Parts_Adds_Limit_And_Offset()
 	{
 		// Arrange
 		var (client, v) = SqliteDbClient_Setup.Get();
-		var skip = Rnd.ULng;
-		var max = Rnd.ULng;
+		var skip = Rnd.UInt64;
+		var max = Rnd.UInt64;
 		var parts = new QueryParts(v.Table) { Skip = skip, Maximum = max };
 		var expected = $"SELECT * FROM \"{v.Schema}.{v.Name}\" LIMIT {skip}, {max};";
 
diff --git a/tests/Tests.Jeebs.Data.Query/- Test Abstracts -/QueryOptions/ToParts_Tests.cs b/tests/Tests.Jeebs.Data.Query/- Test Abstracts -/QueryOptions/ToParts_Tests.cs
index 7578e63de..e54784f9e 100644
--- a/tests/Tests.Jeebs.Data.Query/- Test Abstracts -/QueryOptions/ToParts_Tests.cs	
+++ b/tests/Tests.Jeebs.Data.Query/- Test Abstracts -/QueryOptions/ToParts_Tests.cs	
@@ -19,8 +19,8 @@ protected void Test00()
 	{
 		// Arrange
 		var (options, builder) = Setup();
-		var max = Rnd.ULng;
-		var skip = Rnd.ULng;
+		var max = Rnd.UInt64;
+		var skip = Rnd.UInt64;
 		var opt = options with
 		{
 			Maximum = max,
diff --git a/tests/Tests.Jeebs.Data.Query/- Test Abstracts -/QueryOptions/_Setup.cs b/tests/Tests.Jeebs.Data.Query/- Test Abstracts -/QueryOptions/_Setup.cs
index 1dfe85faa..7bb1742cf 100644
--- a/tests/Tests.Jeebs.Data.Query/- Test Abstracts -/QueryOptions/_Setup.cs	
+++ b/tests/Tests.Jeebs.Data.Query/- Test Abstracts -/QueryOptions/_Setup.cs	
@@ -20,8 +20,8 @@ protected virtual TBuilder GetConfiguredBuilder(ITable table)
 	{
 		var parts = new QueryParts(table)
 		{
-			Maximum = Rnd.ULng,
-			Skip = Rnd.ULng
+			Maximum = Rnd.UInt64,
+			Skip = Rnd.UInt64
 		};
 
 		var builder = Substitute.For<TBuilder>();
diff --git a/tests/Tests.Jeebs.Data.Query/- Test Abstracts -/QueryPartsBuilder/Create_Tests.cs b/tests/Tests.Jeebs.Data.Query/- Test Abstracts -/QueryPartsBuilder/Create_Tests.cs
index 95f6d9769..5b1c75ded 100644
--- a/tests/Tests.Jeebs.Data.Query/- Test Abstracts -/QueryPartsBuilder/Create_Tests.cs	
+++ b/tests/Tests.Jeebs.Data.Query/- Test Abstracts -/QueryPartsBuilder/Create_Tests.cs	
@@ -17,7 +17,7 @@ protected void Test00()
 		var (builder, v) = Setup();
 
 		// Act
-		var result = builder.Create<TModel>(null, Rnd.ULng).Unsafe().Unwrap();
+		var result = builder.Create<TModel>(null, Rnd.UInt64).Unsafe().Unwrap();
 
 		// Assert
 		Assert.NotSame(v.Parts, result);
@@ -32,7 +32,7 @@ protected void Test01()
 		var (builder, v) = Setup();
 
 		// Act
-		var result = builder.Create<TModel>(null, Rnd.ULng);
+		var result = builder.Create<TModel>(null, Rnd.UInt64);
 
 		// Assert
 		Assert.NotSame(v.Parts, result);
@@ -44,11 +44,11 @@ protected void Test01()
 	protected void Test02()
 	{
 		// Arrange
-		var maximum = Rnd.ULng;
+		var maximum = Rnd.UInt64;
 		var (builder, v) = Setup();
 
 		// Act
-		var result = builder.Create<TModel>(maximum, Rnd.ULng).Unsafe().Unwrap();
+		var result = builder.Create<TModel>(maximum, Rnd.UInt64).Unsafe().Unwrap();
 
 		// Assert
 		Assert.NotSame(v.Parts, result);
@@ -60,7 +60,7 @@ protected void Test02()
 	protected void Test03()
 	{
 		// Arrange
-		var skip = Rnd.ULng;
+		var skip = Rnd.UInt64;
 		var (builder, v) = Setup();
 
 		// Act
diff --git a/tests/Tests.Jeebs.Data.Query/_/QueryBuilderWithFrom/Maximum_Tests.cs b/tests/Tests.Jeebs.Data.Query/_/QueryBuilderWithFrom/Maximum_Tests.cs
index b06dabf5b..b89000314 100644
--- a/tests/Tests.Jeebs.Data.Query/_/QueryBuilderWithFrom/Maximum_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Query/_/QueryBuilderWithFrom/Maximum_Tests.cs
@@ -13,7 +13,7 @@ public void Sets_Maximum()
 		// Arrange
 		var table = Substitute.For<ITable>();
 		var builder = new QueryBuilderWithFrom(table);
-		var value = Rnd.ULng;
+		var value = Rnd.UInt64;
 
 		// Act
 		var result = builder.Maximum(value);
diff --git a/tests/Tests.Jeebs.Data.Query/_/QueryBuilderWithFrom/Skip_Tests.cs b/tests/Tests.Jeebs.Data.Query/_/QueryBuilderWithFrom/Skip_Tests.cs
index bef94ac26..83cbfb451 100644
--- a/tests/Tests.Jeebs.Data.Query/_/QueryBuilderWithFrom/Skip_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Query/_/QueryBuilderWithFrom/Skip_Tests.cs
@@ -13,7 +13,7 @@ public void Sets_Skip()
 		// Arrange
 		var table = Substitute.For<ITable>();
 		var builder = new QueryBuilderWithFrom(table);
-		var value = Rnd.ULng;
+		var value = Rnd.UInt64;
 
 		// Act
 		var result = builder.Skip(value);
diff --git a/tests/Tests.Jeebs.Data.Query/_/QueryOptions/_Setup.cs b/tests/Tests.Jeebs.Data.Query/_/QueryOptions/_Setup.cs
index cf651a916..0323fb773 100644
--- a/tests/Tests.Jeebs.Data.Query/_/QueryOptions/_Setup.cs
+++ b/tests/Tests.Jeebs.Data.Query/_/QueryOptions/_Setup.cs
@@ -22,8 +22,8 @@ public static (TestOptions options, ITestBuilder builder) GetOptions()
 		);
 		builder.ReturnsForAll(R.Wrap(new QueryParts(table)
 		{
-			Maximum = Rnd.ULng,
-			Skip = Rnd.ULng
+			Maximum = Rnd.UInt64,
+			Skip = Rnd.UInt64
 		}));
 
 		return (new(builder), builder);
diff --git a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertSort_Tests.cs b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertSort_Tests.cs
index c807a96c1..07d2c3584 100644
--- a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertSort_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertSort_Tests.cs
@@ -32,7 +32,7 @@ public void Incorrect_Method__Throws_MethodNameException(SortOrder input)
 	{
 		// Arrange
 		var fluent = Create();
-		fluent.Skip(Rnd.ULng);
+		fluent.Skip(Rnd.UInt64);
 
 		// Act
 		var action = (ICall c) => FluentQueryHelper.AssertSort<TestEntity, TestId>(c, x => x.Id, input);
diff --git a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhereIn_Tests.cs b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhereIn_Tests.cs
index 9793c46bb..23f1bdd97 100644
--- a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhereIn_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhereIn_Tests.cs
@@ -28,7 +28,7 @@ public void Incorrect_Method__Throws_MethodNameException()
 	{
 		// Arrange
 		var fluent = Create();
-		fluent.Maximum(Rnd.ULng);
+		fluent.Maximum(Rnd.UInt64);
 		var action = (ICall c) => FluentQueryHelper.AssertWhereIn<TestEntity, long>(c, x => x.Bar, [Rnd.Lng, Rnd.Lng]);
 
 		// Act
diff --git a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhereNotIn_Tests.cs b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhereNotIn_Tests.cs
index 4ff2f3239..c971ca880 100644
--- a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhereNotIn_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhereNotIn_Tests.cs
@@ -28,7 +28,7 @@ public void Incorrect_Method__Throws_MethodNameException()
 	{
 		// Arrange
 		var fluent = Create();
-		fluent.Maximum(Rnd.ULng);
+		fluent.Maximum(Rnd.UInt64);
 		var action = (ICall c) => FluentQueryHelper.AssertWhereNotIn<TestEntity, long>(c, x => x.Bar, [Rnd.Lng, Rnd.Lng]);
 
 		// Act
diff --git a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhere_Tests.cs b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhere_Tests.cs
index 0016d4af3..059d81ff9 100644
--- a/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhere_Tests.cs
+++ b/tests/Tests.Jeebs.Data.Testing/Query/FluentQueryHelper/AssertWhere_Tests.cs
@@ -62,7 +62,7 @@ public void Incorrect_Method__Throws_MethodNameException()
 	{
 		// Arrange
 		var fluent = Create();
-		fluent.Maximum(Rnd.ULng);
+		fluent.Maximum(Rnd.UInt64);
 		var a0 = (ICall c) => FluentQueryHelper.AssertWhere<TestEntity, string>(c, x => x.Foo, Compare.Equal, Rnd.Str);
 		var a1 = (ICall c) => FluentQueryHelper.AssertWhere(c, Rnd.Str, Rnd.Str);
 
diff --git a/tests/Tests.Jeebs.Data/Query/_/FluentQuery/Maximum_Tests.cs b/tests/Tests.Jeebs.Data/Query/_/FluentQuery/Maximum_Tests.cs
index 49d48d8f2..3a5c153e7 100644
--- a/tests/Tests.Jeebs.Data/Query/_/FluentQuery/Maximum_Tests.cs
+++ b/tests/Tests.Jeebs.Data/Query/_/FluentQuery/Maximum_Tests.cs
@@ -10,7 +10,7 @@ public void Value_Greater_Than_Zero__Updates_Maximum()
 	{
 		// Arrange
 		var (query, _) = Setup();
-		var value = Rnd.ULng;
+		var value = Rnd.UInt64;
 
 		// Act
 		var result = query.Maximum(value);
diff --git a/tests/Tests.Jeebs.Data/Query/_/FluentQuery/Skip_Tests.cs b/tests/Tests.Jeebs.Data/Query/_/FluentQuery/Skip_Tests.cs
index f5876dd9e..f62fe4092 100644
--- a/tests/Tests.Jeebs.Data/Query/_/FluentQuery/Skip_Tests.cs
+++ b/tests/Tests.Jeebs.Data/Query/_/FluentQuery/Skip_Tests.cs
@@ -10,7 +10,7 @@ public void Value_Greater_Than_Zero__Updates_Skip()
 	{
 		// Arrange
 		var (query, _) = Setup();
-		var value = Rnd.ULng;
+		var value = Rnd.UInt64;
 
 		// Act
 		var result = query.Skip(value);
diff --git a/tests/Tests.Jeebs.Data/Query/_/QueryParts/Constructor_Tests.cs b/tests/Tests.Jeebs.Data/Query/_/QueryParts/Constructor_Tests.cs
index 8b39cc4a5..f52090bd8 100644
--- a/tests/Tests.Jeebs.Data/Query/_/QueryParts/Constructor_Tests.cs
+++ b/tests/Tests.Jeebs.Data/Query/_/QueryParts/Constructor_Tests.cs
@@ -38,8 +38,8 @@ public void Copies_All_Values()
 			WhereCustom = Substitute.For<IImmutableList<(string, IQueryParametersDictionary)>>(),
 			Sort = Substitute.For<IImmutableList<(IColumn, SortOrder)>>(),
 			SortRandom = Rnd.Flip,
-			Maximum = Rnd.ULng,
-			Skip = Rnd.ULng
+			Maximum = Rnd.UInt64,
+			Skip = Rnd.UInt64
 		};
 
 		// Act
diff --git a/tests/Tests.Jeebs.Data/_/DbQuery/QueryAsync_Tests.cs b/tests/Tests.Jeebs.Data/_/DbQuery/QueryAsync_Tests.cs
index d8f042bd9..72bce9307 100644
--- a/tests/Tests.Jeebs.Data/_/DbQuery/QueryAsync_Tests.cs
+++ b/tests/Tests.Jeebs.Data/_/DbQuery/QueryAsync_Tests.cs
@@ -75,8 +75,8 @@ public async Task WithParts_And_Page_GetCountQuery_Fails_Returns_None_With_Error
 		client.GetCountQuery(parts).Returns(FailGen.Create());
 
 		// Act
-		var r0 = await query.QueryAsync<int>(Rnd.ULng, parts);
-		var r1 = await query.QueryAsync<int>(Rnd.ULng, parts, transaction);
+		var r0 = await query.QueryAsync<int>(Rnd.UInt64, parts);
+		var r1 = await query.QueryAsync<int>(Rnd.UInt64, parts, transaction);
 
 		// Assert
 		_ = r0.AssertFailure();
@@ -93,8 +93,8 @@ public async Task WithParts_And_Page_GetQuery_Exception_Returns_None_With_ErrorG
 		client.GetQuery(Arg.Any<IQueryParts>()).Returns(FailGen.Create());
 
 		// Act
-		var r0 = await query.QueryAsync<int>(Rnd.ULng, parts);
-		var r1 = await query.QueryAsync<int>(Rnd.ULng, parts, transaction);
+		var r0 = await query.QueryAsync<int>(Rnd.UInt64, parts);
+		var r1 = await query.QueryAsync<int>(Rnd.UInt64, parts, transaction);
 
 		// Assert
 		_ = r0.AssertFailure();
@@ -130,8 +130,8 @@ public async Task With_Parts_And_Page_Calls_Client_GetCountQuery_And_Client_GetQ
 		var transaction = Substitute.For<IDbTransaction>();
 
 		// Act
-		await query.QueryAsync<int>(Rnd.ULng, parts);
-		await query.QueryAsync<int>(Rnd.ULng, parts, transaction);
+		await query.QueryAsync<int>(Rnd.UInt64, parts);
+		await query.QueryAsync<int>(Rnd.UInt64, parts, transaction);
 
 		// Assert
 		client.Received(2).GetCountQuery(parts);
diff --git a/tests/Tests.Jeebs.Data/_/DbQuery/_DbQuery_Setup.cs b/tests/Tests.Jeebs.Data/_/DbQuery/_DbQuery_Setup.cs
index 24060531c..116049177 100644
--- a/tests/Tests.Jeebs.Data/_/DbQuery/_DbQuery_Setup.cs
+++ b/tests/Tests.Jeebs.Data/_/DbQuery/_DbQuery_Setup.cs
@@ -33,7 +33,7 @@ public static (IDb db, IDbClient client, ILog log, DbQuery<IDb> query) Get(strin
 		db.QueryAsync<int>(text, param, CommandType.Text, Arg.Any<IDbTransaction>()).Returns(R.Wrap(results));
 		db.QuerySingleAsync<int>(text, param, CommandType.Text, Arg.Any<IDbTransaction>()).Returns(R.Wrap(Rnd.Int));
 		db.ExecuteAsync(text, param, CommandType.Text, Arg.Any<IDbTransaction>()).Returns(R.True);
-		db.ExecuteAsync<ulong>(text, param, CommandType.Text, Arg.Any<IDbTransaction>()).Returns(R.Wrap(Rnd.ULng));
+		db.ExecuteAsync<ulong>(text, param, CommandType.Text, Arg.Any<IDbTransaction>()).Returns(R.Wrap(Rnd.UInt64));
 
 		var log = Substitute.For<ILog>();
 		var query = Substitute.ForPartsOf<DbQuery<IDb>>(db, log);
diff --git a/tests/Tests.Jeebs.WordPress/CustomFields/AttachmentCustomField/ParseAttachmentPostId_Tests.cs b/tests/Tests.Jeebs.WordPress/CustomFields/AttachmentCustomField/ParseAttachmentPostId_Tests.cs
index 978e0bbf6..fd2549222 100644
--- a/tests/Tests.Jeebs.WordPress/CustomFields/AttachmentCustomField/ParseAttachmentPostId_Tests.cs
+++ b/tests/Tests.Jeebs.WordPress/CustomFields/AttachmentCustomField/ParseAttachmentPostId_Tests.cs
@@ -26,7 +26,7 @@ public void Valid_Long_Returns_TermId()
 	{
 		// Arrange
 		var type = typeof(ParseAttachmentPostId_Tests);
-		var value = Rnd.ULng;
+		var value = Rnd.UInt64;
 
 		// Act
 		var result = AttachmentCustomField.ParseAttachmentPostId(type, value.ToString());
diff --git a/tests/Tests.Jeebs.WordPress/CustomFields/TermCustomField/ParseTermId_Tests.cs b/tests/Tests.Jeebs.WordPress/CustomFields/TermCustomField/ParseTermId_Tests.cs
index 176413702..12f824da2 100644
--- a/tests/Tests.Jeebs.WordPress/CustomFields/TermCustomField/ParseTermId_Tests.cs
+++ b/tests/Tests.Jeebs.WordPress/CustomFields/TermCustomField/ParseTermId_Tests.cs
@@ -24,7 +24,7 @@ public void Valid_Long_Returns_TermId()
 	{
 		// Arrange
 		var type = typeof(ParseTermId_Tests);
-		var value = Rnd.ULng;
+		var value = Rnd.UInt64;
 
 		// Act
 		var result = TermCustomField.ParseTermId(type, value.ToString());
diff --git a/tests/Tests.Jeebs.WordPress/Entities/Id_Tests.cs b/tests/Tests.Jeebs.WordPress/Entities/Id_Tests.cs
index d2ba925ba..829f2aacd 100644
--- a/tests/Tests.Jeebs.WordPress/Entities/Id_Tests.cs
+++ b/tests/Tests.Jeebs.WordPress/Entities/Id_Tests.cs
@@ -12,7 +12,7 @@ public abstract class Id_Tests<TEntity, TId>
 	protected void Test00(Func<ulong, TEntity> create)
 	{
 		// Arrange
-		var value = Rnd.ULng;
+		var value = Rnd.UInt64;
 		var entity = create(value);
 
 		// Act
diff --git a/tests/Tests.Jeebs.WordPress/Functions/QueryAttachmentsF/GetFilePathAsync_Tests.cs b/tests/Tests.Jeebs.WordPress/Functions/QueryAttachmentsF/GetFilePathAsync_Tests.cs
index 5ff88fe39..c7cfcf4eb 100644
--- a/tests/Tests.Jeebs.WordPress/Functions/QueryAttachmentsF/GetFilePathAsync_Tests.cs
+++ b/tests/Tests.Jeebs.WordPress/Functions/QueryAttachmentsF/GetFilePathAsync_Tests.cs
@@ -14,7 +14,7 @@ public async Task Attachment_Not_Found_Returns_None_With_AttachmentNotFoundMsg()
 	{
 		// Arrange
 		var (db, w, _) = Setup();
-		var empty = new List<Attachment>().AsEnumerable().WrapResult();
+		var empty = new List<Attachment>().AsEnumerable().Wrap().AsResult();
 		db.QueryAsync<Attachment>(Arg.Any<string>(), Arg.Any<object?>(), CommandType.Text, Arg.Any<IDbTransaction>()).Returns(empty);
 		var fileId = IdGen.ULongId<WpPostId>();
 
@@ -32,7 +32,7 @@ public async Task Multiple_Attachments_Found_Returns_None_With_MultipleAttachmen
 	{
 		// Arrange
 		var (db, w, _) = Setup();
-		var list = new[] { new Attachment(), new Attachment() }.AsEnumerable().WrapResult();
+		var list = new[] { new Attachment(), new Attachment() }.AsEnumerable().Wrap().AsResult();
 		db.QueryAsync<Attachment>(Arg.Any<string>(), Arg.Any<object?>(), CommandType.Text, Arg.Any<IDbTransaction>()).Returns(list);
 		var fileId = IdGen.ULongId<WpPostId>();
 
@@ -51,7 +51,7 @@ public async Task Returns_Attachment_File_Path()
 		// Arrange
 		var (db, w, v) = Setup();
 		var urlPath = Rnd.Str;
-		var single = new[] { new Attachment { UrlPath = urlPath } }.AsEnumerable().WrapResult();
+		var single = new[] { new Attachment { UrlPath = urlPath } }.AsEnumerable().Wrap().AsResult();
 		db.QueryAsync<Attachment>(Arg.Any<string>(), Arg.Any<object?>(), CommandType.Text, Arg.Any<IDbTransaction>()).Returns(single);
 
 		// Act
diff --git a/tests/Tests.Jeebs.WordPress/Functions/QueryAttachmentsF/GetQuery_Tests.cs b/tests/Tests.Jeebs.WordPress/Functions/QueryAttachmentsF/GetQuery_Tests.cs
index 21f7ca034..039d0cf13 100644
--- a/tests/Tests.Jeebs.WordPress/Functions/QueryAttachmentsF/GetQuery_Tests.cs
+++ b/tests/Tests.Jeebs.WordPress/Functions/QueryAttachmentsF/GetQuery_Tests.cs
@@ -28,8 +28,8 @@ public void Returns_Valid_Query()
 		// Arrange
 		var prefix = Rnd.Str;
 		var schema = new WpDbSchema(prefix);
-		var i0 = Rnd.ULng;
-		var i1 = Rnd.ULng;
+		var i0 = Rnd.UInt64;
+		var i1 = Rnd.UInt64;
 		var fileIds = ListF.Create<WpPostId>(new() { Value = i0 }, new() { Value = i1 });
 		var virtualUploadsUrl = Rnd.Str;
 		var expected =
diff --git a/tests/Tests.Jeebs.WordPress/Functions/QueryPostsF/ApplyContentFilters_Tests.cs b/tests/Tests.Jeebs.WordPress/Functions/QueryPostsF/ApplyContentFilters_Tests.cs
index d6f9d9d52..ae732bc9c 100644
--- a/tests/Tests.Jeebs.WordPress/Functions/QueryPostsF/ApplyContentFilters_Tests.cs
+++ b/tests/Tests.Jeebs.WordPress/Functions/QueryPostsF/ApplyContentFilters_Tests.cs
@@ -28,7 +28,7 @@ public void No_Posts_Does_Nothing()
 	public void No_Filters_Does_Nothing()
 	{
 		// Arrange
-		var posts = new[] { new Model(Rnd.ULng, Rnd.Str) };
+		var posts = new[] { new Model(Rnd.UInt64, Rnd.Str) };
 		var filters = Array.Empty<IContentFilter>();
 
 		// Act
@@ -43,7 +43,7 @@ public void No_Filters_Does_Nothing()
 	public void Catches_Exception_In_ContentFilter_Returns_None_With_ApplyContentFiltersExceptionMsg()
 	{
 		// Arrange
-		var posts = new[] { new Model(Rnd.ULng, Rnd.Str) };
+		var posts = new[] { new Model(Rnd.UInt64, Rnd.Str) };
 		var filter = Substitute.For<IContentFilter>();
 		var ex = new Exception();
 		filter.Execute(Arg.Any<string>()).Throws(ex);
@@ -61,9 +61,9 @@ public void Applies_Filters_To_Each_Post()
 	{
 		// Arrange
 		var c0 = Rnd.Str;
-		var p0 = new Model(Rnd.ULng, c0);
+		var p0 = new Model(Rnd.UInt64, c0);
 		var c1 = Rnd.Str;
-		var p1 = new Model(Rnd.ULng, c1);
+		var p1 = new Model(Rnd.UInt64, c1);
 		var posts = new[] { p0, p1 };
 
 		var f0 = Substitute.For<IContentFilter>();
diff --git a/tests/Tests.Jeebs.WordPress/Functions/QueryPostsF/GetPreviousAndNext_Tests.cs b/tests/Tests.Jeebs.WordPress/Functions/QueryPostsF/GetPreviousAndNext_Tests.cs
index 106809bc8..a3b8cb0a0 100644
--- a/tests/Tests.Jeebs.WordPress/Functions/QueryPostsF/GetPreviousAndNext_Tests.cs
+++ b/tests/Tests.Jeebs.WordPress/Functions/QueryPostsF/GetPreviousAndNext_Tests.cs
@@ -12,7 +12,7 @@ public void Empty_List_Returns_None_With_ListIsEmptyMsg()
 		var list = new List<ulong>();
 
 		// Act
-		var (r0, r1) = QueryPostsF.GetPreviousAndNext(Rnd.ULng, list);
+		var (r0, r1) = QueryPostsF.GetPreviousAndNext(Rnd.UInt64, list);
 
 		// Assert
 		Assert.Null(r0);
@@ -23,10 +23,10 @@ public void Empty_List_Returns_None_With_ListIsEmptyMsg()
 	public void Single_Item_Returns_None_With_ListContainsSingleItemMsg()
 	{
 		// Arrange
-		var list = new List<ulong> { Rnd.ULng };
+		var list = new List<ulong> { Rnd.UInt64 };
 
 		// Act
-		var (r0, r1) = QueryPostsF.GetPreviousAndNext(Rnd.ULng, list);
+		var (r0, r1) = QueryPostsF.GetPreviousAndNext(Rnd.UInt64, list);
 
 		// Assert
 		Assert.Null(r0);
@@ -38,7 +38,7 @@ public void Item_Not_In_List_Returns_None_With_ListDoesNotContainItemMsg()
 	{
 		// Arrange
 		var value = 10001U;
-		var list = new List<ulong> { Rnd.ULng, Rnd.ULng, Rnd.ULng };
+		var list = new List<ulong> { Rnd.UInt64, Rnd.UInt64, Rnd.UInt64 };
 
 		// Act
 		var (r0, r1) = QueryPostsF.GetPreviousAndNext(value, list);
@@ -52,9 +52,9 @@ public void Item_Not_In_List_Returns_None_With_ListDoesNotContainItemMsg()
 	public void First_Item_Returns_None_And_Next_Item()
 	{
 		// Arrange
-		var value = Rnd.ULng;
-		var next = Rnd.ULng;
-		var list = new List<ulong> { value, next, Rnd.ULng, Rnd.ULng };
+		var value = Rnd.UInt64;
+		var next = Rnd.UInt64;
+		var list = new List<ulong> { value, next, Rnd.UInt64, Rnd.UInt64 };
 
 		// Act
 		var (r0, r1) = QueryPostsF.GetPreviousAndNext(value, list);
@@ -69,9 +69,9 @@ public void First_Item_Returns_None_And_Next_Item()
 	public void Last_Item_Returns_Previous_Item_And_None()
 	{
 		// Arrange
-		var value = Rnd.ULng;
-		var prev = Rnd.ULng;
-		var list = new List<ulong> { Rnd.ULng, Rnd.ULng, prev, value };
+		var value = Rnd.UInt64;
+		var prev = Rnd.UInt64;
+		var list = new List<ulong> { Rnd.UInt64, Rnd.UInt64, prev, value };
 
 		// Act
 		var (r0, r1) = QueryPostsF.GetPreviousAndNext(value, list);
@@ -86,10 +86,10 @@ public void Last_Item_Returns_Previous_Item_And_None()
 	public void Returns_Previous_And_Next_Items()
 	{
 		// Arrange
-		var value = Rnd.ULng;
-		var prev = Rnd.ULng;
-		var next = Rnd.ULng;
-		var list = new List<ulong> { Rnd.ULng, Rnd.ULng, prev, value, next, Rnd.ULng, Rnd.ULng };
+		var value = Rnd.UInt64;
+		var prev = Rnd.UInt64;
+		var next = Rnd.UInt64;
+		var list = new List<ulong> { Rnd.UInt64, Rnd.UInt64, prev, value, next, Rnd.UInt64, Rnd.UInt64 };
 
 		// Act
 		var (r0, r1) = QueryPostsF.GetPreviousAndNext(value, list);

From 612f38f3f19692824bad982f8d3696d9a87e20bd Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Thu, 29 Jan 2026 15:25:00 +0000
Subject: [PATCH 07/12] Using new Actions for returning None values - #531

---
 src/Jeebs.Data/Query/FluentQuery.Sort.cs       | 2 +-
 src/Jeebs.Data/Query/FluentQuery.Where.cs      | 6 +++---
 src/Jeebs.Logging.Serilog.MySql/MySqlLogger.cs | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Jeebs.Data/Query/FluentQuery.Sort.cs b/src/Jeebs.Data/Query/FluentQuery.Sort.cs
index 9a4f751d6..1d157c734 100644
--- a/src/Jeebs.Data/Query/FluentQuery.Sort.cs
+++ b/src/Jeebs.Data/Query/FluentQuery.Sort.cs
@@ -30,6 +30,6 @@ public IFluentQuery<TEntity, TId> Sort<TValue>(Expression<Func<TEntity, TValue>>
 		aliasSelector.GetPropertyInfo()
 			.Match(
 				some: x => Sort(x.Name, order),
-				none: this
+				none: () => this
 			);
 }
diff --git a/src/Jeebs.Data/Query/FluentQuery.Where.cs b/src/Jeebs.Data/Query/FluentQuery.Where.cs
index 6b92c1625..b705f2175 100644
--- a/src/Jeebs.Data/Query/FluentQuery.Where.cs
+++ b/src/Jeebs.Data/Query/FluentQuery.Where.cs
@@ -72,7 +72,7 @@ public IFluentQuery<TEntity, TId> Where<TValue>(Expression<Func<TEntity, TValue>
 		aliasSelector.GetPropertyInfo()
 			.Match(
 				some: x => Where(x.Name, compare, value),
-				none: this
+				none: () => this
 			);
 
 	/// <inheritdoc/>
@@ -105,7 +105,7 @@ public IFluentQuery<TEntity, TId> WhereIn<TValue>(Expression<Func<TEntity, TValu
 		aliasSelector.GetPropertyInfo()
 			.Match(
 				some: x => WhereIn(x.Name, values),
-				none: this
+				none: () => this
 			);
 
 	/// <inheritdoc/>
@@ -124,6 +124,6 @@ public IFluentQuery<TEntity, TId> WhereNotIn<TValue>(Expression<Func<TEntity, TV
 		aliasSelector.GetPropertyInfo()
 			.Match(
 				some: x => WhereNotIn(x.Name, values),
-				none: this
+				none: () => this
 			);
 }
diff --git a/src/Jeebs.Logging.Serilog.MySql/MySqlLogger.cs b/src/Jeebs.Logging.Serilog.MySql/MySqlLogger.cs
index 6434a4547..7040748b3 100644
--- a/src/Jeebs.Logging.Serilog.MySql/MySqlLogger.cs
+++ b/src/Jeebs.Logging.Serilog.MySql/MySqlLogger.cs
@@ -40,7 +40,7 @@ public MySqlLogger(string name) =>
 	public bool IsEnabled(MySqlConnectorLogLevel level) =>
 		LevelF.ConvertToSerilogLevel(level).Match(
 			some: Logger.IsEnabled,
-			none: false
+			none: () => false
 		);
 
 	/// <summary>

From e923644edf130e736f31f223a2aef9dc2408fe05 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Thu, 29 Jan 2026 15:25:14 +0000
Subject: [PATCH 08/12] Using new Wrap F.Format - #531

---
 src/Jeebs/Config/App/AppConfig.cs                          | 3 +--
 src/Jeebs/Extensions/String/StringExtensions.FormatWith.cs | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Jeebs/Config/App/AppConfig.cs b/src/Jeebs/Config/App/AppConfig.cs
index 52282fd09..9808a4588 100644
--- a/src/Jeebs/Config/App/AppConfig.cs
+++ b/src/Jeebs/Config/App/AppConfig.cs
@@ -2,7 +2,6 @@
 // Copyright (c) bfren - licensed under https://mit.bfren.dev/2013
 
 using System;
-using Jeebs.Functions;
 using Microsoft.Extensions.Options;
 
 namespace Jeebs.Config.App;
@@ -32,7 +31,7 @@ public sealed record class AppConfig : IOptions<AppConfig>
 	/// otherwise simply <see cref="Name"/>.
 	/// </summary>
 	public string FullName =>
-		StringF.Format("{0}/", Suite, string.Empty) + Name;
+		F.Format("{0}/", Suite, string.Empty) + Name;
 
 	/// <summary>
 	/// Application Version.
diff --git a/src/Jeebs/Extensions/String/StringExtensions.FormatWith.cs b/src/Jeebs/Extensions/String/StringExtensions.FormatWith.cs
index 7fcd16faf..76605dbf1 100644
--- a/src/Jeebs/Extensions/String/StringExtensions.FormatWith.cs
+++ b/src/Jeebs/Extensions/String/StringExtensions.FormatWith.cs
@@ -7,7 +7,7 @@ namespace Jeebs;
 
 public static partial class StringExtensions
 {
-	/// <inheritdoc cref="StringF.Format{T}(string, T)"/>
+	/// <inheritdoc cref="F.Format{T}(string, T)"/>
 	public static string FormatWith<T>(this string @this, T source) =>
-		Modify(@this, () => StringF.Format(@this, source));
+		Modify(@this, () => F.Format(@this, source));
 }

From fc5978948837700449e7225c8b024f3b344b376d Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Thu, 29 Jan 2026 15:27:00 +0000
Subject: [PATCH 09/12] Enforcing nullable in editorconfig - #531

---
 .editorconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.editorconfig b/.editorconfig
index 9a7532823..d44c44ec7 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -477,6 +477,9 @@ dotnet_style_require_accessibility_modifiers = for_non_interface_members
 # 'using' directive preferences
 csharp_using_directive_placement = outside_namespace:warning
 
+# CS8625: Cannot convert null literal to non-nullable reference type.
+dotnet_diagnostic.CS8625.severity = error
+
 
 ##########################################
 # Disable various diagnostics

From 1094af64e886f5ca0f94bfcd5beeb141aad82927 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Fri, 30 Jan 2026 14:22:44 +0000
Subject: [PATCH 10/12] Updating packages

---
 Directory.Packages.props | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index d8ec0f4f1..185fbe651 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -45,10 +45,10 @@
     <PackageVersion Include="System.Data.SQLite.Core" Version="1.0.119" />
     <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.15.0" />
     <PackageVersion Include="System.Text.Json" Version="10.0.2" />
-    <PackageVersion Include="Wrap" Version="1.1.0-beta.3" />
-    <PackageVersion Include="Wrap.Id.Dapper" Version="1.1.0-beta.3" />
-    <PackageVersion Include="Wrap.Id.Mvc" Version="1.1.0-beta.3" />
-    <PackageVersion Include="Wrap.Testing" Version="1.1.0-beta.3" />
+    <PackageVersion Include="Wrap" Version="1.1.0-beta.4" />
+    <PackageVersion Include="Wrap.Id.Dapper" Version="1.1.0-beta.4" />
+    <PackageVersion Include="Wrap.Id.Mvc" Version="1.1.0-beta.4" />
+    <PackageVersion Include="Wrap.Testing" Version="1.1.0-beta.4" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
     <PackageVersion Include="xunit.v3" Version="3.2.2" />
     <PackageVersion Include="xunit.v3.assert" Version="3.2.2" />

From de6d4a3c7adab697a88c8f7150c7b08d5ada74c0 Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Fri, 30 Jan 2026 14:26:32 +0000
Subject: [PATCH 11/12] Adding NoneGenerator - #531

---
 tests/Directory.Build.props | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index 5aba6d730..d9284f315 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -16,8 +16,9 @@
     <Using Include="Xunit" />
   </ItemGroup>
   <ItemGroup>
-    <Using Include="Wrap.Testing.IdGenerator" Alias="IdGen" />
     <Using Include="Wrap.Testing.FailureGenerator" Alias="FailGen" />
+    <Using Include="Wrap.Testing.IdGenerator" Alias="IdGen" />
+    <Using Include="Wrap.Testing.NoneGenerator" Alias="NoneGen" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="coverlet.collector">
@@ -38,4 +39,4 @@
     </PackageReference>
     <PackageReference Include="xunit.v3" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

From b8a94aa906b4639e02ebe4a144ce8817d34456ff Mon Sep 17 00:00:00 2001
From: bfren <bf@bfren.dev>
Date: Fri, 30 Jan 2026 14:26:44 +0000
Subject: [PATCH 12/12] Running code cleanup

---
 apps/AppConsolePg/Db.cs                                    | 1 -
 src/Jeebs/Extensions/String/StringExtensions.FormatWith.cs | 2 --
 2 files changed, 3 deletions(-)

diff --git a/apps/AppConsolePg/Db.cs b/apps/AppConsolePg/Db.cs
index d2496b935..2ca1b2399 100644
--- a/apps/AppConsolePg/Db.cs
+++ b/apps/AppConsolePg/Db.cs
@@ -5,7 +5,6 @@
 using Jeebs.Data;
 using Jeebs.Logging;
 using Microsoft.Extensions.Options;
-using Wrap.Extensions;
 
 namespace AppConsolePg;
 
diff --git a/src/Jeebs/Extensions/String/StringExtensions.FormatWith.cs b/src/Jeebs/Extensions/String/StringExtensions.FormatWith.cs
index 76605dbf1..d1d2aa515 100644
--- a/src/Jeebs/Extensions/String/StringExtensions.FormatWith.cs
+++ b/src/Jeebs/Extensions/String/StringExtensions.FormatWith.cs
@@ -1,8 +1,6 @@
 // Jeebs Rapid Application Development
 // Copyright (c) bfren - licensed under https://mit.bfren.dev/2013
 
-using Jeebs.Functions;
-
 namespace Jeebs;
 
 public static partial class StringExtensions