diff --git a/package-versions.props b/package-versions.props
index e894e80861..894fd70d25 100644
--- a/package-versions.props
+++ b/package-versions.props
@@ -7,7 +7,7 @@
 
     <!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
     <BenchmarkDotNetVersion>0.13.*</BenchmarkDotNetVersion>
-    <BogusVersion>35.2.*</BogusVersion>
+    <BogusVersion>35.5.*</BogusVersion>
     <CodeAnalysisVersion>4.9.*</CodeAnalysisVersion>
     <CoverletVersion>6.0.*</CoverletVersion>
     <DapperVersion>2.1.*</DapperVersion>
@@ -15,9 +15,8 @@
     <GitHubActionsTestLoggerVersion>2.3.*</GitHubActionsTestLoggerVersion>
     <InheritDocVersion>2.0.*</InheritDocVersion>
     <SourceLinkVersion>8.0.*</SourceLinkVersion>
-    <TestSdkVersion>17.8.*</TestSdkVersion>
-    <XunitVersion>2.6.*</XunitVersion>
-    <XunitVisualStudioVersion>2.5.*</XunitVisualStudioVersion>
+    <TestSdkVersion>17.9.*</TestSdkVersion>
+    <XunitVersion>2.8.*</XunitVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
@@ -26,7 +25,7 @@
 
     <!-- Non-published dependencies (these are safe to update, won't cause a breaking change) -->
     <AspNetCoreVersion>8.0.*</AspNetCoreVersion>
-    <EntityFrameworkCoreVersion>8.0.*-*</EntityFrameworkCoreVersion>
+    <EntityFrameworkCoreVersion>8.0.*</EntityFrameworkCoreVersion>
     <SystemTextJsonVersion>$(AspNetCoreVersion)</SystemTextJsonVersion>
   </PropertyGroup>
 
diff --git a/src/Examples/DapperExample/appsettings.json b/src/Examples/DapperExample/appsettings.json
index b4ddb2dac9..7854646e7f 100644
--- a/src/Examples/DapperExample/appsettings.json
+++ b/src/Examples/DapperExample/appsettings.json
@@ -4,9 +4,9 @@
     // docker run --rm --detach --name dapper-example-postgresql-db -e POSTGRES_USER=postgres -e POSTGRES_PASSWORD=postgres -p 5432:5432 postgres:latest
     // docker run --rm --detach --name dapper-example-postgresql-management --link dapper-example-postgresql-db:db -e PGADMIN_DEFAULT_EMAIL=admin@admin.com -e PGADMIN_DEFAULT_PASSWORD=postgres -p 5050:80 dpage/pgadmin4:latest
     "DapperExamplePostgreSql": "Host=localhost;Database=DapperExample;User ID=postgres;Password=postgres;Include Error Detail=true",
-    // docker run --rm --detach --name dapper-example-mysql-db -e MYSQL_ROOT_PASSWORD=mysql -e MYSQL_DATABASE=DapperExample -e MYSQL_USER=mysql -e MYSQL_PASSWORD=mysql -p 3306:3306 mysql:latest --default-authentication-plugin=mysql_native_password
+    // docker run --rm --detach --name dapper-example-mysql-db -e MYSQL_ROOT_PASSWORD=mysql -e MYSQL_DATABASE=DapperExample -e MYSQL_USER=mysql -e MYSQL_PASSWORD=mysql -p 3306:3306 mysql:latest
     // docker run --rm --detach --name dapper-example-mysql-management --link dapper-example-mysql-db:db -p 8081:80 phpmyadmin/phpmyadmin
-    "DapperExampleMySql": "Host=localhost;Database=DapperExample;User ID=mysql;Password=mysql",
+    "DapperExampleMySql": "Host=localhost;Database=DapperExample;User ID=mysql;Password=mysql;SSL Mode=None;AllowPublicKeyRetrieval=True",
     // docker run --rm --detach --name dapper-example-sqlserver -e "ACCEPT_EULA=Y" -e "MSSQL_SA_PASSWORD=Passw0rd!" -p 1433:1433 mcr.microsoft.com/mssql/server:2022-latest
     "DapperExampleSqlServer": "Server=localhost;Database=DapperExample;User ID=sa;Password=Passw0rd!;TrustServerCertificate=true"
   },
diff --git a/test/DapperTests/IntegrationTests/DapperTestContext.cs b/test/DapperTests/IntegrationTests/DapperTestContext.cs
index 233162e2e8..5817db099a 100644
--- a/test/DapperTests/IntegrationTests/DapperTestContext.cs
+++ b/test/DapperTests/IntegrationTests/DapperTestContext.cs
@@ -58,7 +58,7 @@ private WebApplicationFactory<TodoItem> CreateFactory()
                 $"Host=localhost;Database=DapperExample-{Guid.NewGuid():N};User ID=postgres;Password=postgres;Include Error Detail=true");
 
             builder.UseSetting("ConnectionStrings:DapperExampleMySql",
-                $"Host=localhost;Database=DapperExample-{Guid.NewGuid():N};User ID=root;Password=mysql;SSL Mode=None");
+                $"Host=localhost;Database=DapperExample-{Guid.NewGuid():N};User ID=root;Password=mysql;SSL Mode=None;AllowPublicKeyRetrieval=True");
 
             builder.UseSetting("ConnectionStrings:DapperExampleSqlServer",
                 $"Server=localhost;Database=DapperExample-{Guid.NewGuid():N};User ID=sa;Password=Passw0rd!;TrustServerCertificate=true");
diff --git a/test/DapperTests/IntegrationTests/FrozenClock.cs b/test/DapperTests/IntegrationTests/FrozenClock.cs
index c7ca4ea851..7edfadce5b 100644
--- a/test/DapperTests/IntegrationTests/FrozenClock.cs
+++ b/test/DapperTests/IntegrationTests/FrozenClock.cs
@@ -1,13 +1,11 @@
 using DapperExample;
-using FluentAssertions.Extensions;
 using JetBrains.Annotations;
+using TestBuildingBlocks;
 
 namespace DapperTests.IntegrationTests;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
 internal sealed class FrozenClock : IClock
 {
-    private static readonly DateTimeOffset DefaultTime = 1.January(2020).At(1, 1, 1).AsUtc();
-
-    public DateTimeOffset UtcNow { get; set; } = DefaultTime;
+    public DateTimeOffset UtcNow { get; set; } = FrozenSystemClock.DefaultDateTimeOffsetUtc;
 }
diff --git a/test/DapperTests/IntegrationTests/TestFakers.cs b/test/DapperTests/IntegrationTests/TestFakers.cs
index 7b66367b7c..8b95338aea 100644
--- a/test/DapperTests/IntegrationTests/TestFakers.cs
+++ b/test/DapperTests/IntegrationTests/TestFakers.cs
@@ -9,11 +9,11 @@
 
 namespace DapperTests.IntegrationTests;
 
