StuartFerguson · Aug 17, 2026 · Aug 17, 2026 · Aug 17, 2026 · Aug 17, 2026
diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml
@@ -25,15 +25,15 @@ jobs:
     - name: Run Unit Tests
       run: |
         echo "ASPNETCORE_ENVIRONMENT are > ${ASPNETCORE_ENVIRONMENT}"
-        dotnet test "CallbackHandler.BusinessLogic.Tests\CallbackHandler.BusinessLogic.Tests.csproj" --configuration Release --no-build --verbosity normal --logger "trx;LogFileName=businesslogic-test-results.trx"
-        dotnet test "CallbackHandler.CallbackMessageAggregate.Tests\CallbackHandler.CallbackMessageAggregate.Tests.csproj" --configuration Release --no-build --verbosity normal --logger "trx;LogFileName=callbackmessageaggregate-test-results.trx"
-        dotnet test "CallbackHandler.Tests\CallbackHandler.Tests.csproj" --configuration Release --no-build --verbosity normal --logger "trx;LogFileName=callbackhandler-test-results.trx"
+        dotnet test "CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj" --configuration Release --no-build --verbosity normal -- --report-xunit-trx
+        dotnet test "CallbackHandler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj" --configuration Release --no-build --verbosity normal -- --report-xunit-trx
+        dotnet test "CallbackHandler.Tests/CallbackHandler.Tests.csproj" --configuration Release --no-build --verbosity normal -- --report-xunit-trx
 
     - name: Build Docker Image
       run: docker build . --file CallbackHandler/Dockerfile --tag callbackhandler:latest
 
     - name: Run Integration Tests
-      run: dotnet test "CallbackHandler.IntegrationTests\CallbackHandler.IntegrationTests.csproj" --configuration Release --no-build --verbosity normal --logger "trx;LogFileName=integration-test-results.trx"
+      run: dotnet test "CallbackHandler.IntegrationTests/CallbackHandler.IntegrationTests.csproj" --configuration Release --no-build --verbosity normal --results-directory "${{ github.workspace }}/TestResults" --settings "CallbackHandler.IntegrationTests/Integration.runsettings"
 
     - uses: actions/upload-artifact@v4.4.0
       with:
@@ -57,3 +57,20 @@ jobs:
           path: '**/TestResults/*.trx'
           retention-days: 30 
 
+    - name: Publish integration test results
+      uses: dorny/test-reporter@v1
+      if: always()
+      with:
+          name: Integration Test Results
+          path: 'TestResults/CallbackHandler.IntegrationTests.xml'
+          reporter: dotnet-nunit
+          fail-on-error: true
+
+    - name: Upload integration test results
+      uses: actions/upload-artifact@v4
+      if: always()
+      with:
+          name: integration-test-results
+          path: 'TestResults/CallbackHandler.IntegrationTests.xml'
+          retention-days: 30
+
diff --git a/CallbackHander.Testing/CallbackHander.Testing.csproj b/CallbackHander.Testing/CallbackHander.Testing.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
-    <PackageReference Include="xunit.v3" />
+    <PackageReference Include="xunit.v3.mtp-v2" />
     <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

diff --git a/CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj b/CallbackHandler.BusinessLogic.Tests/CallbackHandler.BusinessLogic.Tests.csproj
@@ -3,6 +3,8 @@
   <PropertyGroup>
 	  <TargetFramework>net10.0</TargetFramework>
 	  <DebugType>None</DebugType>
+    <OutputType>Exe</OutputType>
+    <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -11,7 +13,7 @@
     <PackageReference Include="Moq" />
     <PackageReference Include="Shared.EventStore" />
     <PackageReference Include="Shouldly" />
-    <PackageReference Include="xunit.v3" />
+    <PackageReference Include="xunit.v3.mtp-v2" />
     <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

diff --git a/...dler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj b/...dler.CallbackMessageAggregate.Tests/CallbackHandler.CallbackMessageAggregate.Tests.csproj
@@ -3,14 +3,16 @@
   <PropertyGroup>
 	  <TargetFramework>net10.0</TargetFramework>
 	  <DebugType>None</DebugType>
+    <OutputType>Exe</OutputType>
+    <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Shared.EventStore" />
     <PackageReference Include="Shouldly" />
-    <PackageReference Include="xunit.v3" />
+    <PackageReference Include="xunit.v3.mtp-v2" />
     <PackageReference Include="xunit.v3.extensibility.core" />
     <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/CallbackHandler.IntegrationTests/CallbackHandler.IntegrationTests.csproj b/CallbackHandler.IntegrationTests/CallbackHandler.IntegrationTests.csproj
@@ -4,6 +4,8 @@
 	  <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <EnableNUnitRunner>true</EnableNUnitRunner>
