diff --git a/src/Services/Basket/Basket.API/Basket.API.csproj b/src/Services/Basket/Basket.API/Basket.API.csproj
index 5c4a66df3..173169da1 100644
--- a/src/Services/Basket/Basket.API/Basket.API.csproj
+++ b/src/Services/Basket/Basket.API/Basket.API.csproj
@@ -18,4 +18,8 @@
   <ItemGroup>
     <ProjectReference Include="..\..\Services.Common\Services.Common.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="Basket.FunctionalTests" />
+  </ItemGroup>
 </Project>
diff --git a/src/Services/Basket/Basket.API/Controllers/BasketController.cs b/src/Services/Basket/Basket.API/Controllers/BasketController.cs
index 54c13a982..4bb3b22f6 100644
--- a/src/Services/Basket/Basket.API/Controllers/BasketController.cs
+++ b/src/Services/Basket/Basket.API/Controllers/BasketController.cs
@@ -71,7 +71,7 @@ public class BasketController : ControllerBase
         }
         catch (Exception ex)
         {
-            _logger.LogError(ex, "ERROR Publishing integration event: {IntegrationEventId} from {AppName}", eventMessage.Id, Program.AppName);
+            _logger.LogError(ex, "ERROR Publishing integration event: {IntegrationEventId}", eventMessage.Id);
 
             throw;
         }
diff --git a/src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/OrderStartedIntegrationEventHandler.cs b/src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/OrderStartedIntegrationEventHandler.cs
index 2c93f82fd..d5cf14e1b 100644
--- a/src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/OrderStartedIntegrationEventHandler.cs
+++ b/src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/OrderStartedIntegrationEventHandler.cs
@@ -15,9 +15,9 @@ public class OrderStartedIntegrationEventHandler : IIntegrationEventHandler<Orde
 
     public async Task Handle(OrderStartedIntegrationEvent @event)
     {
-        using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
+        using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}"))
         {
-            _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
+            _logger.LogInformation("----- Handling integration event: {IntegrationEventId} - ({@IntegrationEvent})", @event.Id, @event);
 
             await _repository.DeleteBasketAsync(@event.UserId.ToString());
         }
diff --git a/src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/ProductPriceChangedIntegrationEventHandler.cs b/src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/ProductPriceChangedIntegrationEventHandler.cs
index b389b73d7..c09ba2346 100644
--- a/src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/ProductPriceChangedIntegrationEventHandler.cs
+++ b/src/Services/Basket/Basket.API/IntegrationEvents/EventHandling/ProductPriceChangedIntegrationEventHandler.cs
@@ -15,9 +15,9 @@ public class ProductPriceChangedIntegrationEventHandler : IIntegrationEventHandl
 
     public async Task Handle(ProductPriceChangedIntegrationEvent @event)
     {
-        using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}-{Program.AppName}"))
+        using (LogContext.PushProperty("IntegrationEventContext", $"{@event.Id}"))
         {
-            _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, Program.AppName, @event);
+            _logger.LogInformation("----- Handling integration event: {IntegrationEventId} at {AppName} - ({@IntegrationEvent})", @event.Id, @event);
 
             var userIds = _repository.GetUsers();
 
diff --git a/src/Services/Basket/Basket.API/Program.cs b/src/Services/Basket/Basket.API/Program.cs
index 664a152fb..6d3f85d9b 100644
--- a/src/Services/Basket/Basket.API/Program.cs
+++ b/src/Services/Basket/Basket.API/Program.cs
@@ -63,12 +63,6 @@ try
 }
 catch (Exception ex)
 {
-    app.Logger.LogCritical(ex, "Program terminated unexpectedly ({ApplicationContext})!", AppName);
+    app.Logger.LogCritical(ex, "Program terminated unexpectedly");
     return 1;
 }