-internal sealed class TestFakers : FakerContainer
+internal sealed class TestFakers
 {
     private readonly Lazy<Faker<TodoItem>> _lazyTodoItemFaker = new(() =>
         new Faker<TodoItem>()
-            .UseSeed(GetFakerSeed())
+            .MakeDeterministic()
             .RuleFor(todoItem => todoItem.Description, faker => faker.Lorem.Sentence())
             .RuleFor(todoItem => todoItem.Priority, faker => faker.Random.Enum<TodoItemPriority>())
             .RuleFor(todoItem => todoItem.DurationInHours, faker => faker.Random.Long(1, 250))
@@ -24,31 +24,31 @@ internal sealed class TestFakers : FakerContainer
 
     private readonly Lazy<Faker<LoginAccount>> _lazyLoginAccountFaker = new(() =>
         new Faker<LoginAccount>()
-            .UseSeed(GetFakerSeed())
+            .MakeDeterministic()
             .RuleFor(loginAccount => loginAccount.UserName, faker => faker.Internet.UserName())
             .RuleFor(loginAccount => loginAccount.LastUsedAt, faker => faker.Date.PastOffset()
                 .TruncateToWholeMilliseconds()));
 
     private readonly Lazy<Faker<AccountRecovery>> _lazyAccountRecoveryFaker = new(() =>
         new Faker<AccountRecovery>()
-            .UseSeed(GetFakerSeed())
+            .MakeDeterministic()
             .RuleFor(accountRecovery => accountRecovery.PhoneNumber, faker => faker.Person.Phone)
             .RuleFor(accountRecovery => accountRecovery.EmailAddress, faker => faker.Person.Email));
 
     private readonly Lazy<Faker<Person>> _lazyPersonFaker = new(() =>
         new Faker<Person>()
-            .UseSeed(GetFakerSeed())
+            .MakeDeterministic()
             .RuleFor(person => person.FirstName, faker => faker.Name.FirstName())
             .RuleFor(person => person.LastName, faker => faker.Name.LastName()));
 
     private readonly Lazy<Faker<Tag>> _lazyTagFaker = new(() =>
         new Faker<Tag>()
-            .UseSeed(GetFakerSeed())
+            .MakeDeterministic()
             .RuleFor(tag => tag.Name, faker => faker.Lorem.Word()));
 
     private readonly Lazy<Faker<RgbColorType>> _lazyRgbColorFaker = new(() =>
         new Faker<RgbColorType>()
-            .UseSeed(GetFakerSeed())
+            .MakeDeterministic()
             .RuleFor(rgbColor => rgbColor.Id, faker => RgbColorType.Create(faker.Random.Byte(), faker.Random.Byte(), faker.Random.Byte())
                 .Id));
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionFakers.cs
index 18b5536f36..3fd7fb7b5c 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Archiving/TelevisionFakers.cs
@@ -6,24 +6,24 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.Archiving;
 
-internal sealed class TelevisionFakers : FakerContainer
+internal sealed class TelevisionFakers
 {
     private readonly Lazy<Faker<TelevisionNetwork>> _lazyTelevisionNetworkFaker = new(() => new Faker<TelevisionNetwork>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(network => network.Name, faker => faker.Company.CompanyName()));
 
     private readonly Lazy<Faker<TelevisionStation>> _lazyTelevisionStationFaker = new(() => new Faker<TelevisionStation>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(station => station.Name, faker => faker.Company.CompanyName()));
 
     private readonly Lazy<Faker<TelevisionBroadcast>> _lazyTelevisionBroadcastFaker = new(() => new Faker<TelevisionBroadcast>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(broadcast => broadcast.Title, faker => faker.Lorem.Sentence())
         .RuleFor(broadcast => broadcast.AiredAt, faker => faker.Date.PastOffset().TruncateToWholeMilliseconds())
         .RuleFor(broadcast => broadcast.ArchivedAt, faker => faker.Date.RecentOffset().TruncateToWholeMilliseconds()));
 
     private readonly Lazy<Faker<BroadcastComment>> _lazyBroadcastCommentFaker = new(() => new Faker<BroadcastComment>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(comment => comment.Text, faker => faker.Lorem.Paragraph())
         .RuleFor(comment => comment.CreatedAt, faker => faker.Date.PastOffset().TruncateToWholeMilliseconds()));
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsFakers.cs
index 6666a4ffb9..b66fa6d5df 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/AtomicOperations/OperationsFakers.cs
@@ -7,7 +7,7 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.AtomicOperations;
 
-internal sealed class OperationsFakers : FakerContainer
+internal sealed class OperationsFakers
 {
     private static readonly Lazy<IReadOnlyList<string>> LazyLanguageIsoCodes = new(() => CultureInfo
         .GetCultures(CultureTypes.NeutralCultures)
@@ -16,32 +16,32 @@ internal sealed class OperationsFakers : FakerContainer
         .ToArray());
 
     private readonly Lazy<Faker<Playlist>> _lazyPlaylistFaker = new(() => new Faker<Playlist>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(playlist => playlist.Name, faker => faker.Lorem.Sentence()));
 
     private readonly Lazy<Faker<MusicTrack>> _lazyMusicTrackFaker = new(() => new Faker<MusicTrack>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(musicTrack => musicTrack.Title, faker => faker.Lorem.Word())
         .RuleFor(musicTrack => musicTrack.LengthInSeconds, faker => faker.Random.Decimal(3 * 60, 5 * 60))
         .RuleFor(musicTrack => musicTrack.Genre, faker => faker.Lorem.Word())
         .RuleFor(musicTrack => musicTrack.ReleasedAt, faker => faker.Date.PastOffset().TruncateToWholeMilliseconds()));
 
     private readonly Lazy<Faker<Lyric>> _lazyLyricFaker = new(() => new Faker<Lyric>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(lyric => lyric.Text, faker => faker.Lorem.Text())
         .RuleFor(lyric => lyric.Format, "LRC"));
 
     private readonly Lazy<Faker<TextLanguage>> _lazyTextLanguageFaker = new(() => new Faker<TextLanguage>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(textLanguage => textLanguage.IsoCode, faker => faker.PickRandom<string>(LazyLanguageIsoCodes.Value)));
 
     private readonly Lazy<Faker<Performer>> _lazyPerformerFaker = new(() => new Faker<Performer>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(performer => performer.ArtistName, faker => faker.Name.FullName())
         .RuleFor(performer => performer.BornAt, faker => faker.Date.PastOffset().TruncateToWholeMilliseconds()));
 
     private readonly Lazy<Faker<RecordCompany>> _lazyRecordCompanyFaker = new(() => new Faker<RecordCompany>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(recordCompany => recordCompany.Name, faker => faker.Company.CompanyName())
         .RuleFor(recordCompany => recordCompany.CountryOfResidence, faker => faker.Address.Country()));
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Authorization/Scopes/ScopesFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Authorization/Scopes/ScopesFakers.cs
index 3e89966d4d..ab3da93f38 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Authorization/Scopes/ScopesFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Authorization/Scopes/ScopesFakers.cs
@@ -6,21 +6,21 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.Authorization.Scopes;
 
-internal sealed class ScopesFakers : FakerContainer
+internal sealed class ScopesFakers
 {
     private readonly Lazy<Faker<Movie>> _lazyMovieFaker = new(() => new Faker<Movie>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(movie => movie.Title, faker => faker.Random.Words())
         .RuleFor(movie => movie.ReleaseYear, faker => faker.Random.Int(1900, 2050))
         .RuleFor(movie => movie.DurationInSeconds, faker => faker.Random.Int(300, 14400)));
 
     private readonly Lazy<Faker<Actor>> _lazyActorFaker = new(() => new Faker<Actor>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(actor => actor.Name, faker => faker.Person.FullName)
         .RuleFor(actor => actor.BornAt, faker => faker.Date.Past()));
 
     private readonly Lazy<Faker<Genre>> _lazyGenreFaker = new(() => new Faker<Genre>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(genre => genre.Name, faker => faker.Random.Word()));
 
     public Faker<Movie> Movie => _lazyMovieFaker.Value;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs/BlobFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs/BlobFakers.cs
index 22f5a20d36..be84cf1ad1 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs/BlobFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Blobs/BlobFakers.cs
@@ -6,10 +6,10 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.Blobs;
 
-internal sealed class BlobFakers : FakerContainer
+internal sealed class BlobFakers
 {
     private readonly Lazy<Faker<ImageContainer>> _lazyImageContainerFaker = new(() => new Faker<ImageContainer>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(imageContainer => imageContainer.FileName, faker => faker.System.FileName())
         .RuleFor(imageContainer => imageContainer.Data, faker => faker.Random.Bytes(128))
         .RuleFor(imageContainer => imageContainer.Thumbnail, faker => faker.Random.Bytes(64)));
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeKeyFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeKeyFakers.cs
index e64e7bf8b2..56cc55beee 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeKeyFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CompositeKeys/CompositeKeyFakers.cs
@@ -6,19 +6,19 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.CompositeKeys;
 
-internal sealed class CompositeKeyFakers : FakerContainer
+internal sealed class CompositeKeyFakers
 {
     private readonly Lazy<Faker<Car>> _lazyCarFaker = new(() => new Faker<Car>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(car => car.LicensePlate, faker => faker.Random.Replace("??-??-##"))
         .RuleFor(car => car.RegionId, faker => faker.Random.Long(100, 999)));
 
     private readonly Lazy<Faker<Engine>> _lazyEngineFaker = new(() => new Faker<Engine>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(engine => engine.SerialCode, faker => faker.Random.Replace("????-????")));
 
     private readonly Lazy<Faker<Dealership>> _lazyDealershipFaker = new(() => new Faker<Dealership>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(dealership => dealership.Address, faker => faker.Address.FullAddress()));
 
     public Faker<Car> Car => _lazyCarFaker.Value;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteFakers.cs
index 5a0452010c..832993a626 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/CustomRoutes/CustomRouteFakers.cs
@@ -6,16 +6,16 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.CustomRoutes;
 
-internal sealed class CustomRouteFakers : FakerContainer
+internal sealed class CustomRouteFakers
 {
     private readonly Lazy<Faker<Town>> _lazyTownFaker = new(() => new Faker<Town>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(town => town.Name, faker => faker.Address.City())
         .RuleFor(town => town.Latitude, faker => faker.Address.Latitude())
         .RuleFor(town => town.Longitude, faker => faker.Address.Longitude()));
 
     private readonly Lazy<Faker<Civilian>> _lazyCivilianFaker = new(() => new Faker<Civilian>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(civilian => civilian.Name, faker => faker.Person.FullName));
 
     public Faker<Town> Town => _lazyTownFaker.Value;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingFakers.cs
index 77e25a8192..73ad80ce33 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/EagerLoading/EagerLoadingFakers.cs
@@ -6,31 +6,31 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.EagerLoading;
 
-internal sealed class EagerLoadingFakers : FakerContainer
+internal sealed class EagerLoadingFakers
 {
     private readonly Lazy<Faker<State>> _lazyStateFaker = new(() => new Faker<State>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(state => state.Name, faker => faker.Address.City()));
 
     private readonly Lazy<Faker<City>> _lazyCityFaker = new(() => new Faker<City>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(city => city.Name, faker => faker.Address.City()));
 
     private readonly Lazy<Faker<Street>> _lazyStreetFaker = new(() => new Faker<Street>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(street => street.Name, faker => faker.Address.StreetName()));
 
     private readonly Lazy<Faker<Building>> _lazyBuildingFaker = new(() => new Faker<Building>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(building => building.Number, faker => faker.Address.BuildingNumber()));
 
     private readonly Lazy<Faker<Window>> _lazyWindowFaker = new(() => new Faker<Window>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(window => window.HeightInCentimeters, faker => faker.Random.Number(30, 199))
         .RuleFor(window => window.WidthInCentimeters, faker => faker.Random.Number(30, 199)));
 
     private readonly Lazy<Faker<Door>> _lazyDoorFaker = new(() => new Faker<Door>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(door => door.Color, faker => faker.Commerce.Color()));
 
     public Faker<State> State => _lazyStateFaker.Value;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingFakers.cs
index 33bd79ba9d..8fb0944c32 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/HostingInIIS/HostingFakers.cs
@@ -6,14 +6,14 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.HostingInIIS;
 
-internal sealed class HostingFakers : FakerContainer
+internal sealed class HostingFakers
 {
     private readonly Lazy<Faker<ArtGallery>> _lazyArtGalleryFaker = new(() => new Faker<ArtGallery>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(artGallery => artGallery.Theme, faker => faker.Lorem.Word()));
 
     private readonly Lazy<Faker<Painting>> _lazyPaintingFaker = new(() => new Faker<Painting>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(painting => painting.Title, faker => faker.Lorem.Sentence()));
 
     public Faker<ArtGallery> ArtGallery => _lazyArtGalleryFaker.Value;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscationFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscationFakers.cs
index 2755d1ebcb..001a2cbe52 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscationFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/IdObfuscation/ObfuscationFakers.cs
@@ -6,14 +6,14 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.IdObfuscation;
 
-internal sealed class ObfuscationFakers : FakerContainer
+internal sealed class ObfuscationFakers
 {
     private readonly Lazy<Faker<BankAccount>> _lazyBankAccountFaker = new(() => new Faker<BankAccount>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(bankAccount => bankAccount.Iban, faker => faker.Finance.Iban()));
 
     private readonly Lazy<Faker<DebitCard>> _lazyDebitCardFaker = new(() => new Faker<DebitCard>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(debitCard => debitCard.OwnerName, faker => faker.Name.FullName())
         .RuleFor(debitCard => debitCard.PinCode, faker => (short)faker.Random.Number(1000, 9999)));
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateFakers.cs
index 1939a168dc..6a11c9c247 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/InputValidation/ModelState/ModelStateFakers.cs
@@ -7,7 +7,7 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.InputValidation.ModelState;
 
-internal sealed class ModelStateFakers : FakerContainer
+internal sealed class ModelStateFakers
 {
     private static readonly DateOnly MinCreatedOn = DateOnly.Parse("2000-01-01", CultureInfo.InvariantCulture);
     private static readonly DateOnly MaxCreatedOn = DateOnly.Parse("2050-01-01", CultureInfo.InvariantCulture);
@@ -16,11 +16,11 @@ internal sealed class ModelStateFakers : FakerContainer
     private static readonly TimeOnly MaxCreatedAt = TimeOnly.Parse("17:30:00", CultureInfo.InvariantCulture);
 
     private readonly Lazy<Faker<SystemVolume>> _lazySystemVolumeFaker = new(() => new Faker<SystemVolume>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(systemVolume => systemVolume.Name, faker => faker.Lorem.Word()));
 
     private readonly Lazy<Faker<SystemFile>> _lazySystemFileFaker = new(() => new Faker<SystemFile>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(systemFile => systemFile.FileName, faker => faker.System.FileName())
         .RuleFor(systemFile => systemFile.Attributes, faker => faker.Random.Enum(FileAttributes.Normal, FileAttributes.Hidden, FileAttributes.ReadOnly))
         .RuleFor(systemFile => systemFile.SizeInBytes, faker => faker.Random.Long(0, 1_000_000))
@@ -28,7 +28,7 @@ internal sealed class ModelStateFakers : FakerContainer
         .RuleFor(systemFile => systemFile.CreatedAt, faker => faker.Date.BetweenTimeOnly(MinCreatedAt, MaxCreatedAt)));
 
     private readonly Lazy<Faker<SystemDirectory>> _lazySystemDirectoryFaker = new(() => new Faker<SystemDirectory>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(systemDirectory => systemDirectory.Name, faker => Path.GetFileNameWithoutExtension(faker.System.FileName()))
         .RuleFor(systemDirectory => systemDirectory.IsCaseSensitive, faker => faker.Random.Bool()));
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinksFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinksFakers.cs
index a1acafeb7d..4b7da39862 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinksFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Links/LinksFakers.cs
@@ -6,18 +6,18 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.Links;
 
-internal sealed class LinksFakers : FakerContainer
+internal sealed class LinksFakers
 {
     private readonly Lazy<Faker<PhotoAlbum>> _lazyPhotoAlbumFaker = new(() => new Faker<PhotoAlbum>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(photoAlbum => photoAlbum.Name, faker => faker.Lorem.Sentence()));
 
     private readonly Lazy<Faker<Photo>> _lazyPhotoFaker = new(() => new Faker<Photo>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(photo => photo.Url, faker => faker.Image.PlaceImgUrl()));
 
     private readonly Lazy<Faker<PhotoLocation>> _lazyPhotoLocationFaker = new(() => new Faker<PhotoLocation>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(photoLocation => photoLocation.PlaceName, faker => faker.Address.FullAddress())
         .RuleFor(photoLocation => photoLocation.Latitude, faker => faker.Address.Latitude())
         .RuleFor(photoLocation => photoLocation.Longitude, faker => faker.Address.Longitude()));
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingFakers.cs
index a52f164bf0..a66cdcdf55 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Logging/LoggingFakers.cs
@@ -6,19 +6,19 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.Logging;
 
-internal sealed class LoggingFakers : FakerContainer
+internal sealed class LoggingFakers
 {
     private readonly Lazy<Faker<AuditEntry>> _lazyAuditEntryFaker = new(() => new Faker<AuditEntry>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(auditEntry => auditEntry.UserName, faker => faker.Internet.UserName())
         .RuleFor(auditEntry => auditEntry.CreatedAt, faker => faker.Date.PastOffset().TruncateToWholeMilliseconds()));
 
     private readonly Lazy<Faker<Banana>> _lazyBananaFaker = new(() => new Faker<Banana>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(banana => banana.LengthInCentimeters, faker => faker.Random.Double(10, 25)));
 
     private readonly Lazy<Faker<Peach>> _lazyPeachFaker = new(() => new Faker<Peach>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(peach => peach.DiameterInCentimeters, faker => faker.Random.Double(6, 7.5)));
 
     public Faker<AuditEntry> AuditEntry => _lazyAuditEntryFaker.Value;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/MetaFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/MetaFakers.cs
index c6cd2b5859..019dd6aa9b 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/MetaFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Meta/MetaFakers.cs
@@ -6,14 +6,14 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.Meta;
 
-internal sealed class MetaFakers : FakerContainer
+internal sealed class MetaFakers
 {
     private readonly Lazy<Faker<ProductFamily>> _lazyProductFamilyFaker = new(() => new Faker<ProductFamily>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(productFamily => productFamily.Name, faker => faker.Commerce.ProductName()));
 
     private readonly Lazy<Faker<SupportTicket>> _lazySupportTicketFaker = new(() => new Faker<SupportTicket>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(supportTicket => supportTicket.Description, faker => faker.Lorem.Paragraph()));
 
     public Faker<ProductFamily> ProductFamily => _lazyProductFamilyFaker.Value;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainFakers.cs
index 54d3812b97..c536656d9d 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Microservices/DomainFakers.cs
@@ -6,15 +6,15 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.Microservices;
 
-internal sealed class DomainFakers : FakerContainer
+internal sealed class DomainFakers
 {
     private readonly Lazy<Faker<DomainUser>> _lazyDomainUserFaker = new(() => new Faker<DomainUser>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(domainUser => domainUser.LoginName, faker => faker.Person.UserName)
         .RuleFor(domainUser => domainUser.DisplayName, faker => faker.Person.FullName));
 
     private readonly Lazy<Faker<DomainGroup>> _lazyDomainGroupFaker = new(() => new Faker<DomainGroup>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(domainGroup => domainGroup.Name, faker => faker.Commerce.Department()));
 
     public Faker<DomainUser> DomainUser => _lazyDomainUserFaker.Value;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyFakers.cs
index e92f23808f..b8e64ad1ce 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/MultiTenancy/MultiTenancyFakers.cs
@@ -6,14 +6,14 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.MultiTenancy;
 
-internal sealed class MultiTenancyFakers : FakerContainer
+internal sealed class MultiTenancyFakers
 {
     private readonly Lazy<Faker<WebShop>> _lazyWebShopFaker = new(() => new Faker<WebShop>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(webShop => webShop.Url, faker => faker.Internet.Url()));
 
     private readonly Lazy<Faker<WebProduct>> _lazyWebProductFaker = new(() => new Faker<WebProduct>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(webProduct => webProduct.Name, faker => faker.Commerce.ProductName())
         .RuleFor(webProduct => webProduct.Price, faker => faker.Finance.Amount()));
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/NamingFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/NamingFakers.cs
index dee6e4b19f..58e412a14b 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/NamingFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/NamingConventions/NamingFakers.cs
@@ -6,18 +6,18 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.NamingConventions;
 
-internal sealed class NamingFakers : FakerContainer
+internal sealed class NamingFakers
 {
     private readonly Lazy<Faker<SwimmingPool>> _lazySwimmingPoolFaker = new(() => new Faker<SwimmingPool>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(swimmingPool => swimmingPool.IsIndoor, faker => faker.Random.Bool()));
 
     private readonly Lazy<Faker<WaterSlide>> _lazyWaterSlideFaker = new(() => new Faker<WaterSlide>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(waterSlide => waterSlide.LengthInMeters, faker => faker.Random.Decimal(3, 100)));
 
     private readonly Lazy<Faker<DivingBoard>> _lazyDivingBoardFaker = new(() => new Faker<DivingBoard>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(divingBoard => divingBoard.HeightInMeters, faker => faker.Random.Decimal(1, 15)));
 
     public Faker<SwimmingPool> SwimmingPool => _lazySwimmingPoolFaker.Value;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringFakers.cs
index 849e53b720..36e5e454e7 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/QueryStrings/QueryStringFakers.cs
@@ -6,31 +6,31 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.QueryStrings;
 
-internal sealed class QueryStringFakers : FakerContainer
+internal sealed class QueryStringFakers
 {
     private readonly Lazy<Faker<Blog>> _lazyBlogFaker = new(() => new Faker<Blog>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(blog => blog.Title, faker => faker.Lorem.Word())
         .RuleFor(blog => blog.PlatformName, faker => faker.Company.CompanyName()));
 
     private readonly Lazy<Faker<BlogPost>> _lazyBlogPostFaker = new(() => new Faker<BlogPost>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(blogPost => blogPost.Caption, faker => faker.Lorem.Sentence())
         .RuleFor(blogPost => blogPost.Url, faker => faker.Internet.Url()));
 
     private readonly Lazy<Faker<Label>> _lazyLabelFaker = new(() => new Faker<Label>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(label => label.Name, faker => faker.Lorem.Word())
         .RuleFor(label => label.Color, faker => faker.PickRandom<LabelColor>()));
 
     private readonly Lazy<Faker<Comment>> _lazyCommentFaker = new(() => new Faker<Comment>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(comment => comment.Text, faker => faker.Lorem.Paragraph())
         .RuleFor(comment => comment.CreatedAt, faker => faker.Date.Past().TruncateToWholeMilliseconds())
         .RuleFor(comment => comment.NumStars, faker => faker.Random.Int(0, 10)));
 
     private readonly Lazy<Faker<WebAccount>> _lazyWebAccountFaker = new(() => new Faker<WebAccount>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(webAccount => webAccount.UserName, faker => faker.Person.UserName)
         .RuleFor(webAccount => webAccount.Password, faker => faker.Internet.Password())
         .RuleFor(webAccount => webAccount.DisplayName, faker => faker.Person.FullName)
@@ -38,41 +38,41 @@ internal sealed class QueryStringFakers : FakerContainer
         .RuleFor(webAccount => webAccount.EmailAddress, faker => faker.Internet.Email()));
 
     private readonly Lazy<Faker<LoginAttempt>> _lazyLoginAttemptFaker = new(() => new Faker<LoginAttempt>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(loginAttempt => loginAttempt.TriedAt, faker => faker.Date.PastOffset().TruncateToWholeMilliseconds())
         .RuleFor(loginAttempt => loginAttempt.IsSucceeded, faker => faker.Random.Bool()));
 
     private readonly Lazy<Faker<AccountPreferences>> _lazyAccountPreferencesFaker = new(() => new Faker<AccountPreferences>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(accountPreferences => accountPreferences.UseDarkTheme, faker => faker.Random.Bool()));
 
     private readonly Lazy<Faker<Man>> _lazyManFaker = new(() => new Faker<Man>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(man => man.Name, faker => faker.Name.FullName())
         .RuleFor(man => man.HasBeard, faker => faker.Random.Bool())
         .RuleFor(man => man.Age, faker => faker.Random.Int(10, 90)));
 
     private readonly Lazy<Faker<Woman>> _lazyWomanFaker = new(() => new Faker<Woman>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(woman => woman.Name, faker => faker.Name.FullName())
         .RuleFor(woman => woman.MaidenName, faker => faker.Name.LastName())
         .RuleFor(woman => woman.Age, faker => faker.Random.Int(10, 90)));
 
     private readonly Lazy<Faker<Calendar>> _lazyCalendarFaker = new(() => new Faker<Calendar>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(calendar => calendar.TimeZone, faker => faker.Date.TimeZoneString())
         .RuleFor(calendar => calendar.ShowWeekNumbers, faker => faker.Random.Bool())
         .RuleFor(calendar => calendar.DefaultAppointmentDurationInMinutes, faker => faker.PickRandom(15, 30, 45, 60)));
 
     private readonly Lazy<Faker<Appointment>> _lazyAppointmentFaker = new(() => new Faker<Appointment>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(appointment => appointment.Title, faker => faker.Random.Word())
         .RuleFor(appointment => appointment.Description, faker => faker.Lorem.Sentence())
         .RuleFor(appointment => appointment.StartTime, faker => faker.Date.FutureOffset().TruncateToWholeMilliseconds())
         .RuleFor(appointment => appointment.EndTime, (faker, appointment) => appointment.StartTime.AddHours(faker.Random.Double(1, 4))));
 
     private readonly Lazy<Faker<Reminder>> _lazyReminderFaker = new(() => new Faker<Reminder>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(reminder => reminder.RemindsAt, faker => faker.Date.Future().TruncateToWholeMilliseconds()));
 
     public Faker<Blog> Blog => _lazyBlogFaker.Value;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteFakers.cs
index 81b235e048..2d88428118 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ReadWrite/ReadWriteFakers.cs
@@ -6,31 +6,31 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.ReadWrite;
 
-internal sealed class ReadWriteFakers : FakerContainer
+internal sealed class ReadWriteFakers
 {
     private readonly Lazy<Faker<WorkItem>> _lazyWorkItemFaker = new(() => new Faker<WorkItem>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(workItem => workItem.Description, faker => faker.Lorem.Sentence())
         .RuleFor(workItem => workItem.DueAt, faker => faker.Date.Future().TruncateToWholeMilliseconds())
         .RuleFor(workItem => workItem.Priority, faker => faker.PickRandom<WorkItemPriority>()));
 
     private readonly Lazy<Faker<WorkTag>> _lazyWorkTagFaker = new(() => new Faker<WorkTag>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(workTag => workTag.Text, faker => faker.Lorem.Word())
         .RuleFor(workTag => workTag.IsBuiltIn, faker => faker.Random.Bool()));
 
     private readonly Lazy<Faker<UserAccount>> _lazyUserAccountFaker = new(() => new Faker<UserAccount>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(userAccount => userAccount.FirstName, faker => faker.Name.FirstName())
         .RuleFor(userAccount => userAccount.LastName, faker => faker.Name.LastName()));
 
     private readonly Lazy<Faker<WorkItemGroup>> _lazyWorkItemGroupFaker = new(() => new Faker<WorkItemGroup>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(group => group.Name, faker => faker.Lorem.Word())
         .RuleFor(group => group.IsPublic, faker => faker.Random.Bool()));
 
     private readonly Lazy<Faker<RgbColor>> _lazyRgbColorFaker = new(() => new Faker<RgbColor>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(color => color.Id, faker => faker.Random.Hexadecimal(6))
         .RuleFor(color => color.DisplayName, faker => faker.Commerce.Color()));
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorFakers.cs
index 12a8fa51d7..7512ded310 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RequiredRelationships/DefaultBehaviorFakers.cs
@@ -6,18 +6,18 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.RequiredRelationships;
 
-internal sealed class DefaultBehaviorFakers : FakerContainer
+internal sealed class DefaultBehaviorFakers
 {
     private readonly Lazy<Faker<Order>> _lazyOrderFaker = new(() => new Faker<Order>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(order => order.Amount, faker => faker.Finance.Amount()));
 
     private readonly Lazy<Faker<Customer>> _lazyCustomerFaker = new(() => new Faker<Customer>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(customer => customer.EmailAddress, faker => faker.Person.Email));
 
     private readonly Lazy<Faker<Shipment>> _lazyShipmentFaker = new(() => new Faker<Shipment>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(shipment => shipment.TrackAndTraceCode, faker => faker.Commerce.Ean13())
         .RuleFor(shipment => shipment.ShippedAt, faker => faker.Date.Past().TruncateToWholeMilliseconds()));
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/InjectionFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/InjectionFakers.cs
index ba44acdad0..28c7d28dd7 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/InjectionFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceConstructorInjection/InjectionFakers.cs
@@ -8,7 +8,7 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceConstructorInjection;
 
-internal sealed class InjectionFakers : FakerContainer
+internal sealed class InjectionFakers
 {
     private readonly IServiceProvider _serviceProvider;
 
@@ -25,12 +25,12 @@ public InjectionFakers(IServiceProvider serviceProvider)
         _serviceProvider = serviceProvider;
 
         _lazyPostOfficeFaker = new Lazy<Faker<PostOffice>>(() => new Faker<PostOffice>()
-            .UseSeed(GetFakerSeed())
+            .MakeDeterministic()
             .CustomInstantiator(_ => new PostOffice(ResolveDbContext()))
             .RuleFor(postOffice => postOffice.Address, faker => faker.Address.FullAddress()));
 
         _lazyGiftCertificateFaker = new Lazy<Faker<GiftCertificate>>(() => new Faker<GiftCertificate>()
-            .UseSeed(GetFakerSeed())
+            .MakeDeterministic()
             .CustomInstantiator(_ => new GiftCertificate(ResolveDbContext()))
             .RuleFor(giftCertificate => giftCertificate.IssueDate, faker => faker.Date.PastOffset().TruncateToWholeMilliseconds()));
     }
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/UniverseFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/UniverseFakers.cs
index 3038333124..4c0723e1df 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/UniverseFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Reading/UniverseFakers.cs
@@ -6,10 +6,10 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Reading;
 
-internal sealed class UniverseFakers : FakerContainer
+internal sealed class UniverseFakers
 {
     private readonly Lazy<Faker<Star>> _lazyStarFaker = new(() => new Faker<Star>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(star => star.Name, faker => faker.Random.Word())
         .RuleFor(star => star.Kind, faker => faker.PickRandom<StarKind>())
         .RuleFor(star => star.SolarRadius, faker => faker.Random.Decimal(.01M, 1000M))
@@ -17,13 +17,13 @@ internal sealed class UniverseFakers : FakerContainer
         .RuleFor(star => star.IsVisibleFromEarth, faker => faker.Random.Bool()));
 
     private readonly Lazy<Faker<Planet>> _lazyPlanetFaker = new(() => new Faker<Planet>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(planet => planet.PublicName, faker => faker.Random.Word())
         .RuleFor(planet => planet.HasRingSystem, faker => faker.Random.Bool())
         .RuleFor(planet => planet.SolarMass, faker => faker.Random.Decimal(.001M, 100M)));
 
     private readonly Lazy<Faker<Moon>> _lazyMoonFaker = new(() => new Faker<Moon>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(moon => moon.Name, faker => faker.Random.Word())
         .RuleFor(moon => moon.SolarRadius, faker => faker.Random.Decimal(.01M, 1000M)));
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationFakers.cs
index 7b660d16b5..7414af23c2 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceDefinitions/Serialization/SerializationFakers.cs
@@ -7,15 +7,15 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceDefinitions.Serialization;
 
-internal sealed class SerializationFakers : FakerContainer
+internal sealed class SerializationFakers
 {
     private readonly Lazy<Faker<Student>> _lazyStudentFaker = new(() => new Faker<Student>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(student => student.Name, faker => faker.Person.FullName)
         .RuleFor(student => student.SocialSecurityNumber, faker => faker.Person.Ssn()));
 
     private readonly Lazy<Faker<Scholarship>> _lazyScholarshipFaker = new(() => new Faker<Scholarship>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(scholarship => scholarship.ProgramName, faker => faker.Commerce.Department())
         .RuleFor(scholarship => scholarship.Amount, faker => faker.Finance.Amount()));
 
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceInheritanceFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceInheritanceFakers.cs
index f5016971e1..4bbb2433a6 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceInheritanceFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ResourceInheritance/ResourceInheritanceFakers.cs
@@ -7,105 +7,105 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.ResourceInheritance;
 
-internal sealed class ResourceInheritanceFakers : FakerContainer
+internal sealed class ResourceInheritanceFakers
 {
     private readonly Lazy<Faker<Bike>> _lazyBikeFaker = new(() => new Faker<Bike>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(bike => bike.Weight, faker => faker.Random.Decimal(10, 30))
         .RuleFor(bike => bike.RequiresDriverLicense, _ => false)
         .RuleFor(bike => bike.GearCount, faker => faker.Random.Int(1, 10)));
 
     private readonly Lazy<Faker<Tandem>> _lazyTandemFaker = new(() => new Faker<Tandem>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(tandem => tandem.Weight, faker => faker.Random.Decimal(20, 50))
         .RuleFor(tandem => tandem.RequiresDriverLicense, _ => false)
         .RuleFor(tandem => tandem.GearCount, faker => faker.Random.Int(1, 10))
         .RuleFor(tandem => tandem.PassengerCount, faker => faker.Random.Int(2, 150)));
 
     private readonly Lazy<Faker<AlwaysMovingTandem>> _lazyAlwaysMovingTandemFaker = new(() => new Faker<AlwaysMovingTandem>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(movingTandem => movingTandem.Weight, faker => faker.Random.Decimal(10, 30))
         .RuleFor(movingTandem => movingTandem.RequiresDriverLicense, _ => false)
         .RuleFor(movingTandem => movingTandem.GearCount, faker => faker.Random.Int(1, 10)));
 
     private readonly Lazy<Faker<Car>> _lazyCarFaker = new(() => new Faker<Car>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(car => car.Weight, faker => faker.Random.Decimal(1200, 2000))
         .RuleFor(car => car.RequiresDriverLicense, _ => true)
         .RuleFor(car => car.LicensePlate, faker => faker.Random.Replace("??-??-##"))
         .RuleFor(car => car.SeatCount, faker => faker.Random.Int(2, 8)));
 
     private readonly Lazy<Faker<Truck>> _lazyTruckFaker = new(() => new Faker<Truck>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(truck => truck.Weight, faker => faker.Random.Decimal(1200, 12_000))
         .RuleFor(truck => truck.RequiresDriverLicense, _ => true)
         .RuleFor(truck => truck.LicensePlate, faker => faker.Random.Replace("??-??-##"))
         .RuleFor(truck => truck.LoadingCapacity, faker => faker.Random.Decimal(500, 25_000)));
 
     private readonly Lazy<Faker<CarbonWheel>> _lazyCarbonWheelFaker = new(() => new Faker<CarbonWheel>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(carbonWheel => carbonWheel.Radius, faker => faker.Random.Decimal(50, 100))
         .RuleFor(carbonWheel => carbonWheel.HasTube, faker => faker.Random.Bool()));
 
     private readonly Lazy<Faker<ChromeWheel>> _lazyChromeWheelFaker = new(() => new Faker<ChromeWheel>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(chromeWheel => chromeWheel.Radius, faker => faker.Random.Decimal(50, 100))
         .RuleFor(chromeWheel => chromeWheel.PaintColor, faker => faker.Internet.Color()));
 
     private readonly Lazy<Faker<GasolineEngine>> _lazyGasolineEngineFaker = new(() => new Faker<GasolineEngine>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(gasolineEngine => gasolineEngine.IsHydrocarbonBased, faker => faker.Random.Bool())
         .RuleFor(gasolineEngine => gasolineEngine.Capacity, faker => faker.Random.Decimal(10, 500))
         .RuleFor(gasolineEngine => gasolineEngine.SerialCode, faker => faker.Commerce.Ean8())
         .RuleFor(gasolineEngine => gasolineEngine.Volatility, faker => faker.Random.Decimal(1, 100)));
 
     private readonly Lazy<Faker<Cylinder>> _lazyCylinderFaker = new(() => new Faker<Cylinder>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(cylinder => cylinder.SparkPlugCount, faker => faker.Random.Int(1, 5)));
 
     private readonly Lazy<Faker<DieselEngine>> _lazyDieselEngineFaker = new(() => new Faker<DieselEngine>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(dieselEngine => dieselEngine.IsHydrocarbonBased, faker => faker.Random.Bool())
         .RuleFor(dieselEngine => dieselEngine.Capacity, faker => faker.Random.Decimal(10, 500))
         .RuleFor(dieselEngine => dieselEngine.SerialCode, faker => faker.Commerce.Ean8())
         .RuleFor(dieselEngine => dieselEngine.Viscosity, faker => faker.Random.Decimal(1, 100)));
 
     private readonly Lazy<Faker<VehicleManufacturer>> _lazyVehicleManufacturerFaker = new(() => new Faker<VehicleManufacturer>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(vehicleManufacturer => vehicleManufacturer.Name, faker => faker.Company.CompanyName()));
 
     private readonly Lazy<Faker<BicycleLight>> _lazyBicycleLightFaker = new(() => new Faker<BicycleLight>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(bicycleLight => bicycleLight.Color, faker => faker.Internet.Color()));
 
     private readonly Lazy<Faker<Box>> _lazyBoxFaker = new(() => new Faker<Box>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(box => box.Width, faker => faker.Random.Decimal(1, 100))
         .RuleFor(box => box.Height, faker => faker.Random.Decimal(1, 100))
         .RuleFor(box => box.Depth, faker => faker.Random.Decimal(1, 100)));
 
     private readonly Lazy<Faker<NavigationSystem>> _lazyNavigationSystemFaker = new(() => new Faker<NavigationSystem>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(navigationSystem => navigationSystem.ModelType, faker => faker.Commerce.ProductName()));
 
     private readonly Lazy<Faker<GenericFeature>> _lazyGenericFeatureFaker = new(() => new Faker<GenericFeature>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(genericFeature => genericFeature.Description, faker => faker.Lorem.Sentence()));
 
     private readonly Lazy<Faker<StringProperty>> _lazyStringPropertyFaker = new(() => new Faker<StringProperty>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(stringProperty => stringProperty.Name, faker => faker.Lorem.Word()));
 
     private readonly Lazy<Faker<StringValue>> _lazyStringValueFaker = new(() => new Faker<StringValue>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(stringValue => stringValue.Content, faker => faker.Lorem.Lines(1)));
 
     private readonly Lazy<Faker<NumberProperty>> _lazyNumberPropertyFaker = new(() => new Faker<NumberProperty>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(numberProperty => numberProperty.Name, faker => faker.Lorem.Word()));
 
     private readonly Lazy<Faker<NumberValue>> _lazyNumberValueFaker = new(() => new Faker<NumberValue>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(numberValue => numberValue.Content, faker => faker.Random.Decimal()));
 
     public Faker<Bike> Bike => _lazyBikeFaker.Value;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/RestrictionFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/RestrictionFakers.cs
index 594f8cff65..8dab142b40 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/RestrictionFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/RestrictedControllers/RestrictionFakers.cs
@@ -8,30 +8,30 @@
 namespace JsonApiDotNetCoreTests.IntegrationTests.RestrictedControllers;
 
 [UsedImplicitly(ImplicitUseTargetFlags.Members)]
-internal sealed class RestrictionFakers : FakerContainer
+internal sealed class RestrictionFakers
 {
     private readonly Lazy<Faker<Room>> _lazyRoomFaker = new(() => new Faker<Room>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(room => room.WindowCount, faker => faker.Random.Int(0, 3)));
 
     private readonly Lazy<Faker<Table>> _lazyTableFaker = new(() => new Faker<Table>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(table => table.LegCount, faker => faker.Random.Int(1, 4)));
 
     private readonly Lazy<Faker<Chair>> _lazyChairFaker = new(() => new Faker<Chair>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(chair => chair.LegCount, faker => faker.Random.Int(2, 4)));
 
     private readonly Lazy<Faker<Sofa>> _lazySofaFaker = new(() => new Faker<Sofa>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(sofa => sofa.SeatCount, faker => faker.Random.Int(2, 6)));
 
     private readonly Lazy<Faker<Pillow>> _lazyPillowFaker = new(() => new Faker<Pillow>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(pillow => pillow.Color, faker => faker.Internet.Color()));
 
     private readonly Lazy<Faker<Bed>> _lazyBedFaker = new(() => new Faker<Bed>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(bed => bed.IsDouble, faker => faker.Random.Bool()));
 
     public Faker<Room> Room => _lazyRoomFaker.Value;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationFakers.cs
index ca3b246f3f..ab9e20ade3 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/Serialization/SerializationFakers.cs
@@ -6,7 +6,7 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.Serialization;
 
-internal sealed class SerializationFakers : FakerContainer
+internal sealed class SerializationFakers
 {
     private static readonly TimeSpan[] MeetingDurations =
     [
@@ -17,7 +17,7 @@ internal sealed class SerializationFakers : FakerContainer
     ];
 
     private readonly Lazy<Faker<Meeting>> _lazyMeetingFaker = new(() => new Faker<Meeting>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(meeting => meeting.Title, faker => faker.Lorem.Word())
         .RuleFor(meeting => meeting.StartTime, faker => faker.Date.FutureOffset().TruncateToWholeMilliseconds())
         .RuleFor(meeting => meeting.Duration, faker => faker.PickRandom(MeetingDurations))
@@ -25,7 +25,7 @@ internal sealed class SerializationFakers : FakerContainer
         .RuleFor(meeting => meeting.Longitude, faker => faker.Address.Longitude()));
 
     private readonly Lazy<Faker<MeetingAttendee>> _lazyMeetingAttendeeFaker = new(() => new Faker<MeetingAttendee>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(attendee => attendee.DisplayName, faker => faker.Random.Utf16String())
         .RuleFor(attendee => attendee.HomeAddress, faker => new Address
         {
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionFakers.cs
index 4921f57959..1cbf435c45 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/SoftDeletion/SoftDeletionFakers.cs
@@ -6,14 +6,14 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.SoftDeletion;
 
-internal sealed class SoftDeletionFakers : FakerContainer
+internal sealed class SoftDeletionFakers
 {
     private readonly Lazy<Faker<Company>> _lazyCompanyFaker = new(() => new Faker<Company>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(company => company.Name, faker => faker.Company.CompanyName()));
 
     private readonly Lazy<Faker<Department>> _lazyDepartmentFaker = new(() => new Faker<Department>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(department => department.Name, faker => faker.Commerce.Department()));
 
     public Faker<Company> Company => _lazyCompanyFaker.Value;
diff --git a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyFakers.cs b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyFakers.cs
index 3326a36173..9a41aad9da 100644
--- a/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyFakers.cs
+++ b/test/JsonApiDotNetCoreTests/IntegrationTests/ZeroKeys/ZeroKeyFakers.cs
@@ -6,19 +6,19 @@
 
 namespace JsonApiDotNetCoreTests.IntegrationTests.ZeroKeys;
 
-internal sealed class ZeroKeyFakers : FakerContainer
+internal sealed class ZeroKeyFakers
 {
     private readonly Lazy<Faker<Game>> _lazyGameFaker = new(() => new Faker<Game>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(game => game.Title, faker => faker.Random.Words()));
 
     private readonly Lazy<Faker<Player>> _lazyPlayerFaker = new(() => new Faker<Player>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(player => player.Id, faker => faker.Person.UserName)
         .RuleFor(player => player.EmailAddress, faker => faker.Person.Email));
 
     private readonly Lazy<Faker<Map>> _lazyMapFaker = new(() => new Faker<Map>()
-        .UseSeed(GetFakerSeed())
+        .MakeDeterministic()
         .RuleFor(map => map.Id, faker => faker.Random.Guid())
         .RuleFor(map => map.Name, faker => faker.Random.Words()));
 
diff --git a/test/TestBuildingBlocks/FakerContainer.cs b/test/TestBuildingBlocks/FakerExtensions.cs
similarity index 86%
rename from test/TestBuildingBlocks/FakerContainer.cs
rename to test/TestBuildingBlocks/FakerExtensions.cs
index c29700c968..282aa26c6b 100644
--- a/test/TestBuildingBlocks/FakerContainer.cs
+++ b/test/TestBuildingBlocks/FakerExtensions.cs
@@ -1,21 +1,26 @@
 using System.Diagnostics;
 using System.Reflection;
-using Bogus.DataSets;
-using FluentAssertions.Extensions;
+using Bogus;
 using Xunit;
 
 namespace TestBuildingBlocks;
 
-public abstract class FakerContainer
+public static class FakerExtensions
 {
-    static FakerContainer()
+    public static Faker<T> MakeDeterministic<T>(this Faker<T> faker)
+        where T : class
     {
+        int seed = GetFakerSeed();
+        faker.UseSeed(seed);
+
         // Setting the system DateTime to kind Utc, so that faker calls like PastOffset() don't depend on the system time zone.
         // See https://docs.microsoft.com/en-us/dotnet/api/system.datetimeoffset.op_implicit?view=net-6.0#remarks
-        Date.SystemClock = () => 1.January(2020).At(1, 1, 1).AsUtc();
+        faker.UseDateTimeReference(FrozenSystemClock.DefaultDateTimeUtc);
+
+        return faker;
     }
 
-    protected static int GetFakerSeed()
+    private static int GetFakerSeed()
     {
         // The goal here is to have stable data over multiple test runs, but at the same time different data per test case.
 
diff --git a/test/TestBuildingBlocks/FrozenSystemClock.cs b/test/TestBuildingBlocks/FrozenSystemClock.cs
index 6ffe8feaaf..031349086d 100644
--- a/test/TestBuildingBlocks/FrozenSystemClock.cs
+++ b/test/TestBuildingBlocks/FrozenSystemClock.cs
@@ -4,7 +4,8 @@ namespace TestBuildingBlocks;
 
 public sealed class FrozenSystemClock : ISystemClock
 {
-    private static readonly DateTimeOffset DefaultTime = 1.January(2020).At(1, 1, 1).AsUtc();
+    internal static readonly DateTime DefaultDateTimeUtc = 1.January(2020).At(1, 1, 1).AsUtc();
+    public static readonly DateTimeOffset DefaultDateTimeOffsetUtc = DefaultDateTimeUtc;
 
-    public DateTimeOffset UtcNow { get; set; } = DefaultTime;
+    public DateTimeOffset UtcNow { get; set; } = DefaultDateTimeOffsetUtc;
 }
diff --git a/test/TestBuildingBlocks/TestBuildingBlocks.csproj b/test/TestBuildingBlocks/TestBuildingBlocks.csproj
index 40e10eb297..ae6cf32ff6 100644
--- a/test/TestBuildingBlocks/TestBuildingBlocks.csproj
+++ b/test/TestBuildingBlocks/TestBuildingBlocks.csproj
@@ -19,6 +19,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(EntityFrameworkCoreVersion)" />
     <PackageReference Include="xunit" Version="$(XunitVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVisualStudioVersion)" PrivateAssets="All" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" PrivateAssets="All" />
   </ItemGroup>
 </Project>