diff --git a/server/RdtClient.Service.Test/BackgroundServices/WatchFolderCheckerTests.cs b/server/RdtClient.Service.Test/BackgroundServices/WatchFolderCheckerTests.cs
index d9a6f90..4902ca2 100644
--- a/server/RdtClient.Service.Test/BackgroundServices/WatchFolderCheckerTests.cs
+++ b/server/RdtClient.Service.Test/BackgroundServices/WatchFolderCheckerTests.cs
@@ -3,7 +3,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Moq;
 using RdtClient.Data.Models.Data;
-using RdtClient.Data.Models.Internal;
 using RdtClient.Service.BackgroundServices;
 using RdtClient.Service.Services;
 
@@ -25,7 +24,7 @@ public class WatchFolderCheckerTests : IDisposable
         _serviceProviderMock = new();
         _serviceScopeMock = new();
         _scopeServiceProviderMock = new();
-        _settings = new(new DbSettings
+        _settings = new(new()
         {
             Watch = new()
             {
diff --git a/server/RdtClient.Service.Test/Services/NzbTorrentsTest.cs b/server/RdtClient.Service.Test/Services/NzbTorrentsTest.cs
index 4751b40..546c1f6 100644
--- a/server/RdtClient.Service.Test/Services/NzbTorrentsTest.cs
+++ b/server/RdtClient.Service.Test/Services/NzbTorrentsTest.cs
@@ -3,7 +3,6 @@ using System.Text;
 using Moq;
 using RdtClient.Data.Enums;
 using RdtClient.Data.Models.Data;
-using TestSettings = RdtClient.Service.Services.TestSettings;
 using TorrentRunnerState = RdtClient.Service.Services.TorrentRunnerState;
 using TorrentsService = RdtClient.Service.Services.Torrents;
 
diff --git a/server/RdtClient.Service.Test/TestSettings.cs b/server/RdtClient.Service.Test/TestSettings.cs
index 7ffc2ea..061664c 100644
--- a/server/RdtClient.Service.Test/TestSettings.cs
+++ b/server/RdtClient.Service.Test/TestSettings.cs
@@ -1,6 +1,7 @@
 using RdtClient.Data.Models.Internal;
+using RdtClient.Service.Services;
 
-namespace RdtClient.Service.Services;
+namespace RdtClient.Service.Test;
 
 internal sealed class TestSettings(DbSettings? settings = null) : ISettings
 {
diff --git a/server/RdtClient.Service/DiConfig.cs b/server/RdtClient.Service/DiConfig.cs
index de6e8ae..5d7b9da 100644
--- a/server/RdtClient.Service/DiConfig.cs
+++ b/server/RdtClient.Service/DiConfig.cs
@@ -30,7 +30,7 @@ public static class DiConfig
         services.AddScoped<AllDebridDebridClient>();
 
         services.AddSingleton<IRateLimitCoordinator, RateLimitCoordinator>();
-        services.AddSingleton<ITorrentRunnerState>(TorrentRunner.SharedState);
+        services.AddSingleton(TorrentRunner.SharedState);
         services.AddSingleton<IProcessFactory, ProcessFactory>();
         services.AddSingleton<IFileSystem, FileSystem>();
 
diff --git a/server/RdtClient.Web.Test/Controllers/QBittorrentControllerTest.cs b/server/RdtClient.Web.Test/Controllers/QBittorrentControllerTest.cs
index dcc4175..c7ae2b8 100644
--- a/server/RdtClient.Web.Test/Controllers/QBittorrentControllerTest.cs
+++ b/server/RdtClient.Web.Test/Controllers/QBittorrentControllerTest.cs
@@ -12,30 +12,22 @@ public class QBittorrentControllerTest
 {
     private readonly QBittorrentController _controller;
     private readonly Mock<QBittorrent> _qBittorrentMock;
-<<<<<<< .merge_file_2jl9Ws
     private readonly Mock<Torrents> _torrentsMock;
-
-    public QBittorrentControllerTest()
-    {
-        _qBittorrentMock = new(new Mock<ILogger<QBittorrent>>().Object, null!, null!, null!, null!);
-        _torrentsMock = new(null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, null!);
-
-        _controller = new(new Mock<ILogger<QBittorrentController>>().Object, _qBittorrentMock.Object, new Mock<IHttpClientFactory>().Object, _torrentsMock.Object);
-=======
     private readonly TestSettings _settings;
 
     public QBittorrentControllerTest()
     {
         _settings = new();
         _qBittorrentMock = new(new Mock<ILogger<QBittorrent>>().Object, _settings, null!, null!, null!, new TorrentRunnerState());
+        _torrentsMock = new(null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, null!, _settings, new TorrentRunnerState());
 
         _controller = new(
             new Mock<ILogger<QBittorrentController>>().Object,
             _qBittorrentMock.Object,
             new Mock<IHttpClientFactory>().Object,
-            _settings);
+            _settings,
+            _torrentsMock.Object);
 
->>>>>>> .merge_file_I8bokE
         _controller.ControllerContext = new()
         {
             HttpContext = new DefaultHttpContext()
diff --git a/server/RdtClient.Web.Test/TestSettings.cs b/server/RdtClient.Web.Test/TestSettings.cs
index 7ffc2ea..2136fb0 100644
--- a/server/RdtClient.Web.Test/TestSettings.cs
+++ b/server/RdtClient.Web.Test/TestSettings.cs
@@ -1,6 +1,7 @@
 using RdtClient.Data.Models.Internal;
+using RdtClient.Service.Services;
 
-namespace RdtClient.Service.Services;
+namespace RdtClient.Web.Test;
 
 internal sealed class TestSettings(DbSettings? settings = null) : ISettings
 {
diff --git a/server/RdtClient.Web/Controllers/QBittorrentController.cs b/server/RdtClient.Web/Controllers/QBittorrentController.cs
index bfaeda2..bfe6061 100644
--- a/server/RdtClient.Web/Controllers/QBittorrentController.cs
+++ b/server/RdtClient.Web/Controllers/QBittorrentController.cs
@@ -14,11 +14,7 @@ namespace RdtClient.Web.Controllers;
 [ApiController]
 [Route("api/v2")]
 [Route("qbittorrent/api/v2")]
-<<<<<<< .merge_file_3yoKAx
-public class QBittorrentController(ILogger<QBittorrentController> logger, QBittorrent qBittorrent, IHttpClientFactory httpClientFactory, Torrents torrents) : Controller
-=======
-public class QBittorrentController(ILogger<QBittorrentController> logger, QBittorrent qBittorrent, IHttpClientFactory httpClientFactory, ISettings settings) : Controller
->>>>>>> .merge_file_cLOJCF
+public class QBittorrentController(ILogger<QBittorrentController> logger, QBittorrent qBittorrent, IHttpClientFactory httpClientFactory, ISettings settings, Torrents torrents) : Controller
 {
     [AllowAnonymous]
     [Route("/version/api")]
diff --git a/server/RdtClient.Web/Controllers/SettingsController.cs b/server/RdtClient.Web/Controllers/SettingsController.cs
index 5e58296..7000663 100644
--- a/server/RdtClient.Web/Controllers/SettingsController.cs
+++ b/server/RdtClient.Web/Controllers/SettingsController.cs
@@ -3,7 +3,6 @@ using System.Reflection;
 using Aria2NET;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using RdtClient.Data.Data;
 using RdtClient.Data.Models.Data;
 using RdtClient.Data.Models.Internal;
 using RdtClient.Service.Helpers;