diff --git a/Hikkaba.Tests.Integration/Builders/BanTestDataBuilder.cs b/Hikkaba.Tests.Integration/Builders/BanTestDataBuilder.cs
new file mode 100644
index 0000000..be22e12
--- /dev/null
+++ b/Hikkaba.Tests.Integration/Builders/BanTestDataBuilder.cs
@@ -0,0 +1,200 @@
+using System;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using Hikkaba.Application.Contracts;
+using Hikkaba.Data.Context;
+using Hikkaba.Data.Entities;
+using Hikkaba.Shared.Constants;
+using Hikkaba.Shared.Enums;
+using Hikkaba.Tests.Integration.Utils;
+using Microsoft.Extensions.DependencyInjection;
+using Thread = Hikkaba.Data.Entities.Thread;
+
+namespace Hikkaba.Tests.Integration.Builders;
+
+internal sealed class BanTestDataBuilder
+{
+    private static readonly GuidGenerator GuidGenerator = new();
+
+    private readonly ApplicationDbContext _dbContext;
+    private readonly IHashService _hashService;
+    private readonly TimeProvider _timeProvider;
+
+    private ApplicationUser? _admin;
+    private Category? _category;
+    private Thread? _thread;
+
+    public BanTestDataBuilder(IServiceScope scope)
+    {
+        _dbContext = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
+        _hashService = scope.ServiceProvider.GetRequiredService<IHashService>();
+        _timeProvider = scope.ServiceProvider.GetRequiredService<TimeProvider>();
+    }
+
+    public ApplicationUser Admin => _admin ?? throw new InvalidOperationException("Admin not created. Call WithDefaultAdmin() first.");
+    public Category Category => _category ?? throw new InvalidOperationException("Category not created. Call WithDefaultCategory() first.");
+    public Thread Thread => _thread ?? throw new InvalidOperationException("Thread not created. Call WithDefaultThread() first.");
+
+    public BanTestDataBuilder WithDefaultAdmin()
+    {
+        _admin = new ApplicationUser
+        {
+            UserName = "admin",
+            NormalizedUserName = "ADMIN",
+            Email = "admin@example.com",
+            NormalizedEmail = "ADMIN@EXAMPLE.COM",
+            EmailConfirmed = true,
+            SecurityStamp = "896e8014-c237-41f5-a925-dabf640ee4c4",
+            ConcurrencyStamp = "43035b63-359d-4c23-8812-29bbc5affbf2",
+            CreatedAt = _timeProvider.GetUtcNow().UtcDateTime,
+        };
+        _dbContext.Users.Add(_admin);
+        return this;
+    }
+
+    public BanTestDataBuilder WithDefaultCategory()
+    {
+        EnsureAdminExists();
+
+        _category = new Category
+        {
+            IsDeleted = false,
+            CreatedAt = _timeProvider.GetUtcNow().UtcDateTime,
+            ModifiedAt = null,
+            Alias = "b",
+            Name = "Random",
+            IsHidden = false,
+            DefaultBumpLimit = 500,
+            ShowThreadLocalUserHash = false,
+            ShowCountry = false,
+            ShowOs = false,
+            ShowBrowser = false,
+            MaxThreadCount = Defaults.MaxThreadCountInCategory,
+            CreatedBy = Admin,
+        };
+        _dbContext.Categories.Add(_category);
+        return this;
+    }
+
+    public BanTestDataBuilder WithDefaultThread()
+    {
+        EnsureCategoryExists();
+
+        var utcNow = _timeProvider.GetUtcNow().UtcDateTime;
+        _thread = new Thread
+        {
+            CreatedAt = utcNow,
+            LastBumpAt = utcNow,
+            Title = "test thread 1",
+            IsPinned = false,
+            IsClosed = false,
+            BumpLimit = 500,
+            Salt = GuidGenerator.GenerateSeededGuid(),
+            Category = Category,
+        };
+        _dbContext.Threads.Add(_thread);
+        return this;
+    }
+
+    public BanTestDataBuilder WithPost(Guid blobContainerId, string ipAddress, string userAgent, bool isOriginalPost = false)
+    {
+        EnsureThreadExists();
+
+        var ip = IPAddress.Parse(ipAddress);
+        var post = new Post
+        {
+            IsOriginalPost = isOriginalPost,
+            BlobContainerId = blobContainerId,
+            CreatedAt = _timeProvider.GetUtcNow().UtcDateTime,
+            IsSageEnabled = false,
+            MessageText = $"test post {userAgent}",
+            MessageHtml = $"test post {userAgent}",
+            UserIpAddress = ip.GetAddressBytes(),
+            UserAgent = userAgent,
+            ThreadLocalUserHash = _hashService.GetHashBytes(Thread.Salt, ip.GetAddressBytes()),
+            Thread = Thread,
+        };
+        _dbContext.Posts.Add(post);
+        return this;
+    }
+
+    public BanTestDataBuilder WithExactBan(string ipAddress, string reason)
+    {
+        EnsureAdminExists();
+
+        var ip = IPAddress.Parse(ipAddress);
+        var ipType = ip.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork
+            ? IpAddressType.IpV4
+            : IpAddressType.IpV6;
+
+        var ban = new Ban
+        {
+            CreatedAt = _timeProvider.GetUtcNow().UtcDateTime,
+            EndsAt = _timeProvider.GetUtcNow().UtcDateTime.AddYears(99),
+            IpAddressType = ipType,
+            BannedIpAddress = ip.GetAddressBytes(),
+            Reason = reason,
+            CreatedBy = Admin,
+        };
+        _dbContext.Bans.Add(ban);
+        return this;
+    }
+
+    public BanTestDataBuilder WithRangeBan(
+        string bannedIpAddress,
+        string lowerIpAddress,
+        string upperIpAddress,
+        string reason)
+    {
+        EnsureAdminExists();
+
+        var ip = IPAddress.Parse(bannedIpAddress);
+        var ipType = ip.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork
+            ? IpAddressType.IpV4
+            : IpAddressType.IpV6;
+
+        var ban = new Ban
+        {
+            CreatedAt = _timeProvider.GetUtcNow().UtcDateTime,
+            EndsAt = _timeProvider.GetUtcNow().UtcDateTime.AddYears(99),
+            IpAddressType = ipType,
+            BannedIpAddress = ip.GetAddressBytes(),
+            BannedCidrLowerIpAddress = IPAddress.Parse(lowerIpAddress).GetAddressBytes(),
+            BannedCidrUpperIpAddress = IPAddress.Parse(upperIpAddress).GetAddressBytes(),
+            Reason = reason,
+            CreatedBy = Admin,
+        };
+        _dbContext.Bans.Add(ban);
+        return this;
+    }
+
+    public async Task SaveAsync(CancellationToken cancellationToken)
+    {
+        await _dbContext.SaveChangesAsync(cancellationToken);
+    }
+
+    private void EnsureAdminExists()
+    {
+        if (_admin == null)
+        {
+            throw new InvalidOperationException("Admin must be created first. Call WithDefaultAdmin().");
+        }
+    }
+
+    private void EnsureCategoryExists()
+    {
+        if (_category == null)
+        {
+            throw new InvalidOperationException("Category must be created first. Call WithDefaultCategory().");
+        }
+    }
+
+    private void EnsureThreadExists()
+    {
+        if (_thread == null)
+        {
+            throw new InvalidOperationException("Thread must be created first. Call WithDefaultThread().");
+        }
+    }
+}
diff --git a/Hikkaba.Tests.Integration/Builders/PostTestDataBuilder.cs b/Hikkaba.Tests.Integration/Builders/PostTestDataBuilder.cs
new file mode 100644
index 0000000..a360168
--- /dev/null
+++ b/Hikkaba.Tests.Integration/Builders/PostTestDataBuilder.cs
@@ -0,0 +1,153 @@
+using System;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using Hikkaba.Application.Contracts;
+using Hikkaba.Data.Context;
+using Hikkaba.Data.Entities;
+using Hikkaba.Shared.Constants;
+using Hikkaba.Tests.Integration.Utils;
+using Microsoft.Extensions.DependencyInjection;
+using Thread = Hikkaba.Data.Entities.Thread;
+
+namespace Hikkaba.Tests.Integration.Builders;
+
+internal sealed class PostTestDataBuilder
+{
+    private static readonly GuidGenerator GuidGenerator = new();
+
+    private readonly ApplicationDbContext _dbContext;
+    private readonly IHashService _hashService;
+    private readonly TimeProvider _timeProvider;
+
+    private ApplicationUser? _admin;
+    private Category? _category;
+    private Thread? _thread;
+
+    public PostTestDataBuilder(IServiceScope scope)
+    {
+        _dbContext = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
+        _hashService = scope.ServiceProvider.GetRequiredService<IHashService>();
+        _timeProvider = scope.ServiceProvider.GetRequiredService<TimeProvider>();
+    }
+
+    public ApplicationUser Admin => _admin ?? throw new InvalidOperationException("Admin not created. Call WithDefaultAdmin() first.");
+    public Category Category => _category ?? throw new InvalidOperationException("Category not created. Call WithCategory() first.");
+    public Thread Thread => _thread ?? throw new InvalidOperationException("Thread not created. Call WithThread() first.");
+
+    public PostTestDataBuilder WithDefaultAdmin()
+    {
+        _admin = new ApplicationUser
+        {
+            UserName = "admin",
+            NormalizedUserName = "ADMIN",
+            Email = "admin@example.com",
+            NormalizedEmail = "ADMIN@EXAMPLE.COM",
+            EmailConfirmed = true,
+            SecurityStamp = "896e8014-c237-41f5-a925-dabf640ee4c4",
+            ConcurrencyStamp = "43035b63-359d-4c23-8812-29bbc5affbf2",
+            CreatedAt = _timeProvider.GetUtcNow().UtcDateTime,
+        };
+        _dbContext.Users.Add(_admin);
+        return this;
+    }
+
+    public PostTestDataBuilder WithCategory(string alias, string name)
+    {
+        EnsureAdminExists();
+
+        _category = new Category
+        {
+            IsDeleted = false,
+            CreatedAt = _timeProvider.GetUtcNow().UtcDateTime,
+            ModifiedAt = null,
+            Alias = alias,
+            Name = name,
+            IsHidden = false,
+            DefaultBumpLimit = 500,
+            ShowThreadLocalUserHash = false,
+            MaxThreadCount = Defaults.MaxThreadCountInCategory,
+            CreatedBy = Admin,
+        };
+        _dbContext.Categories.Add(_category);
+        return this;
+    }
+
+    public PostTestDataBuilder WithThread(string title)
+    {
+        EnsureCategoryExists();
+
+        var utcNow = _timeProvider.GetUtcNow().UtcDateTime;
+        _thread = new Thread
+        {
+            CreatedAt = utcNow,
+            LastBumpAt = utcNow,
+            Title = title,
+            IsPinned = false,
+            IsClosed = false,
+            BumpLimit = 500,
+            Salt = GuidGenerator.GenerateSeededGuid(),
+            Category = Category,
+        };
+        _dbContext.Threads.Add(_thread);
+        return this;
+    }
+
+    public PostTestDataBuilder WithPost(
+        Guid blobContainerId,
+        string messageText,
+        string ipAddress,
+        string userAgent,
+        bool isOriginalPost = false,
+        bool isDeleted = false)
+    {
+        EnsureThreadExists();
+
+        var ip = IPAddress.Parse(ipAddress);
+        var post = new Post
+        {
+            IsOriginalPost = isOriginalPost,
+            IsDeleted = isDeleted,
+            BlobContainerId = blobContainerId,
+            CreatedAt = _timeProvider.GetUtcNow().UtcDateTime,
+            IsSageEnabled = false,
+            MessageText = messageText,
+            MessageHtml = messageText,
+            UserIpAddress = ip.GetAddressBytes(),
+            UserAgent = userAgent,
+            ThreadLocalUserHash = _hashService.GetHashBytes(Thread.Salt, ip.GetAddressBytes()),
+            Thread = Thread,
+        };
+        _dbContext.Posts.Add(post);
+        return this;
+    }
+
+    public async Task SaveAsync(CancellationToken cancellationToken)
+    {
+        await _dbContext.SaveChangesAsync(cancellationToken);
+    }
+
+    private void EnsureAdminExists()
+    {
+        if (_admin == null)
+        {
+            throw new InvalidOperationException("Admin must be created first. Call WithDefaultAdmin().");
+        }
+    }
+
+    private void EnsureCategoryExists()
+    {
+        if (_category == null)
+        {
+            throw new InvalidOperationException("Category must be created first. Call WithCategory().");
+        }
+    }
+
+    private void EnsureThreadExists()
+    {
+        if (_thread == null)
+        {
+            throw new InvalidOperationException("Thread must be created first. Call WithThread().");
+        }
+    }
+}
diff --git a/Hikkaba.Tests.Integration/Builders/ThreadTestDataBuilder.cs b/Hikkaba.Tests.Integration/Builders/ThreadTestDataBuilder.cs
new file mode 100644
index 0000000..f3223c6
--- /dev/null
+++ b/Hikkaba.Tests.Integration/Builders/ThreadTestDataBuilder.cs
@@ -0,0 +1,403 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Threading;
+using System.Threading.Tasks;
+using Blake3;
+using Hikkaba.Application.Contracts;
+using Hikkaba.Data.Context;
+using Hikkaba.Data.Entities;
+using Hikkaba.Data.Entities.Attachments;
+using Hikkaba.Shared.Constants;
+using Hikkaba.Tests.Integration.Utils;
+using Microsoft.Extensions.DependencyInjection;
+using Thread = Hikkaba.Data.Entities.Thread;
+
+namespace Hikkaba.Tests.Integration.Builders;
+
+internal sealed class ThreadTestDataBuilder
+{
+    private static readonly GuidGenerator GuidGenerator = new();
+
+    private readonly ApplicationDbContext _dbContext;
+    private readonly List<Category> _categories = [];
+    private readonly List<Thread> _threads = [];
+
+    private ApplicationUser? _admin;
+
+    public ThreadTestDataBuilder(IServiceScope scope)
+    {
+        _dbContext = scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
+        HashService = scope.ServiceProvider.GetRequiredService<IHashService>();
+        TimeProvider = scope.ServiceProvider.GetRequiredService<TimeProvider>();
+    }
+
+    public ApplicationUser Admin => _admin ?? throw new InvalidOperationException("Admin not created. Call WithDefaultAdmin() first.");
+    public IReadOnlyList<Category> Categories => _categories;
+    public IReadOnlyList<Thread> Threads => _threads;
+    public IHashService HashService { get; }
+
+    public TimeProvider TimeProvider { get; }
+
+    public ThreadTestDataBuilder WithDefaultAdmin()
+    {
+        _admin = new ApplicationUser
+        {
+            UserName = "admin",
+            NormalizedUserName = "ADMIN",
+            Email = "admin@example.com",
+            NormalizedEmail = "ADMIN@EXAMPLE.COM",
+            EmailConfirmed = true,
+            SecurityStamp = "896e8014-c237-41f5-a925-dabf640ee4c4",
+            ConcurrencyStamp = "43035b63-359d-4c23-8812-29bbc5affbf2",
+            CreatedAt = TimeProvider.GetUtcNow().UtcDateTime,
+        };
+        _dbContext.Users.Add(_admin);
+        return this;
+    }
+
+    public ThreadTestDataBuilder WithCategory(string alias, string name)
+    {
+        EnsureAdminExists();
+
+        var category = new Category
+        {
+            IsDeleted = false,
+            CreatedAt = TimeProvider.GetUtcNow().UtcDateTime,
+            ModifiedAt = null,
+            Alias = alias,
+            Name = name,
+            IsHidden = false,
+            DefaultBumpLimit = 500,
+            ShowThreadLocalUserHash = false,
+            ShowOs = false,
+            ShowBrowser = false,
+            ShowCountry = false,
+            MaxThreadCount = Defaults.MaxThreadCountInCategory,
+            CreatedBy = Admin,
+        };
+        _categories.Add(category);
+        _dbContext.Categories.Add(category);
+        return this;
+    }
+
+    public Category GetCategory(string alias) =>
+        _categories.Find(c => c.Alias == alias)
+        ?? throw new InvalidOperationException($"Category with alias '{alias}' not found.");
+
+    public ThreadTestDataBuilder WithThread(
+        string categoryAlias,
+        string title,
+        bool isPinned = false,
+        bool isClosed = false,
+        bool isDeleted = false,
+        int bumpLimit = 500,
+        DateTime? createdAt = null,
+        DateTime? lastBumpAt = null)
+    {
+        var category = GetCategory(categoryAlias);
+        var utcNow = createdAt ?? TimeProvider.GetUtcNow().UtcDateTime;
+
+        var thread = new Thread
+        {
+            CreatedAt = utcNow,
+            LastBumpAt = lastBumpAt ?? utcNow,
+            Title = title,
+            IsPinned = isPinned,
+            IsClosed = isClosed,
+            IsDeleted = isDeleted,
+            BumpLimit = bumpLimit,
+            Salt = GuidGenerator.GenerateSeededGuid(),
+            Category = category,
+        };
+        _threads.Add(thread);
+        _dbContext.Threads.Add(thread);
+        return this;
+    }
+
+    public Thread GetThread(string title) =>
+        _threads.Find(t => t.Title == title)
+        ?? throw new InvalidOperationException($"Thread with title '{title}' not found.");
+
+    public Thread GetLastThread() =>
+        _threads.LastOrDefault()
+        ?? throw new InvalidOperationException("No threads created yet.");
+
+    public ThreadTestDataBuilder WithPost(
+        string threadTitle,
+        Guid blobContainerId,
+        string messageText,
+        string ipAddress = "127.0.0.1",
+        string userAgent = "Firefox",
+        bool isOriginalPost = false,
+        bool isSageEnabled = false,
+        bool isDeleted = false,
+        TimeSpan? createdAtOffset = null)
+    {
+        var thread = GetThread(threadTitle);
+        var ip = IPAddress.Parse(ipAddress);
+
+        var post = new Post
+        {
+            IsOriginalPost = isOriginalPost,
+            BlobContainerId = blobContainerId,
+            CreatedAt = TimeProvider.GetUtcNow().UtcDateTime.Add(createdAtOffset ?? TimeSpan.Zero),
+            IsSageEnabled = isSageEnabled,
+            IsDeleted = isDeleted,
+            MessageText = messageText,
+            MessageHtml = messageText,
+            UserIpAddress = ip.GetAddressBytes(),
+            UserAgent = userAgent,
+            ThreadLocalUserHash = HashService.GetHashBytes(thread.Salt, ip.GetAddressBytes()),
+            Thread = thread,
+        };
+        _dbContext.Posts.Add(post);
+        return this;
+    }
+
+    public ThreadTestDataBuilder WithPostWithAudio(
+        string threadTitle,
+        Guid blobContainerId,
+        string messageText,
+        Guid audioBlobId,
+        string audioFileName,
+        string ipAddress = "127.0.0.1",
+        string userAgent = "Chrome",
+        TimeSpan? createdAtOffset = null)
+    {
+        var thread = GetThread(threadTitle);
+        var ip = IPAddress.Parse(ipAddress);
+
+        var post = new Post
+        {
+            IsOriginalPost = false,
+            BlobContainerId = blobContainerId,
+            CreatedAt = TimeProvider.GetUtcNow().UtcDateTime.Add(createdAtOffset ?? TimeSpan.Zero),
+            IsSageEnabled = false,
+            MessageText = messageText,
+            MessageHtml = messageText,
+            UserIpAddress = ip.GetAddressBytes(),
+            UserAgent = userAgent,
+            ThreadLocalUserHash = HashService.GetHashBytes(thread.Salt, ip.GetAddressBytes()),
+            Thread = thread,
+            Audios =
+            [
+                new Audio
+                {
+                    BlobId = audioBlobId,
+                    FileNameWithoutExtension = audioFileName,
+                    FileExtension = "mp3",
+                    FileSize = 3671469,
+                    FileContentType = "audio/mpeg",
+                    FileHash = Hasher.Hash("f61d4fbb-4cbd-4d4e-8df1-6c22c58de9cf"u8).AsSpan().ToArray(),
+                    Title = audioFileName,
+                    Album = "My Album",
+                    Artist = "AI Generated Music",
+                    DurationSeconds = 120,
+                },
+            ],
+        };
+        _dbContext.Posts.Add(post);
+        return this;
+    }
+
+    public ThreadTestDataBuilder WithPostWithPicture(
+        string threadTitle,
+        Guid blobContainerId,
+        string messageText,
+        Guid pictureBlobId,
+        string pictureFileName,
+        string ipAddress = "127.0.0.1",
+        string userAgent = "Chrome",
+        TimeSpan? createdAtOffset = null)
+    {
+        var thread = GetThread(threadTitle);
+        var ip = IPAddress.Parse(ipAddress);
+
+        var post = new Post
+        {
+            IsOriginalPost = false,
+            BlobContainerId = blobContainerId,
+            CreatedAt = TimeProvider.GetUtcNow().UtcDateTime.Add(createdAtOffset ?? TimeSpan.Zero),
+            IsSageEnabled = false,
+            MessageText = messageText,
+            MessageHtml = messageText,
+            UserIpAddress = ip.GetAddressBytes(),
+            UserAgent = userAgent,
+            ThreadLocalUserHash = HashService.GetHashBytes(thread.Salt, ip.GetAddressBytes()),
+            Thread = thread,
+            Pictures =
+            [
+                new Picture
+                {
+                    BlobId = pictureBlobId,
+                    FileNameWithoutExtension = pictureFileName,
+                    FileExtension = "jpg",
+                    FileSize = 204316,
+                    FileContentType = "image/jpeg",
+                    FileHash = Hasher.Hash("6e84e6b4-5370-44c6-a319-a03a027f3905"u8).AsSpan().ToArray(),
+                    Width = 1280,
+                    Height = 960,
+                    ThumbnailExtension = "jpg",
+                    ThumbnailWidth = 128,
+                    ThumbnailHeight = 96,
+                },
+            ],
+        };
+        _dbContext.Posts.Add(post);
+        return this;
+    }
+
+    public ThreadTestDataBuilder WithThreadAndPosts(
+        string categoryAlias,
+        string title,
+        int postCount,
+        bool isPinned = false,
+        bool isClosed = false,
+        bool isDeleted = false,
+        int bumpLimit = 500,
+        bool allPostsSage = false,
+        bool includeDeletedPost = false,
+        DateTime? threadCreatedAt = null)
+    {
+        var category = GetCategory(categoryAlias);
+        var utcNow = threadCreatedAt ?? TimeProvider.GetUtcNow().UtcDateTime;
+        var salt = GuidGenerator.GenerateSeededGuid();
+
+        var thread = new Thread
+        {
+            CreatedAt = utcNow,
+            LastBumpAt = utcNow,
+            Title = title,
+            IsPinned = isPinned,
+            IsClosed = isClosed,
+            IsDeleted = isDeleted,
+            BumpLimit = bumpLimit,
+            Salt = salt,
+            Category = category,
+        };
+
+        var posts = Enumerable.Range(0, postCount)
+            .Select(i =>
+            {
+                var ip = IPAddress.Parse($"127.0.0.{i % 256}").GetAddressBytes();
+                return new Post
+                {
+                    IsOriginalPost = i == 0,
+                    BlobContainerId = GuidGenerator.GenerateSeededGuid(),
+                    CreatedAt = TimeProvider.GetUtcNow().UtcDateTime.AddMinutes(i),
+                    IsSageEnabled = allPostsSage || i % 2 == 0,
+                    IsDeleted = false,
+                    MessageText = $"test post {i}",
+                    MessageHtml = $"test post {i}",
+                    UserIpAddress = ip,
+                    UserAgent = "Firefox",
+                    ThreadLocalUserHash = HashService.GetHashBytes(salt, ip),
+                    Thread = thread,
+                };
+            })
+            .ToList();
+
+        if (includeDeletedPost)
+        {
+            var deletedPostIp = IPAddress.Parse("127.0.0.1").GetAddressBytes();
+            posts.Add(new Post
+            {
+                IsOriginalPost = false,
+                BlobContainerId = GuidGenerator.GenerateSeededGuid(),
+                CreatedAt = TimeProvider.GetUtcNow().UtcDateTime.AddYears(1),
+                IsSageEnabled = false,
+                IsDeleted = true,
+                MessageText = "deleted post",
+                MessageHtml = "deleted post",
+                UserIpAddress = deletedPostIp,
+                UserAgent = "Firefox",
+                ThreadLocalUserHash = HashService.GetHashBytes(salt, deletedPostIp),
+                Thread = thread,
+            });
+        }
+
+        _threads.Add(thread);
+        _dbContext.Threads.Add(thread);
+        _dbContext.Posts.AddRange(posts);
+        return this;
+    }
+
+    public ThreadTestDataBuilder WithManyThreadsAndPosts(
+        string categoryAlias,
+        int threadCount,
+        int postCountPerThread,
+        bool includeDeletedPost = false,
+        Func<int, bool>? isPinnedSelector = null,
+        Func<int, DateTime>? threadCreatedAtSelector = null)
+    {
+        for (var i = 0; i < threadCount; i++)
+        {
+            var createdAt = threadCreatedAtSelector?.Invoke(i) ?? TimeProvider.GetUtcNow().UtcDateTime.AddSeconds(i);
+            WithThreadAndPosts(
+                categoryAlias,
+                $"test thread {i}",
+                postCountPerThread,
+                isPinned: isPinnedSelector?.Invoke(i) ?? false,
+                includeDeletedPost: includeDeletedPost,
+                threadCreatedAt: createdAt);
+        }
+        return this;
+    }
+
+    public ThreadTestDataBuilder AddPostsToThread(
+        string threadTitle,
+        DateTime startingAt,
+        int count,
+        bool isSageEnabled = false,
+        bool isDeleted = false)
+    {
+        var thread = GetThread(threadTitle);
+
+        for (var i = 0; i < count; i++)
+        {
+            var ip = IPAddress.Parse($"127.0.0.{i % 256}").GetAddressBytes();
+            var post = new Post
+            {
+                IsOriginalPost = thread.Posts.Count == 0 && i == 0,
+                BlobContainerId = GuidGenerator.GenerateSeededGuid(),
+                CreatedAt = startingAt.AddSeconds(i),
+                IsSageEnabled = isSageEnabled,
+                IsDeleted = isDeleted,
+                MessageText = $"test post {i} in thread {thread.Title}",
+                MessageHtml = $"test post {i} in thread {thread.Title}",
+                UserIpAddress = ip,
+                UserAgent = "Firefox",
+                ThreadLocalUserHash = HashService.GetHashBytes(thread.Salt, ip),
+                Thread = thread,
+            };
+            thread.Posts.Add(post);
+        }
+        return this;
+    }
+
+    public ThreadTestDataBuilder UpdateThreadLastBumpAt(string threadTitle)
+    {
+        var thread = GetThread(threadTitle);
+        var lastNonSagePost = thread.Posts.Where(p => p is { IsSageEnabled: false, IsDeleted: false }).MaxBy(p => p.CreatedAt);
+        if (lastNonSagePost != null)
+        {
+            thread.LastBumpAt = lastNonSagePost.CreatedAt;
+        }
+        return this;
+    }
+
+    public async Task SaveAsync(CancellationToken cancellationToken)
+    {
+        await _dbContext.SaveChangesAsync(cancellationToken);
+    }
+
+    private void EnsureAdminExists()
+    {
+        if (_admin == null)
+        {
+            throw new InvalidOperationException("Admin must be created first. Call WithDefaultAdmin().");
+        }
+    }
+}
diff --git a/Hikkaba.Tests.Integration/Models/SeedResult.cs b/Hikkaba.Tests.Integration/Models/AppScope.cs
similarity index 81%
rename from Hikkaba.Tests.Integration/Models/SeedResult.cs
rename to Hikkaba.Tests.Integration/Models/AppScope.cs
index 4e8d073..c6d2779 100644
--- a/Hikkaba.Tests.Integration/Models/SeedResult.cs
+++ b/Hikkaba.Tests.Integration/Models/AppScope.cs
@@ -2,7 +2,7 @@
 
 namespace Hikkaba.Tests.Integration.Models;
 
