diff --git a/TeslaSolarCharger.Tests/Services/Server/TeslaFleetApiService.cs b/TeslaSolarCharger.Tests/Services/Server/TeslaFleetApiService.cs
index 03fe8e6e6..eb2bebb35 100644
--- a/TeslaSolarCharger.Tests/Services/Server/TeslaFleetApiService.cs
+++ b/TeslaSolarCharger.Tests/Services/Server/TeslaFleetApiService.cs
@@ -1,4 +1,5 @@
 using Newtonsoft.Json;
+using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using TeslaSolarCharger.Server.Dtos.TeslaFleetApi;
 using Xunit;
@@ -6,6 +7,7 @@
 
 namespace TeslaSolarCharger.Tests.Services.Server;
 
+[SuppressMessage("ReSharper", "UseConfigureAwaitFalse")]
 public class TeslaFleetApiService(ITestOutputHelper outputHelper) : TestBase(outputHelper)
 {
     [Fact]
@@ -14,6 +16,11 @@ public async Task CanHandleUnsignedCommands()
         var commandResult = JsonConvert.DeserializeObject<DtoGenericTeslaResponse<DtoVehicleCommandResult>>("{\"response\":{\"result\":false,\"reason\":\"unsigned_cmds_hardlocked\"}}");
         Assert.NotNull(commandResult?.Response);
         var fleetApiService = Mock.Create<TeslaSolarCharger.Server.Services.TeslaFleetApiService>();
-        await fleetApiService.HandleUnsignedCommands(commandResult.Response).ConfigureAwait(false);
+        var fleetApiProxyNeeded = await fleetApiService.IsFleetApiProxyNeededInDatabase();
+        Assert.False(fleetApiProxyNeeded);
+        await fleetApiService.HandleUnsignedCommands(commandResult.Response);
+        fleetApiProxyNeeded = await fleetApiService.IsFleetApiProxyNeededInDatabase();
+        Assert.True(fleetApiProxyNeeded);
+
     }
 }
diff --git a/TeslaSolarCharger.Tests/TestBase.cs b/TeslaSolarCharger.Tests/TestBase.cs
index d7898f2be..bd6746ad9 100644
--- a/TeslaSolarCharger.Tests/TestBase.cs
+++ b/TeslaSolarCharger.Tests/TestBase.cs
@@ -16,7 +16,9 @@
 using TeslaSolarCharger.Server.MappingExtensions;
 using TeslaSolarCharger.Shared.Contracts;
 using TeslaSolarCharger.Shared.TimeProviding;
+using TeslaSolarCharger.SharedBackend.Contracts;
 using Xunit.Abstractions;
+using Constants = TeslaSolarCharger.SharedBackend.Values.Constants;
 
 namespace TeslaSolarCharger.Tests;
 
@@ -58,6 +60,7 @@ protected TestBase(
 
         _fake = new AutoFake();
         _fake.Provide<IMapperConfigurationFactory, MapperConfigurationFactory>();
+        _fake.Provide<IConstants, Constants>();
         _fake.Provide<IDateTimeProvider>(new FakeDateTimeProvider(currentFakeTime));
         _fake.Provide<IConfiguration>(configuration);
 
@@ -66,6 +69,7 @@ protected TestBase(
             {
                 b.Register((_, _) => Context);
                 b.Register((_, _) => _fake.Resolve<IMapperConfigurationFactory>());
+                b.Register((_, _) => _fake.Resolve<IConstants>());
                 b.Register((_, _) => _fake.Resolve<IConfiguration>());
                 b.RegisterType<FakeDateTimeProvider>();
                 //b.Register((_, _) => _fake.Resolve<IDateTimeProvider>());