-
-public partial class Program
-{
-    private static string Namespace = typeof(Program).Assembly.GetName().Name;
-    public static string AppName = Namespace.Substring(Namespace.LastIndexOf('.', Namespace.LastIndexOf('.') - 1) + 1);
-}
diff --git a/src/Services/Basket/Basket.FunctionalTests/Base/BasketScenarioBase.cs b/src/Services/Basket/Basket.FunctionalTests/Base/BasketScenarioBase.cs
index d763a336e..ddf920e14 100644
--- a/src/Services/Basket/Basket.FunctionalTests/Base/BasketScenarioBase.cs
+++ b/src/Services/Basket/Basket.FunctionalTests/Base/BasketScenarioBase.cs
@@ -3,13 +3,14 @@ using Microsoft.Extensions.Hosting;
 
 namespace Basket.FunctionalTests.Base;
 
-public class BasketScenarioBase : WebApplicationFactory<Program>
+public class BasketScenarioBase
 {
     private const string ApiUrlBase = "api/v1/basket";
 
     public TestServer CreateServer()
     {
-        return Server;
+        var factory = new BasketApplicaton();
+        return factory.Server;
     }
 
     public static class Get
@@ -26,33 +27,36 @@ public class BasketScenarioBase : WebApplicationFactory<Program>
         public static string CheckoutOrder = $"{ApiUrlBase}/checkout";
     }
 
-    protected override IHost CreateHost(IHostBuilder builder)
+    private class BasketApplicaton : WebApplicationFactory<Program>
     {
-        builder.ConfigureServices(services =>
+        protected override IHost CreateHost(IHostBuilder builder)
         {
-            services.AddSingleton<IStartupFilter, AuthStartupFilter>();
-        });
+            builder.ConfigureServices(services =>
+            {
+                services.AddSingleton<IStartupFilter, AuthStartupFilter>();
+            });
 
-        builder.ConfigureAppConfiguration(c =>
-        {
-            var directory = Path.GetDirectoryName(typeof(BasketScenarioBase).Assembly.Location)!;
+            builder.ConfigureAppConfiguration(c =>
+            {
+                var directory = Path.GetDirectoryName(typeof(BasketScenarioBase).Assembly.Location)!;
 
-            c.AddJsonFile(Path.Combine(directory, "appsettings.json"), optional: false);
-        });
+                c.AddJsonFile(Path.Combine(directory, "appsettings.json"), optional: false);
+            });
 
-        return base.CreateHost(builder);
-    }
+            return base.CreateHost(builder);
+        }
 
-    private class AuthStartupFilter : IStartupFilter
-    {
-        public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
+        private class AuthStartupFilter : IStartupFilter
         {
-            return app =>
+            public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
             {
-                app.UseMiddleware<AutoAuthorizeMiddleware>();
+                return app =>
+                {
+                    app.UseMiddleware<AutoAuthorizeMiddleware>();
 
-                next(app);
-            };
+                    next(app);
+                };
+            }
         }
     }
 }
diff --git a/src/Services/Basket/Basket.FunctionalTests/RedisBasketRepositoryTests.cs b/src/Services/Basket/Basket.FunctionalTests/RedisBasketRepositoryTests.cs
index 217a85ec2..835146c2e 100644
--- a/src/Services/Basket/Basket.FunctionalTests/RedisBasketRepositoryTests.cs
+++ b/src/Services/Basket/Basket.FunctionalTests/RedisBasketRepositoryTests.cs
@@ -9,7 +9,8 @@ namespace Basket.FunctionalTests
         [Fact]
         public async Task UpdateBasket_return_and_add_basket()
         {
-            var redis = Services.GetRequiredService<ConnectionMultiplexer>();
+            var server = CreateServer();
+            var redis = server.Services.GetRequiredService<ConnectionMultiplexer>();
 
             var redisBasketRepository = BuildBasketRepository(redis);
 
@@ -26,7 +27,8 @@ namespace Basket.FunctionalTests
         [Fact]
         public async Task Delete_Basket_return_null()
         {
-            var redis = Services.GetRequiredService<ConnectionMultiplexer>();
+            var server = CreateServer();
+            var redis = server.Services.GetRequiredService<ConnectionMultiplexer>();
 
             var redisBasketRepository = BuildBasketRepository(redis);