-internal sealed class SeedResult : ISeedResult, IAppFactorySeedResult
+internal sealed class AppScope : IAppFactoryScope
 {
     public required IServiceScope Scope { get; set; }
     public required CustomAppFactory AppFactory { get; set; }
diff --git a/Hikkaba.Tests.Integration/Models/IAppFactoryScope.cs b/Hikkaba.Tests.Integration/Models/IAppFactoryScope.cs
new file mode 100644
index 0000000..cef16f5
--- /dev/null
+++ b/Hikkaba.Tests.Integration/Models/IAppFactoryScope.cs
@@ -0,0 +1,6 @@
+namespace Hikkaba.Tests.Integration.Models;
+
+internal interface IAppFactoryScope : IAppScope
+{
+    CustomAppFactory AppFactory { get; set; }
+}
diff --git a/Hikkaba.Tests.Integration/Models/IAppFactorySeedResult.cs b/Hikkaba.Tests.Integration/Models/IAppFactorySeedResult.cs
deleted file mode 100644
index 39d5429..0000000
--- a/Hikkaba.Tests.Integration/Models/IAppFactorySeedResult.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using Microsoft.Extensions.DependencyInjection;
-
-namespace Hikkaba.Tests.Integration.Models;
-
-internal interface IAppFactorySeedResult : IDisposable
-{
-    IServiceScope Scope { get; set; }
-    CustomAppFactory AppFactory { get; set; }
-}
diff --git a/Hikkaba.Tests.Integration/Models/ISeedResult.cs b/Hikkaba.Tests.Integration/Models/IAppScope.cs
similarity index 78%
rename from Hikkaba.Tests.Integration/Models/ISeedResult.cs
rename to Hikkaba.Tests.Integration/Models/IAppScope.cs
index 542951b..be27c33 100644
--- a/Hikkaba.Tests.Integration/Models/ISeedResult.cs
+++ b/Hikkaba.Tests.Integration/Models/IAppScope.cs
@@ -3,7 +3,7 @@
 
 namespace Hikkaba.Tests.Integration.Models;
 
-internal interface ISeedResult : IDisposable
+internal interface IAppScope : IDisposable
 {
     public IServiceScope Scope { get; set; }
 }
diff --git a/Hikkaba.Tests.Integration/Tests/Repositories/BanRepositoryTests.cs b/Hikkaba.Tests.Integration/Tests/Repositories/BanRepositoryTests.cs
index 01979c9..6462a4d 100644
--- a/Hikkaba.Tests.Integration/Tests/Repositories/BanRepositoryTests.cs
+++ b/Hikkaba.Tests.Integration/Tests/Repositories/BanRepositoryTests.cs
@@ -3,15 +3,13 @@
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
-using Hikkaba.Application.Contracts;
 using Hikkaba.Data.Context;
 using Hikkaba.Data.Entities;
 using Hikkaba.Infrastructure.Models.Ban;
 using Hikkaba.Infrastructure.Repositories.Contracts;
 using Hikkaba.Paging.Enums;
 using Hikkaba.Paging.Models;
-using Hikkaba.Shared.Constants;
-using Hikkaba.Shared.Enums;
+using Hikkaba.Tests.Integration.Builders;
 using Hikkaba.Tests.Integration.Constants;
 using Hikkaba.Tests.Integration.Extensions;
 using Hikkaba.Tests.Integration.Models;
@@ -20,7 +18,6 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
-using Thread = Hikkaba.Data.Entities.Thread;
 
 namespace Hikkaba.Tests.Integration.Tests.Repositories;
 
@@ -28,8 +25,6 @@ namespace Hikkaba.Tests.Integration.Tests.Repositories;
 [Parallelizable(scope: ParallelScope.Fixtures)]
 internal sealed class BanRepositoryTests
 {
-    private static readonly GuidGenerator GuidGenerator = new();
-
     private RespawnableContextManager<ApplicationDbContext>? _contextManager;
 
     [OneTimeSetUp]
@@ -45,7 +40,7 @@ public async Task OneTimeTearDownAsync()
     }
 
     [MustDisposeResource]
-    private async Task<ISeedResult> Seed(CancellationToken cancellationToken)
+    private async Task<IAppScope> CreateSeedResultAsync(CancellationToken cancellationToken)
     {
         var connectionString = await _contextManager!.CreateRespawnedDbConnectionStringAsync();
         var customAppFactory = new CustomAppFactory(connectionString);
@@ -58,13 +53,39 @@ private async Task<ISeedResult> Seed(CancellationToken cancellationToken)
             await dbContext.Database.MigrateAsync(cancellationToken);
         }
 
-        return new SeedResult
+        return new AppScope
         {
             Scope = scope,
             AppFactory = customAppFactory,
         };
     }
 
