diff --git a/DigitalData.Core.Tests/Mock/Fake.cs b/DigitalData.Core.Tests/Mock/Fake.cs
index fd89b34..87abe9f 100644
--- a/DigitalData.Core.Tests/Mock/Fake.cs
+++ b/DigitalData.Core.Tests/Mock/Fake.cs
@@ -4,12 +4,13 @@ namespace DigitalData.Core.Tests.Mock;
 
 public static class Fake
 {
-    private static readonly Faker<User> UserFaker = new Faker<User>()
-        .RuleFor(u => u.FirstName, f => f.Name.FirstName())
-        .RuleFor(u => u.Email, f => f.Internet.Email())
-        .RuleFor(u => u.Age, f => f.Random.Int(18, 99));
+    public static Faker<User> CreateUserFaker(string? firstName = null, string? email = null, int? age = null) => new Faker<User>()
+        .RuleFor(u => u.FirstName, f => firstName ?? f.Name.FirstName())
+        .RuleFor(u => u.Email, f => email ?? f.Internet.Email())
+        .RuleFor(u => u.Age, f => age ?? f.Random.Int(18, 99));
 
-    public static User FakeUser => UserFaker.Generate();
-
-    public static List<User> CreateFakeUser(int count) => UserFaker.Generate(count);
+    public static Faker<UserDto> CreateUserDtoFaker(string? firstName = null, string? email = null, int? age = null) => new Faker<UserDto>()
+        .RuleFor(u => u.FirstName, f => firstName ?? f.Name.FirstName())
+        .RuleFor(u => u.Email, f => email ?? f.Internet.Email())
+        .RuleFor(u => u.Age, f => age ?? f.Random.Int(18, 99));
 }
diff --git a/DigitalData.Core.Tests/Mock/MockDbContext.cs b/DigitalData.Core.Tests/Mock/MockDbContext.cs
index cd41ec5..e5695e6 100644
--- a/DigitalData.Core.Tests/Mock/MockDbContext.cs
+++ b/DigitalData.Core.Tests/Mock/MockDbContext.cs
@@ -4,6 +4,8 @@ namespace DigitalData.Core.Tests.Mock;
 
 public class MockDbContext : DbContext
 {
+    public DbSet<User> Users { get; set; }
+
     public MockDbContext(DbContextOptions options) : base(options)
     {
     }