+    <OutputType>Exe</OutputType>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/CallbackHandler.IntegrationTests/Common/DockerHelper.cs b/CallbackHandler.IntegrationTests/Common/DockerHelper.cs
@@ -2,6 +2,7 @@
 using SecurityService.Client;
 using Shared.IntegrationTesting;
 using Shared.Serialisation;
+using TestHosts.Clients;
 using TransactionProcessor.Client;
 
 namespace CallbackHandler.IntegrationTests.Common;
@@ -15,6 +16,9 @@ public DockerHelper() {
     public ISecurityServiceClient SecurityServiceClient;
     public ITransactionProcessorClient TransactionProcessorClient;
     public EventStoreProjectionManagementClient ProjectionManagementClient;
+
+    public IAgencyBankingClient AgencyBankingClient;
+
     public HttpClient TestHostHttpClient;
     public override async Task CreateSubscriptions()
     {
@@ -53,7 +57,7 @@ public override async Task StartContainersForScenarioRun(String scenarioName,
         // Setup the base address resolvers
         String SecurityServiceBaseAddressResolver(String api) => $"https://127.0.0.1:{this.SecurityServicePort}";
         String TransactionProcessorBaseAddressResolver(String api) => $"http://127.0.0.1:{this.TransactionProcessorPort}";
-
+        String TestHostServiceBaseAddressResolver(String api) => $"http://127.0.0.1:{this.TestHostServicePort}";
         HttpClientHandler clientHandler = new HttpClientHandler
         {
             ServerCertificateCustomValidationCallback = (message,
@@ -70,6 +74,7 @@ public override async Task StartContainersForScenarioRun(String scenarioName,
         this.ProjectionManagementClient = new EventStoreProjectionManagementClient(ConfigureEventStoreSettings());
         this.TestHostHttpClient = new HttpClient(clientHandler);
         this.TestHostHttpClient.BaseAddress = new Uri($"http://127.0.0.1:{this.TestHostServicePort}");
+        this.AgencyBankingClient = new AgencyBankingClient(TestHostServiceBaseAddressResolver, httpClient, Serialise_CamelCase, this.Deserialise_CamelCase);
     }
 
     String Serialise(Object arg)
@@ -81,4 +86,14 @@ Object Deserialise(String arg, Type type)
     {
         return StringSerialiser.DeserializeObject<Object>(arg, type, new SerialiserOptions(SerialiserPropertyFormat.SnakeCase));
     }
+
+    String Serialise_CamelCase(Object arg)
+    {
+        return StringSerialiser.Serialise<Object>(arg, new SerialiserOptions(SerialiserPropertyFormat.CamelCase));
+    }
+
+    Object Deserialise_CamelCase(String arg, Type type)
+    {
+        return StringSerialiser.DeserializeObject<Object>(arg, type, new SerialiserOptions(SerialiserPropertyFormat.CamelCase));
+    }
 }
diff --git a/CallbackHandler.IntegrationTests/Integration.runsettings b/CallbackHandler.IntegrationTests/Integration.runsettings
@@ -0,0 +1,6 @@
+<RunSettings>
+  <NUnit>
+    <TestOutputXml>TestResults</TestOutputXml>
+    <OutputXmlFolderMode>UseResultDirectory</OutputXmlFolderMode>
+  </NUnit>
+</RunSettings>
diff --git a/CallbackHandler.IntegrationTests/Shared/SharedSteps.cs b/CallbackHandler.IntegrationTests/Shared/SharedSteps.cs
@@ -37,7 +37,7 @@ public SharedSteps(ScenarioContext scenarioContext,
             this.TestingContext = testingContext;
             this.SecurityServiceSteps = new SecurityServiceSteps(testingContext.DockerHelper.SecurityServiceClient);
             this.TransactionProcessorSteps = new TransactionProcessorSteps(testingContext.DockerHelper.TransactionProcessorClient, testingContext.DockerHelper.TestHostHttpClient,
-                testingContext.DockerHelper.ProjectionManagementClient);
+                testingContext.DockerHelper.ProjectionManagementClient, testingContext.DockerHelper.AgencyBankingClient);
 
         }
 
@@ -166,7 +166,7 @@ public async Task WhenICreateTheFollowingEstates(DataTable table)
         [When(@"I create the following merchants")]
         public async Task WhenICreateTheFollowingMerchants(DataTable table)
         {
-            List<(EstateDetails estate, CreateMerchantRequest)> requests = table.Rows.ToCreateMerchantRequests(this.TestingContext.Estates);
+            List<(EstateDetails estate, CreateMerchantRequest, Boolean EnableAgencyBanking)> requests = table.Rows.ToCreateMerchantRequests(this.TestingContext.Estates);
 
             List<MerchantResponse> verifiedMerchants = await this.TransactionProcessorSteps.WhenICreateTheFollowingMerchants(this.TestingContext.AccessToken, requests);
 

diff --git a/CallbackHandler.Tests/CallbackHandler.Tests.csproj b/CallbackHandler.Tests/CallbackHandler.Tests.csproj
@@ -2,6 +2,8 @@
 
   <PropertyGroup>
 	  <TargetFramework>net10.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <UseMicrosoftTestingPlatformRunner>true</UseMicrosoftTestingPlatformRunner>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -12,7 +14,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" />
     <PackageReference Include="Moq" />
-    <PackageReference Include="xunit.v3" />
+    <PackageReference Include="xunit.v3.mtp-v2" />
     <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <TestingPlatformDotnetTestSupport>true</TestingPlatformDotnetTestSupport>
+  </PropertyGroup>
+</Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -5,12 +5,12 @@
   <ItemGroup>
     <PackageVersion Include="Lamar" Version="16.0.0" />
     <PackageVersion Include="Lamar.Microsoft.DependencyInjection" Version="16.0.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.9" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.11" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
     <PackageVersion Include="Moq" Version="4.20.72" />
-    <PackageVersion Include="xunit.v3" Version="3.2.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
+    <PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="4.0.0" />
     <PackageVersion Include="coverlet.collector" Version="10.0.1" />
     <PackageVersion Include="coverlet.msbuild" Version="10.0.1" />
     <PackageVersion Include="EventStoreProjections" Version="2023.12.3" />
@@ -19,29 +19,29 @@
     <PackageVersion Include="Reqnroll.NUnit" Version="3.3.4" />
     <PackageVersion Include="NUnit" Version="4.6.1" />
     <PackageVersion Include="NUnit3TestAdapter" Version="6.2.0" />
-    <PackageVersion Include="SecurityService.Client" Version="2026.5.1" />
-    <PackageVersion Include="SecurityService.IntegrationTesting.Helpers" Version="2026.5.1" />
-    <PackageVersion Include="Shared" Version="2026.5.7" />
-    <PackageVersion Include="Shared.IntegrationTesting" Version="2026.5.7" />
-    <PackageVersion Include="TransactionProcessor.Client" Version="2026.5.2" />
-    <PackageVersion Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2026.5.2" />
-    <PackageVersion Include="Grpc.Net.Client" Version="2.80.0" />
-    <PackageVersion Include="Shared.DomainDrivenDesign" Version="2026.5.7" />
-    <PackageVersion Include="Shared.EventStore" Version="2026.5.7" />
+    <PackageVersion Include="SecurityService.Client" Version="2026.7.2" />
+    <PackageVersion Include="SecurityService.IntegrationTesting.Helpers" Version="2026.7.2" />
+    <PackageVersion Include="Shared" Version="2026.8.2" />
+    <PackageVersion Include="Shared.IntegrationTesting" Version="2026.8.2" />
+    <PackageVersion Include="TransactionProcessor.Client" Version="2026.7.2" />
+    <PackageVersion Include="TransactionProcessor.IntegrationTesting.Helpers" Version="2026.7.2" />
+    <PackageVersion Include="Grpc.Net.Client" Version="2.83.0" />
+    <PackageVersion Include="Shared.DomainDrivenDesign" Version="2026.8.2" />
+    <PackageVersion Include="Shared.EventStore" Version="2026.8.2" />
     <PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
-    <PackageVersion Include="MediatR" Version="14.1.0" />
+    <PackageVersion Include="MediatR" Version="14.2.0" />
     <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.23.0" />
-    <PackageVersion Include="Sentry.AspNetCore" Version="6.6.0" />
-    <PackageVersion Include="Shared.Results.Web" Version="2026.5.7" />
+    <PackageVersion Include="Sentry.AspNetCore" Version="6.9.0" />
+    <PackageVersion Include="Shared.Results.Web" Version="2026.8.2" />
     <PackageVersion Include="SimpleResults.AspNetCore" Version="4.0.0" />
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="10.2.1" />
-    <PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="10.2.1" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="10.2.3" />
+    <PackageVersion Include="Swashbuckle.AspNetCore.Annotations" Version="10.2.3" />
     <PackageVersion Include="Swashbuckle.AspNetCore.Filters" Version="10.0.1" />
-    <PackageVersion Include="Swashbuckle.AspNetCore.Swagger" Version="10.2.1" />
-    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="10.2.1" />
-    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.2.1" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.9" />
+    <PackageVersion Include="Swashbuckle.AspNetCore.Swagger" Version="10.2.3" />
+    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerGen" Version="10.2.3" />
+    <PackageVersion Include="Swashbuckle.AspNetCore.SwaggerUI" Version="10.2.3" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting.WindowsServices" Version="10.0.11" />
     <PackageVersion Include="Shouldly" Version="4.3.0" />
     <PackageVersion Include="xunit.v3.extensibility.core" Version="3.2.2" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/global.json b/global.json
@@ -0,0 +1,5 @@
+{
+  "test": {
+    "runner": "Microsoft.Testing.Platform"
+  }
+}