+    private static async Task SeedExactBansDataAsync(IServiceScope scope, CancellationToken cancellationToken)
+    {
+        await new BanTestDataBuilder(scope)
+            .WithDefaultAdmin()
+            .WithDefaultCategory()
+            .WithDefaultThread()
+            .WithPost(new Guid("05E219F7-35F2-495B-A0D3-D7EF7018C674"), "176.213.241.52", "Firefox", isOriginalPost: true)
+            .WithPost(new Guid("EADF6C08-1C14-432E-A9EB-0DDF67D55FC7"), "b550:f112:2801:51d4:fdaf:21d8:6bbc:aaba", "Chrome")
+            .WithExactBan("176.213.241.52", "ban reason 1")
+            .WithExactBan("b550:f112:2801:51d4:fdaf:21d8:6bbc:aaba", "ban reason 2")
+            .SaveAsync(cancellationToken);
+    }
+
+    private static async Task SeedRangeBansDataAsync(IServiceScope scope, CancellationToken cancellationToken)
+    {
+        await new BanTestDataBuilder(scope)
+            .WithDefaultAdmin()
+            .WithDefaultCategory()
+            .WithDefaultThread()
+            .WithPost(new Guid("64596344-BC44-489A-9D6E-1AA2BB5A27BF"), "176.213.224.37", "Firefox", isOriginalPost: true)
+            .WithPost(new Guid("9BC6094D-DD51-4C59-8EAB-444446DEEF62"), "2001:4860:0000:0000:0000:0000:ffff:0", "Chrome")
+            .WithRangeBan("176.213.224.40", "176.213.224.1", "176.213.224.254", "ban reason 1")
+            .WithRangeBan("2001:4860:0000:0000:ffff:0000:0000:0", "2001:4860:0000:0000:0000:0000:0000:0", "2001:4860:ffff:ffff:ffff:ffff:ffff:ffff", "ban reason 2")
+            .SaveAsync(cancellationToken);
+    }
+
     [CancelAfter(TestDefaults.TestTimeout)]
     [TestCase("176.213.241.52", true)]
     [TestCase("b550:f112:2801:51d4:fdaf:21d8:6bbc:aaba", true)]
@@ -76,107 +97,8 @@ public async Task ListBansPaginatedAsync_WhenSearchExact_ReturnsExpectedResult(
         CancellationToken cancellationToken)
     {
         // Arrange
-        using var seedResult = await Seed(cancellationToken);
-
-        var dbContext = seedResult.Scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
-        var hashService = seedResult.Scope.ServiceProvider.GetRequiredService<IHashService>();
-        var timeProvider = seedResult.Scope.ServiceProvider.GetRequiredService<TimeProvider>();
-
-        // Seed
-        var admin = new ApplicationUser
-        {
-            UserName = "admin",
-            NormalizedUserName = "ADMIN",
-            Email = "admin@example.com",
-            NormalizedEmail = "ADMIN@EXAMPLE.COM",
-            EmailConfirmed = true,
-            SecurityStamp = "896e8014-c237-41f5-a925-dabf640ee4c4",
-            ConcurrencyStamp = "43035b63-359d-4c23-8812-29bbc5affbf2",
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-        };
-        dbContext.Users.Add(admin);
-
-        var category = new Category
-        {
-            IsDeleted = false,
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-            ModifiedAt = null,
-            Alias = "b",
-            Name = "Random Foo",
-            IsHidden = false,
-            DefaultBumpLimit = 500,
-            ShowThreadLocalUserHash = false,
-            ShowCountry = false,
-            ShowOs = false,
-            ShowBrowser = false,
-            MaxThreadCount = Defaults.MaxThreadCountInCategory,
-            CreatedBy = admin,
-        };
-        dbContext.Categories.Add(category);
-
-        var utcNow = timeProvider.GetUtcNow().UtcDateTime;
-        var thread = new Thread
-        {
-            CreatedAt = utcNow,
-            LastBumpAt = utcNow,
-            Title = "test thread 1 Buzz",
-            IsPinned = false,
-            IsClosed = false,
-            BumpLimit = 500,
-            Salt = GuidGenerator.GenerateSeededGuid(),
-            Category = category,
-        };
-        dbContext.Threads.Add(thread);
-
-        var post1 = new Post
-        {
-            IsOriginalPost = true,
-            BlobContainerId = new Guid("05E219F7-35F2-495B-A0D3-D7EF7018C674"),
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-            IsSageEnabled = false,
-            MessageText = "test post 1 abc",
-            MessageHtml = "test post 1 abc",
-            UserIpAddress = IPAddress.Parse("176.213.241.52").GetAddressBytes(),
-            UserAgent = "Firefox",
-            ThreadLocalUserHash = hashService.GetHashBytes(thread.Salt, IPAddress.Parse("176.213.241.52").GetAddressBytes()),
-            Thread = thread,
-        };
-        var post2 = new Post
-        {
-            IsOriginalPost = false,
-            BlobContainerId = new Guid("EADF6C08-1C14-432E-A9EB-0DDF67D55FC7"),
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-            IsSageEnabled = false,
-            MessageText = "test post 2 def",
-            MessageHtml = "test post 2 def",
-            UserIpAddress = IPAddress.Parse("b550:f112:2801:51d4:fdaf:21d8:6bbc:aaba").GetAddressBytes(),
-            UserAgent = "Chrome",
-            ThreadLocalUserHash = hashService.GetHashBytes(thread.Salt, IPAddress.Parse("b550:f112:2801:51d4:fdaf:21d8:6bbc:aaba").GetAddressBytes()),
-            Thread = thread,
-        };
-        dbContext.Posts.AddRange(post1, post2);
-
-        var ban1 = new Ban
-        {
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-            EndsAt = timeProvider.GetUtcNow().UtcDateTime.AddYears(99),
-            IpAddressType = IpAddressType.IpV4,
-            BannedIpAddress = IPAddress.Parse("176.213.241.52").GetAddressBytes(),
-            Reason = "ban reason 1",
-            CreatedBy = admin,
-        };
-        var ban2 = new Ban
-        {
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-            EndsAt = timeProvider.GetUtcNow().UtcDateTime.AddYears(99),
-            IpAddressType = IpAddressType.IpV6,
-            BannedIpAddress = IPAddress.Parse("b550:f112:2801:51d4:fdaf:21d8:6bbc:aaba").GetAddressBytes(),
-            Reason = "ban reason 2",
-            CreatedBy = admin,
-        };
-        dbContext.Bans.AddRange(ban1, ban2);
-
-        await dbContext.SaveChangesAsync(cancellationToken);
+        using var seedResult = await CreateSeedResultAsync(cancellationToken);
+        await SeedExactBansDataAsync(seedResult.Scope, cancellationToken);
 
         var repository = seedResult.Scope.ServiceProvider.GetRequiredService<IBanRepository>();
 
@@ -205,110 +127,8 @@ public async Task ListBansPaginatedAsync_WhenSearchInRange_ReturnsExpectedResult
         CancellationToken cancellationToken)
     {
         // Arrange
-        using var seedResult = await Seed(cancellationToken);
-        var dbContext = seedResult.Scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
-        var hashService = seedResult.Scope.ServiceProvider.GetRequiredService<IHashService>();
-        var timeProvider = seedResult.Scope.ServiceProvider.GetRequiredService<TimeProvider>();
-
-        // Seed
-        var admin = new ApplicationUser
-        {
-            UserName = "admin",
-            NormalizedUserName = "ADMIN",
-            Email = "admin@example.com",
-            NormalizedEmail = "ADMIN@EXAMPLE.COM",
-            EmailConfirmed = true,
-            SecurityStamp = "896e8014-c237-41f5-a925-dabf640ee4c4",
-            ConcurrencyStamp = "43035b63-359d-4c23-8812-29bbc5affbf2",
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-        };
-        dbContext.Users.Add(admin);
-
-        var category = new Category
-        {
-            IsDeleted = false,
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-            ModifiedAt = null,
-            Alias = "b",
-            Name = "Random Foo",
-            IsHidden = false,
-            DefaultBumpLimit = 500,
-            ShowThreadLocalUserHash = false,
-            ShowCountry = false,
-            ShowOs = false,
-            ShowBrowser = false,
-            MaxThreadCount = Defaults.MaxThreadCountInCategory,
-            CreatedBy = admin,
-        };
-        dbContext.Categories.Add(category);
-
-        var utcNow = timeProvider.GetUtcNow().UtcDateTime;
-        var thread = new Thread
-        {
-            CreatedAt = utcNow,
-            LastBumpAt = utcNow,
-            Title = "test thread 1 Buzz",
-            IsPinned = false,
-            IsClosed = false,
-            BumpLimit = 500,
-            Salt = GuidGenerator.GenerateSeededGuid(),
-            Category = category,
-        };
-        dbContext.Threads.Add(thread);
-
-        var post1 = new Post
-        {
-            IsOriginalPost = true,
-            BlobContainerId = new Guid("64596344-BC44-489A-9D6E-1AA2BB5A27BF"),
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-            IsSageEnabled = false,
-            MessageText = "test post 1 abc",
-            MessageHtml = "test post 1 abc",
-            UserIpAddress = IPAddress.Parse("176.213.224.37").GetAddressBytes(),
-            UserAgent = "Firefox",
-            ThreadLocalUserHash = hashService.GetHashBytes(thread.Salt, IPAddress.Parse("176.213.224.37").GetAddressBytes()),
-            Thread = thread,
-        };
-        var post2 = new Post
-        {
-            IsOriginalPost = false,
-            BlobContainerId = new Guid("9BC6094D-DD51-4C59-8EAB-444446DEEF62"),
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-            IsSageEnabled = false,
-            MessageText = "test post 2 def",
-            MessageHtml = "test post 2 def",
-            UserIpAddress = IPAddress.Parse("2001:4860:0000:0000:0000:0000:ffff:0").GetAddressBytes(),
-            UserAgent = "Chrome",
-            ThreadLocalUserHash = hashService.GetHashBytes(thread.Salt, IPAddress.Parse("2001:4860:0000:0000:0000:0000:ffff:0").GetAddressBytes()),
-            Thread = thread,
-        };
-        dbContext.Posts.AddRange(post1, post2);
-
-        var ban1 = new Ban
-        {
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-            EndsAt = timeProvider.GetUtcNow().UtcDateTime.AddYears(99),
-            IpAddressType = IpAddressType.IpV4,
-            BannedIpAddress = IPAddress.Parse("176.213.224.40").GetAddressBytes(),
-            BannedCidrLowerIpAddress = IPAddress.Parse("176.213.224.1").GetAddressBytes(),
-            BannedCidrUpperIpAddress = IPAddress.Parse("176.213.224.254").GetAddressBytes(),
-            Reason = "ban reason 1",
-            CreatedBy = admin,
-        };
-        var ban2 = new Ban
-        {
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-            EndsAt = timeProvider.GetUtcNow().UtcDateTime.AddYears(99),
-            IpAddressType = IpAddressType.IpV6,
-            BannedIpAddress = IPAddress.Parse("2001:4860:0000:0000:ffff:0000:0000:0").GetAddressBytes(),
-            BannedCidrLowerIpAddress = IPAddress.Parse("2001:4860:0000:0000:0000:0000:0000:0").GetAddressBytes(),
-            BannedCidrUpperIpAddress = IPAddress.Parse("2001:4860:ffff:ffff:ffff:ffff:ffff:ffff").GetAddressBytes(),
-            Reason = "ban reason 2",
-            CreatedBy = admin,
-        };
-        dbContext.Bans.AddRange(ban1, ban2);
-
-        await dbContext.SaveChangesAsync(cancellationToken);
+        using var seedResult = await CreateSeedResultAsync(cancellationToken);
+        await SeedRangeBansDataAsync(seedResult.Scope, cancellationToken);
 
         var repository = seedResult.Scope.ServiceProvider.GetRequiredService<IBanRepository>();
 
diff --git a/Hikkaba.Tests.Integration/Tests/Repositories/PostRepositoryTests.cs b/Hikkaba.Tests.Integration/Tests/Repositories/PostRepositoryTests.cs
index c80e28f..8e7948e 100644
--- a/Hikkaba.Tests.Integration/Tests/Repositories/PostRepositoryTests.cs
+++ b/Hikkaba.Tests.Integration/Tests/Repositories/PostRepositoryTests.cs
@@ -1,17 +1,14 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
-using Hikkaba.Application.Contracts;
 using Hikkaba.Data.Context;
 using Hikkaba.Data.Entities;
 using Hikkaba.Infrastructure.Models.Post;
 using Hikkaba.Infrastructure.Repositories.Contracts;
 using Hikkaba.Paging.Enums;
 using Hikkaba.Paging.Models;
-using Hikkaba.Shared.Constants;
+using Hikkaba.Tests.Integration.Builders;
 using Hikkaba.Tests.Integration.Constants;
 using Hikkaba.Tests.Integration.Extensions;
 using Hikkaba.Tests.Integration.Models;
@@ -21,7 +18,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Thread = Hikkaba.Data.Entities.Thread;
 
 namespace Hikkaba.Tests.Integration.Tests.Repositories;
 
@@ -29,7 +25,6 @@ namespace Hikkaba.Tests.Integration.Tests.Repositories;
 [Parallelizable(scope: ParallelScope.Fixtures)]
 internal sealed class PostRepositoryTests
 {
-    private static readonly GuidGenerator GuidGenerator = new();
     private RespawnableContextManager<ApplicationDbContext>? _contextManager;
 
     [OneTimeSetUp]
@@ -45,7 +40,7 @@ public async Task OneTimeTearDownAsync()
     }
 
     [MustDisposeResource]
-    private async Task<ISeedResult> Seed(CancellationToken cancellationToken)
+    private async Task<IAppScope> CreateSeedResultAsync(CancellationToken cancellationToken)
     {
         var connectionString = await _contextManager!.CreateRespawnedDbConnectionStringAsync();
         var customAppFactory = new CustomAppFactory(connectionString);
@@ -58,13 +53,25 @@ private async Task<ISeedResult> Seed(CancellationToken cancellationToken)
             await dbContext.Database.MigrateAsync(cancellationToken);
         }
 
-        return new SeedResult
+        return new AppScope
         {
             Scope = scope,
             AppFactory = customAppFactory,
         };
     }
 
+    private static async Task SeedSearchPostsDataAsync(IServiceScope scope, CancellationToken cancellationToken)
+    {
+        await new PostTestDataBuilder(scope)
+            .WithDefaultAdmin()
+            .WithCategory("b", "Random CategorySearchTerm")
+            .WithThread("BoardThreadPostSearchTerm thread 1 ThreadAndPostSearchTerm")
+            .WithPost(new Guid("243D7DB4-4EE8-4285-8888-E7185A7CB1B2"), "BoardThreadPostSearchTerm post 1 Post1SearchTerm", "127.0.0.1", "Firefox", isOriginalPost: true)
+            .WithPost(new Guid("D9AED982-37D6-4C5C-B235-E1AADC342236"), "BoardThreadPostSearchTerm post 2 Post2SearchTerm", "127.0.0.1", "Chrome")
+            .WithPost(new Guid("C8393E45-20AE-4214-A1EF-5F6AE0D93477"), "BoardThreadPostSearchTerm Post1SearchTerm Post2SearchTerm BoardSearchTerm CategorySearchTerm ThreadAndPostSearchTerm", "127.0.0.1", "Chrome", isDeleted: true)
+            .SaveAsync(cancellationToken);
+    }
+
     [CancelAfter(TestDefaults.TestTimeout)]
     [TestCase("BoardSearchTerm", 0)]
     [TestCase("CategorySearchTerm", 0)]
@@ -78,100 +85,11 @@ public async Task SearchPostsPaginatedAsync_WhenSearchQueryIsProvided_ReturnsExp
         CancellationToken cancellationToken)
     {
         // Arrange
-        using var seedResult = await Seed(cancellationToken);
+        using var seedResult = await CreateSeedResultAsync(cancellationToken);
+        await SeedSearchPostsDataAsync(seedResult.Scope, cancellationToken);
+
         var dbContext = seedResult.Scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
-        var hashService = seedResult.Scope.ServiceProvider.GetRequiredService<IHashService>();
-        var timeProvider = seedResult.Scope.ServiceProvider.GetRequiredService<TimeProvider>();
         var logger = seedResult.Scope.ServiceProvider.GetRequiredService<ILogger<PostRepositoryTests>>();
-
-        // Seed
-        var admin = new ApplicationUser
-        {
-            UserName = "admin",
-            NormalizedUserName = "ADMIN",
-            Email = "admin@example.com",
-            NormalizedEmail = "ADMIN@EXAMPLE.COM",
-            EmailConfirmed = true,
-            SecurityStamp = "896e8014-c237-41f5-a925-dabf640ee4c4",
-            ConcurrencyStamp = "43035b63-359d-4c23-8812-29bbc5affbf2",
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-        };
-        dbContext.Users.Add(admin);
-
-        var category = new Category
-        {
-            IsDeleted = false,
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-            ModifiedAt = null,
-            Alias = "b",
-            Name = "Random CategorySearchTerm",
-            IsHidden = false,
-            DefaultBumpLimit = 500,
-            ShowThreadLocalUserHash = false,
-            MaxThreadCount = Defaults.MaxThreadCountInCategory,
-            CreatedBy = admin,
-        };
-        dbContext.Categories.Add(category);
-
-        var utcNow = timeProvider.GetUtcNow().UtcDateTime;
-        var thread = new Thread
-        {
-            CreatedAt = utcNow,
-            LastBumpAt = utcNow,
-            Title = "BoardThreadPostSearchTerm thread 1 ThreadAndPostSearchTerm",
-            IsPinned = false,
-            IsClosed = false,
-            BumpLimit = 500,
-            Salt = GuidGenerator.GenerateSeededGuid(),
-            Category = category,
-        };
-        dbContext.Threads.Add(thread);
-
-        var post1 = new Post
-        {
-            IsOriginalPost = true,
-            BlobContainerId = new Guid("243D7DB4-4EE8-4285-8888-E7185A7CB1B2"),
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-            IsSageEnabled = false,
-            MessageText = "BoardThreadPostSearchTerm post 1 Post1SearchTerm",
-            MessageHtml = "BoardThreadPostSearchTerm post 1 Post1SearchTerm",
-            UserIpAddress = IPAddress.Parse("127.0.0.1").GetAddressBytes(),
-            UserAgent = "Firefox",
-            ThreadLocalUserHash = hashService.GetHashBytes(thread.Salt, IPAddress.Parse("127.0.0.1").GetAddressBytes()),
-            Thread = thread,
-        };
-        var post2 = new Post
-        {
-            IsOriginalPost = false,
-            BlobContainerId = new Guid("D9AED982-37D6-4C5C-B235-E1AADC342236"),
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-            IsSageEnabled = false,
-            MessageText = "BoardThreadPostSearchTerm post 2 Post2SearchTerm",
-            MessageHtml = "BoardThreadPostSearchTerm post 2 Post2SearchTerm",
-            UserIpAddress = IPAddress.Parse("127.0.0.1").GetAddressBytes(),
-            UserAgent = "Chrome",
-            ThreadLocalUserHash = hashService.GetHashBytes(thread.Salt, IPAddress.Parse("127.0.0.1").GetAddressBytes()),
-            Thread = thread,
-        };
-        var post3 = new Post
-        {
-            IsOriginalPost = false,
-            BlobContainerId = new Guid("C8393E45-20AE-4214-A1EF-5F6AE0D93477"),
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-            IsDeleted = true,
-            IsSageEnabled = false,
-            MessageText = "BoardThreadPostSearchTerm Post1SearchTerm Post2SearchTerm BoardSearchTerm CategorySearchTerm ThreadAndPostSearchTerm",
-            MessageHtml = "BoardThreadPostSearchTerm Post1SearchTerm Post2SearchTerm BoardSearchTerm CategorySearchTerm ThreadAndPostSearchTerm",
-            UserIpAddress = IPAddress.Parse("127.0.0.1").GetAddressBytes(),
-            UserAgent = "Chrome",
-            ThreadLocalUserHash = hashService.GetHashBytes(thread.Salt, IPAddress.Parse("127.0.0.1").GetAddressBytes()),
-            Thread = thread,
-        };
-        IReadOnlyList<Post> allPosts = [post1, post2, post3];
-        dbContext.Posts.AddRange(allPosts);
-
-        await dbContext.SaveChangesAsync(cancellationToken);
-
         await DbUtils.WaitForFulltextIndexAsync(logger, dbContext, ["Posts", "Threads"], cancellationToken: cancellationToken);
 
         var repository = seedResult.Scope.ServiceProvider.GetRequiredService<IPostRepository>();
diff --git a/Hikkaba.Tests.Integration/Tests/Repositories/ThreadRepositoryTests.cs b/Hikkaba.Tests.Integration/Tests/Repositories/ThreadRepositoryTests.cs
index e216b61..f5955f2 100644
--- a/Hikkaba.Tests.Integration/Tests/Repositories/ThreadRepositoryTests.cs
+++ b/Hikkaba.Tests.Integration/Tests/Repositories/ThreadRepositoryTests.cs
@@ -1,20 +1,16 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
-using Blake3;
 using Hikkaba.Application.Contracts;
 using Hikkaba.Data.Context;
-using Hikkaba.Data.Entities;
-using Hikkaba.Data.Entities.Attachments;
 using Hikkaba.Infrastructure.Models.Post;
 using Hikkaba.Infrastructure.Models.Thread;
 using Hikkaba.Infrastructure.Repositories.Contracts;
 using Hikkaba.Paging.Enums;
 using Hikkaba.Paging.Models;
 using Hikkaba.Shared.Constants;
+using Hikkaba.Tests.Integration.Builders;
 using Hikkaba.Tests.Integration.Constants;
 using Hikkaba.Tests.Integration.Extensions;
 using Hikkaba.Tests.Integration.Models;
@@ -23,7 +19,6 @@
 using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
-using Thread = Hikkaba.Data.Entities.Thread;
 
 namespace Hikkaba.Tests.Integration.Tests.Repositories;
 
@@ -31,8 +26,6 @@ namespace Hikkaba.Tests.Integration.Tests.Repositories;
 [Parallelizable(scope: ParallelScope.Fixtures)]
 internal sealed class ThreadRepositoryTests
 {
-    private static readonly GuidGenerator GuidGenerator = new();
-
     private RespawnableContextManager<ApplicationDbContext>? _contextManager;
 
     [OneTimeSetUp]
@@ -48,7 +41,7 @@ public async Task OneTimeTearDownAsync()
     }
 
     [MustDisposeResource]
-    private async Task<ISeedResult> Seed(CancellationToken cancellationToken)
+    private async Task<IAppScope> CreateAppScopeAsync(CancellationToken cancellationToken)
     {
         var connectionString = await _contextManager!.CreateRespawnedDbConnectionStringAsync();
         var customAppFactory = new CustomAppFactory(connectionString);
@@ -61,190 +54,199 @@ private async Task<ISeedResult> Seed(CancellationToken cancellationToken)
             await dbContext.Database.MigrateAsync(cancellationToken);
         }
 
-        return new SeedResult
+        return new AppScope
         {
             Scope = scope,
             AppFactory = customAppFactory,
         };
     }
 
-    [CancelAfter(TestDefaults.TestTimeout)]
-    [Test]
-    public async Task ListThreadPreviewsPaginatedAsync_WhenOnePageExists_ReturnsCorrectResult(
+    #region Seed Methods
+
+    private static async Task<(ThreadTestDataBuilder Builder, int PostCount)> SeedOnePageDataAsync(
+        IServiceScope scope,
         CancellationToken cancellationToken)
     {
-        // Arrange
-        using var seedResult = await Seed(cancellationToken);
-        var dbContext = seedResult.Scope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
-        var hashService = seedResult.Scope.ServiceProvider.GetRequiredService<IHashService>();
-        var timeProvider = seedResult.Scope.ServiceProvider.GetRequiredService<TimeProvider>();
+        var builder = new ThreadTestDataBuilder(scope)
+            .WithDefaultAdmin()
+            .WithCategory("b", "Random")
+            .WithThread("b", "test thread 1")
+            .WithPost("test thread 1", new Guid("545917CA-374F-4C34-80B9-7D8DF0842D72"), "test post 0", isOriginalPost: true, createdAtOffset: TimeSpan.FromSeconds(1))
+            .WithPostWithAudio("test thread 1", new Guid("502FACD5-C207-4684-960B-274949E6D043"), "test post 1", new Guid("6D3CD116-6336-47BC-BBE7-5DB289AC6C51"), "Extended electric guitar solo", createdAtOffset: TimeSpan.FromSeconds(2))
+            .WithPostWithPicture("test thread 1", new Guid("91F9A825-FFC0-45FA-B8CF-EA0435F414BC"), "test post 2", new Guid("668B2737-0540-4DDD-A23E-58FA031A933F"), "photo_2024-10-31_16-20-39", createdAtOffset: TimeSpan.FromSeconds(3))
+            .WithPost("test thread 1", new Guid("BD852887-CBE3-4BAB-9FAC-F501EC3DA439"), "test post 3", createdAtOffset: TimeSpan.FromSeconds(4))
+            .WithPost("test thread 1", new Guid("2FA199CC-CD14-402D-8209-0A1B8353E463"), "test post 4", createdAtOffset: TimeSpan.FromSeconds(5))
+            .WithPost("test thread 1", new Guid("1F657883-6C50-48FE-982C-5E1B552918D3"), "test post 5", createdAtOffset: TimeSpan.FromSeconds(6));
+
+        await builder.SaveAsync(cancellationToken);
+        return (builder, 6);
+    }
 
-        // Seed
-        var admin = new ApplicationUser
-        {
-            UserName = "admin",
-            NormalizedUserName = "ADMIN",
-            Email = "admin@example.com",
-            NormalizedEmail = "ADMIN@EXAMPLE.COM",
-            EmailConfirmed = true,
-            SecurityStamp = "896e8014-c237-41f5-a925-dabf640ee4c4",
-            ConcurrencyStamp = "43035b63-359d-4c23-8812-29bbc5affbf2",
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-        };
-        dbContext.Users.Add(admin);
+    private static async Task SeedManyPagesDataAsync(
+        IServiceScope scope,
+        int totalThreadCount,
+        int totalPostCountPerThread,
+        CancellationToken cancellationToken)
+    {
+        var builder = new ThreadTestDataBuilder(scope)
+            .WithDefaultAdmin()
+            .WithCategory("b", "Random")
+            .WithCategory("a", "Anime");
+
+        // Deleted thread (should be excluded)
+        builder.WithThreadAndPosts("b", "deleted thread", 1, isPinned: true, isClosed: true, isDeleted: true);
+
+        // Thread in another category (should be excluded)
+        builder.WithThreadAndPosts("a", "another category thread", 1);
+
+        // Main threads
+        builder.WithManyThreadsAndPosts(
+            "b",
+            totalThreadCount,
+            totalPostCountPerThread,
+            includeDeletedPost: true,
+            threadCreatedAtSelector: i => builder.TimeProvider.GetUtcNow().UtcDateTime.AddSeconds(i));
+
+        await builder.SaveAsync(cancellationToken);
+    }
 
-        var category = new Category
-        {
-            IsDeleted = false,
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-            ModifiedAt = null,
-            Alias = "b",
-            Name = "Random Foo",
-            IsHidden = false,
-            DefaultBumpLimit = 500,
-            ShowThreadLocalUserHash = false,
-            ShowOs = false,
-            ShowBrowser = false,
-            ShowCountry = false,
-            MaxThreadCount = Defaults.MaxThreadCountInCategory,
-            CreatedBy = admin,
-        };
-        dbContext.Categories.Add(category);
+    private static async Task SeedPinnedThreadDataAsync(
+        IServiceScope scope,
+        int totalThreadCount,
+        int totalPostCountPerThread,
+        CancellationToken cancellationToken)
+    {
+        var builder = new ThreadTestDataBuilder(scope)
+            .WithDefaultAdmin()
+            .WithCategory("b", "Random")
+            .WithCategory("a", "Anime");
+
+        // Deleted thread
+        builder.WithThreadAndPosts("b", "deleted thread", 1, isPinned: true, isClosed: true, isDeleted: true);
+
+        // Thread in another category
+        builder.WithThreadAndPosts("a", "another category thread", 1);
+
+        // Main threads with one pinned
+        builder.WithManyThreadsAndPosts(
+            "b",
+            totalThreadCount,
+            totalPostCountPerThread,
+            includeDeletedPost: true,
+            isPinnedSelector: i => i == 3);
+
+        await builder.SaveAsync(cancellationToken);
+    }
 
-        var utcNow = timeProvider.GetUtcNow().UtcDateTime;
-        var thread = new Thread
-        {
-            CreatedAt = utcNow,
-            LastBumpAt = utcNow,
-            Title = "test thread 1 Buzz",
-            IsPinned = false,
-            IsClosed = false,
-            BumpLimit = 500,
-            Salt = GuidGenerator.GenerateSeededGuid(),
-            Category = category,
-        };
-        dbContext.Threads.Add(thread);
+    private static async Task SeedSagePostDataAsync(
+        IServiceScope scope,
+        int totalThreadCount,
+        int totalPostCountPerThread,
+        CancellationToken cancellationToken)
+    {
+        var builder = new ThreadTestDataBuilder(scope)
+            .WithDefaultAdmin()
+            .WithCategory("b", "Random")
+            .WithCategory("a", "Anime");
 
-        var userIp = IPAddress.Parse("127.0.0.1").GetAddressBytes();
-        var post0 = new Post
-        {
-            IsOriginalPost = true,
-            BlobContainerId = new Guid("545917CA-374F-4C34-80B9-7D8DF0842D72"),
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime.AddSeconds(1),
-            IsSageEnabled = false,
-            MessageText = "test post 0",
-            MessageHtml = "test post 0",
-            UserIpAddress = userIp,
-            UserAgent = "Firefox",
-            ThreadLocalUserHash = hashService.GetHashBytes(thread.Salt, userIp),
-            Thread = thread,
-        };
-        var post1 = new Post
-        {
-            IsOriginalPost = false,
-            BlobContainerId = new Guid("502FACD5-C207-4684-960B-274949E6D043"),
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime.AddSeconds(2),
-            IsSageEnabled = false,
-            MessageText = "test post 1",
-            MessageHtml = "test post 1",
-            UserIpAddress = userIp,
-            UserAgent = "Chrome",
-            ThreadLocalUserHash = hashService.GetHashBytes(thread.Salt, userIp),
-            Thread = thread,
-            Audios = new List<Audio>
-            {
-                new()
-                {
-                    BlobId = new Guid("6D3CD116-6336-47BC-BBE7-5DB289AC6C51"),
-                    FileNameWithoutExtension = "Extended electric guitar solo",
-                    FileExtension = "mp3",
-                    FileSize = 3671469,
-                    FileContentType = "audio/mpeg",
-                    FileHash = Hasher.Hash("f61d4fbb-4cbd-4d4e-8df1-6c22c58de9cf"u8)
-                        .AsSpan()
-                        .ToArray(),
-                    Title = "Extended electric guitar solo",
-                    Album = "My Album",
-                    Artist = "AI Generated Music",
-                    DurationSeconds = 120,
-                },
-            },
-        };
-        var post2 = new Post
-        {
-            IsOriginalPost = false,
-            BlobContainerId = new Guid("91F9A825-FFC0-45FA-B8CF-EA0435F414BC"),
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime.AddSeconds(3),
-            IsSageEnabled = false,
-            MessageText = "test post 2",
-            MessageHtml = "test post 2",
-            UserIpAddress = userIp,
-            UserAgent = "Chrome",
-            ThreadLocalUserHash = hashService.GetHashBytes(thread.Salt, userIp),
-            Thread = thread,
-            Pictures = new List<Picture>
-            {
-                new()
-                {
-                    BlobId = new Guid("668B2737-0540-4DDD-A23E-58FA031A933F"),
-                    FileNameWithoutExtension = "photo_2024-10-31_16-20-39",
-                    FileExtension = "jpg",
-                    FileSize = 204316,
-                    FileContentType = "image/jpeg",
-                    FileHash = Hasher.Hash("6e84e6b4-5370-44c6-a319-a03a027f3905"u8).AsSpan().ToArray(),
-                    Width = 1280,
-                    Height = 960,
-                    ThumbnailExtension = "jpg",
-                    ThumbnailWidth = 128,
-                    ThumbnailHeight = 96,
-                },
-            },
-        };
-        var post3 = new Post
-        {
-            IsOriginalPost = false,
-            BlobContainerId = new Guid("BD852887-CBE3-4BAB-9FAC-F501EC3DA439"),
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime.AddSeconds(4),
-            IsSageEnabled = false,
-            MessageText = "test post 3",
-            MessageHtml = "test post 3",
-            UserIpAddress = userIp,
-            UserAgent = "Chrome",
-            ThreadLocalUserHash = hashService.GetHashBytes(thread.Salt, userIp),
-            Thread = thread,
-        };
-        var post4 = new Post
-        {
-            IsOriginalPost = false,
-            BlobContainerId = new Guid("2FA199CC-CD14-402D-8209-0A1B8353E463"),
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime.AddSeconds(5),
-            IsSageEnabled = false,
-            MessageText = "test post 4",
-            MessageHtml = "test post 4",
-            UserIpAddress = userIp,
-            UserAgent = "Chrome",
-            ThreadLocalUserHash = hashService.GetHashBytes(thread.Salt, userIp),
-            Thread = thread,
-        };
-        var post5 = new Post
+        // Deleted thread
+        builder.WithThreadAndPosts("b", "deleted thread", 1, isPinned: true, isClosed: true, isDeleted: true);
+
+        // Thread in another category
+        builder.WithThreadAndPosts("a", "another category thread", 1);
+
+        // Main threads with all sage posts
+        for (var i = 0; i < totalThreadCount; i++)
         {
-            IsOriginalPost = false,
-            BlobContainerId = new Guid("1F657883-6C50-48FE-982C-5E1B552918D3"),
-            CreatedAt = timeProvider.GetUtcNow().UtcDateTime.AddSeconds(6),
-            IsSageEnabled = false,
-            MessageText = "test post 5",
-            MessageHtml = "test post 5",
-            UserIpAddress = userIp,
-            UserAgent = "Chrome",
-            ThreadLocalUserHash = hashService.GetHashBytes(thread.Salt, userIp),
-            Thread = thread,
-        };
-        List<Post> allPosts = [post0, post1, post2, post3, post4, post5];
-        dbContext.AddRange(allPosts);
+            builder.WithThreadAndPosts(
+                "b",
+                $"test thread {i}",
+                totalPostCountPerThread,
+                allPostsSage: true,
+                includeDeletedPost: true);
+        }
+
+        // Thread with non-sage post that should appear first
+        var utcNow = builder.TimeProvider.GetUtcNow().UtcDateTime;
+        builder.WithThread("b", "thread with no-sage post", lastBumpAt: utcNow)
+            .WithPost(
+                "thread with no-sage post",
+                new Guid("9BE82B5A-0C4C-475C-9A3B-29F498E079E5"),
+                "no-sage post",
+                userAgent: "Chrome",
+                createdAtOffset: TimeSpan.FromDays(-20));
+
+        await builder.SaveAsync(cancellationToken);
+    }
+
+    private static async Task SeedBumpLimitDataAsync(IServiceScope scope, int bumpLimit, CancellationToken cancellationToken)
+    {
+        var builder = new ThreadTestDataBuilder(scope)
+            .WithDefaultAdmin()
+            .WithCategory("b", "Random")
+            .WithCategory("a", "Anime");
+
+        var utcNow = builder.TimeProvider.GetUtcNow().UtcDateTime;
+
+        // Deleted thread
+        builder.WithThreadAndPosts("b", "deleted thread", 1, isPinned: true, isClosed: true, isDeleted: true);
+
+        // Thread in another category
+        builder.WithThreadAndPosts("a", "another category thread", 1);
+
+        // Threads with bump limit scenarios
+        builder
+            .WithThread("b", "thread with bump limit 1", bumpLimit: bumpLimit, createdAt: utcNow.AddMinutes(1), lastBumpAt: utcNow.AddMinutes(1))
+            .WithThread("b", "thread with bump limit 2", bumpLimit: bumpLimit, createdAt: utcNow.AddMinutes(2), lastBumpAt: utcNow.AddMinutes(2))
+            .WithThread("b", "thread with bump limit 3", bumpLimit: bumpLimit, createdAt: utcNow.AddMinutes(3), lastBumpAt: utcNow.AddMinutes(3))
+            .WithThread("b", "thread with bump limit 4", bumpLimit: bumpLimit, createdAt: utcNow.AddMinutes(4), lastBumpAt: utcNow.AddMinutes(4));
+
+        // Add posts to deleted thread and another category thread (newest posts, but excluded from query)
+        builder
+            .AddPostsToThread("deleted thread", utcNow.AddYears(2), bumpLimit + 2)
+            .AddPostsToThread("another category thread", utcNow.AddYears(2), bumpLimit + 2);
+
+        // thread1: old posts before bump limit + new posts after bump limit (shouldn't affect result)
+        builder
+            .AddPostsToThread("thread with bump limit 1", utcNow.AddYears(-1), bumpLimit)
+            .AddPostsToThread("thread with bump limit 1", utcNow.AddYears(1), 2)
+            .UpdateThreadLastBumpAt("thread with bump limit 1");
+
+        // thread2: several new posts
+        builder
+            .AddPostsToThread("thread with bump limit 2", utcNow.AddDays(1).AddHours(1), 1, isSageEnabled: true)
+            .AddPostsToThread("thread with bump limit 2", utcNow.AddDays(1), bumpLimit)
+            .UpdateThreadLastBumpAt("thread with bump limit 2");
+
+        // thread3: even newer posts
+        builder
+            .AddPostsToThread("thread with bump limit 3", utcNow.AddDays(1).AddHours(3), 1, isSageEnabled: true)
+            .AddPostsToThread("thread with bump limit 3", utcNow.AddDays(1).AddSeconds(1), bumpLimit)
+            .UpdateThreadLastBumpAt("thread with bump limit 3");
+
+        // thread4: a lot of posts
+        builder
+            .AddPostsToThread("thread with bump limit 4", utcNow, bumpLimit + 10)
+            .AddPostsToThread("thread with bump limit 4", utcNow.AddYears(5), bumpLimit + 10)
+            .UpdateThreadLastBumpAt("thread with bump limit 4");
+
+        await builder.SaveAsync(cancellationToken);
+    }
+
+    #endregion
 
-        await dbContext.SaveChangesAsync(cancellationToken);
+    [CancelAfter(TestDefaults.TestTimeout)]
+    [Test]
+    public async Task ListThreadPreviewsPaginatedAsync_WhenOnePageExists_ReturnsCorrectResult(
+        CancellationToken cancellationToken)
+    {
+        // Arrange
+        using var appScope = await CreateAppScopeAsync(cancellationToken);
+        var (builder, postCount) = await SeedOnePageDataAsync(appScope.Scope, cancellationToken);
 
-        var repository = seedResult.Scope.ServiceProvider.GetRequiredService<IThreadRepository>();
+        var thread = builder.GetThread("test thread 1");
+        var userIp = System.Net.IPAddress.Parse("127.0.0.1").GetAddressBytes();
+        var repository = appScope.Scope.ServiceProvider.GetRequiredService<IThreadRepository>();
 
         // Act
         var result = await repository.ListThreadPreviewsPaginatedAsync(new ThreadPreviewFilter
@@ -257,42 +259,31 @@ public async Task ListThreadPreviewsPaginatedAsync_WhenOnePageExists_ReturnsCorr
                 new OrderByItem { Field = nameof(ThreadPreviewModel.LastBumpAt), Direction = OrderByDirection.Desc },
                 new OrderByItem { Field = nameof(ThreadPreviewModel.Id), Direction = OrderByDirection.Desc },
             ],
-            CategoryAlias = category.Alias,
+            CategoryAlias = "b",
         }, cancellationToken);
 
         // Assert
         Assert.That(result, Is.Not.Null);
-
-        // 1 thread shown
         Assert.That(result.Data, Has.Count.EqualTo(1));
-
-        // 1 thread found
         Assert.That(result.TotalItemCount, Is.EqualTo(1));
-
         Assert.That(result.TotalPageCount, Is.EqualTo(1));
         Assert.That(result.PageNumber, Is.EqualTo(1));
         Assert.That(result.PageSize, Is.EqualTo(10));
         Assert.That(result.SkippedItemCount, Is.EqualTo(0));
 
-        // thread has 6 posts
         var firstThread = result.Data[0];
-        Assert.That(firstThread.PostCount, Is.EqualTo(allPosts.Count));
-
-        var actualPost0 = firstThread.Posts[0];
-        var actualPost1 = firstThread.Posts[1];
-        var actualPost2 = firstThread.Posts[2];
-        var actualPost3 = firstThread.Posts[3];
+        Assert.That(firstThread.PostCount, Is.EqualTo(postCount));
 
-        // only 4 posts are shown
-        Assert.That(actualPost0.MessageHtml, Is.EqualTo(post0.MessageHtml));
-        Assert.That(actualPost1.MessageHtml, Is.EqualTo(post3.MessageHtml));
-        Assert.That(actualPost2.MessageHtml, Is.EqualTo(post4.MessageHtml));
-        Assert.That(actualPost3.MessageHtml, Is.EqualTo(post5.MessageHtml));
+        // Only 4 posts are shown (OP + 3 latest)
+        Assert.That(firstThread.Posts[0].MessageHtml, Is.EqualTo("test post 0"));
+        Assert.That(firstThread.Posts[1].MessageHtml, Is.EqualTo("test post 3"));
+        Assert.That(firstThread.Posts[2].MessageHtml, Is.EqualTo("test post 4"));
+        Assert.That(firstThread.Posts[3].MessageHtml, Is.EqualTo("test post 5"));
 
-        // all posts have valid hash
-        foreach (var actualPost in new List<PostDetailsModel> { actualPost0, actualPost1, actualPost2, actualPost3 })
+        // All posts have valid hash
+        foreach (var actualPost in firstThread.Posts)
         {
-            Assert.That(actualPost.ThreadLocalUserHash, Is.EqualTo(hashService.GetHashBytes(thread.Salt, userIp)));
+            Assert.That(actualPost.ThreadLocalUserHash, Is.EqualTo(builder.HashService.GetHashBytes(thread.Salt, userIp)));
         }
     }
 
@@ -316,183 +307,15 @@ public async Task ListThreadPreviewsPaginatedAsync_WhenManyPagesExist_ReturnsCor
         const int totalPostCountPerThread = 55;
 
         // Arrange
-        using var seedResult = await Seed(cancellationToken);
+        using var appScope = await CreateAppScopeAsync(cancellationToken);
 
-        using (var seedScope = seedResult.Scope.ServiceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
+        using (var seedScope = appScope.Scope.ServiceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
         {
-            var seedTimeProvider = seedScope.ServiceProvider.GetRequiredService<TimeProvider>();
-            var seedDbContext = seedScope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
-            var hashService = seedScope.ServiceProvider.GetRequiredService<IHashService>();
-            var timeProvider = seedScope.ServiceProvider.GetRequiredService<TimeProvider>();
-
-            // Seed
-            var admin = new ApplicationUser
-            {
-                UserName = "admin",
-                NormalizedUserName = "ADMIN",
-                Email = "admin@example.com",
-                NormalizedEmail = "ADMIN@EXAMPLE.COM",
-                EmailConfirmed = true,
-                SecurityStamp = "896e8014-c237-41f5-a925-dabf640ee4c4",
-                ConcurrencyStamp = "43035b63-359d-4c23-8812-29bbc5affbf2",
-                CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime,
-            };
-            seedDbContext.Users.Add(admin);
-
-            var category1 = new Category
-            {
-                IsDeleted = false,
-                CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime,
-                ModifiedAt = null,
-                Alias = "b",
-                Name = "Random Foo",
-                IsHidden = false,
-                DefaultBumpLimit = 500,
-                ShowThreadLocalUserHash = false,
-                ShowOs = false,
-                ShowBrowser = false,
-                ShowCountry = false,
-                MaxThreadCount = Defaults.MaxThreadCountInCategory,
-                CreatedBy = admin,
-            };
-            var category2 = new Category
-            {
-                IsDeleted = false,
-                CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime,
-                ModifiedAt = null,
-                Alias = "a",
-                Name = "Random Bar",
-                IsHidden = false,
-                DefaultBumpLimit = 500,
-                ShowThreadLocalUserHash = false,
-                ShowOs = false,
-                ShowBrowser = false,
-                ShowCountry = false,
-                MaxThreadCount = Defaults.MaxThreadCountInCategory,
-                CreatedBy = admin,
-            };
-            seedDbContext.Categories.AddRange(category1, category2);
-
-            var salt1 = GuidGenerator.GenerateSeededGuid();
-            var salt2 = GuidGenerator.GenerateSeededGuid();
-            var userIp = IPAddress.Parse($"127.0.0.1").GetAddressBytes();
-            var utcNow = timeProvider.GetUtcNow().UtcDateTime;
-            var deletedThread = new Thread
-            {
-                CreatedAt = utcNow,
-                LastBumpAt = utcNow,
-                Title = "deleted thread",
-                IsPinned = true,
-                IsClosed = true,
-                IsDeleted = true,
-                BumpLimit = 500,
-                Salt = salt1,
-                Category = category1,
-                Posts =
-                [
-                    new Post
-                    {
-                        IsOriginalPost = true,
-                        BlobContainerId = new Guid("CC8B3B30-A82B-4634-BE98-17E6FE646E1A"),
-                        CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime,
-                        IsSageEnabled = false,
-                        IsDeleted = false,
-                        MessageText = $"test post in deleted thread",
-                        MessageHtml = $"test post in deleted thread",
-                        UserIpAddress = userIp,
-                        UserAgent = "Firefox",
-                        ThreadLocalUserHash = hashService.GetHashBytes(salt1, userIp),
-                    },
-                ],
-            };
-            var anotherCategoryThread = new Thread
-            {
-                CreatedAt = utcNow,
-                LastBumpAt = utcNow,
-                Title = "another category thread",
-                IsPinned = false,
-                IsClosed = false,
-                IsDeleted = false,
-                BumpLimit = 500,
-                Salt = salt2,
-                Category = category2,
-                Posts =
-                [
-                    new Post
-                    {
-                        IsOriginalPost = true,
-                        BlobContainerId = new Guid("8B6789E0-9086-456F-94AA-AC070DF868B5"),
-                        CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime,
-                        IsSageEnabled = false,
-                        IsDeleted = false,
-                        MessageText = $"test post in deleted thread",
-                        MessageHtml = $"test post in deleted thread",
-                        UserIpAddress = userIp,
-                        UserAgent = "Firefox",
-                        ThreadLocalUserHash = hashService.GetHashBytes(salt2, userIp),
-                    },
-                ],
-            };
-
-            var threads = Enumerable
-                .Range(0, totalThreadCount)
-                .Select(i => new Thread
-                {
-                    CreatedAt = utcNow.AddSeconds(i),
-                    LastBumpAt = utcNow.AddSeconds(i),
-                    Title = $"test thread {i}",
-                    IsPinned = false,
-                    IsClosed = false,
-                    IsDeleted = false,
-                    BumpLimit = 500,
-                    Salt = GuidGenerator.GenerateSeededGuid(),
-                    Category = category1,
-                })
-                .Union([deletedThread, anotherCategoryThread])
-                .ToList();
-            seedDbContext.Threads.AddRange(threads);
-
-            var posts = threads.SelectMany(t => Enumerable
-                    .Range(0, totalPostCountPerThread)
-                    .Select(i => new Post
-                    {
-                        IsOriginalPost = i == 0,
-                        BlobContainerId = GuidGenerator.GenerateSeededGuid(),
-                        CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime.AddMinutes(i),
-                        IsSageEnabled = i % 2 == 0,
-                        IsDeleted = false,
-                        MessageText = $"test post {i}",
-                        MessageHtml = $"test post {i}",
-                        UserIpAddress = IPAddress.Parse($"127.0.0.{i}").GetAddressBytes(),
-                        UserAgent = "Firefox",
-                        ThreadLocalUserHash = hashService.GetHashBytes(t.Salt, IPAddress.Parse($"127.0.0.{i}").GetAddressBytes()),
-                        Thread = t,
-                    })
-                    .Union([
-                        new Post
-                        {
-                            IsOriginalPost = false,
-                            BlobContainerId = GuidGenerator.GenerateSeededGuid(),
-                            CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime.AddYears(1),
-                            IsSageEnabled = false,
-                            IsDeleted = true,
-                            MessageText = $"deleted post",
-                            MessageHtml = $"deleted post",
-                            UserIpAddress = IPAddress.Parse($"127.0.0.1").GetAddressBytes(),
-                            UserAgent = "Firefox",
-                            ThreadLocalUserHash = hashService.GetHashBytes(t.Salt, IPAddress.Parse($"127.0.0.1").GetAddressBytes()),
-                            Thread = t,
-                        },
-                    ])
-                    .ToList())
-                .ToList();
-            seedDbContext.Posts.AddRange(posts);
-
-            await seedDbContext.SaveChangesAsync(cancellationToken);
+            await SeedManyPagesDataAsync(seedScope, totalThreadCount, totalPostCountPerThread, cancellationToken);
         }
 
         // Act
-        using (var actScope = seedResult.Scope.ServiceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
+        using (var actScope = appScope.Scope.ServiceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
         {
             var threadRepository = actScope.ServiceProvider.GetRequiredService<IThreadRepository>();
 
@@ -512,46 +335,25 @@ public async Task ListThreadPreviewsPaginatedAsync_WhenManyPagesExist_ReturnsCor
 
             // Assert
             Assert.That(actualThreadPreviews, Is.Not.Null);
-
-            // N threads shown (except deleted)
             Assert.That(actualThreadPreviews.Data, Has.Count.EqualTo(expectedThreadCount));
-
-            // All threads found (except deleted)
             Assert.That(actualThreadPreviews.TotalItemCount, Is.EqualTo(totalThreadCount));
-
             Assert.That(actualThreadPreviews.TotalPageCount, Is.EqualTo(Math.Ceiling((decimal)totalThreadCount / pageSize)));
             Assert.That(actualThreadPreviews.PageNumber, Is.EqualTo(pageNumber));
             Assert.That(actualThreadPreviews.PageSize, Is.EqualTo(pageSize));
             Assert.That(actualThreadPreviews.SkippedItemCount, Is.EqualTo((pageNumber - 1) * pageSize));
 
-            // check that category is correct
-            Assert.That(actualThreadPreviews.Data, Is.All.Matches<ThreadPreviewModel>(x => x.CategoryAlias == "b"));
+            Assert.That(actualThreadPreviews.Data, Is.All.Matches<ThreadPreviewModel>(x => x is { CategoryAlias: "b", IsDeleted: false }
+                                                                                           && x.Posts.All(p => !p.IsDeleted)));
 
-            // check that there are no deleted threads
-            Assert.That(actualThreadPreviews.Data, Is.All.Matches<ThreadPreviewModel>(x => !x.IsDeleted));
-
-            // check that there are no deleted posts
-            Assert.That(actualThreadPreviews.Data, Is.All.Matches<ThreadPreviewModel>(x => x.Posts.All(p => !p.IsDeleted)));
-
-            // check that every next thread updated earlier than the previous one (sort by LastPostCreatedAt desc)
             Assert.That(actualThreadPreviews.Data, Is.Ordered
-                .By(nameof(ThreadPreviewModel.IsPinned))
-                .Descending
-                .Then
-                .By(nameof(ThreadPreviewModel.LastBumpAt))
-                .Descending);
+                .By(nameof(ThreadPreviewModel.IsPinned)).Descending
+                .Then.By(nameof(ThreadPreviewModel.LastBumpAt)).Descending);
 
             foreach (var thread in actualThreadPreviews.Data)
             {
-                // Every thread has M posts
                 Assert.That(thread.PostCount, Is.EqualTo(totalPostCountPerThread));
-
-                // But only K posts are shown (OP post + latest posts)
                 Assert.That(thread.Posts, Has.Count.EqualTo(Defaults.LatestPostsCountInThreadPreview + 1));
-
-                // check that posts are sorted by date ascending
                 Assert.That(thread.Posts, Is.Ordered.By(nameof(PostDetailsModel.CreatedAt)).Ascending);
-
                 Assert.That(thread.Posts, Is.All.Matches<PostDetailsModel>(x => x.ThreadLocalUserHash.Length == 32));
             }
         }
@@ -574,183 +376,18 @@ public async Task ListThreadPreviewsPaginatedAsync_WhenPinnedThreadExist_Returns
         const int totalPostCountPerThread = 25;
 
         // Arrange
-        using var seedResult = await Seed(cancellationToken);
+        using var appScope = await CreateAppScopeAsync(cancellationToken);
 
-        using (var seedScope = seedResult.Scope.ServiceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
+        using (var seedScope = appScope.Scope.ServiceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
         {
-            var seedTimeProvider = seedScope.ServiceProvider.GetRequiredService<TimeProvider>();
-            var seedDbContext = seedScope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
-            var hashService = seedScope.ServiceProvider.GetRequiredService<IHashService>();
-
-            // Seed
-            var admin = new ApplicationUser
-            {
-                UserName = "admin",
-                NormalizedUserName = "ADMIN",
-                Email = "admin@example.com",
-                NormalizedEmail = "ADMIN@EXAMPLE.COM",
-                EmailConfirmed = true,
-                SecurityStamp = "896e8014-c237-41f5-a925-dabf640ee4c4",
-                ConcurrencyStamp = "43035b63-359d-4c23-8812-29bbc5affbf2",
-                CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime,
-            };
-            seedDbContext.Users.Add(admin);
-
-            var category1 = new Category
-            {
-                IsDeleted = false,
-                CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime,
-                ModifiedAt = null,
-                Alias = "b",
-                Name = "Random Foo",
-                IsHidden = false,
-                DefaultBumpLimit = 500,
-                ShowThreadLocalUserHash = false,
-                ShowOs = false,
-                ShowBrowser = false,
-                ShowCountry = false,
-                MaxThreadCount = Defaults.MaxThreadCountInCategory,
-                CreatedBy = admin,
-            };
-            var category2 = new Category
-            {
-                IsDeleted = false,
-                CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime,
-                ModifiedAt = null,
-                Alias = "a",
-                Name = "Random Bar",
-                IsHidden = false,
-                DefaultBumpLimit = 500,
-                ShowThreadLocalUserHash = false,
-                ShowOs = false,
-                ShowBrowser = false,
-                ShowCountry = false,
-                MaxThreadCount = Defaults.MaxThreadCountInCategory,
-                CreatedBy = admin,
-            };
-            seedDbContext.Categories.AddRange(category1, category2);
-
-            var salt1 = GuidGenerator.GenerateSeededGuid();
-            var salt2 = GuidGenerator.GenerateSeededGuid();
-            var utcNow = seedTimeProvider.GetUtcNow().UtcDateTime;
-            var deletedThread = new Thread
-            {
-                CreatedAt = utcNow,
-                LastBumpAt = utcNow,
-                Title = "deleted thread",
-                IsPinned = true,
-                IsClosed = true,
-                IsDeleted = true,
-                BumpLimit = 500,
-                Salt = salt1,
-                Category = category1,
-                Posts =
-                [
-                    new Post
-                    {
-                        IsOriginalPost = true,
-                        BlobContainerId = new Guid("4C708859-478D-451F-9EFD-315EAC9ABCAF"),
-                        CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime,
-                        IsSageEnabled = false,
-                        IsDeleted = false,
-                        MessageText = $"test post in deleted thread",
-                        MessageHtml = $"test post in deleted thread",
-                        UserIpAddress = IPAddress.Parse($"127.0.0.1").GetAddressBytes(),
-                        UserAgent = "Firefox",
-                        ThreadLocalUserHash = hashService.GetHashBytes(salt1, IPAddress.Parse("127.0.0.1").GetAddressBytes()),
-                    },
-                ],
-            };
-            var anotherCategoryThread = new Thread
-            {
-                CreatedAt = utcNow,
-                LastBumpAt = utcNow,
-                Title = "another category thread",
-                IsPinned = false,
-                IsClosed = false,
-                IsDeleted = false,
-                BumpLimit = 500,
-                Salt = salt2,
-                Category = category2,
-                Posts =
-                [
-                    new Post
-                    {
-                        IsOriginalPost = true,
-                        BlobContainerId = new Guid("B4041A4C-10CD-4332-AFA2-7D04A9D130DD"),
-                        CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime,
-                        IsSageEnabled = false,
-                        IsDeleted = false,
-                        MessageText = $"test post in deleted thread",
-                        MessageHtml = $"test post in deleted thread",
-                        UserIpAddress = IPAddress.Parse($"127.0.0.1").GetAddressBytes(),
-                        UserAgent = "Firefox",
-                        ThreadLocalUserHash = hashService.GetHashBytes(salt2, IPAddress.Parse("127.0.0.1").GetAddressBytes()),
-                    },
-                ],
-            };
-
-            var threads = Enumerable
-                .Range(0, totalThreadCount)
-                .Select(i => new Thread
-                {
-                    CreatedAt = utcNow,
-                    LastBumpAt = utcNow,
-                    Title = $"test thread {i}",
-                    IsPinned = i == 3,
-                    IsClosed = false,
-                    IsDeleted = false,
-                    BumpLimit = 500,
-                    Salt = GuidGenerator.GenerateSeededGuid(),
-                    Category = category1,
-                })
-                .Union([deletedThread, anotherCategoryThread])
-                .ToList();
-            seedDbContext.Threads.AddRange(threads);
-
-            var posts = threads.SelectMany(t => Enumerable
-                    .Range(0, totalPostCountPerThread)
-                    .Select(i => new Post
-                    {
-                        IsOriginalPost = i == 0,
-                        BlobContainerId = GuidGenerator.GenerateSeededGuid(),
-                        CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime.AddMinutes(i),
-                        IsSageEnabled = i % 2 == 0,
-                        IsDeleted = false,
-                        MessageText = $"test post {i}",
-                        MessageHtml = $"test post {i}",
-                        UserIpAddress = IPAddress.Parse($"127.0.0.{i}").GetAddressBytes(),
-                        UserAgent = "Firefox",
-                        ThreadLocalUserHash = hashService.GetHashBytes(t.Salt, IPAddress.Parse($"127.0.0.{i}").GetAddressBytes()),
-                        Thread = t,
-                    })
-                    .Union([
-                        new Post
-                        {
-                            IsOriginalPost = false,
-                            BlobContainerId = GuidGenerator.GenerateSeededGuid(),
-                            CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime.AddYears(1),
-                            IsSageEnabled = false,
-                            IsDeleted = true,
-                            MessageText = $"deleted post",
-                            MessageHtml = $"deleted post",
-                            UserIpAddress = IPAddress.Parse($"127.0.0.1").GetAddressBytes(),
-                            UserAgent = "Firefox",
-                            ThreadLocalUserHash = hashService.GetHashBytes(t.Salt, IPAddress.Parse($"127.0.0.1").GetAddressBytes()),
-                            Thread = t,
-                        },
-                    ])
-                    .ToList())
-                .ToList();
-            seedDbContext.Posts.AddRange(posts);
-
-            await seedDbContext.SaveChangesAsync(cancellationToken);
+            await SeedPinnedThreadDataAsync(seedScope, totalThreadCount, totalPostCountPerThread, cancellationToken);
         }
 
         // Act
-        using (var actScope = seedResult.Scope.ServiceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
+        using (var actScope = appScope.Scope.ServiceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
         {
             var threadRepository = actScope.ServiceProvider.GetRequiredService<IThreadRepository>();
+
             var actualThreadPreviews = await threadRepository.ListThreadPreviewsPaginatedAsync(new ThreadPreviewFilter
             {
                 PageNumber = pageNumber,
@@ -767,13 +404,8 @@ public async Task ListThreadPreviewsPaginatedAsync_WhenPinnedThreadExist_Returns
 
             // Assert
             Assert.That(actualThreadPreviews, Is.Not.Null);
-
-            // N threads shown (except deleted)
             Assert.That(actualThreadPreviews.Data, Has.Count.EqualTo(expectedThreadCount));
-
-            // All threads found (except deleted)
             Assert.That(actualThreadPreviews.TotalItemCount, Is.EqualTo(totalThreadCount));
-
             Assert.That(actualThreadPreviews.TotalPageCount, Is.EqualTo(Math.Ceiling((decimal)totalThreadCount / pageSize)));
             Assert.That(actualThreadPreviews.PageNumber, Is.EqualTo(pageNumber));
             Assert.That(actualThreadPreviews.PageSize, Is.EqualTo(pageSize));
@@ -784,32 +416,18 @@ public async Task ListThreadPreviewsPaginatedAsync_WhenPinnedThreadExist_Returns
                 Assert.That(actualThreadPreviews.Data[0].IsPinned, Is.True);
             }
 
-            // check that category is correct
             Assert.That(actualThreadPreviews.Data, Is.All.Matches<ThreadPreviewModel>(x => x.CategoryAlias == "b"));
-
-            // check that there are no deleted threads
             Assert.That(actualThreadPreviews.Data, Is.All.Matches<ThreadPreviewModel>(x => !x.IsDeleted));
-
-            // check that there are no deleted posts
             Assert.That(actualThreadPreviews.Data, Is.All.Matches<ThreadPreviewModel>(x => x.Posts.All(p => !p.IsDeleted)));
 
-            // check that every next thread updated earlier than the previous one (sort by LastPostCreatedAt desc)
             Assert.That(actualThreadPreviews.Data, Is.Ordered
-                .By(nameof(ThreadPreviewModel.IsPinned))
-                .Descending
-                .Then
-                .By(nameof(ThreadPreviewModel.LastBumpAt))
-                .Descending);
+                .By(nameof(ThreadPreviewModel.IsPinned)).Descending
+                .Then.By(nameof(ThreadPreviewModel.LastBumpAt)).Descending);
 
             foreach (var thread in actualThreadPreviews.Data)
             {
-                // Every thread has M posts
                 Assert.That(thread.PostCount, Is.EqualTo(totalPostCountPerThread));
-
-                // But only K posts are shown (OP post + latest posts)
                 Assert.That(thread.Posts, Has.Count.EqualTo(Defaults.LatestPostsCountInThreadPreview + 1));
-
-                // check that posts are sorted by date ascending
                 Assert.That(thread.Posts, Is.Ordered.By(nameof(PostDetailsModel.CreatedAt)).Ascending);
             }
         }
@@ -835,212 +453,18 @@ public async Task ListThreadPreviewsPaginatedAsync_WhenSagePostExist_ReturnsCorr
         const int totalPostCountPerThread = 25;
 
         // Arrange
-        using var seedResult = await Seed(cancellationToken);
+        using var appScope = await CreateAppScopeAsync(cancellationToken);
 
-        using (var seedScope = seedResult.Scope.ServiceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
+        using (var seedScope = appScope.Scope.ServiceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
         {
-            var seedTimeProvider = seedScope.ServiceProvider.GetRequiredService<TimeProvider>();
-            var seedDbContext = seedScope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
-            var hashService = seedScope.ServiceProvider.GetRequiredService<IHashService>();
-
-            // Seed
-            var admin = new ApplicationUser
-            {
-                UserName = "admin",
-                NormalizedUserName = "ADMIN",
-                Email = "admin@example.com",
-                NormalizedEmail = "ADMIN@EXAMPLE.COM",
-                EmailConfirmed = true,
-                SecurityStamp = "896e8014-c237-41f5-a925-dabf640ee4c4",
-                ConcurrencyStamp = "43035b63-359d-4c23-8812-29bbc5affbf2",
-                CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime,
-            };
-            seedDbContext.Users.Add(admin);
-
-            var category1 = new Category
-            {
-                IsDeleted = false,
-                CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime,
-                ModifiedAt = null,
-                Alias = "b",
-                Name = "Random Foo",
-                IsHidden = false,
-                DefaultBumpLimit = 500,
-                ShowThreadLocalUserHash = false,
-                ShowOs = false,
-                ShowBrowser = false,
-                ShowCountry = false,
-                MaxThreadCount = Defaults.MaxThreadCountInCategory,
-                CreatedBy = admin,
-            };
-            var category2 = new Category
-            {
-                IsDeleted = false,
-                CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime,
-                ModifiedAt = null,
-                Alias = "a",
-                Name = "Random Bar",
-                IsHidden = false,
-                DefaultBumpLimit = 500,
-                ShowThreadLocalUserHash = false,
-                ShowOs = false,
-                ShowBrowser = false,
-                ShowCountry = false,
-                MaxThreadCount = Defaults.MaxThreadCountInCategory,
-                CreatedBy = admin,
-            };
-            seedDbContext.Categories.AddRange(category1, category2);
-
-            var salt1 = GuidGenerator.GenerateSeededGuid();
-            var salt2 = GuidGenerator.GenerateSeededGuid();
-            var utcNow = seedTimeProvider.GetUtcNow().UtcDateTime;
-            var deletedThread = new Thread
-            {
-                CreatedAt = utcNow,
-                LastBumpAt = utcNow,
-                Title = "deleted thread",
-                IsPinned = true,
-                IsClosed = true,
-                IsDeleted = true,
-                BumpLimit = 500,
-                Salt = salt1,
-                Category = category1,
-                Posts =
-                [
-                    new Post
-                    {
-                        IsOriginalPost = true,
-                        BlobContainerId = new Guid("F115A07E-3B7F-4F54-8140-A9481EBE3F0A"),
-                        CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime,
-                        IsSageEnabled = false,
-                        IsDeleted = false,
-                        MessageText = $"test post in deleted thread",
-                        MessageHtml = $"test post in deleted thread",
-                        UserIpAddress = IPAddress.Parse($"127.0.0.1").GetAddressBytes(),
-                        UserAgent = "Firefox",
-                        ThreadLocalUserHash = hashService.GetHashBytes(salt1, IPAddress.Parse("127.0.0.1").GetAddressBytes()),
-                    },
-                ],
-            };
-            var anotherCategoryThread = new Thread
-            {
-                CreatedAt = utcNow,
-                LastBumpAt = utcNow,
-                Title = "another category thread",
-                IsPinned = false,
-                IsClosed = false,
-                IsDeleted = false,
-                BumpLimit = 500,
-                Salt = salt2,
-                Category = category2,
-                Posts =
-                [
-                    new Post
-                    {
-                        IsOriginalPost = true,
-                        BlobContainerId = new Guid("A4129657-90E4-4B5C-95A6-CB9D1B9746EC"),
-                        CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime,
-                        IsSageEnabled = false,
-                        IsDeleted = false,
-                        MessageText = $"test post in deleted thread",
-                        MessageHtml = $"test post in deleted thread",
-                        UserIpAddress = IPAddress.Parse($"127.0.0.1").GetAddressBytes(),
-                        UserAgent = "Firefox",
-                        ThreadLocalUserHash = hashService.GetHashBytes(salt2, IPAddress.Parse("127.0.0.1").GetAddressBytes()),
-                    },
-                ],
-            };
-
-            var threads = Enumerable
-                .Range(0, totalThreadCount)
-                .Select(i => new Thread
-                {
-                    CreatedAt = utcNow,
-                    LastBumpAt = utcNow,
-                    Title = $"test thread {i}",
-                    IsPinned = false,
-                    IsClosed = false,
-                    IsDeleted = false,
-                    BumpLimit = 500,
-                    Salt = GuidGenerator.GenerateSeededGuid(),
-                    Category = category1,
-                })
-                .Union([deletedThread, anotherCategoryThread])
-                .ToList();
-            seedDbContext.Threads.AddRange(threads);
-
-            var salt3 = GuidGenerator.GenerateSeededGuid();
-            var postWithoutSage = new Post
-            {
-                IsOriginalPost = false,
-                BlobContainerId = new Guid("9BE82B5A-0C4C-475C-9A3B-29F498E079E5"),
-                CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime.Subtract(TimeSpan.FromDays(20)),
-                IsDeleted = false,
-                IsSageEnabled = false,
-                MessageText = "no-sage post",
-                MessageHtml = "no-sage post",
-                UserIpAddress = IPAddress.Parse("127.0.0.1").GetAddressBytes(),
-                UserAgent = "Chrome",
-                ThreadLocalUserHash = hashService.GetHashBytes(salt3, IPAddress.Parse("127.0.0.1").GetAddressBytes()),
-            };
-            var threadWithPostWithoutSage = new Thread
-            {
-                CreatedAt = utcNow,
-                LastBumpAt = utcNow,
-                Title = "thread with no-sage post",
-                IsPinned = false,
-                IsClosed = false,
-                IsDeleted = false,
-                BumpLimit = 500,
-                Salt = salt3,
-                Category = category1,
-                Posts = [postWithoutSage],
-            };
-            seedDbContext.Threads.Add(threadWithPostWithoutSage);
-
-            var posts = threads.SelectMany(t => Enumerable
-                    .Range(0, totalPostCountPerThread)
-                    .Select(i => new Post
-                    {
-                        IsOriginalPost = i == 0,
-                        BlobContainerId = GuidGenerator.GenerateSeededGuid(),
-                        CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime.AddMinutes(i),
-                        IsSageEnabled = true,
-                        IsDeleted = false,
-                        MessageText = $"test post {i}",
-                        MessageHtml = $"test post {i}",
-                        UserIpAddress = IPAddress.Parse($"127.0.0.{i}").GetAddressBytes(),
-                        UserAgent = "Firefox",
-                        ThreadLocalUserHash = hashService.GetHashBytes(t.Salt, IPAddress.Parse($"127.0.0.{i}").GetAddressBytes()),
-                        Thread = t,
-                    })
-                    .Union([
-                        new Post
-                        {
-                            IsOriginalPost = false,
-                            BlobContainerId = GuidGenerator.GenerateSeededGuid(),
-                            CreatedAt = seedTimeProvider.GetUtcNow().UtcDateTime.AddYears(1),
-                            IsSageEnabled = false,
-                            IsDeleted = true,
-                            MessageText = $"deleted post",
-                            MessageHtml = $"deleted post",
-                            UserIpAddress = IPAddress.Parse($"127.0.0.1").GetAddressBytes(),
-                            UserAgent = "Firefox",
-                            ThreadLocalUserHash = hashService.GetHashBytes(t.Salt, IPAddress.Parse($"127.0.0.1").GetAddressBytes()),
-                            Thread = t,
-                        },
-                    ])
-                    .ToList())
-                .ToList();
-            seedDbContext.Posts.AddRange(posts);
-
-            await seedDbContext.SaveChangesAsync(cancellationToken);
+            await SeedSagePostDataAsync(seedScope, totalThreadCount, totalPostCountPerThread, cancellationToken);
         }
 
         // Act
-        using (var actScope = seedResult.Scope.ServiceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
+        using (var actScope = appScope.Scope.ServiceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
         {
             var threadRepository = actScope.ServiceProvider.GetRequiredService<IThreadRepository>();
+
             var actualThreadPreviews = await threadRepository.ListThreadPreviewsPaginatedAsync(new ThreadPreviewFilter
             {
                 PageNumber = pageNumber,
@@ -1063,26 +487,16 @@ public async Task ListThreadPreviewsPaginatedAsync_WhenSagePostExist_ReturnsCorr
                 Assert.That(actualThreadPreviews.Data[0].Title, Is.EqualTo("thread with no-sage post"));
             }
 
-            // check that category is correct
             Assert.That(actualThreadPreviews.Data, Is.All.Matches<ThreadPreviewModel>(x => x.CategoryAlias == "b"));
-
-            // check that there are no deleted threads
             Assert.That(actualThreadPreviews.Data, Is.All.Matches<ThreadPreviewModel>(x => !x.IsDeleted));
-
-            // check that there are no deleted posts
             Assert.That(actualThreadPreviews.Data, Is.All.Matches<ThreadPreviewModel>(x => x.Posts.All(p => !p.IsDeleted)));
 
-            // check that every next thread updated earlier than the previous one (sort by LastPostCreatedAt desc)
             Assert.That(actualThreadPreviews.Data, Is.Ordered
-                .By(nameof(ThreadPreviewModel.IsPinned))
-                .Descending
-                .Then
-                .By(nameof(ThreadPreviewModel.LastBumpAt))
-                .Descending);
+                .By(nameof(ThreadPreviewModel.IsPinned)).Descending
+                .Then.By(nameof(ThreadPreviewModel.LastBumpAt)).Descending);
 
             foreach (var thread in actualThreadPreviews.Data)
             {
-                // check that posts are sorted by date ascending
                 Assert.That(thread.Posts, Is.Ordered.By(nameof(PostDetailsModel.CreatedAt)).Ascending);
             }
         }
@@ -1092,216 +506,23 @@ public async Task ListThreadPreviewsPaginatedAsync_WhenSagePostExist_ReturnsCorr
     [Test]
     public async Task ListThreadPreviewsPaginatedAsync_WhenBumpLimitReached_ReturnsCorrectResult(CancellationToken cancellationToken)
     {
-        void AddPosts(Thread thread, DateTime startingAt, int count, bool isSageEnabled, bool isDeleted, IHashService hashService)
-        {
-            for (var i = 0; i < count; i++)
-            {
-                thread.Posts.Add(new Post
-                {
-                    IsOriginalPost = i == 0,
-                    BlobContainerId = GuidGenerator.GenerateSeededGuid(),
-                    CreatedAt = startingAt.AddSeconds(i),
-                    IsSageEnabled = isSageEnabled,
-                    IsDeleted = isDeleted,
-                    MessageText = $"test post {i} in thread {thread.Title}",
-                    MessageHtml = $"test post {i} in thread {thread.Title}",
-                    UserIpAddress = IPAddress.Parse($"127.0.0.{i}").GetAddressBytes(),
-                    UserAgent = "Firefox",
-                    ThreadLocalUserHash = hashService.GetHashBytes(thread.Salt, IPAddress.Parse($"127.0.0.{i}").GetAddressBytes()),
-                });
-            }
-        }
-
         const int bumpLimit = 5;
         const int pageNumber = 1;
         const int pageSize = 10;
 
         // Arrange
-        using var seedResult = await Seed(cancellationToken);
+        using var appScope = await CreateAppScopeAsync(cancellationToken);
 
-        using (var seedScope = seedResult.Scope.ServiceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
+        using (var seedScope = appScope.Scope.ServiceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
         {
-            var dbContext = seedScope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
-            var hashService = seedScope.ServiceProvider.GetRequiredService<IHashService>();
-            var timeProvider = seedScope.ServiceProvider.GetRequiredService<TimeProvider>();
-
-            // Seed
-            var admin = new ApplicationUser
-            {
-                UserName = "admin",
-                NormalizedUserName = "ADMIN",
-                Email = "admin@example.com",
-                NormalizedEmail = "ADMIN@EXAMPLE.COM",
-                EmailConfirmed = true,
-                SecurityStamp = "896e8014-c237-41f5-a925-dabf640ee4c4",
-                ConcurrencyStamp = "43035b63-359d-4c23-8812-29bbc5affbf2",
-                CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-            };
-            dbContext.Users.Add(admin);
-
-            var category1 = new Category
-            {
-                IsDeleted = false,
-                CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-                ModifiedAt = null,
-                Alias = "b",
-                Name = "Random Foo",
-                IsHidden = false,
-                DefaultBumpLimit = 500,
-                ShowThreadLocalUserHash = false,
-                ShowOs = false,
-                ShowBrowser = false,
-                ShowCountry = false,
-                MaxThreadCount = Defaults.MaxThreadCountInCategory,
-                CreatedBy = admin,
-            };
-            var category2 = new Category
-            {
-                IsDeleted = false,
-                CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-                ModifiedAt = null,
-                Alias = "a",
-                Name = "Random Bar",
-                IsHidden = false,
-                DefaultBumpLimit = 500,
-                ShowThreadLocalUserHash = false,
-                ShowOs = false,
-                ShowBrowser = false,
-                ShowCountry = false,
-                MaxThreadCount = Defaults.MaxThreadCountInCategory,
-                CreatedBy = admin,
-            };
-            dbContext.Categories.AddRange(category1, category2);
-
-            var salt1 = GuidGenerator.GenerateSeededGuid();
-            var salt2 = GuidGenerator.GenerateSeededGuid();
-            var utcNow = timeProvider.GetUtcNow().UtcDateTime;
-            var deletedThread = new Thread
-            {
-                CreatedAt = utcNow,
-                LastBumpAt = utcNow,
-                Title = "deleted thread",
-                IsPinned = true,
-                IsClosed = true,
-                IsDeleted = true,
-                BumpLimit = 500,
-                Salt = salt1,
-                Category = category1,
-                Posts =
-                [
-                    new Post
-                    {
-                        IsOriginalPost = true,
-                        BlobContainerId = new Guid("F115A07E-3B7F-4F54-8140-A9481EBE3F0A"),
-                        CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-                        IsSageEnabled = false,
-                        IsDeleted = false,
-                        MessageText = $"test post in deleted thread",
-                        MessageHtml = $"test post in deleted thread",
-                        UserIpAddress = IPAddress.Parse($"127.0.0.1").GetAddressBytes(),
-                        UserAgent = "Firefox",
-                        ThreadLocalUserHash = hashService.GetHashBytes(salt1, IPAddress.Parse($"127.0.0.1").GetAddressBytes()),
-                    },
-                ],
-            };
-            var anotherCategoryThread = new Thread
-            {
-                CreatedAt = utcNow,
-                LastBumpAt = utcNow,
-                Title = "another category thread",
-                IsPinned = false,
-                IsClosed = false,
-                IsDeleted = false,
-                BumpLimit = 500,
-                Salt = salt2,
-                Category = category2,
-                Posts =
-                [
-                    new Post
-                    {
-                        IsOriginalPost = true,
-                        BlobContainerId = new Guid("A4129657-90E4-4B5C-95A6-CB9D1B9746EC"),
-                        CreatedAt = timeProvider.GetUtcNow().UtcDateTime,
-                        IsSageEnabled = false,
-                        IsDeleted = false,
-                        MessageText = $"test post in deleted thread",
-                        MessageHtml = $"test post in deleted thread",
-                        UserIpAddress = IPAddress.Parse($"127.0.0.1").GetAddressBytes(),
-                        UserAgent = "Firefox",
-                        ThreadLocalUserHash = hashService.GetHashBytes(salt1, IPAddress.Parse($"127.0.0.1").GetAddressBytes()),
-                    },
-                ],
-            };
-            var thread1 = new Thread
-            {
-                CreatedAt = utcNow.AddMinutes(1),
-                LastBumpAt = utcNow.AddMinutes(1),
-                Title = "thread with bump limit 1",
-                BumpLimit = bumpLimit,
-                Salt = GuidGenerator.GenerateSeededGuid(),
-                Category = category1,
-            };
-            var thread2 = new Thread
-            {
-                CreatedAt = utcNow.AddMinutes(2),
-                LastBumpAt = utcNow.AddMinutes(2),
-                Title = "thread with bump limit 2",
-                BumpLimit = bumpLimit,
-                Salt = GuidGenerator.GenerateSeededGuid(),
-                Category = category1,
-            };
-            var thread3 = new Thread
-            {
-                CreatedAt = utcNow.AddMinutes(3),
-                LastBumpAt = utcNow.AddMinutes(3),
-                Title = "thread with bump limit 3",
-                BumpLimit = bumpLimit,
-                Salt = GuidGenerator.GenerateSeededGuid(),
-                Category = category1,
-            };
-            var thread4 = new Thread
-            {
-                CreatedAt = utcNow.AddMinutes(4),
-                LastBumpAt = utcNow.AddMinutes(4),
-                Title = "thread with bump limit 4",
-                BumpLimit = bumpLimit,
-                Salt = GuidGenerator.GenerateSeededGuid(),
-                Category = category1,
-            };
-            List<Thread> allThreads = [deletedThread, anotherCategoryThread, thread1, thread2, thread3, thread4];
-            dbContext.Threads.AddRange(allThreads);
-
-            // these threads contain the newest posts, but they aren't included in our query
-            AddPosts(deletedThread, timeProvider.GetUtcNow().UtcDateTime.AddYears(2), bumpLimit + 2, false, false, hashService);
-            AddPosts(anotherCategoryThread, timeProvider.GetUtcNow().UtcDateTime.AddYears(2), bumpLimit + 2, false, false, hashService);
-
-            // thread1 contains several old posts before bump limit and several new posts after bump limit, which shouldn't affect the result
-            AddPosts(thread1, timeProvider.GetUtcNow().UtcDateTime.AddYears(-1), bumpLimit, false, false, hashService);
-            AddPosts(thread1, timeProvider.GetUtcNow().UtcDateTime.AddYears(1), 2, false, false, hashService);
-            thread1.LastBumpAt = thread1.Posts.Where(p => !p.IsSageEnabled).Max(x => x.CreatedAt);
-
-            // thread2 contains several new posts
-            AddPosts(thread2, timeProvider.GetUtcNow().UtcDateTime.AddDays(1).AddHours(1), 1, true, false, hashService);
-            AddPosts(thread2, timeProvider.GetUtcNow().UtcDateTime.AddDays(1), bumpLimit, false, false, hashService);
-            thread2.LastBumpAt = thread2.Posts.Where(p => !p.IsSageEnabled).Max(x => x.CreatedAt);
-
-            // thread3 contains even newer posts
-            AddPosts(thread3, timeProvider.GetUtcNow().UtcDateTime.AddDays(1).AddHours(3), 1, true, false, hashService);
-            AddPosts(thread3, timeProvider.GetUtcNow().UtcDateTime.AddDays(1).AddSeconds(1), bumpLimit, false, false, hashService);
-            thread3.LastBumpAt = thread3.Posts.Where(p => !p.IsSageEnabled).Max(x => x.CreatedAt);
-
-            // thread4 contains a lot of posts
-            AddPosts(thread4, timeProvider.GetUtcNow().UtcDateTime, bumpLimit + 10, false, false, hashService);
-            AddPosts(thread4, timeProvider.GetUtcNow().UtcDateTime.AddYears(5), bumpLimit + 10, false, false, hashService);
-            thread4.LastBumpAt = thread4.Posts.Where(p => !p.IsSageEnabled).Max(x => x.CreatedAt);
-
-            await dbContext.SaveChangesAsync(cancellationToken);
+            await SeedBumpLimitDataAsync(seedScope, bumpLimit, cancellationToken);
         }
 
         // Act
-        using (var actScope = seedResult.Scope.ServiceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
+        using (var actScope = appScope.Scope.ServiceProvider.GetRequiredService<IServiceScopeFactory>().CreateScope())
         {
             var threadRepository = actScope.ServiceProvider.GetRequiredService<IThreadRepository>();
+
             var actualThreadPreviews = await threadRepository.ListThreadPreviewsPaginatedAsync(new ThreadPreviewFilter
             {
                 PageNumber = pageNumber,
@@ -1318,29 +539,18 @@ void AddPosts(Thread thread, DateTime startingAt, int count, bool isSageEnabled,
 
             // Assert
             Assert.That(actualThreadPreviews, Is.Not.Null);
-
             Assert.That(actualThreadPreviews.Data, Has.Count.EqualTo(4));
 
-            // check that category is correct
             Assert.That(actualThreadPreviews.Data, Is.All.Matches<ThreadPreviewModel>(x => x.CategoryAlias == "b"));
-
-            // check that there are no deleted threads
             Assert.That(actualThreadPreviews.Data, Is.All.Matches<ThreadPreviewModel>(x => !x.IsDeleted));
-
-            // check that there are no deleted posts
             Assert.That(actualThreadPreviews.Data, Is.All.Matches<ThreadPreviewModel>(x => x.Posts.All(p => !p.IsDeleted)));
 
-            // check that every next thread updated earlier than the previous one (sort by LastPostCreatedAt desc)
             Assert.That(actualThreadPreviews.Data, Is.Ordered
-                .By(nameof(ThreadPreviewModel.IsPinned))
-                .Descending
-                .Then
-                .By(nameof(ThreadPreviewModel.LastBumpAt))
-                .Descending);
+                .By(nameof(ThreadPreviewModel.IsPinned)).Descending
+                .Then.By(nameof(ThreadPreviewModel.LastBumpAt)).Descending);
 
             foreach (var thread in actualThreadPreviews.Data)
             {
-                // check that posts are sorted by date ascending
                 Assert.That(thread.Posts, Is.Ordered.By(nameof(PostDetailsModel.CreatedAt)).Ascending);
             }
         }