From a6086528423ec82f00dd833a50f0b565a597bcd9 Mon Sep 17 00:00:00 2001
From: Jamie Li <lijamie@gmail.com>
Date: Sat, 16 Dec 2023 21:47:45 +0800
Subject: [PATCH] Merge release 2.5.2 to `main` branch (#1238)

### Description

Merge release 2.5.2 to `main` branch

### Context

Release process.

### Testing

- `./gradlew test`
---
 .../on_release_created_or_updated.yml         |  26 +-
 .github/workflows/sub_essential_tests.yml     |   3 +-
 .github/workflows/sub_extended_tests.yml      | 146 +++++++-
 ...un.xml => Custody Server_ custody.run.xml} |   2 +-
 ... Event Processing Server_ default.run.xml} |   2 +-
 ...n.xml => Platform Server_ default.run.xml} |   2 +-
 ....xml => Reference Server_ default.run.xml} |   2 +-
 ... Java Reference Server - no Docker.run.xml |  10 -
 ...er.run.xml => Sep Server_ default.run.xml} |   2 +-
 ....xml => Stellar Observer_ default.run.xml} |   4 +-
 ...Test - End2End Test - no fullstack.run.xml |  34 --
 ...st - End2End Test - with fullstack.run.xml |  34 --
 ...d2End with RPC Test - no fullstack.run.xml |  34 --
 ...End with RPC Test - with fullstack.run.xml |  34 --
 ...blocks End2End Test - no fullstack.run.xml |  38 --
 ...ocks End2End Test - with fullstack.run.xml |  38 --
 ... - Integration Test - no fullstack.run.xml |  34 --
 ... Integration Test - with fullstack.run.xml |  34 --
 ...in Reference Server - no fullstack.run.xml |  19 -
 .../Test Profile_ auth-apikey-custody.run.xml |  14 +
 ...Test Profile_ auth-apikey-platform.run.xml |  14 +
 .run/Test Profile_ auth-jwt-custody.run.xml   |  14 +
 .run/Test Profile_ auth-jwt-platform.run.xml  |  14 +
 .run/Test Profile_ custody.run.xml            |  14 +
 ....run.xml => Test Profile_ default.run.xml} |   4 +-
 .run/Test Profile_ rpc.run.xml                |  14 +
 ... Wallet Reference Server_ default.run.xml} |   2 +-
 .../api/callback/PutCustomerRequest.java      |   4 +-
 .../sep/sep12/Sep12PutCustomerRequest.java    |   5 +-
 build.gradle.kts                              |   2 +-
 .../org/stellar/anchor/sep10/Sep10Helper.java |  10 +-
 .../stellar/anchor/sep12/Sep12Service.java    |  29 ++
 .../stellar/anchor/sep24/Sep24Service.java    |   1 -
 .../org/stellar/anchor/util/Sep1Helper.java   |  20 +-
 .../stellar/anchor/sep12/Sep12ServiceTest.kt  |  40 ++
 .../stellar/anchor/sep38/Sep38ServiceTest.kt  |   3 +-
 .../kotlin/org/stellar/anchor/util/LogTest.kt |  34 +-
 .../org/stellar/anchor/util/NetUtilTest.kt    |   7 +
 .../org/stellar/anchor/util/SepHelperTest.kt  |  32 +-
 .../A - Development Environment.md            | 111 +++---
 docs/README.md                                |   2 +-
 .../platform/e2etest/Sep24End2EndTests.kt     |  56 +--
 .../platform/e2etest}/Sep31End2EndTests.kt    | 130 ++++---
 .../platform/e2etest/Sep6End2EndTest.kt       |   6 +-
 .../platform/integrationtest/Sep12Tests.kt    |   1 -
 .../platform/integrationtest/Sep24Tests.kt    |   2 -
 .../platform/integrationtest/Sep31Tests.kt    |   3 +-
 extended-tests/build.gradle.kts               |  12 +-
 .../platform/AbstractAuthIntegrationTest.kt   |  42 ---
 .../platform/AbstractIntegrationTest.kt       |  73 ----
 .../AnchorPlatformApiRpcEnd2EndTest.kt        |  49 ---
 .../AnchorPlatformCustodyIntegrationTest.kt   |  54 ---
 .../anchor/platform/DatabaseMigrationTests.kt |  36 --
 .../auth/AbstractAuthIntegrationTest.kt       |  48 +++
 .../apikey/custody/AuthApiKeyCustodyTests.kt} |  44 +--
 .../platform/AuthApiKeyPlatformTests.kt}      |  39 +-
 .../auth/jwt/custody/AuthJwtCustodyTests.kt}  |  36 +-
 .../jwt/platform/AuthJwtPlatformTests.kt}     |  70 +---
 .../custody}/CustodyApiTests.kt               | 235 +++++++-----
 .../custody}/PlatformApiCustodyTests.kt       |  76 ++--
 .../extendedtest/rpc/RpcEnd2EndTests.kt       |  46 +++
 .../suite/AuthApikeyCustodyTestSuite.kt       |   8 +
 .../suite/AuthApikeyPlatformTestSuite.kt      |   8 +
 .../platform/suite/AuthJwtCustodyTestSuite.kt |   8 +
 .../suite/AuthJwtPlatformTestSuite.kt         |   8 +
 .../anchor/platform/suite/CustodyTestSuite.kt |   6 +
 .../anchor/platform/suite/RpcTestSuite.kt     |   6 +
 .../platform/test/ReferenceServerTests.kt     |  26 --
 .../platform/test/Sep24BaseEnd2EndTest.kt     | 344 ------------------
 .../reference/dao/CustomerRepository.kt       |  19 +-
 .../org/stellar/reference/dao/Customers.kt    |   4 +-
 .../org/stellar/reference/model/Customer.kt   |   6 +-
 lib-util/build.gradle.kts                     |   1 +
 .../org/stellar/anchor/util/FileUtil.java     |   3 -
 .../org/stellar/anchor/util}/RSAUtil.java     |  42 ++-
 .../stellar/anchor/client/CustodyApiClient.kt |  16 +-
 .../org/stellar/anchor/client/Sep38Client.kt  |   2 -
 .../org/stellar/anchor/client/SepClient.kt    |  11 +-
 .../org/stellar/anchor/util/FileUtilTest.kt   |   0
 .../org/stellar/anchor}/util/RSAUtilTest.kt   | 117 +++---
 .../src/test/resources/test_resource.txt      |   0
 .../platform/config/FireblocksConfig.java     |   8 +-
 .../anchor/platform/config/MetricConfig.java  |   2 +-
 .../platform/configurator/ConfigReader.java   |   3 -
 .../platform/controller/HealthController.java |   5 +-
 .../custody/CustodyHealthController.java      |   5 +-
 .../custody/CustodyPaymentController.java     |   2 +
 .../custody/CustodyTransactionController.java |   3 +
 .../custody/CustodyWebhookController.java     |   3 +-
 .../observer/ObserverHealthController.java    |   5 +-
 .../platform/PlatformController.java          |   6 +-
 .../platform/PlatformHealthController.java    |   5 +-
 .../platform/PlatformRpcController.java       |   5 +-
 .../controller/sep/Sep10Controller.java       |   6 +-
 .../controller/sep/Sep12Controller.java       |   7 +-
 .../controller/sep/Sep1Controller.java        |   3 +
 .../controller/sep/Sep24Controller.java       |  12 +-
 .../controller/sep/Sep31Controller.java       |   3 +
 .../controller/sep/Sep38Controller.java       |   5 +
 .../controller/sep/Sep6Controller.java        |   8 +
 .../controller/sep/SepHealthController.java   |   5 +-
 .../fireblocks/FireblocksEventService.java    |   5 +-
 .../anchor/platform/LogAppenderTest.kt        |  83 -----
 .../callback/RestCustomerIntegrationTest.kt   |   2 -
 .../custody/CustodyEventServiceTest.kt        |   3 +-
 .../fireblocks/FireblocksEventServiceTest.kt  |   6 +-
 .../platform/service/CustodyServiceTest.kt    |   2 -
 .../service/TransactionServiceTest.kt         |   2 -
 service-runner/build.gradle.kts               |  10 +
 .../anchor/platform/TestProfileRunner.kt      |   9 +-
 .../platform/run_profiles/RunCustodyServer.kt |   2 +-
 ...unSEP24NoFrontend.kt => RunTestProfile.kt} |  12 +-
 .../profiles/auth-apikey-custody/config.env   |  17 +
 .../profiles/auth-apikey-custody/test.env     |   3 +
 .../profiles/auth-apikey-platform/config.env  |   1 +
 .../profiles/auth-apikey-platform/test.env    |   2 +
 .../profiles/auth-jwt-custody/config.env      |  19 +
 .../profiles/auth-jwt-custody/test.env        |   3 +
 .../profiles/auth-jwt-platform/config.env     |  14 +
 .../profiles/auth-jwt-platform/test.env       |   2 +
 .../{default-custody => custody}/config.env   |   1 +
 .../main/resources/profiles/custody/test.env  |   2 +
 .../profiles/default-custody/test.env         |   1 -
 .../main/resources/profiles/default/test.env  |   6 +-
 .../profiles/{default-rpc => rpc}/config.env  |   0
 .../profiles/{default-rpc => rpc}/test.env    |   0
 .../unused-default-custody-rpc/config.env     |  61 ----
 .../unused-default-custody-rpc/test.env       |  16 -
 128 files changed, 1190 insertions(+), 1776 deletions(-)
 rename .run/{Run - Custody Server - no Docker.run.xml => Custody Server_ custody.run.xml} (77%)
 rename .run/{Run - Event Processing Server - no Docker .run.xml => Event Processing Server_ default.run.xml} (76%)
 rename .run/{Run - Platform Server - no Docker.run.xml => Platform Server_ default.run.xml} (77%)
 rename .run/{Run - Kotlin Reference Server - no Docker.run.xml => Reference Server_ default.run.xml} (81%)
 delete mode 100644 .run/Run - Java Reference Server - no Docker.run.xml
 rename .run/{Run - Sep Server - no Docker.run.xml => Sep Server_ default.run.xml} (78%)
 rename .run/{Run - All Servers - with Docker.run.xml => Stellar Observer_ default.run.xml} (68%)
 delete mode 100644 .run/Test - End2End Test - no fullstack.run.xml
 delete mode 100644 .run/Test - End2End Test - with fullstack.run.xml
 delete mode 100644 .run/Test - End2End with RPC Test - no fullstack.run.xml
 delete mode 100644 .run/Test - End2End with RPC Test - with fullstack.run.xml
 delete mode 100644 .run/Test - Fireblocks End2End Test - no fullstack.run.xml
 delete mode 100644 .run/Test - Fireblocks End2End Test - with fullstack.run.xml
 delete mode 100644 .run/Test - Integration Test - no fullstack.run.xml
 delete mode 100644 .run/Test - Integration Test - with fullstack.run.xml
 delete mode 100644 .run/Test - Kotlin Reference Server - no fullstack.run.xml
 create mode 100644 .run/Test Profile_ auth-apikey-custody.run.xml
 create mode 100644 .run/Test Profile_ auth-apikey-platform.run.xml
 create mode 100644 .run/Test Profile_ auth-jwt-custody.run.xml
 create mode 100644 .run/Test Profile_ auth-jwt-platform.run.xml
 create mode 100644 .run/Test Profile_ custody.run.xml
 rename .run/{Run - All Servers - no Docker.run.xml => Test Profile_ default.run.xml} (74%)
 create mode 100644 .run/Test Profile_ rpc.run.xml
 rename .run/{Run - Wallet Reference Server - no Docker.run.xml => Wallet Reference Server_ default.run.xml} (76%)
 rename {extended-tests/src/test/kotlin/org/stellar/anchor/platform/test => essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest}/Sep31End2EndTests.kt (68%)
 delete mode 100644 extended-tests/src/test/kotlin/org/stellar/anchor/platform/AbstractAuthIntegrationTest.kt
 delete mode 100644 extended-tests/src/test/kotlin/org/stellar/anchor/platform/AbstractIntegrationTest.kt
 delete mode 100644 extended-tests/src/test/kotlin/org/stellar/anchor/platform/AnchorPlatformApiRpcEnd2EndTest.kt
 delete mode 100644 extended-tests/src/test/kotlin/org/stellar/anchor/platform/AnchorPlatformCustodyIntegrationTest.kt
 delete mode 100644 extended-tests/src/test/kotlin/org/stellar/anchor/platform/DatabaseMigrationTests.kt
 create mode 100644 extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/auth/AbstractAuthIntegrationTest.kt
 rename extended-tests/src/test/kotlin/org/stellar/anchor/platform/{CustodyApiKeyAuthIntegrationTest.kt => extendedtest/auth/apikey/custody/AuthApiKeyCustodyTests.kt} (54%)
 rename extended-tests/src/test/kotlin/org/stellar/anchor/platform/{PlatformApiKeyAuthIntegrationTest.kt => extendedtest/auth/apikey/platform/AuthApiKeyPlatformTests.kt} (66%)
 rename extended-tests/src/test/kotlin/org/stellar/anchor/platform/{CustodyJwtAuthIntegrationTest.kt => extendedtest/auth/jwt/custody/AuthJwtCustodyTests.kt} (75%)
 rename extended-tests/src/test/kotlin/org/stellar/anchor/platform/{PlatformJwtAuthIntegrationTest.kt => extendedtest/auth/jwt/platform/AuthJwtPlatformTests.kt} (71%)
 rename extended-tests/src/test/kotlin/org/stellar/anchor/platform/{test => extendedtest/custody}/CustodyApiTests.kt (78%)
 rename extended-tests/src/test/kotlin/org/stellar/anchor/platform/{test => extendedtest/custody}/PlatformApiCustodyTests.kt (96%)
 create mode 100644 extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/rpc/RpcEnd2EndTests.kt
 create mode 100644 extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/AuthApikeyCustodyTestSuite.kt
 create mode 100644 extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/AuthApikeyPlatformTestSuite.kt
 create mode 100644 extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/AuthJwtCustodyTestSuite.kt
 create mode 100644 extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/AuthJwtPlatformTestSuite.kt
 create mode 100644 extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/CustodyTestSuite.kt
 create mode 100644 extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/RpcTestSuite.kt
 delete mode 100644 extended-tests/src/test/kotlin/org/stellar/anchor/platform/test/ReferenceServerTests.kt
 delete mode 100644 extended-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24BaseEnd2EndTest.kt
 rename {core => lib-util}/src/main/java/org/stellar/anchor/util/FileUtil.java (90%)
 rename {platform/src/main/java/org/stellar/anchor/platform/utils => lib-util/src/main/java/org/stellar/anchor/util}/RSAUtil.java (74%)
 rename {core => lib-util}/src/test/kotlin/org/stellar/anchor/util/FileUtilTest.kt (100%)
 rename {platform/src/test/kotlin/org/stellar/anchor/platform => lib-util/src/test/kotlin/org/stellar/anchor}/util/RSAUtilTest.kt (59%)
 rename {core => lib-util}/src/test/resources/test_resource.txt (100%)
 delete mode 100644 platform/src/test/kotlin/org/stellar/anchor/platform/LogAppenderTest.kt
 rename service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/{RunSEP24NoFrontend.kt => RunTestProfile.kt} (53%)
 create mode 100644 service-runner/src/main/resources/profiles/auth-apikey-custody/config.env
 create mode 100644 service-runner/src/main/resources/profiles/auth-apikey-custody/test.env
 create mode 100644 service-runner/src/main/resources/profiles/auth-apikey-platform/config.env
 create mode 100644 service-runner/src/main/resources/profiles/auth-apikey-platform/test.env
 create mode 100644 service-runner/src/main/resources/profiles/auth-jwt-custody/config.env
 create mode 100644 service-runner/src/main/resources/profiles/auth-jwt-custody/test.env
 create mode 100644 service-runner/src/main/resources/profiles/auth-jwt-platform/config.env
 create mode 100644 service-runner/src/main/resources/profiles/auth-jwt-platform/test.env
 rename service-runner/src/main/resources/profiles/{default-custody => custody}/config.env (96%)
 create mode 100644 service-runner/src/main/resources/profiles/custody/test.env
 delete mode 100644 service-runner/src/main/resources/profiles/default-custody/test.env
 rename service-runner/src/main/resources/profiles/{default-rpc => rpc}/config.env (100%)
 rename service-runner/src/main/resources/profiles/{default-rpc => rpc}/test.env (100%)
 delete mode 100644 service-runner/src/main/resources/profiles/unused-default-custody-rpc/config.env
 delete mode 100644 service-runner/src/main/resources/profiles/unused-default-custody-rpc/test.env

diff --git a/.github/workflows/on_release_created_or_updated.yml b/.github/workflows/on_release_created_or_updated.yml
index b4c2e84b7c..96cfbed2e2 100644
--- a/.github/workflows/on_release_created_or_updated.yml
+++ b/.github/workflows/on_release_created_or_updated.yml
@@ -9,23 +9,20 @@ jobs:
   gradle_build:
     uses: ./.github/workflows/sub_gradle_build.yml
 
-  jacoco_report:
-    needs: [ gradle_build ]
-    uses: ./.github/workflows/sub_jacoco_report.yml
-
-  essential_tests:
-    needs: [ gradle_build ]
-    uses: ./.github/workflows/sub_essential_tests.yml
-
-  extended_tests:
-    needs: [ gradle_build ]
-    uses: ./.github/workflows/sub_extended_tests.yml
-
+#  essential_tests:
+#    needs: [ gradle_build ]
+#    uses: ./.github/workflows/sub_essential_tests.yml
+#
+#  extended_tests:
+#    needs: [ gradle_build ]
+#    uses: ./.github/workflows/sub_extended_tests.yml
+#
   codeql_analysis:
     uses: ./.github/workflows/sub_codeql_analysis.yml
 
   build_and_push_docker_image:
-    needs: [ gradle_build, essential_tests, extended_tests, codeql_analysis ]
+    #    needs: [ gradle_build, essential_tests, extended_tests, codeql_analysis ]
+    needs: [ gradle_build, codeql_analysis ]
     name: Push to DockerHub (tag=stellar/anchor-platform:${{ github.event.release.tag_name }})
     runs-on: ubuntu-latest
     steps:
@@ -60,7 +57,8 @@ jobs:
 
   complete:
     if: always()
-    needs: [ essential_tests, extended_tests, build_and_push_docker_image ]
+    #    needs: [ essential_tests, extended_tests, build_and_push_docker_image ]
+    needs: [ build_and_push_docker_image ]
     runs-on: ubuntu-latest
     steps:
       - if: contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled')
diff --git a/.github/workflows/sub_essential_tests.yml b/.github/workflows/sub_essential_tests.yml
index 8423ef8043..c2b238fa1d 100644
--- a/.github/workflows/sub_essential_tests.yml
+++ b/.github/workflows/sub_essential_tests.yml
@@ -7,8 +7,7 @@ on:
 jobs:
   essential_tests:
     name: Run Essential Tests (Integration Tests, Faster End-2-End Tests, Unit Tests, and Stellar Validation Tools)
-    runs-on: ubuntu-latest-16-cores
-    #    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-8-cores
     steps:
       #############################################
       # Setup JDK 11
diff --git a/.github/workflows/sub_extended_tests.yml b/.github/workflows/sub_extended_tests.yml
index 5717c27e96..f5393ba8f6 100644
--- a/.github/workflows/sub_extended_tests.yml
+++ b/.github/workflows/sub_extended_tests.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   extended_tests:
     name: Run Extended Tests
-    runs-on: ubuntu-latest-8-cores
+    runs-on: ubuntu-latest-16-cores
     steps:
       #############################################
       # Setup JDK 11
@@ -46,14 +46,148 @@ jobs:
 
       #############################################
 
-      - name: Run Extended Tests
+      - name: Run Zookeeper, Kafka, Postgres, and Sep24 UI with docker-compose
+        run: docker-compose -f /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/docker-compose-test.yaml up -d --build
+
+      # `custody` Tests
+      - name: Start `custody` configuration
+        env:
+          TEST_PROFILE_NAME: custody
+        run: |
+          cd /home/runner/java-stellar-anchor-sdk
+          ./gradlew startServersWithTestProfile &
+          echo "PID=$!" >> $GITHUB_ENV
+
+      - name: Wait for the sep server to start and get ready
+        uses: mydea/action-wait-for-api@v1
+        with:
+          url: "http://localhost:8080/.well-known/stellar.toml"
+          interval: "1"
+
+      - name: Run `custody` configuration tests
+        env:
+          TEST_PROFILE_NAME: custody
+        run: |
+          cd /home/runner/java-stellar-anchor-sdk
+          ./gradlew :service-runner:clean :extended-tests:clean :extended-tests:test --tests org.stellar.anchor.platform.suite.CustodyTestSuite         
+          kill -9 $PID
+
+      # `rpc` Tests
+      - name: Start `rpc` configuration
+        env:
+          TEST_PROFILE_NAME: rpc
+        run: |
+          cd /home/runner/java-stellar-anchor-sdk
+          ./gradlew startServersWithTestProfile &
+          echo "PID=$!" >> $GITHUB_ENV
+
+      - name: Wait for the sep server to start and get ready
+        uses: mydea/action-wait-for-api@v1
+        with:
+          url: "http://localhost:8080/.well-known/stellar.toml"
+          interval: "1"
+
+      - name: Run `rpc` configuration tests
+        env:
+          TEST_PROFILE_NAME: rpc
+        run: |
+          cd /home/runner/java-stellar-anchor-sdk
+          ./gradlew :extended-tests:test --tests org.stellar.anchor.platform.suite.RpcTestSuite         
+          kill -9 $PID      
+
+      # `auth-apikey-custody` Tests
+      - name: Start `auth-apikey-custody` configuration
+        env:
+          TEST_PROFILE_NAME: auth-apikey-custody
+        run: |
+          cd /home/runner/java-stellar-anchor-sdk
+          ./gradlew startServersWithTestProfile &
+          echo "PID=$!" >> $GITHUB_ENV
+
+      - name: Wait for the custody server to start and get ready
+        uses: mydea/action-wait-for-api@v1
+        with:
+          url: "http://localhost:8086/health"
+          interval: "1"
+
+      - name: Run `auth-apikey-custody` configuration tests
+        env:
+          TEST_PROFILE_NAME: auth-apikey-custody
+        run: |
+          cd /home/runner/java-stellar-anchor-sdk
+          ./gradlew :extended-tests:test --tests org.stellar.anchor.platform.suite.AuthApikeyCustodyTestSuite         
+          kill -9 $PID           
+
+      # `auth-jwt-custody` Tests
+      - name: Start `auth-jwt-custody` configuration
+        env:
+          TEST_PROFILE_NAME: auth-jwt-custody
+        run: |
+          cd /home/runner/java-stellar-anchor-sdk
+          ./gradlew startServersWithTestProfile &
+          echo "PID=$!" >> $GITHUB_ENV
+
+      - name: Wait for the custody server to start and get ready
+        uses: mydea/action-wait-for-api@v1
+        with:
+          url: "http://localhost:8086/health"
+          interval: "1"
+
+      - name: Run `auth-jwt-custody` configuration tests
+        env:
+          TEST_PROFILE_NAME: auth-jwt-custody
+        run: |
+          cd /home/runner/java-stellar-anchor-sdk
+          ./gradlew :extended-tests:test --tests org.stellar.anchor.platform.suite.AuthJwtCustodyTestSuite         
+          kill -9 $PID    
+
+      # `auth-apikey-platform` Tests
+      - name: Start `auth-apikey-platform` configuration
+        env:
+          TEST_PROFILE_NAME: auth-apikey-platform
+        run: |
+          cd /home/runner/java-stellar-anchor-sdk
+          ./gradlew startServersWithTestProfile &
+          echo "PID=$!" >> $GITHUB_ENV
+
+      - name: Wait for the platform server to start and get ready
+        uses: mydea/action-wait-for-api@v1
+        with:
+          url: "http://localhost:8085/health"
+          expected-status: "403"
+          interval: "1"
+
+      - name: Run `auth-apikey-platform` configuration tests
+        env:
+          TEST_PROFILE_NAME: auth-apikey-platform
+        run: |
+          cd /home/runner/java-stellar-anchor-sdk
+          ./gradlew :extended-tests:test --tests org.stellar.anchor.platform.suite.AuthApikeyPlatformTestSuite         
+          kill -9 $PID
+
+      # `auth-jwt-platform` Tests
+      - name: Start `auth-jwt-platform` configuration
+        env:
+          TEST_PROFILE_NAME: auth-jwt-platform
+        run: |
+          cd /home/runner/java-stellar-anchor-sdk
+          ./gradlew startServersWithTestProfile &
+          echo "PID=$!" >> $GITHUB_ENV
+
+      - name: Wait for the platform server to start and get ready
+        uses: mydea/action-wait-for-api@v1
+        with:
+          url: "http://localhost:8085/health"
+          expected-status: "403"
+          interval: "1"
+
+      - name: Run `auth-jwt-platform` configuration tests
         env:
-          ANCHOR_DOMAIN: http://host.docker.internal:8080
-          SEP1_TOML_VALUE: /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/config/stellar.host.docker.internal.toml
-          SEP10_HOME_DOMAIN: host.docker.internal:8080
+          TEST_PROFILE_NAME: auth-jwt-platform
         run: |
           cd /home/runner/java-stellar-anchor-sdk
-          ./gradlew extended-tests:test --stacktrace -x spotlessApply -x spotlessKotlinApply -x javadoc -x javadocJar -x sourcesJar -x distTar -x distZip -x shadowJar -x shadowDistZip -x shadowDistTar -x bootDistTar -x bootDistZip
+          ./gradlew :extended-tests:test --tests org.stellar.anchor.platform.suite.AuthJwtPlatformTestSuite         
+          kill -9 $PID   
 
       - name: Upload Extended Tests Report
         if: always()
diff --git a/.run/Run - Custody Server - no Docker.run.xml b/.run/Custody Server_ custody.run.xml
similarity index 77%
rename from .run/Run - Custody Server - no Docker.run.xml
rename to .run/Custody Server_ custody.run.xml
index e94211a3bb..6d72f93a07 100644
--- a/.run/Run - Custody Server - no Docker.run.xml	
+++ b/.run/Custody Server_ custody.run.xml	
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run - Custody Server - no Docker" type="JetRunConfigurationType">
+  <configuration default="false" name="Custody Server: custody" type="JetRunConfigurationType">
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunCustodyServer" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
diff --git a/.run/Run - Event Processing Server - no Docker .run.xml b/.run/Event Processing Server_ default.run.xml
similarity index 76%
rename from .run/Run - Event Processing Server - no Docker .run.xml
rename to .run/Event Processing Server_ default.run.xml
index e26261c525..9ca7ce2bd0 100644
--- a/.run/Run - Event Processing Server - no Docker .run.xml	
+++ b/.run/Event Processing Server_ default.run.xml	
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run - Event Processing Server - no Docker " type="JetRunConfigurationType">
+  <configuration default="false" name="Event Processing Server: default" type="JetRunConfigurationType">
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunEventProcessingServer" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
diff --git a/.run/Run - Platform Server - no Docker.run.xml b/.run/Platform Server_ default.run.xml
similarity index 77%
rename from .run/Run - Platform Server - no Docker.run.xml
rename to .run/Platform Server_ default.run.xml
index 065e78e1f8..62fd8e2aa7 100644
--- a/.run/Run - Platform Server - no Docker.run.xml	
+++ b/.run/Platform Server_ default.run.xml	
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run - Platform Server - no Docker" type="JetRunConfigurationType">
+  <configuration default="false" name="Platform Server: default" type="JetRunConfigurationType">
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunPlatformServer" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
diff --git a/.run/Run - Kotlin Reference Server - no Docker.run.xml b/.run/Reference Server_ default.run.xml
similarity index 81%
rename from .run/Run - Kotlin Reference Server - no Docker.run.xml
rename to .run/Reference Server_ default.run.xml
index ef247dcd7e..e5f34fa0d1 100644
--- a/.run/Run - Kotlin Reference Server - no Docker.run.xml	
+++ b/.run/Reference Server_ default.run.xml	
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run - Kotlin Reference Server - no Docker" type="JetRunConfigurationType">
+  <configuration default="false" name="Reference Server: default" type="JetRunConfigurationType">
     <envs>
       <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="default" />
diff --git a/.run/Run - Java Reference Server - no Docker.run.xml b/.run/Run - Java Reference Server - no Docker.run.xml
deleted file mode 100644
index 7d0bd07c18..0000000000
--- a/.run/Run - Java Reference Server - no Docker.run.xml	
+++ /dev/null
@@ -1,10 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run - Java Reference Server - no Docker" type="JetRunConfigurationType">
-    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunSEP24NoFrontend" />
-    <module name="java-stellar-anchor-sdk.service-runner.main" />
-    <shortenClasspath name="ARGS_FILE" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.run/Run - Sep Server - no Docker.run.xml b/.run/Sep Server_ default.run.xml
similarity index 78%
rename from .run/Run - Sep Server - no Docker.run.xml
rename to .run/Sep Server_ default.run.xml
index d66588825b..f79a2712c6 100644
--- a/.run/Run - Sep Server - no Docker.run.xml	
+++ b/.run/Sep Server_ default.run.xml	
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run - Sep Server - no Docker" type="JetRunConfigurationType">
+  <configuration default="false" name="Sep Server: default" type="JetRunConfigurationType">
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunSepServer" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
diff --git a/.run/Run - All Servers - with Docker.run.xml b/.run/Stellar Observer_ default.run.xml
similarity index 68%
rename from .run/Run - All Servers - with Docker.run.xml
rename to .run/Stellar Observer_ default.run.xml
index 295eb0caf3..1e4905519f 100644
--- a/.run/Run - All Servers - with Docker.run.xml	
+++ b/.run/Stellar Observer_ default.run.xml	
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run - All Servers - with Docker" type="JetRunConfigurationType">
-    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunAllServersWithDocker" />
+  <configuration default="false" name="Stellar Observer: default" type="JetRunConfigurationType">
+    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunStellarObserver" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
     <method v="2">
diff --git a/.run/Test - End2End Test - no fullstack.run.xml b/.run/Test - End2End Test - no fullstack.run.xml
deleted file mode 100644
index eae5b2b32d..0000000000
--- a/.run/Test - End2End Test - no fullstack.run.xml	
+++ /dev/null
@@ -1,34 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test - End2End Test - no fullstack" type="JUnit" factoryName="JUnit">
-    <module name="java-stellar-anchor-sdk.essential-tests.test" />
-    <shortenClasspath name="ARGS_FILE" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.stellar.anchor.platform.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <extension name="net.ashald.envfile">
-      <option name="IS_ENABLED" value="false" />
-      <option name="IS_SUBST" value="false" />
-      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
-      <option name="IS_IGNORE_MISSING_FILES" value="false" />
-      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
-      <ENTRIES>
-        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
-      </ENTRIES>
-    </extension>
-    <option name="PACKAGE_NAME" value="org.stellar.anchor.platform" />
-    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.AnchorPlatformEnd2EndTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <envs>
-      <env name="TEST_PROFILE_NAME" value="default" />
-      <env name="run_all_servers" value="false" />
-      <env name="run_docker" value="false" />
-    </envs>
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.run/Test - End2End Test - with fullstack.run.xml b/.run/Test - End2End Test - with fullstack.run.xml
deleted file mode 100644
index 05d1f83a21..0000000000
--- a/.run/Test - End2End Test - with fullstack.run.xml	
+++ /dev/null
@@ -1,34 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test - End2End Test - with fullstack" type="JUnit" factoryName="JUnit">
-    <module name="java-stellar-anchor-sdk.essential-tests.test" />
-    <shortenClasspath name="ARGS_FILE" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.stellar.anchor.platform.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <extension name="net.ashald.envfile">
-      <option name="IS_ENABLED" value="false" />
-      <option name="IS_SUBST" value="false" />
-      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
-      <option name="IS_IGNORE_MISSING_FILES" value="false" />
-      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
-      <ENTRIES>
-        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
-      </ENTRIES>
-    </extension>
-    <option name="PACKAGE_NAME" value="org.stellar.anchor.platform" />
-    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.AnchorPlatformEnd2EndTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <envs>
-      <env name="TEST_PROFILE_NAME" value="default" />
-      <env name="run_all_servers" value="true" />
-      <env name="run_docker" value="true" />
-    </envs>
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.run/Test - End2End with RPC Test - no fullstack.run.xml b/.run/Test - End2End with RPC Test - no fullstack.run.xml
deleted file mode 100644
index 43c5d1ab4b..0000000000
--- a/.run/Test - End2End with RPC Test - no fullstack.run.xml	
+++ /dev/null
@@ -1,34 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test - End2End Test - no fullstack" type="JUnit" factoryName="JUnit">
-    <module name="java-stellar-anchor-sdk.essential-tests.test" />
-    <shortenClasspath name="ARGS_FILE" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.stellar.anchor.platform.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <extension name="net.ashald.envfile">
-      <option name="IS_ENABLED" value="false" />
-      <option name="IS_SUBST" value="false" />
-      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
-      <option name="IS_IGNORE_MISSING_FILES" value="false" />
-      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
-      <ENTRIES>
-        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
-      </ENTRIES>
-    </extension>
-    <option name="PACKAGE_NAME" value="org.stellar.anchor.platform" />
-    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.AnchorPlatformApiRpcEnd2EndTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <envs>
-      <env name="TEST_PROFILE_NAME" value="default-rpc" />
-      <env name="run_all_servers" value="false" />
-      <env name="run_docker" value="false" />
-    </envs>
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.run/Test - End2End with RPC Test - with fullstack.run.xml b/.run/Test - End2End with RPC Test - with fullstack.run.xml
deleted file mode 100644
index df0f286b25..0000000000
--- a/.run/Test - End2End with RPC Test - with fullstack.run.xml	
+++ /dev/null
@@ -1,34 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test - End2End Test - with fullstack" type="JUnit" factoryName="JUnit">
-    <module name="java-stellar-anchor-sdk.essential-tests.test" />
-    <shortenClasspath name="ARGS_FILE" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.stellar.anchor.platform.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <extension name="net.ashald.envfile">
-      <option name="IS_ENABLED" value="false" />
-      <option name="IS_SUBST" value="false" />
-      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
-      <option name="IS_IGNORE_MISSING_FILES" value="false" />
-      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
-      <ENTRIES>
-        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
-      </ENTRIES>
-    </extension>
-    <option name="PACKAGE_NAME" value="org.stellar.anchor.platform" />
-    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.AnchorPlatformApiRpcEnd2EndTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <envs>
-      <env name="TEST_PROFILE_NAME" value="default-rpc" />
-      <env name="run_all_servers" value="true" />
-      <env name="run_docker" value="true" />
-    </envs>
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.run/Test - Fireblocks End2End Test - no fullstack.run.xml b/.run/Test - Fireblocks End2End Test - no fullstack.run.xml
deleted file mode 100644
index 39dd22fc03..0000000000
--- a/.run/Test - Fireblocks End2End Test - no fullstack.run.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test - Fireblocks End2End Test - no fullstack" type="JUnit" factoryName="JUnit">
-    <module name="java-stellar-anchor-sdk.essential-tests.test" />
-    <shortenClasspath name="ARGS_FILE" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.stellar.anchor.platform.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <extension name="net.ashald.envfile">
-      <option name="IS_ENABLED" value="false" />
-      <option name="IS_SUBST" value="false" />
-      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
-      <option name="IS_IGNORE_MISSING_FILES" value="false" />
-      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
-      <ENTRIES>
-        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
-      </ENTRIES>
-    </extension>
-    <option name="PACKAGE_NAME" value="org.stellar.anchor.platform" />
-    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.AnchorPlatformCustodyEnd2EndTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <envs>
-      <env name="TEST_PROFILE_NAME" value="default-custody" />
-      <env name="run_all_servers" value="false" />
-      <env name="run_docker" value="false" />
-      <env name="CUSTODY_TYPE" value="fireblocks" />
-      <env name="CUSTODY_FIREBLOCKS_VAULT_ACCOUNT_ID" value="stub" />
-      <env name="SECRET_CUSTODY_FIREBLOCKS_API_KEY" value="stub" />
-      <env name="SECRET_CUSTODY_FIREBLOCKS_SECRET_KEY" value="stub" />
-    </envs>
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.run/Test - Fireblocks End2End Test - with fullstack.run.xml b/.run/Test - Fireblocks End2End Test - with fullstack.run.xml
deleted file mode 100644
index 9e52d9fa91..0000000000
--- a/.run/Test - Fireblocks End2End Test - with fullstack.run.xml	
+++ /dev/null
@@ -1,38 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test - Fireblocks End2End Test - with fullstack" type="JUnit" factoryName="JUnit">
-    <module name="java-stellar-anchor-sdk.essential-tests.test" />
-    <shortenClasspath name="ARGS_FILE" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.stellar.anchor.platform.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <extension name="net.ashald.envfile">
-      <option name="IS_ENABLED" value="false" />
-      <option name="IS_SUBST" value="false" />
-      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
-      <option name="IS_IGNORE_MISSING_FILES" value="false" />
-      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
-      <ENTRIES>
-        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
-      </ENTRIES>
-    </extension>
-    <option name="PACKAGE_NAME" value="org.stellar.anchor.platform" />
-    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.AnchorPlatformCustodyEnd2EndTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <envs>
-      <env name="TEST_PROFILE_NAME" value="default-custody" />
-      <env name="run_all_servers" value="true" />
-      <env name="run_docker" value="true" />
-      <env name="CUSTODY_TYPE" value="fireblocks" />
-      <env name="CUSTODY_FIREBLOCKS_VAULT_ACCOUNT_ID" value="stub" />
-      <env name="SECRET_CUSTODY_FIREBLOCKS_API_KEY" value="stub" />
-      <env name="SECRET_CUSTODY_FIREBLOCKS_SECRET_KEY" value="stub" />
-    </envs>
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.run/Test - Integration Test - no fullstack.run.xml b/.run/Test - Integration Test - no fullstack.run.xml
deleted file mode 100644
index 6d54c44ff6..0000000000
--- a/.run/Test - Integration Test - no fullstack.run.xml	
+++ /dev/null
@@ -1,34 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test - Integration Test - no fullstack" type="JUnit" factoryName="JUnit">
-    <module name="java-stellar-anchor-sdk.essential-tests.test" />
-    <shortenClasspath name="ARGS_FILE" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.stellar.anchor.platform.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <extension name="net.ashald.envfile">
-      <option name="IS_ENABLED" value="false" />
-      <option name="IS_SUBST" value="false" />
-      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
-      <option name="IS_IGNORE_MISSING_FILES" value="false" />
-      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
-      <ENTRIES>
-        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
-      </ENTRIES>
-    </extension>
-    <option name="PACKAGE_NAME" value="org.stellar.anchor.platform" />
-    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.AnchorPlatformIntegrationTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <envs>
-      <env name="TEST_PROFILE_NAME" value="default" />
-      <env name="run_all_servers" value="false" />
-      <env name="run_docker" value="false" />
-    </envs>
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.run/Test - Integration Test - with fullstack.run.xml b/.run/Test - Integration Test - with fullstack.run.xml
deleted file mode 100644
index b5f268afdc..0000000000
--- a/.run/Test - Integration Test - with fullstack.run.xml	
+++ /dev/null
@@ -1,34 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test - Integration Test - with fullstack" type="JUnit" factoryName="JUnit">
-    <module name="java-stellar-anchor-sdk.essential-tests.test" />
-    <shortenClasspath name="ARGS_FILE" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.stellar.anchor.platform.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <extension name="net.ashald.envfile">
-      <option name="IS_ENABLED" value="false" />
-      <option name="IS_SUBST" value="false" />
-      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
-      <option name="IS_IGNORE_MISSING_FILES" value="false" />
-      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
-      <ENTRIES>
-        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
-      </ENTRIES>
-    </extension>
-    <option name="PACKAGE_NAME" value="org.stellar.anchor.platform" />
-    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.AnchorPlatformIntegrationTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <envs>
-      <env name="TEST_PROFILE_NAME" value="default" />
-      <env name="run_all_servers" value="true" />
-      <env name="run_docker" value="true" />
-    </envs>
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.run/Test - Kotlin Reference Server - no fullstack.run.xml b/.run/Test - Kotlin Reference Server - no fullstack.run.xml
deleted file mode 100644
index 2a3da8ed50..0000000000
--- a/.run/Test - Kotlin Reference Server - no fullstack.run.xml	
+++ /dev/null
@@ -1,19 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test - Kotlin Reference Server - no fullstack" type="JUnit" factoryName="JUnit">
-    <module name="java-stellar-anchor-sdk.essential-tests.test" />
-    <shortenClasspath name="ARGS_FILE" />
-    <extension name="coverage">
-      <pattern>
-        <option name="PATTERN" value="org.stellar.anchor.platform.*" />
-        <option name="ENABLED" value="true" />
-      </pattern>
-    </extension>
-    <option name="PACKAGE_NAME" value="org.stellar.anchor.platform" />
-    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.KotlinReferenceServerIntegrationTest" />
-    <option name="METHOD_NAME" value="" />
-    <option name="TEST_OBJECT" value="class" />
-    <method v="2">
-      <option name="Make" enabled="true" />
-    </method>
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/.run/Test Profile_ auth-apikey-custody.run.xml b/.run/Test Profile_ auth-apikey-custody.run.xml
new file mode 100644
index 0000000000..33b15572bd
--- /dev/null
+++ b/.run/Test Profile_ auth-apikey-custody.run.xml	
@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Test Profile: auth-apikey-custody" type="JetRunConfigurationType">
+    <envs>
+      <env name="app.enableTest" value="true" />
+      <env name="TEST_PROFILE_NAME" value="auth-apikey-custody" />
+    </envs>
+    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
+    <module name="java-stellar-anchor-sdk.service-runner.main" />
+    <shortenClasspath name="ARGS_FILE" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/Test Profile_ auth-apikey-platform.run.xml b/.run/Test Profile_ auth-apikey-platform.run.xml
new file mode 100644
index 0000000000..92d603b154
--- /dev/null
+++ b/.run/Test Profile_ auth-apikey-platform.run.xml	
@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Test Profile: auth-apikey-platform" type="JetRunConfigurationType">
+    <envs>
+      <env name="app.enableTest" value="true" />
+      <env name="TEST_PROFILE_NAME" value="auth-apikey-platform" />
+    </envs>
+    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
+    <module name="java-stellar-anchor-sdk.service-runner.main" />
+    <shortenClasspath name="ARGS_FILE" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/Test Profile_ auth-jwt-custody.run.xml b/.run/Test Profile_ auth-jwt-custody.run.xml
new file mode 100644
index 0000000000..c780e955b7
--- /dev/null
+++ b/.run/Test Profile_ auth-jwt-custody.run.xml	
@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Test Profile: auth-jwt-custody" type="JetRunConfigurationType">
+    <envs>
+      <env name="app.enableTest" value="true" />
+      <env name="TEST_PROFILE_NAME" value="auth-jwt-custody" />
+    </envs>
+    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
+    <module name="java-stellar-anchor-sdk.service-runner.main" />
+    <shortenClasspath name="ARGS_FILE" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/Test Profile_ auth-jwt-platform.run.xml b/.run/Test Profile_ auth-jwt-platform.run.xml
new file mode 100644
index 0000000000..e8158b0760
--- /dev/null
+++ b/.run/Test Profile_ auth-jwt-platform.run.xml	
@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Test Profile: auth-jwt-platform" type="JetRunConfigurationType">
+    <envs>
+      <env name="app.enableTest" value="true" />
+      <env name="TEST_PROFILE_NAME" value="auth-jwt-platform" />
+    </envs>
+    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
+    <module name="java-stellar-anchor-sdk.service-runner.main" />
+    <shortenClasspath name="ARGS_FILE" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/Test Profile_ custody.run.xml b/.run/Test Profile_ custody.run.xml
new file mode 100644
index 0000000000..8bfc635428
--- /dev/null
+++ b/.run/Test Profile_ custody.run.xml	
@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Test Profile: custody" type="JetRunConfigurationType">
+    <envs>
+      <env name="app.enableTest" value="true" />
+      <env name="TEST_PROFILE_NAME" value="custody" />
+    </envs>
+    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
+    <module name="java-stellar-anchor-sdk.service-runner.main" />
+    <shortenClasspath name="ARGS_FILE" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/Run - All Servers - no Docker.run.xml b/.run/Test Profile_ default.run.xml
similarity index 74%
rename from .run/Run - All Servers - no Docker.run.xml
rename to .run/Test Profile_ default.run.xml
index 37b6d97e91..048ba2e347 100644
--- a/.run/Run - All Servers - no Docker.run.xml	
+++ b/.run/Test Profile_ default.run.xml	
@@ -1,9 +1,9 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run - All Servers - no Docker" type="JetRunConfigurationType">
+  <configuration default="false" name="Test Profile: default" type="JetRunConfigurationType">
     <envs>
       <env name="app.enableTest" value="true" />
     </envs>
-    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunAllServers" />
+    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
     <method v="2">
diff --git a/.run/Test Profile_ rpc.run.xml b/.run/Test Profile_ rpc.run.xml
new file mode 100644
index 0000000000..bede51ddba
--- /dev/null
+++ b/.run/Test Profile_ rpc.run.xml	
@@ -0,0 +1,14 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Test Profile: rpc" type="JetRunConfigurationType">
+    <envs>
+      <env name="app.enableTest" value="true" />
+      <env name="TEST_PROFILE_NAME" value="rpc" />
+    </envs>
+    <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
+    <module name="java-stellar-anchor-sdk.service-runner.main" />
+    <shortenClasspath name="ARGS_FILE" />
+    <method v="2">
+      <option name="Make" enabled="true" />
+    </method>
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/Run - Wallet Reference Server - no Docker.run.xml b/.run/Wallet Reference Server_ default.run.xml
similarity index 76%
rename from .run/Run - Wallet Reference Server - no Docker.run.xml
rename to .run/Wallet Reference Server_ default.run.xml
index a01a10f891..65abfc5869 100644
--- a/.run/Run - Wallet Reference Server - no Docker.run.xml	
+++ b/.run/Wallet Reference Server_ default.run.xml	
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run - Wallet Reference Server - no Docker" type="JetRunConfigurationType">
+  <configuration default="false" name="Wallet Reference Server: default" type="JetRunConfigurationType">
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunWalletServer" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
diff --git a/api-schema/src/main/java/org/stellar/anchor/api/callback/PutCustomerRequest.java b/api-schema/src/main/java/org/stellar/anchor/api/callback/PutCustomerRequest.java
index ba010cec23..9a4dbfb738 100644
--- a/api-schema/src/main/java/org/stellar/anchor/api/callback/PutCustomerRequest.java
+++ b/api-schema/src/main/java/org/stellar/anchor/api/callback/PutCustomerRequest.java
@@ -113,10 +113,10 @@ public class PutCustomerRequest {
   String idCountryCode;
 
   @SerializedName("id_issue_date")
-  Instant idIssueDate;
+  String idIssueDate;
 
   @SerializedName("id_expiration_date")
-  Instant idExpirationDate;
+  String idExpirationDate;
 
   @SerializedName("id_number")
   String idNumber;
diff --git a/api-schema/src/main/java/org/stellar/anchor/api/sep/sep12/Sep12PutCustomerRequest.java b/api-schema/src/main/java/org/stellar/anchor/api/sep/sep12/Sep12PutCustomerRequest.java
index 573f23751b..40c0f3610e 100644
--- a/api-schema/src/main/java/org/stellar/anchor/api/sep/sep12/Sep12PutCustomerRequest.java
+++ b/api-schema/src/main/java/org/stellar/anchor/api/sep/sep12/Sep12PutCustomerRequest.java
@@ -1,7 +1,6 @@
 package org.stellar.anchor.api.sep.sep12;
 
 import com.google.gson.annotations.SerializedName;
-import java.time.Instant;
 import lombok.Builder;
 import lombok.Data;
 
@@ -109,10 +108,10 @@ public class Sep12PutCustomerRequest implements Sep12CustomerRequestBase {
   String idCountryCode;
 
   @SerializedName("id_issue_date")
-  Instant idIssueDate;
+  String idIssueDate;
 
   @SerializedName("id_expiration_date")
-  Instant idExpirationDate;
+  String idExpirationDate;
 
   @SerializedName("id_number")
   String idNumber;
diff --git a/build.gradle.kts b/build.gradle.kts
index 7ad4fc6748..669058017d 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -178,7 +178,7 @@ subprojects {
 
 allprojects {
   group = "org.stellar.anchor-sdk"
-  version = "2.5.1"
+  version = "2.5.2"
 
   tasks.jar {
     manifest {
diff --git a/core/src/main/java/org/stellar/anchor/sep10/Sep10Helper.java b/core/src/main/java/org/stellar/anchor/sep10/Sep10Helper.java
index e5cb2a5fa5..9f2d09b53d 100644
--- a/core/src/main/java/org/stellar/anchor/sep10/Sep10Helper.java
+++ b/core/src/main/java/org/stellar/anchor/sep10/Sep10Helper.java
@@ -4,6 +4,7 @@
 import static org.stellar.anchor.util.Log.infoF;
 
 import java.io.IOException;
+import org.stellar.anchor.api.exception.InvalidConfigException;
 import org.stellar.anchor.api.exception.SepException;
 import org.stellar.anchor.util.Sep1Helper;
 import org.stellar.sdk.FormatException;
@@ -34,13 +35,16 @@ public static String fetchSigningKeyFromClientDomain(String clientDomain) throws
       debugF("Validating client_domain signing key: {}", clientSigningKey);
       KeyPair.fromAccountId(clientSigningKey);
       return clientSigningKey;
-    } catch (IllegalArgumentException | FormatException ex) {
+    } catch (IllegalArgumentException | FormatException e) {
       infoF("SIGNING_KEY {} is not a valid Stellar account Id.", clientSigningKey);
       throw new SepException(
           String.format("SIGNING_KEY %s is not a valid Stellar account Id.", clientSigningKey));
-    } catch (IOException ioex) {
+    } catch (IOException e) {
       infoF("Unable to read from {}", url);
-      throw new SepException(String.format("Unable to read from %s", url), ioex);
+      throw new SepException(String.format("Unable to read from %s", url), e);
+    } catch (InvalidConfigException e) {
+      infoF("Invalid config: {}", e.getMessage());
+      throw new SepException(String.format("Invalid config: %s", e.getMessage()));
     }
   }
 }
diff --git a/core/src/main/java/org/stellar/anchor/sep12/Sep12Service.java b/core/src/main/java/org/stellar/anchor/sep12/Sep12Service.java
index 58991752d5..97f17a2823 100644
--- a/core/src/main/java/org/stellar/anchor/sep12/Sep12Service.java
+++ b/core/src/main/java/org/stellar/anchor/sep12/Sep12Service.java
@@ -6,11 +6,15 @@
 
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.Metrics;
+import java.time.LocalDate;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeParseException;
 import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import org.apache.commons.lang3.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.stellar.anchor.api.callback.*;
 import org.stellar.anchor.api.event.AnchorEvent;
@@ -81,6 +85,17 @@ public Sep12PutCustomerResponse putCustomer(Sep10Jwt token, Sep12PutCustomerRequ
       request.setAccount(token.getAccount());
     }
 
+    if (StringUtils.isNotEmpty(request.getIdIssueDate())) {
+      if (!isValidISO8601Date(request.getIdIssueDate())) {
+        throw new SepValidationException("Invalid 'id_issue_date'");
+      }
+    }
+    if (StringUtils.isNotEmpty(request.getIdExpirationDate())) {
+      if (!isValidISO8601Date(request.getIdExpirationDate())) {
+        throw new SepValidationException("Invalid 'id_expiration_date'");
+      }
+    }
+
     PutCustomerResponse response =
         customerIntegration.putCustomer(PutCustomerRequest.from(request));
 
@@ -226,4 +241,18 @@ void updateRequestMemoAndMemoType(@NotNull Sep12CustomerRequestBase requestBase,
     requestBase.setMemo(memo);
     requestBase.setMemoType(memoType);
   }
+
+  private boolean isValidISO8601Date(String dateStr) {
+    try {
+      LocalDate.parse(dateStr);
+      return true;
+    } catch (DateTimeParseException e) {
+      try {
+        ZonedDateTime.parse(dateStr);
+        return true;
+      } catch (DateTimeParseException e2) {
+        return false;
+      }
+    }
+  }
 }
diff --git a/core/src/main/java/org/stellar/anchor/sep24/Sep24Service.java b/core/src/main/java/org/stellar/anchor/sep24/Sep24Service.java
index 62366dbc14..83b0a7c53a 100644
--- a/core/src/main/java/org/stellar/anchor/sep24/Sep24Service.java
+++ b/core/src/main/java/org/stellar/anchor/sep24/Sep24Service.java
@@ -253,7 +253,6 @@ public InteractiveTransactionResponse withdraw(
 
     String quoteId = withdrawRequest.get("quote_id");
     if (quoteId != null) {
-      System.out.println(asset.getSep38AssetName() + 1231231);
       AssetInfo buyAsset = assetService.getAssetByName(withdrawRequest.get("destination_asset"));
       this.validatedAndPopulateQuote(
           quoteId, asset, buyAsset, strAmount, builder, WITHDRAWAL.toString(), txnId);
diff --git a/core/src/main/java/org/stellar/anchor/util/Sep1Helper.java b/core/src/main/java/org/stellar/anchor/util/Sep1Helper.java
index 9aca02d869..ed1b8f375d 100644
--- a/core/src/main/java/org/stellar/anchor/util/Sep1Helper.java
+++ b/core/src/main/java/org/stellar/anchor/util/Sep1Helper.java
@@ -7,7 +7,7 @@
 import org.stellar.anchor.api.exception.InvalidConfigException;
 
 public class Sep1Helper {
-  public static TomlContent readToml(String url) throws IOException {
+  public static TomlContent readToml(String url) throws IOException, InvalidConfigException {
     try {
       String tomlValue = NetUtil.fetch(url);
       return new TomlContent(tomlValue);
@@ -16,6 +16,12 @@ public static TomlContent readToml(String url) throws IOException {
           String.format("An error occurred while fetching the TOML from %s", url);
       Log.error(e.toString());
       throw new IOException(obfuscatedMessage); // Preserve the original exception as the cause
+    } catch (InvalidConfigException e) {
+      String obfuscatedMessage =
+          String.format("An error occurred while parsing the TOML from %s", url);
+      Log.error(e.toString());
+      throw new InvalidConfigException(
+          obfuscatedMessage); // Preserve the original exception as the cause
     }
   }
 
@@ -34,8 +40,16 @@ public static TomlContent parse(String tomlString) throws InvalidConfigException
   public static class TomlContent {
     private final Toml toml;
 
-    TomlContent(String tomlString) {
-      toml = new Toml().read(tomlString);
+    TomlContent(String tomlString) throws InvalidConfigException {
+      try {
+        toml = new Toml().read(tomlString);
+      } catch (Exception e) {
+        // Obfuscate the message and rethrow
+        String obfuscatedMessage = "Failed to parse TOML content. Invalid Config.";
+        Log.error(e.toString()); // Log the parsing exception
+        throw new InvalidConfigException(
+            obfuscatedMessage); // Preserve the original exception as the cause
+      }
     }
 
     public String getString(String key) {
diff --git a/core/src/test/kotlin/org/stellar/anchor/sep12/Sep12ServiceTest.kt b/core/src/test/kotlin/org/stellar/anchor/sep12/Sep12ServiceTest.kt
index a4fdbd514e..8c6da27a6f 100644
--- a/core/src/test/kotlin/org/stellar/anchor/sep12/Sep12ServiceTest.kt
+++ b/core/src/test/kotlin/org/stellar/anchor/sep12/Sep12ServiceTest.kt
@@ -243,6 +243,8 @@ class Sep12ServiceTest {
         .memoType("id")
         .type("sending_user")
         .firstName("John")
+        .idIssueDate("2023-12-13")
+        .idExpirationDate("2023-12-13T19:33:07Z")
         .build()
     val jwtToken = createJwtToken(TEST_ACCOUNT)
     assertDoesNotThrow { sep12Service.putCustomer(jwtToken, mockPutRequest) }
@@ -255,6 +257,8 @@ class Sep12ServiceTest {
         .memoType("id")
         .type("sending_user")
         .firstName("John")
+        .idIssueDate("2023-12-13")
+        .idExpirationDate("2023-12-13T19:33:07Z")
         .build()
     assertEquals(wantCallbackApiPutRequest, callbackApiPutRequestSlot.captured)
 
@@ -273,6 +277,42 @@ class Sep12ServiceTest {
     assertEquals(TEST_ACCOUNT, mockPutRequest.account)
   }
 
+  @Test
+  fun `Test put customer bad id_issue_date`() {
+    // Execute the request
+    val mockPutRequest =
+      Sep12PutCustomerRequest.builder()
+        .account(TEST_ACCOUNT)
+        .memo(TEST_MEMO)
+        .memoType("id")
+        .type("sending_user")
+        .firstName("John")
+        .idIssueDate("2023-12-13T19:33:07X")
+        .build()
+    val jwtToken = createJwtToken(TEST_ACCOUNT)
+
+    assertThrows<SepValidationException> { sep12Service.putCustomer(jwtToken, mockPutRequest) }
+    verify(exactly = 0) { customerIntegration.putCustomer(any()) }
+  }
+
+  @Test
+  fun `Test put customer bad id_expiration_date`() {
+    // Execute the request
+    val mockPutRequest =
+      Sep12PutCustomerRequest.builder()
+        .account(TEST_ACCOUNT)
+        .memo(TEST_MEMO)
+        .memoType("id")
+        .type("sending_user")
+        .firstName("John")
+        .idExpirationDate("2023-12-13T19:33:07X")
+        .build()
+    val jwtToken = createJwtToken(TEST_ACCOUNT)
+
+    assertThrows<SepValidationException> { sep12Service.putCustomer(jwtToken, mockPutRequest) }
+    verify(exactly = 0) { customerIntegration.putCustomer(any()) }
+  }
+
   @Test
   fun `Test put customer request failure`() {
     val callbackApiPutRequestSlot = slot<PutCustomerRequest>()
diff --git a/core/src/test/kotlin/org/stellar/anchor/sep38/Sep38ServiceTest.kt b/core/src/test/kotlin/org/stellar/anchor/sep38/Sep38ServiceTest.kt
index 0ce4d2a284..e209dcdf50 100644
--- a/core/src/test/kotlin/org/stellar/anchor/sep38/Sep38ServiceTest.kt
+++ b/core/src/test/kotlin/org/stellar/anchor/sep38/Sep38ServiceTest.kt
@@ -33,6 +33,7 @@ import org.stellar.anchor.config.Sep38Config
 import org.stellar.anchor.event.EventService
 import org.stellar.anchor.event.EventService.EventQueue.TRANSACTION
 import org.stellar.anchor.event.EventService.Session
+import org.stellar.anchor.util.Log.debug
 import org.stellar.anchor.util.StringHelper.json
 
 @Order(88)
@@ -110,7 +111,7 @@ class Sep38ServiceTest {
     assertNull(stellarJPYC.sellDeliveryMethods)
     assertNull(stellarJPYC.buyDeliveryMethods)
     wantAssets = listOf(fiatUSD, stellarUSDC)
-    println(stellarJPYC.exchangeableAssetNames)
+    debug(stellarJPYC.exchangeableAssetNames)
     assertTrue(stellarJPYC.exchangeableAssetNames.containsAll(wantAssets))
     assertTrue(wantAssets.containsAll(stellarJPYC.exchangeableAssetNames))
 
diff --git a/core/src/test/kotlin/org/stellar/anchor/util/LogTest.kt b/core/src/test/kotlin/org/stellar/anchor/util/LogTest.kt
index fd7b86b4ad..32972f7e64 100644
--- a/core/src/test/kotlin/org/stellar/anchor/util/LogTest.kt
+++ b/core/src/test/kotlin/org/stellar/anchor/util/LogTest.kt
@@ -6,18 +6,14 @@ import io.mockk.*
 import io.mockk.impl.annotations.MockK
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
 import org.slf4j.Logger
 import org.stellar.anchor.LockAndMockStatic
 import org.stellar.anchor.LockAndMockTest
-import org.stellar.anchor.config.AppConfig
 import org.stellar.anchor.config.PII
 import org.stellar.anchor.util.Log.shorter
-import org.stellar.sdk.Network.TESTNET
 
-@Disabled
 @ExtendWith(LockAndMockTest::class)
 internal class LogTest {
   @MockK(relaxed = true) private lateinit var logger: Logger
@@ -27,20 +23,13 @@ internal class LogTest {
     MockKAnnotations.init(this, relaxed = true)
   }
 
-  @Suppress("unused")
-  class TestBean {
-    val field1: String = "1"
-    val field2: String = "2"
-  }
-
-  @Suppress("unused")
   class TestBeanPII {
     val fieldNoPII: String = "no secret"
 
     @PII val fieldPII: String = "secret"
   }
 
-  val wantTestPIIJson = """{"fieldNoPII":"no secret"}"""
+  private val wantTestPIIJson = """{"fieldNoPII":"no secret"}"""
 
   @Test
   @LockAndMockStatic([Log::class])
@@ -85,25 +74,6 @@ internal class LogTest {
     verify { logger.trace("Hello$wantTestPIIJson") }
   }
 
-  @Suppress("unused")
-  class TestAppConfig : AppConfig {
-    override fun getStellarNetwork(): String {
-      return "TESTNET"
-    }
-
-    override fun getStellarNetworkPassphrase(): String {
-      return TESTNET.networkPassphrase
-    }
-
-    override fun getHorizonUrl(): String {
-      return "https://horizon.stellar.org"
-    }
-
-    override fun getLanguages(): MutableList<String> {
-      return mutableListOf("en")
-    }
-  }
-
   @Test
   @LockAndMockStatic([Log::class])
   fun `test errorEx`() {
@@ -122,6 +92,7 @@ internal class LogTest {
   }
 
   @Test
+  @LockAndMockStatic([Log::class])
   fun `test shorter string conversion`() {
     assertNull(shorter(null))
     assertEquals(shorter("123"), "123")
@@ -132,6 +103,7 @@ internal class LogTest {
   }
 
   @Test
+  @LockAndMockStatic([Log::class])
   fun `test getLogger`() {
     val logger = Log.getLogger()
     assertNotNull(logger)
diff --git a/core/src/test/kotlin/org/stellar/anchor/util/NetUtilTest.kt b/core/src/test/kotlin/org/stellar/anchor/util/NetUtilTest.kt
index 81eeecd20d..e009ed91b3 100644
--- a/core/src/test/kotlin/org/stellar/anchor/util/NetUtilTest.kt
+++ b/core/src/test/kotlin/org/stellar/anchor/util/NetUtilTest.kt
@@ -19,6 +19,7 @@ import org.junit.jupiter.params.provider.NullSource
 import org.junit.jupiter.params.provider.ValueSource
 import org.stellar.anchor.LockAndMockStatic
 import org.stellar.anchor.LockAndMockTest
+import org.stellar.anchor.LockStatic
 import org.stellar.anchor.util.NetUtil.*
 
 @Order(100)
@@ -100,6 +101,7 @@ internal class NetUtilTest {
         "file:///home/johndoe/a.toml"
       ]
   )
+  @LockStatic([NetUtil::class])
   fun `test valid urls with isUrlValid()`(testValue: String?) {
     assertTrue(isUrlValid(testValue))
   }
@@ -121,6 +123,7 @@ internal class NetUtilTest {
         ""
       ]
   )
+  @LockStatic([NetUtil::class])
   fun `test bad urls with isUrlValid()`(testValue: String?) {
     assertFalse(isUrlValid(testValue))
   }
@@ -139,6 +142,7 @@ internal class NetUtilTest {
         "127.0.0.1:8080"
       ]
   )
+  @LockStatic([NetUtil::class])
   fun `test valid server port with isServerPortValid`(testValue: String) {
     assertTrue(isServerPortValid(testValue, false))
   }
@@ -157,6 +161,7 @@ internal class NetUtilTest {
         ""
       ]
   )
+  @LockStatic([NetUtil::class])
   fun `test bad server port with isServerPortValid`(testValue: String?) {
     assertFalse(isServerPortValid(testValue, true))
   }
@@ -171,6 +176,7 @@ internal class NetUtilTest {
         "http://test.stellar.org:9800,test.stellar.org:9800",
       ]
   )
+  @LockStatic([NetUtil::class])
   fun `test good URLs for getDomainFromURL`(testUri: String, compareDomain: String) {
     val domain = getDomainFromURL(testUri)
     assertEquals(domain, compareDomain)
@@ -178,6 +184,7 @@ internal class NetUtilTest {
 
   @ParameterizedTest
   @ValueSource(strings = ["bad url", "http :///test.stellar.org:9800/"])
+  @LockStatic([NetUtil::class])
   fun `test bad URLs for getDomainFromURL`(testUrl: String) {
     org.junit.jupiter.api.assertThrows<MalformedURLException> { getDomainFromURL(testUrl) }
   }
diff --git a/core/src/test/kotlin/org/stellar/anchor/util/SepHelperTest.kt b/core/src/test/kotlin/org/stellar/anchor/util/SepHelperTest.kt
index b66ec2bbed..aac1c1ec72 100644
--- a/core/src/test/kotlin/org/stellar/anchor/util/SepHelperTest.kt
+++ b/core/src/test/kotlin/org/stellar/anchor/util/SepHelperTest.kt
@@ -1,12 +1,16 @@
 package org.stellar.anchor.util
 
+import io.mockk.every
+import io.mockk.mockkStatic
 import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Disabled
+import org.junit.jupiter.api.Assertions.assertTrue
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.CsvSource
 import org.junit.jupiter.params.provider.ValueSource
+import org.stellar.anchor.LockAndMockStatic
+import org.stellar.anchor.api.exception.InvalidConfigException
 import org.stellar.sdk.xdr.MemoType
 
 internal class SepHelperTest {
@@ -44,9 +48,31 @@ internal class SepHelperTest {
         "AMCEO75Y6YKE53HM6N46IJYH3LK3YYFZ4QWGNUKCSSIQSH3KOAD7BEAAAAAAAAAAAPNT2W"
       ]
   )
-  @Disabled // This is disabled until AccountConverter.enableMuxed() is throwing exception on
-  // "MCEO75Y6YKE53HM6N46IJYH3LK3YYFZ4QWGNUKCSSIQSH3KOAD7BEAAAAAAAAAAAPNT2W___"
   fun `test invalid stellar account`(strAccount: String) {
     assertThrows<Exception> { SepHelper.getAccountMemo(strAccount) }
   }
+
+  @Test
+  @LockAndMockStatic([NetUtil::class])
+  fun `readToml throws InvalidConfigException when fetching instance metadata instead of TOML`() {
+    val mockUrl = "http://169.254.169.254/latest/meta-data/local-hostname"
+    val instanceMetadataContent =
+      """
+        hostname: ec2-instance-hostname
+        ami-id: ami-1234567890abcdef0
+        instance-id: i-1234567890abcdef0
+        instance-type: t2.micro
+        """
+        .trimIndent()
+    mockkStatic(NetUtil::class)
+    every { NetUtil.fetch(mockUrl) } returns instanceMetadataContent
+
+    var exceptionThrown = false
+    try {
+      Sep1Helper.readToml(mockUrl)
+    } catch (e: InvalidConfigException) {
+      exceptionThrown = true
+    }
+    assertTrue(exceptionThrown, "InvalidConfigException was expected but not thrown")
+  }
 }
diff --git a/docs/01 - Contributing/A - Development Environment.md b/docs/01 - Contributing/A - Development Environment.md
index 58013d1754..f9fe593f52 100644
--- a/docs/01 - Contributing/A - Development Environment.md	
+++ b/docs/01 - Contributing/A - Development Environment.md	
@@ -10,12 +10,18 @@
     * [Clean](#clean)
     * [Build](#build)
     * [Running Unit Tests](#running-unit-tests)
+    * [Running `docker-compose` up for development](#running-docker-compose-up-for-development)
+    * [Starting all servers](#starting-all-servers)
   * [Set up the Git Hooks](#set-up-the-git-hooks)
 * [Set up the Development Environment with IntelliJ IDEA](#set-up-the-development-environment-with-intellij-idea)
   * [Configuring Gradle on IntelliJ IDEA](#configuring-gradle-on-intellij-idea)
-  * [Run Configurations](#run-configurations)
-    * [Example: Debug the Platform Server](#example-debug-the-platform-server)
-    * [Example: Debug the Junit or the End-to-End Tests](#example-debug-the-junit-or-the-end-to-end-tests)
+  * [IntelliJ Run Configurations](#intellij-run-configurations)
+  * [Test Profiles](#test-profiles)
+  * [Development Scenarios](#development-scenarios)
+    * [How to debug the platform server](#how-to-debug-the-platform-server)
+    * [Debug the integration tests or the end-to-end tests](#debug-the-integration-tests-or-the-end-to-end-tests)
+      * [Option 1: Run the servers from IntelliJ](#option-1-run-the-servers-from-intellij)
+    * [Option 2: Run the servers and tests from Gradle](#option-2-run-the-servers-and-tests-from-gradle)
   * [Running the Tests From Gradle in IntelliJ](#running-the-tests-from-gradle-in-intellij)
 <!-- TOC -->
 
@@ -103,12 +109,15 @@ Run all tests: `./gradlew test`
 
 Run subproject tests: `./gradlew :[subproject]:test`
 
-### Running `docker-compose` up for development
+### Running `docker-compose up` for Kafka, Zookeeper, Postgres, and SEP24 Reference UI
 `./gradlew dockerComposeUp`
 
 ### Starting all servers
 `./gradlew startAllServers`
 
+### Starting the servers with a specific test profile
+`export TEST_PROFILE_NAME=rpc && ./gradlew startServersWithTestProfile`
+
 ## Set up the Git Hooks
 
 In order to have consistent code style, we use [Google Java Format](https://github.com/google/google-java-format) to
@@ -160,67 +169,69 @@ The project is mostly developed with IntelliJ, therefore we will only cover the
 
    ![gradle-reload-all.png](/docs/resources/img/gradle-reload-all.png)
 
-## Run Configurations
+## IntelliJ Run Configurations
 
 Several IntelliJ run configurations are provided to make it easier to run the project.
 
-- `Docker - Run Dev Stack - Zookeeper, Kafka, DB`: runs the development stack locally, using `docker-compose`.
-- `Run - All Servers - with Docker`: runs all the servers locally, using `docker-compose`.
-- `Run - All Servers - no Docker`: runs all the servers locally, without running `docker-compose`.
-- `Run - Sep Server - no Docker`: runs the SEP server locally, without running `docker-compose`.
-- `Run - Platform Server - no Docker`: runs the Platform server locally, without running `docker-compose`.
-- `Run - Event Processing Server - no Docker`: runs the Event Processing server locally, without
-  running `docker-compose`.
-- `Run - Custody Server - no Docker`: runs the Custody server locally, without running `docker-compose`.
-- `Run - Java Reference Server - no Docker`: runs the Java Reference server locally, without running `docker-compose`.
-- `Run - Kotlin Reference Server - no Docker`: runs the Kotlin Reference server locally, without
-  running `docker-compose`.
-
-The following run configurations are provided to run integration and end-2-end tests
-
-- `Test - End2End Test - no fullstack`: runs the end-2-end tests locally, without running `docker-compose`.
-- `Test - End2End Test - with fullstack`: runs the end-2-end tests locally, with running `docker-compose`.
-- `Test - End2End with RPC Test - no fullstack`: runs the end-2-end tests with RPC locally, 
-  without running `docker-compose`.
-- `Test - End2End with RPC Test - with fullstack`: runs the end-2-end tests with RPC locally, 
-  with running `docker-compose`.
-- `Test - Fireblocks End2End Test - no fullstack`: runs the end-2-end tests with Fireblocks locally, 
-  without running `docker-compose`.
-- `Test - Fireblocks End2End Test - with fullstack`: runs the end-2-end tests with Fireblocks locally, 
-  with running `docker-compose`. 
-- `Test - Fireblocks End2End with RPC Test - no fullstack`: runs the end-2-end tests with Fireblocks and RPC locally,
-  without running `docker-compose`.
-- `Test - Fireblocks End2End with RPC Test - with fullstack`: runs the end-2-end tests with Fireblocks and RPC locally,
-  with running `docker-compose`.
-- `Test - Integration Test - no fullstack`: runs the integration tests locally, without running `docker-compose`.
-- `Test - Integration Test - with fullstack`: runs the integration tests locally, with running `docker-compose`.
-
-### Example: Debug the Platform Server
+- `Docker - Run Dev Stack - Zookeeper, Kafka, Postgres, SEP24 Reference UI`: runs the development stack locally, using `docker-compose`.
+- `Test Profile: default`: runs the tests with the default profile.
+- `Test Profile: rpc`: runs the tests with the rpc profile.
+- `Test Profile: custody`: runs the tests with the custody profile.
+- `Test Profile: auth-apikey-custody`: runs the tests with the auth-apikey-custody profile.
+- `Test Profile: auth-jwt-custody`: runs the tests with the auth-jwt-custody profile.
+- `Test Profile: auth-apikey-platform`: runs the tests with the auth-apikey-platform profile.
+- `Test Profile: auth-jwt-platform`: runs the tests with the auth-jwt-platform profile.
+- `Sep Server: default`: runs the SEP server locally with `default` profile.
+- `Stellar Observer: default`: runs the Stellar Observer locally with `default` profile.
+- `Platform Server: default`: runs the Platform server locally with `default` profile.
+- `Event Processing Server: default`: runs the Event Processing server locally with `default` profile.
+- `Reference Server: default`: runs the Reference server locally with `default` profile.
+- `Wallet Reference Server: default`: runs the Wallet Reference server locally with `default` profile.
+- `Custody Server: custody`: runs the Custody server locally with `custody` profile.
+
+## Test Profiles
+There are several test profiles that can be used to start the Anchor platform servers. These test profiles are listed in the `service-runner/src/main/resources/profiles` folder.
+- `default`: starts all servers with the most commonly used configuration.
+- `rpc`: starts all servers with the RPC enabled.
+- `custody`: starts all servers with the custody servers enabled.
+- `auth-apikey-custody`: starts the custody servers with the API key authentication enabled.
+- `auth-jwt-custody`: starts the custody servers with the JWT authentication enabled.
+- `auth-apikey-platform`: starts the platform servers with the API key authentication enabled.
+- `auth-jwt-platform`: starts the platform servers with the JWT authentication enabled.
+
+## Development Scenarios
+### How to debug the platform server
 
 If you would like to debug the Platform server, you can do so by running the
 
 - Make sure `docker` and `docker-compose` is available on your local machine.
-- Run `Docker - Run Dev Stack - Zookeeper, Kafka, DB` to start the development stack.
-- Run `Run - Sep Server - no Docker` to start the SEP server.
-- Debug `Run - Platform Server - no Docker` to start debugging the Platform server.
+- Check if there are previous docker containers running on your machine. If there are, please stop and delete them.
+- Run `Docker - Run Dev Stack - Zookeeper, Kafka, Postgres, SEP24 Reference UI` to start the development stack.
+- Debug `Sep Server: default` to start the SEP server.
+
+### Debug the integration tests or the end-to-end tests
 
-### Example: Debug the Junit or the End-to-End Tests
+If you would like to debug the unit tests or the end-to-end tests, there are two options:
 
-If you would like to debug the unit tests or the end-to-end tests
 
+#### Option 1: Run the servers from IntelliJ
 - Make sure `docker` and `docker-compose` is available on your local machine.
-- Run or Debug `Run - All Servers - with Docker`
-- Debug `Test - End2End Test - no fullstack` or `Test - Integration Test - no fullstack`
+- Check if there are previous docker containers running on your machine. If there are, please stop and delete them.
+- Run `Docker - Run Dev Stack - Zookeeper, Kafka, Postgres, SEP24 Reference UI` to start the development stack.
+- Run `Test Profile: default` to run the servers with the `default` profile.
+- Debug the tests you want to run with the IntelliJ debugger.
 
-## Running the Tests From Gradle in IntelliJ
+### Option 2: Run the servers and tests from Gradle
+- Make sure `docker` and `docker-compose` is available on your local machine.
+- Check if there are previous docker containers running on your machine. If there are, please stop and delete them.
+- Navigate to the directory to the project folder
+- `./gradlew dockerComposeUp` to start the development stack.
+- `export TEST_PROFILE_NAME=rpc && ./gradlew startServersWithTestProfile` to start the servers with `rpc`. You can also choose other test profile name by changing the value of `TEST_PROFILE_NAME`.
+- `./gradlew :extended-tests:test --tests org.stellar.anchor.platform.suite.RpcTestSuite`
 
-To make sure your configuration worked, please make sure you can run all the tests successfully from the IDE:
+## Running the Tests From Gradle in IntelliJ
 
 1. Open the Gradle tool window: `View -> Tool Windows -> Gradle`.
 2. Navigate to the all tests option: `Tasks -> verification -> test`.
 3. Right-click it and select the `run` or `debug` option:
    ![running-the-tests.png](/docs/resources/img/running-the-tests.png)
-
-__Note__: You may need to check there is no active docker containers running on your machine from the previous debug
-sessions. If there are, please stop and delete them. 
-
diff --git a/docs/README.md b/docs/README.md
index 6732bec1f6..a2ceb3f0a5 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,6 +1,6 @@
 [![License](https://badgen.net/badge/license/Apache%202/blue?icon=github&label=License)](https://github.com/stellar/java-stellar-anchor-sdk/blob/develop/LICENSE)
 [![GitHub Version](https://badgen.net/github/release/stellar/java-stellar-anchor-sdk?icon=github&label=Latest%20release)](https://github.com/stellar/java-stellar-anchor-sdk/releases)
-[![Docker](https://badgen.net/badge/Latest%20Release/v2.5.1/blue?icon=docker)](https://hub.docker.com/r/stellar/anchor-platform/tags?page=1&name=2.5.1)
+[![Docker](https://badgen.net/badge/Latest%20Release/v2.5.2/blue?icon=docker)](https://hub.docker.com/r/stellar/anchor-platform/tags?page=1&name=2.5.1)
 ![Develop Branch](https://github.com/stellar/java-stellar-anchor-sdk/actions/workflows/wk_push_to_develop.yml/badge.svg?branch=develop)
 
 <div style="text-align: center">
diff --git a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep24End2EndTests.kt b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep24End2EndTests.kt
index a71735526a..da490901c3 100644
--- a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep24End2EndTests.kt
+++ b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep24End2EndTests.kt
@@ -31,6 +31,7 @@ import org.stellar.anchor.auth.Sep24InteractiveUrlJwt
 import org.stellar.anchor.platform.AbstractIntegrationTests
 import org.stellar.anchor.platform.CLIENT_WALLET_SECRET
 import org.stellar.anchor.platform.TestConfig
+import org.stellar.anchor.util.Log.debug
 import org.stellar.anchor.util.Log.info
 import org.stellar.reference.client.AnchorReferenceServerClient
 import org.stellar.reference.wallet.WalletServerClient
@@ -51,7 +52,7 @@ const val DEPOSIT_FUND_CLIENT_SECRET_2 = "SCW2SJEPTL4K7FFPFOFABFEFZJCG6LHULWVJX6
 
 @TestInstance(PER_CLASS)
 @Execution(CONCURRENT)
-class Sep24End2EndTests : AbstractIntegrationTests(TestConfig()) {
+open class Sep24End2EndTests : AbstractIntegrationTests(TestConfig()) {
   private val client = HttpClient {
     install(HttpTimeout) {
       requestTimeoutMillis = 300000
@@ -106,12 +107,32 @@ class Sep24End2EndTests : AbstractIntegrationTests(TestConfig()) {
     assertEquals(fetchedTxn.id, transactionByStellarId.id)
 
     // Check the events sent to the reference server are recorded correctly
-    val actualEvents = waitForBusinessServerEvents(response.id, 5)
-    assertEvents(actualEvents, expectedDepositStatuses)
+    val actualEvents = waitForBusinessServerEvents(response.id, getExpectedDepositStatus().size)
+    assertEvents(actualEvents, getExpectedDepositStatus())
 
     // Check the callbacks sent to the wallet reference server are recorded correctly
-    val actualCallbacks = waitForWalletServerCallbacks(response.id, 5)
-    assertCallbacks(actualCallbacks, expectedDepositStatuses)
+    val actualCallbacks = waitForWalletServerCallbacks(response.id, getExpectedDepositStatus().size)
+    assertCallbacks(actualCallbacks, getExpectedDepositStatus())
+  }
+
+  open fun getExpectedDepositStatus(): List<Pair<AnchorEvent.Type, SepTransactionStatus>> {
+    return listOf(
+      TRANSACTION_CREATED to SepTransactionStatus.INCOMPLETE,
+      TRANSACTION_STATUS_CHANGED to SepTransactionStatus.PENDING_USR_TRANSFER_START,
+      TRANSACTION_STATUS_CHANGED to SepTransactionStatus.PENDING_ANCHOR,
+      TRANSACTION_STATUS_CHANGED to SepTransactionStatus.PENDING_STELLAR,
+      TRANSACTION_STATUS_CHANGED to SepTransactionStatus.COMPLETED
+    )
+  }
+
+  open fun getExpectedWithdrawalStatus(): List<Pair<AnchorEvent.Type, SepTransactionStatus>> {
+    return listOf(
+      TRANSACTION_CREATED to SepTransactionStatus.INCOMPLETE,
+      TRANSACTION_STATUS_CHANGED to SepTransactionStatus.PENDING_USR_TRANSFER_START,
+      TRANSACTION_STATUS_CHANGED to SepTransactionStatus.PENDING_ANCHOR,
+      TRANSACTION_STATUS_CHANGED to SepTransactionStatus.PENDING_EXTERNAL,
+      TRANSACTION_STATUS_CHANGED to SepTransactionStatus.COMPLETED
+    )
   }
 
   private suspend fun makeDeposit(
@@ -230,12 +251,13 @@ class Sep24End2EndTests : AbstractIntegrationTests(TestConfig()) {
     assertEquals(fetchTxn.id, transactionByStellarId.id)
 
     // Check the events sent to the reference server are recorded correctly
-    val actualEvents = waitForBusinessServerEvents(withdrawTxn.id, 5)
-    assertEvents(actualEvents, expectedWithdrawalStatuses)
+    val actualEvents =
+      waitForBusinessServerEvents(withdrawTxn.id, getExpectedWithdrawalStatus().size)
+    assertEvents(actualEvents, getExpectedWithdrawalStatus())
 
     // Check the callbacks sent to the wallet reference server are recorded correctly
     val actualCallbacks = waitForWalletServerCallbacks(withdrawTxn.id, 5)
-    assertCallbacks(actualCallbacks, expectedWithdrawalStatuses)
+    assertCallbacks(actualCallbacks, getExpectedWithdrawalStatus())
   }
 
   private suspend fun waitForWalletServerCallbacks(
@@ -335,28 +357,12 @@ class Sep24End2EndTests : AbstractIntegrationTests(TestConfig()) {
       }
     val history = anchor.interactive().getTransactionsForAsset(asset, token)
     assertThat(history).allMatch { deposits.contains(it.id) }
-    println("test created transactions show up in the get history call passed")
+    debug("test created transactions show up in the get history call passed")
   }
 
   companion object {
     private val USDC =
       IssuedAssetId("USDC", "GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP")
-    private val expectedDepositStatuses =
-      listOf(
-        TRANSACTION_CREATED to SepTransactionStatus.INCOMPLETE,
-        TRANSACTION_STATUS_CHANGED to SepTransactionStatus.PENDING_USR_TRANSFER_START,
-        TRANSACTION_STATUS_CHANGED to SepTransactionStatus.PENDING_ANCHOR,
-        TRANSACTION_STATUS_CHANGED to SepTransactionStatus.PENDING_STELLAR,
-        TRANSACTION_STATUS_CHANGED to SepTransactionStatus.COMPLETED
-      )
-    private val expectedWithdrawalStatuses =
-      listOf(
-        TRANSACTION_CREATED to SepTransactionStatus.INCOMPLETE,
-        TRANSACTION_STATUS_CHANGED to SepTransactionStatus.PENDING_USR_TRANSFER_START,
-        TRANSACTION_STATUS_CHANGED to SepTransactionStatus.PENDING_ANCHOR,
-        TRANSACTION_STATUS_CHANGED to SepTransactionStatus.PENDING_EXTERNAL,
-        TRANSACTION_STATUS_CHANGED to SepTransactionStatus.COMPLETED
-      )
 
     @JvmStatic
     fun depositAssetsAndAmounts(): Stream<Arguments> {
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep31End2EndTests.kt b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep31End2EndTests.kt
similarity index 68%
rename from extended-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep31End2EndTests.kt
rename to essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep31End2EndTests.kt
index d5f16b78f3..779c7254d2 100644
--- a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep31End2EndTests.kt
+++ b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep31End2EndTests.kt
@@ -1,14 +1,17 @@
-package org.stellar.anchor.platform.test
+package org.stellar.anchor.platform.e2etest
 
-import io.ktor.client.plugins.*
 import io.ktor.http.*
-import junit.framework.TestCase.assertEquals
-import junit.framework.TestCase.fail
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.runBlocking
 import org.junit.jupiter.api.Assertions
+import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNotNull
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.TestInstance
+import org.junit.jupiter.api.fail
+import org.junit.jupiter.api.parallel.Execution
+import org.junit.jupiter.api.parallel.ExecutionMode
 import org.stellar.anchor.api.callback.SendEventRequest
 import org.stellar.anchor.api.callback.SendEventRequestPayload
 import org.stellar.anchor.api.event.AnchorEvent
@@ -23,6 +26,7 @@ import org.stellar.anchor.auth.AuthHelper
 import org.stellar.anchor.client.Sep12Client
 import org.stellar.anchor.client.Sep31Client
 import org.stellar.anchor.client.Sep38Client
+import org.stellar.anchor.platform.AbstractIntegrationTests
 import org.stellar.anchor.platform.CLIENT_WALLET_SECRET
 import org.stellar.anchor.platform.TestConfig
 import org.stellar.anchor.platform.integrationtest.Sep12Tests.Companion.testCustomer1Json
@@ -30,35 +34,27 @@ import org.stellar.anchor.platform.integrationtest.Sep12Tests.Companion.testCust
 import org.stellar.anchor.util.GsonUtils
 import org.stellar.anchor.util.Log.info
 import org.stellar.anchor.util.MemoHelper
-import org.stellar.anchor.util.Sep1Helper
 import org.stellar.reference.client.AnchorReferenceServerClient
 import org.stellar.reference.wallet.WalletServerClient
-import org.stellar.walletsdk.ApplicationConfiguration
-import org.stellar.walletsdk.StellarConfiguration
-import org.stellar.walletsdk.Wallet
 import org.stellar.walletsdk.anchor.MemoType
 import org.stellar.walletsdk.asset.IssuedAssetId
-import org.stellar.walletsdk.asset.StellarAssetId
 import org.stellar.walletsdk.horizon.SigningKeyPair
 import org.stellar.walletsdk.horizon.sign
 
-/** TODO: This should be moved into essential tests */
-class Sep31End2EndTests(config: TestConfig, val toml: Sep1Helper.TomlContent, val jwt: String) {
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Execution(ExecutionMode.CONCURRENT)
+open class Sep31End2EndTests : AbstractIntegrationTests(TestConfig()) {
+
   private val gson = GsonUtils.getInstance()
   private val walletSecretKey = System.getenv("WALLET_SECRET_KEY") ?: CLIENT_WALLET_SECRET
   private val keypair = SigningKeyPair.fromSecret(walletSecretKey)
-  private val wallet =
-    Wallet(
-      StellarConfiguration.Testnet,
-      ApplicationConfiguration { defaultRequest { url { protocol = URLProtocol.HTTP } } }
-    )
   private val maxTries = 60
   private val anchorReferenceServerClient =
     AnchorReferenceServerClient(Url(config.env["reference.server.url"]!!))
   private val walletServerClient = WalletServerClient(Url(config.env["wallet.server.url"]!!))
-  private val sep12Client = Sep12Client(toml.getString("KYC_SERVER"), jwt)
-  private val sep31Client = Sep31Client(toml.getString("DIRECT_PAYMENT_SERVER"), jwt)
-  private val sep38Client = Sep38Client(toml.getString("ANCHOR_QUOTE_SERVER"), jwt)
+  private val sep12Client = Sep12Client(toml.getString("KYC_SERVER"), token.token)
+  private val sep31Client = Sep31Client(toml.getString("DIRECT_PAYMENT_SERVER"), token.token)
+  private val sep38Client = Sep38Client(toml.getString("ANCHOR_QUOTE_SERVER"), token.token)
   private val platformApiClient =
     PlatformApiClient(AuthHelper.forNone(), config.env["platform.server.url"]!!)
 
@@ -99,49 +95,53 @@ class Sep31End2EndTests(config: TestConfig, val toml: Sep1Helper.TomlContent, va
     }
   }
 
-  private fun `test typical receive end-to-end flow`(asset: StellarAssetId, amount: String) =
-    runBlocking {
-      walletServerClient.clearCallbacks()
-      anchorReferenceServerClient.clearEvents()
+  @Test
+  fun `test typical receive end to end flow`() = runBlocking {
+    val asset = USDC
+    val amount = "5"
+
+    walletServerClient.clearCallbacks()
+    anchorReferenceServerClient.clearEvents()
 
-      val senderCustomerRequest =
-        gson.fromJson(testCustomer1Json, Sep12PutCustomerRequest::class.java)
-      val senderCustomer = sep12Client.putCustomer(senderCustomerRequest)
+    val senderCustomerRequest =
+      gson.fromJson(testCustomer1Json, Sep12PutCustomerRequest::class.java)
+    val senderCustomer = sep12Client.putCustomer(senderCustomerRequest)
 
-      // Create receiver customer
-      val receiverCustomerRequest =
-        gson.fromJson(testCustomer2Json, Sep12PutCustomerRequest::class.java)
-      val receiverCustomer = sep12Client.putCustomer(receiverCustomerRequest)
+    // Create receiver customer
+    val receiverCustomerRequest =
+      gson.fromJson(testCustomer2Json, Sep12PutCustomerRequest::class.java)
+    val receiverCustomer = sep12Client.putCustomer(receiverCustomerRequest)
 
-      val quote = sep38Client.postQuote(asset.sep38, amount, FIAT_USD)
+    val quote = sep38Client.postQuote(asset.sep38, amount, FIAT_USD)
 
-      // POST Sep31 transaction
-      val txnRequest = gson.fromJson(postSep31TxnRequest, Sep31PostTransactionRequest::class.java)
-      txnRequest.senderId = senderCustomer!!.id
-      txnRequest.receiverId = receiverCustomer!!.id
-      txnRequest.quoteId = quote.id
-      val postTxResponse = sep31Client.postTransaction(txnRequest)
+    // POST Sep31 transaction
+    val txnRequest = gson.fromJson(postSep31TxnRequest, Sep31PostTransactionRequest::class.java)
+    txnRequest.senderId = senderCustomer!!.id
+    txnRequest.receiverId = receiverCustomer!!.id
+    txnRequest.quoteId = quote.id
+    val postTxResponse = sep31Client.postTransaction(txnRequest)
 
-      anchorReferenceServerClient.processSep31Receive(postTxResponse.id)
+    anchorReferenceServerClient.processSep31Receive(postTxResponse.id)
 
-      // Get transaction status and make sure it is PENDING_SENDER
-      val transaction = platformApiClient.getTransaction(postTxResponse.id)
-      assertEquals(SepTransactionStatus.PENDING_SENDER, transaction.status)
+    // Get transaction status and make sure it is PENDING_SENDER
+    val transaction = platformApiClient.getTransaction(postTxResponse.id)
+    assertEquals(SepTransactionStatus.PENDING_SENDER, transaction.status)
 
-      val memoType: MemoType =
-        when (postTxResponse.stellarMemoType) {
-          MemoHelper.memoTypeAsString(org.stellar.sdk.xdr.MemoType.MEMO_ID) -> {
-            MemoType.ID
-          }
-          MemoHelper.memoTypeAsString(org.stellar.sdk.xdr.MemoType.MEMO_HASH) -> {
-            MemoType.HASH
-          }
-          else -> {
-            MemoType.TEXT
-          }
+    val memoType: MemoType =
+      when (postTxResponse.stellarMemoType) {
+        MemoHelper.memoTypeAsString(org.stellar.sdk.xdr.MemoType.MEMO_ID) -> {
+          MemoType.ID
+        }
+        MemoHelper.memoTypeAsString(org.stellar.sdk.xdr.MemoType.MEMO_HASH) -> {
+          MemoType.HASH
         }
+        else -> {
+          MemoType.TEXT
+        }
+      }
 
-      // Submit transfer transaction
+    // Submit transfer transaction
+    transactionWithRetry {
       val transfer =
         wallet
           .stellar()
@@ -151,18 +151,19 @@ class Sep31End2EndTests(config: TestConfig, val toml: Sep1Helper.TomlContent, va
           .build()
       transfer.sign(keypair)
       wallet.stellar().submitTransaction(transfer)
+    }
 
-      // Wait for the status to change to COMPLETED
-      waitStatus(postTxResponse.id, SepTransactionStatus.COMPLETED)
+    // Wait for the status to change to COMPLETED
+    waitStatus(postTxResponse.id, SepTransactionStatus.COMPLETED)
 
-      // Check the events sent to the reference server are recorded correctly
-      val actualEvents = waitForBusinessServerEvents(postTxResponse.id, 3)
-      assertEvents(actualEvents, expectedStatuses)
+    // Check the events sent to the reference server are recorded correctly
+    val actualEvents = waitForBusinessServerEvents(postTxResponse.id, 3)
+    assertEvents(actualEvents, expectedStatuses)
 
-      // Check the callbacks sent to the wallet reference server are recorded correctly
-      val actualCallbacks = waitForWalletServerCallbacks(postTxResponse.id, 3)
-      assertCallbacks(actualCallbacks, expectedStatuses)
-    }
+    // Check the callbacks sent to the wallet reference server are recorded correctly
+    val actualCallbacks = waitForWalletServerCallbacks(postTxResponse.id, 3)
+    assertCallbacks(actualCallbacks, expectedStatuses)
+  }
 
   private suspend fun waitForWalletServerCallbacks(
     txnId: String,
@@ -222,11 +223,6 @@ class Sep31End2EndTests(config: TestConfig, val toml: Sep1Helper.TomlContent, va
     fail("Transaction wasn't $expectedStatus in $maxTries tries, last status: $status")
   }
 
-  fun testAll() {
-    info("Running SEP-31 USDC end-to-end tests...")
-    `test typical receive end-to-end flow`(USDC, "5")
-  }
-
   companion object {
     private val USDC =
       IssuedAssetId("USDC", "GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP")
diff --git a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep6End2EndTest.kt b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep6End2EndTest.kt
index a151395a85..06e2ec7ed9 100644
--- a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep6End2EndTest.kt
+++ b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep6End2EndTest.kt
@@ -29,7 +29,7 @@ import org.stellar.walletsdk.horizon.sign
 
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 @Execution(ExecutionMode.CONCURRENT)
-class Sep6End2EndTest : AbstractIntegrationTests(TestConfig()) {
+open class Sep6End2EndTest : AbstractIntegrationTests(TestConfig()) {
   private val maxTries = 30
   private val anchorReferenceServerClient =
     AnchorReferenceServerClient(Url(config.env["reference.server.url"]!!))
@@ -47,8 +47,8 @@ class Sep6End2EndTest : AbstractIntegrationTests(TestConfig()) {
         "email_address" to "john@email.com",
         "id_type" to "drivers_license",
         "id_country_code" to "CAN",
-        "id_issue_date" to "2023-01-01T05:00:00Z",
-        "id_expiration_date" to "2099-01-01T05:00:00Z",
+        "id_issue_date" to "2023-01-01",
+        "id_expiration_date" to "2099-01-01",
         "id_number" to "1234567890",
         "bank_account_number" to "13719713158835300",
         "bank_account_type" to "checking",
diff --git a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep12Tests.kt b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep12Tests.kt
index dd3f7ff0b9..b31607ce40 100644
--- a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep12Tests.kt
+++ b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep12Tests.kt
@@ -65,7 +65,6 @@ open class Sep12Tests : AbstractIntegrationTests(TestConfig()) {
     val ex: ClientRequestException = assertThrows {
       anchor.sep12(token).get(pr.id, type = "sep31-receiver")
     }
-    println(ex)
   }
 
   companion object {
diff --git a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep24Tests.kt b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep24Tests.kt
index 754a3a23d4..6c8805fd56 100644
--- a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep24Tests.kt
+++ b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep24Tests.kt
@@ -58,7 +58,6 @@ class Sep24Tests : AbstractIntegrationTests(TestConfig()) {
   fun `test Sep24 info endpoint`() = runBlocking {
     printRequest("Calling GET /info")
     val info = anchor.sep24().getServicesInfo()
-    println(gson.toJson(info))
     JSONAssert.assertEquals(expectedSep24Info, gson.toJson(info), JSONCompareMode.LENIENT)
   }
 
@@ -68,7 +67,6 @@ class Sep24Tests : AbstractIntegrationTests(TestConfig()) {
     printRequest("POST /transactions/withdraw/interactive")
     val withdrawRequest: HashMap<String, String> =
       gson.fromJson(withdrawRequest, object : TypeToken<HashMap<String, String>>() {}.type)
-    println(withdrawRequest)
     val response =
       anchor
         .sep24()
diff --git a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep31Tests.kt b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep31Tests.kt
index e30d4bd675..2decc13c1a 100644
--- a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep31Tests.kt
+++ b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep31Tests.kt
@@ -33,6 +33,7 @@ import org.stellar.anchor.platform.integrationtest.Sep12Tests.Companion.testCust
 import org.stellar.anchor.platform.integrationtest.Sep12Tests.Companion.testCustomer2Json
 import org.stellar.anchor.platform.printRequest
 import org.stellar.anchor.util.GsonUtils
+import org.stellar.anchor.util.Log.*
 import org.stellar.anchor.util.StringHelper.json
 
 lateinit var savedTxn: Sep31GetTransactionResponse
@@ -121,7 +122,7 @@ class Sep31Tests : AbstractIntegrationTests(TestConfig()) {
 
     val all = listOf(tx1, tx2, tx3)
 
-    println("Created transactions ${tx1.id} ${tx2.id} ${tx3.id}")
+    debug("Created transactions ${tx1.id} ${tx2.id} ${tx3.id}")
 
     // Basic test
     val txs = getTransactions(pageSize = 1000)
diff --git a/extended-tests/build.gradle.kts b/extended-tests/build.gradle.kts
index 6a6679cb9c..d7368fcbd0 100644
--- a/extended-tests/build.gradle.kts
+++ b/extended-tests/build.gradle.kts
@@ -31,16 +31,8 @@ tasks { bootJar { enabled = false } }
 
 // The following is to enable test concurrency
 apply(from = "$rootDir/scripts.gradle.kts")
+
 @Suppress("UNCHECKED_CAST")
 val enableTestConcurrency = extra["enableTestConcurrency"] as (Test) -> Unit
 
-tasks.test {
-// Useful exclusions for debugging tests
-//  exclude("**/org/stellar/anchor/platform/AnchorPlatformApiRpcEnd2EndTest**")
-//  exclude("**/org/stellar/anchor/platform/AnchorPlatformCustodyApiRpcEnd2EndTest**")
-//  exclude("**/org/stellar/anchor/platform/AnchorPlatformCustodyEnd2EndTest**")
-//  exclude("**/org/stellar/anchor/platform/AnchorPlatformCustodyIntegrationTest**")
-//  exclude("**/org/stellar/anchor/platform/CustodyApiKeyAuthIntegrationTest**")
-//  exclude("**/org/stellar/anchor/platform/CustodyJwtAuthIntegrationTest**")
-//  exclude("**/org/stellar/anchor/platform/PostgresMigrationTest**")
-}
+tasks.test { exclude("**/org/stellar/anchor/platform/extendedtest/**") }
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/AbstractAuthIntegrationTest.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/AbstractAuthIntegrationTest.kt
deleted file mode 100644
index b5090d774d..0000000000
--- a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/AbstractAuthIntegrationTest.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.stellar.anchor.platform
-
-import org.stellar.anchor.auth.AuthHelper
-import org.stellar.anchor.auth.JwtService
-import org.stellar.anchor.platform.AbstractIntegrationTest.Companion.ANCHOR_TO_PLATFORM_SECRET
-import org.stellar.anchor.platform.AbstractIntegrationTest.Companion.PLATFORM_TO_ANCHOR_SECRET
-import org.stellar.anchor.platform.AbstractIntegrationTest.Companion.PLATFORM_TO_CUSTODY_SECRET
-
-const val GET_TRANSACTIONS_ENDPOINT = "GET,/transactions"
-const val PATCH_TRANSACTIONS_ENDPOINT = "PATCH,/transactions"
-const val GET_TRANSACTIONS_MY_ID_ENDPOINT = "GET,/transactions/my_id"
-const val GET_EXCHANGE_QUOTES_ENDPOINT = "GET,/exchange/quotes"
-const val GET_EXCHANGE_QUOTES_ID_ENDPOINT = "GET,/exchange/quotes/id"
-const val POST_CUSTODY_TRANSACTION_ENDPOINT = "POST,/transactions"
-
-abstract class AbstractAuthIntegrationTest {
-  companion object {
-    private val jwtService =
-      JwtService(
-        null,
-        null,
-        null,
-        PLATFORM_TO_ANCHOR_SECRET,
-        ANCHOR_TO_PLATFORM_SECRET,
-        PLATFORM_TO_CUSTODY_SECRET
-      )
-    private val jwtWrongKeyService =
-      JwtService(
-        null,
-        null,
-        null,
-        PLATFORM_TO_ANCHOR_SECRET + "bad",
-        ANCHOR_TO_PLATFORM_SECRET + "bad",
-        PLATFORM_TO_CUSTODY_SECRET + "bad"
-      )
-
-    internal val jwtAuthHelper = AuthHelper.forJwtToken(jwtService, 10000)
-    internal val jwtWrongKeyAuthHelper = AuthHelper.forJwtToken(jwtWrongKeyService, 10000)
-    internal val jwtExpiredAuthHelper = AuthHelper.forJwtToken(jwtService, 0)
-    internal lateinit var testProfileRunner: TestProfileExecutor
-  }
-}
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/AbstractIntegrationTest.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/AbstractIntegrationTest.kt
deleted file mode 100644
index d1361fc76e..0000000000
--- a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/AbstractIntegrationTest.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.stellar.anchor.platform
-
-import io.ktor.client.plugins.*
-import io.ktor.http.*
-import kotlinx.coroutines.runBlocking
-import org.stellar.anchor.platform.test.CustodyApiTests
-import org.stellar.anchor.platform.test.PlatformApiCustodyTests
-import org.stellar.anchor.platform.test.Sep24BaseEnd2EndTest
-import org.stellar.anchor.platform.test.Sep31End2EndTests
-import org.stellar.anchor.util.Sep1Helper
-import org.stellar.walletsdk.ApplicationConfiguration
-import org.stellar.walletsdk.StellarConfiguration
-import org.stellar.walletsdk.Wallet
-import org.stellar.walletsdk.anchor.auth
-import org.stellar.walletsdk.horizon.SigningKeyPair
-
-open class AbstractIntegrationTest(private val config: TestConfig) {
-  companion object {
-    const val ANCHOR_TO_PLATFORM_SECRET = "myAnchorToPlatformSecret"
-    const val PLATFORM_TO_ANCHOR_SECRET = "myPlatformToAnchorSecret"
-    const val PLATFORM_TO_CUSTODY_SECRET = "myPlatformToCustodySecret"
-    const val PLATFORM_SERVER_PORT = 8085
-    const val CUSTODY_SERVER_SERVER_PORT = 8086
-    const val REFERENCE_SERVER_PORT = 8091
-    const val JWT_EXPIRATION_MILLISECONDS = 10000L
-  }
-
-  init {
-    System.getProperties()
-      .setProperty("REFERENCE_SERVER_CONFIG", "classpath:/anchor-reference-server.yaml")
-  }
-
-  val testProfileRunner = TestProfileExecutor(config)
-  lateinit var platformApiCustodyTests: PlatformApiCustodyTests
-  lateinit var custodyApiTests: CustodyApiTests
-  lateinit var sep24RpcE2eTests: Sep24BaseEnd2EndTest
-  lateinit var sep31RpcE2eTests: Sep31End2EndTests
-
-  fun setUp(envMap: Map<String, String>) {
-    envMap.forEach { (key, value) -> config.env[key] = value }
-    testProfileRunner.start()
-    setupTests()
-  }
-
-  fun tearDown() {
-    testProfileRunner.shutdown()
-  }
-
-  private fun setupTests() = runBlocking {
-    // Query SEP-1
-    val toml =
-      Sep1Helper.parse(resourceAsString("${config.env["anchor.domain"]}/.well-known/stellar.toml"))
-
-    // Get JWT
-    val jwt = auth()
-
-    platformApiCustodyTests = PlatformApiCustodyTests(config, toml, jwt)
-    custodyApiTests = CustodyApiTests(config, toml, jwt)
-    sep24RpcE2eTests = Sep24BaseEnd2EndTest(config, jwt)
-    sep31RpcE2eTests = Sep31End2EndTests(config, toml, jwt)
-  }
-
-  private suspend fun auth(): String {
-    val wallet =
-      Wallet(
-        StellarConfiguration.Testnet,
-        ApplicationConfiguration { defaultRequest { url { protocol = URLProtocol.HTTP } } }
-      )
-    val walletKeyPair = SigningKeyPair.fromSecret(CLIENT_WALLET_SECRET)
-    val anchor = wallet.anchor(config.env["anchor.domain"]!!)
-    return anchor.auth().authenticate(walletKeyPair).token
-  }
-}
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/AnchorPlatformApiRpcEnd2EndTest.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/AnchorPlatformApiRpcEnd2EndTest.kt
deleted file mode 100644
index e011ba0f6f..0000000000
--- a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/AnchorPlatformApiRpcEnd2EndTest.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package org.stellar.anchor.platform
-
-import org.junit.jupiter.api.*
-
-@TestMethodOrder(MethodOrderer.OrderAnnotation::class)
-class AnchorPlatformApiRpcEnd2EndTest :
-  AbstractIntegrationTest(
-    TestConfig(testProfileName = "default-rpc").also {
-      it.env[RUN_DOCKER] = "true"
-      it.env[RUN_ALL_SERVERS] = "false"
-      it.env[RUN_SEP_SERVER] = "true"
-      it.env[RUN_PLATFORM_SERVER] = "true"
-      it.env[RUN_EVENT_PROCESSING_SERVER] = "true"
-      it.env[RUN_PAYMENT_OBSERVER] = "true"
-      it.env[RUN_CUSTODY_SERVER] = "true"
-      it.env[RUN_KOTLIN_REFERENCE_SERVER] = "true"
-      it.env[RUN_WALLET_SERVER] = "true"
-    }
-  ) {
-
-  companion object {
-    private val singleton = AnchorPlatformApiRpcEnd2EndTest()
-
-    @BeforeAll
-    @JvmStatic
-    fun construct() {
-      println("Running AnchorPlatformApiRpcEnd2EndTest")
-      singleton.setUp(mapOf())
-    }
-
-    @AfterAll
-    @JvmStatic
-    fun destroy() {
-      singleton.tearDown()
-    }
-  }
-
-  @Test
-  @Order(1)
-  fun runSep24Test() {
-    singleton.sep24RpcE2eTests.testAll()
-  }
-
-  @Test
-  @Order(11)
-  fun runSep31Test() {
-    singleton.sep31RpcE2eTests.testAll()
-  }
-}
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/AnchorPlatformCustodyIntegrationTest.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/AnchorPlatformCustodyIntegrationTest.kt
deleted file mode 100644
index 2315d2dd2b..0000000000
--- a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/AnchorPlatformCustodyIntegrationTest.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package org.stellar.anchor.platform
-
-import kotlinx.coroutines.*
-import okhttp3.mockwebserver.MockWebServer
-import org.junit.jupiter.api.*
-
-@TestMethodOrder(MethodOrderer.OrderAnnotation::class)
-class AnchorPlatformCustodyIntegrationTest :
-  AbstractIntegrationTest(
-    TestConfig(testProfileName = "default-custody").also {
-      it.env[RUN_DOCKER] = "true"
-      it.env[RUN_ALL_SERVERS] = "false"
-      it.env[RUN_SEP_SERVER] = "true"
-      it.env[RUN_PLATFORM_SERVER] = "true"
-      it.env[RUN_EVENT_PROCESSING_SERVER] = "true"
-      it.env[RUN_PAYMENT_OBSERVER] = "true"
-      it.env[RUN_CUSTODY_SERVER] = "true"
-      it.env[RUN_KOTLIN_REFERENCE_SERVER] = "true"
-      it.env[RUN_WALLET_SERVER] = "false"
-    }
-  ) {
-  companion object {
-    private val singleton = AnchorPlatformCustodyIntegrationTest()
-    private val custodyMockServer = MockWebServer()
-
-    @BeforeAll
-    @JvmStatic
-    fun construct() {
-      println("Running AnchorPlatformCustodyIntegrationTest")
-      custodyMockServer.start()
-      val mockServerUrl = custodyMockServer.url("").toString()
-      singleton.setUp(mapOf("custody.fireblocks.base_url" to mockServerUrl))
-    }
-
-    @AfterAll
-    @JvmStatic
-    fun destroy() {
-      custodyMockServer.shutdown()
-      singleton.tearDown()
-    }
-  }
-
-  @Test
-  @Order(1)
-  fun runCustodyApiTest() {
-    singleton.custodyApiTests.testAll(custodyMockServer)
-  }
-
-  @Test
-  @Order(11)
-  fun runPlatformApiCustodyTest() {
-    singleton.platformApiCustodyTests.testAll(custodyMockServer)
-  }
-}
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/DatabaseMigrationTests.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/DatabaseMigrationTests.kt
deleted file mode 100644
index e3f446d943..0000000000
--- a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/DatabaseMigrationTests.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.stellar.anchor.platform
-
-import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.BeforeAll
-import org.junit.jupiter.api.Test
-
-val PostgresConfig =
-  TestConfig().also {
-    it.env[RUN_ALL_SERVERS] = "false"
-    it.env[RUN_SEP_SERVER] = "true"
-    it.env["data.flyway_enabled"] = "true"
-  }
-
-class PostgresMigrationTest : AbstractIntegrationTest(PostgresConfig) {
-  companion object {
-    private val singleton = PostgresMigrationTest()
-
-    @BeforeAll
-    @JvmStatic
-    fun construct() {
-      println("Running PostgresMigrationTest")
-      singleton.testProfileRunner.start()
-    }
-
-    @AfterAll
-    @JvmStatic
-    fun destroy() {
-      singleton.testProfileRunner.shutdown()
-    }
-  }
-
-  @Test
-  fun test() {
-    // Nothing to do
-  }
-}
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/auth/AbstractAuthIntegrationTest.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/auth/AbstractAuthIntegrationTest.kt
new file mode 100644
index 0000000000..263d8bb9c7
--- /dev/null
+++ b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/auth/AbstractAuthIntegrationTest.kt
@@ -0,0 +1,48 @@
+package org.stellar.anchor.platform.extendedtest.auth
+
+import org.stellar.anchor.auth.AuthHelper
+import org.stellar.anchor.auth.JwtService
+import org.stellar.anchor.platform.TestProfileExecutor
+
+abstract class AbstractAuthIntegrationTest {
+  companion object {
+    const val ANCHOR_TO_PLATFORM_SECRET = "myAnchorToPlatformSecret"
+    const val PLATFORM_TO_ANCHOR_SECRET = "myPlatformToAnchorSecret"
+    const val PLATFORM_TO_CUSTODY_SECRET = "myPlatformToCustodySecret"
+    const val PLATFORM_SERVER_PORT = 8085
+    const val CUSTODY_SERVER_SERVER_PORT = 8086
+    const val REFERENCE_SERVER_PORT = 8091
+    const val JWT_EXPIRATION_MILLISECONDS = 10000L
+
+    const val GET_TRANSACTIONS_ENDPOINT = "GET,/transactions"
+    const val PATCH_TRANSACTIONS_ENDPOINT = "PATCH,/transactions"
+    const val GET_TRANSACTIONS_MY_ID_ENDPOINT = "GET,/transactions/my_id"
+    const val GET_EXCHANGE_QUOTES_ENDPOINT = "GET,/exchange/quotes"
+    const val GET_EXCHANGE_QUOTES_ID_ENDPOINT = "GET,/exchange/quotes/id"
+    const val POST_CUSTODY_TRANSACTION_ENDPOINT = "POST,/transactions"
+
+    private val jwtService =
+      JwtService(
+        null,
+        null,
+        null,
+        PLATFORM_TO_ANCHOR_SECRET,
+        ANCHOR_TO_PLATFORM_SECRET,
+        PLATFORM_TO_CUSTODY_SECRET
+      )
+    private val jwtWrongKeyService =
+      JwtService(
+        null,
+        null,
+        null,
+        PLATFORM_TO_ANCHOR_SECRET + "bad",
+        ANCHOR_TO_PLATFORM_SECRET + "bad",
+        PLATFORM_TO_CUSTODY_SECRET + "bad"
+      )
+
+    internal val jwtAuthHelper = AuthHelper.forJwtToken(jwtService, 10000)
+    internal val jwtWrongKeyAuthHelper = AuthHelper.forJwtToken(jwtWrongKeyService, 10000)
+    internal val jwtExpiredAuthHelper = AuthHelper.forJwtToken(jwtService, 0)
+    internal lateinit var testProfileRunner: TestProfileExecutor
+  }
+}
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/CustodyApiKeyAuthIntegrationTest.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/auth/apikey/custody/AuthApiKeyCustodyTests.kt
similarity index 54%
rename from extended-tests/src/test/kotlin/org/stellar/anchor/platform/CustodyApiKeyAuthIntegrationTest.kt
rename to extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/auth/apikey/custody/AuthApiKeyCustodyTests.kt
index bdb13eb9f2..370d96aafc 100644
--- a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/CustodyApiKeyAuthIntegrationTest.kt
+++ b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/auth/apikey/custody/AuthApiKeyCustodyTests.kt
@@ -1,43 +1,18 @@
-package org.stellar.anchor.platform
+package org.stellar.anchor.platform.extendedtest.auth.apikey.custody
 
 import java.util.concurrent.TimeUnit
 import kotlin.test.assertEquals
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
-import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.CsvSource
+import org.stellar.anchor.platform.extendedtest.auth.AbstractAuthIntegrationTest
 import org.stellar.anchor.util.GsonUtils
 import org.stellar.anchor.util.OkHttpUtil
 
-internal class CustodyApiKeyAuthIntegrationTest : AbstractAuthIntegrationTest() {
-  companion object {
-    @BeforeAll
-    @JvmStatic
-    fun setup() {
-      println("Running CustodyApiKeyAuthIntegrationTest")
-      testProfileRunner =
-        TestProfileExecutor(
-          TestConfig(testProfileName = "default-custody").also {
-            it.env[RUN_DOCKER] = "true"
-            it.env[RUN_ALL_SERVERS] = "false"
-            it.env[RUN_CUSTODY_SERVER] = "true"
-
-            // enable custody server api_key auth
-            it.env["custody_server.auth.type"] = "api_key"
-          }
-        )
-      testProfileRunner.start()
-    }
-
-    @AfterAll
-    @JvmStatic
-    fun breakdown() {
-      testProfileRunner.shutdown()
-    }
-  }
+// use TEST_PROFILE_NAME = "auth-apikey-custody"
+internal class AuthApiKeyCustodyTests : AbstractAuthIntegrationTest() {
 
   private val gson = GsonUtils.getInstance()
   private val httpClient: OkHttpClient =
@@ -52,7 +27,7 @@ internal class CustodyApiKeyAuthIntegrationTest : AbstractAuthIntegrationTest()
   fun test_incomingCustodyAuth_emptyApiKey_authFails(method: String, endpoint: String) {
     val httpRequest =
       Request.Builder()
-        .url("http://localhost:${AbstractIntegrationTest.CUSTODY_SERVER_SERVER_PORT}$endpoint")
+        .url("http://localhost:$CUSTODY_SERVER_SERVER_PORT$endpoint")
         .header("Content-Type", "application/json")
         .method(method, getCustodyDummyRequestBody())
         .build()
@@ -65,20 +40,15 @@ internal class CustodyApiKeyAuthIntegrationTest : AbstractAuthIntegrationTest()
   fun test_incomingCustodyAuth_emptyApiKey_authPasses(method: String, endpoint: String) {
     val httpRequest =
       Request.Builder()
-        .url("http://localhost:${AbstractIntegrationTest.CUSTODY_SERVER_SERVER_PORT}$endpoint")
+        .url("http://localhost:$CUSTODY_SERVER_SERVER_PORT$endpoint")
         .header("Content-Type", "application/json")
-        .header("X-Api-Key", AbstractIntegrationTest.PLATFORM_TO_CUSTODY_SECRET)
+        .header("X-Api-Key", PLATFORM_TO_CUSTODY_SECRET)
         .method(method, getCustodyDummyRequestBody())
         .build()
     val response = httpClient.newCall(httpRequest).execute()
     assertEquals(200, response.code)
   }
 
-  private fun getPlatformDummyRequestBody(method: String): RequestBody? {
-    return if (method != "PATCH") null
-    else OkHttpUtil.buildJsonRequestBody(gson.toJson(mapOf("proposedAssetsJson" to "bar")))
-  }
-
   private fun getCustodyDummyRequestBody(): RequestBody? {
     return OkHttpUtil.buildJsonRequestBody(gson.toJson(mapOf("id" to "testId")))
   }
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/PlatformApiKeyAuthIntegrationTest.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/auth/apikey/platform/AuthApiKeyPlatformTests.kt
similarity index 66%
rename from extended-tests/src/test/kotlin/org/stellar/anchor/platform/PlatformApiKeyAuthIntegrationTest.kt
rename to extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/auth/apikey/platform/AuthApiKeyPlatformTests.kt
index 07e33c8e2a..72080e26a5 100644
--- a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/PlatformApiKeyAuthIntegrationTest.kt
+++ b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/auth/apikey/platform/AuthApiKeyPlatformTests.kt
@@ -1,45 +1,18 @@
-package org.stellar.anchor.platform
+package org.stellar.anchor.platform.extendedtest.auth.apikey.platform
 
 import java.util.concurrent.TimeUnit
 import kotlin.test.assertEquals
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
-import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.Assertions
-import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.CsvSource
+import org.stellar.anchor.platform.extendedtest.auth.*
 import org.stellar.anchor.util.GsonUtils
 import org.stellar.anchor.util.OkHttpUtil
 
-internal class PlatformApiKeyAuthIntegrationTest : AbstractAuthIntegrationTest() {
-  companion object {
-    @BeforeAll
-    @JvmStatic
-    fun setup() {
-      println("Running PlatformApiKeyAuthIntegrationTest")
-      testProfileRunner =
-        TestProfileExecutor(
-          TestConfig().also {
-            it.env[RUN_DOCKER] = "true"
-            it.env[RUN_ALL_SERVERS] = "false"
-            it.env[RUN_PLATFORM_SERVER] = "true"
-
-            // enable platform server api_key auth
-            it.env["platform_server.auth.type"] = "api_key"
-          }
-        )
-      testProfileRunner.start()
-    }
-
-    @AfterAll
-    @JvmStatic
-    fun breakdown() {
-      testProfileRunner.shutdown()
-    }
-  }
-
+internal class AuthApiKeyPlatformTests : AbstractAuthIntegrationTest() {
   private val gson = GsonUtils.getInstance()
   private val httpClient: OkHttpClient =
     OkHttpClient.Builder()
@@ -62,7 +35,7 @@ internal class PlatformApiKeyAuthIntegrationTest : AbstractAuthIntegrationTest()
   fun `test API_KEY auth protection of the platform server`(method: String, endpoint: String) {
     val httpRequest =
       Request.Builder()
-        .url("http://localhost:${AbstractIntegrationTest.PLATFORM_SERVER_PORT}$endpoint")
+        .url("http://localhost:${PLATFORM_SERVER_PORT}$endpoint")
         .header("Content-Type", "application/json")
         .method(method, getPlatformDummyRequestBody(method))
         .build()
@@ -84,9 +57,9 @@ internal class PlatformApiKeyAuthIntegrationTest : AbstractAuthIntegrationTest()
   fun `test the platform endpoints with API_KEY auth`(method: String, endpoint: String) {
     val httpRequest =
       Request.Builder()
-        .url("http://localhost:${AbstractIntegrationTest.PLATFORM_SERVER_PORT}$endpoint")
+        .url("http://localhost:${PLATFORM_SERVER_PORT}$endpoint")
         .header("Content-Type", "application/json")
-        .header("X-Api-Key", AbstractIntegrationTest.ANCHOR_TO_PLATFORM_SECRET)
+        .header("X-Api-Key", ANCHOR_TO_PLATFORM_SECRET)
         .method(method, getPlatformDummyRequestBody(method))
         .build()
     val response = httpClient.newCall(httpRequest).execute()
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/CustodyJwtAuthIntegrationTest.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/auth/jwt/custody/AuthJwtCustodyTests.kt
similarity index 75%
rename from extended-tests/src/test/kotlin/org/stellar/anchor/platform/CustodyJwtAuthIntegrationTest.kt
rename to extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/auth/jwt/custody/AuthJwtCustodyTests.kt
index 64ef873594..f81a9a7727 100644
--- a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/CustodyJwtAuthIntegrationTest.kt
+++ b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/auth/jwt/custody/AuthJwtCustodyTests.kt
@@ -1,12 +1,10 @@
-package org.stellar.anchor.platform
+package org.stellar.anchor.platform.extendedtest.auth.jwt.custody
 
 import java.util.concurrent.TimeUnit
 import kotlin.test.assertEquals
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
-import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.params.ParameterizedTest
@@ -16,35 +14,11 @@ import org.stellar.anchor.api.exception.CustodyException
 import org.stellar.anchor.platform.apiclient.CustodyApiClient
 import org.stellar.anchor.platform.config.CustodyApiConfig
 import org.stellar.anchor.platform.config.PropertyCustodySecretConfig
+import org.stellar.anchor.platform.extendedtest.auth.AbstractAuthIntegrationTest
+import org.stellar.anchor.platform.gson
 import org.stellar.anchor.util.OkHttpUtil
 
-internal class CustodyJwtAuthIntegrationTest : AbstractAuthIntegrationTest() {
-  companion object {
-    @BeforeAll
-    @JvmStatic
-    fun setup() {
-      println("Running CustodyJwtAuthIntegrationTest")
-      testProfileRunner =
-        TestProfileExecutor(
-          TestConfig(testProfileName = "default-custody").also {
-            it.env[RUN_DOCKER] = "true"
-            it.env[RUN_ALL_SERVERS] = "false"
-            it.env[RUN_CUSTODY_SERVER] = "true"
-
-            // enable custody server jwt auth
-            it.env["custody_server.auth.type"] = "jwt"
-          }
-        )
-      testProfileRunner.start()
-    }
-
-    @AfterAll
-    @JvmStatic
-    fun breakdown() {
-      testProfileRunner.shutdown()
-    }
-  }
-
+internal class AuthJwtCustodyTests : AbstractAuthIntegrationTest() {
   private val httpClient: OkHttpClient =
     OkHttpClient.Builder()
       .connectTimeout(10, TimeUnit.MINUTES)
@@ -76,7 +50,7 @@ internal class CustodyJwtAuthIntegrationTest : AbstractAuthIntegrationTest() {
     // Check if the request without JWT will cause a 403.
     val httpRequest =
       Request.Builder()
-        .url("http://localhost:${AbstractIntegrationTest.CUSTODY_SERVER_SERVER_PORT}${endpoint}")
+        .url("http://localhost:${CUSTODY_SERVER_SERVER_PORT}${endpoint}")
         .header("Content-Type", "application/json")
         .method(method, getCustodyDummyRequestBody())
         .build()
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/PlatformJwtAuthIntegrationTest.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/auth/jwt/platform/AuthJwtPlatformTests.kt
similarity index 71%
rename from extended-tests/src/test/kotlin/org/stellar/anchor/platform/PlatformJwtAuthIntegrationTest.kt
rename to extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/auth/jwt/platform/AuthJwtPlatformTests.kt
index 0c47948fe9..32b7c1afdd 100644
--- a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/PlatformJwtAuthIntegrationTest.kt
+++ b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/auth/jwt/platform/AuthJwtPlatformTests.kt
@@ -1,15 +1,11 @@
-package org.stellar.anchor.platform
+package org.stellar.anchor.platform.extendedtest.auth.jwt.platform
 
 import java.util.concurrent.TimeUnit
 import kotlin.test.assertEquals
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.RequestBody
-import org.junit.jupiter.api.AfterAll
-import org.junit.jupiter.api.BeforeAll
-import org.junit.jupiter.api.Disabled
-import org.junit.jupiter.api.Test
-import org.junit.jupiter.api.assertThrows
+import org.junit.jupiter.api.*
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.CsvSource
 import org.stellar.anchor.api.callback.GetCustomerRequest
@@ -17,46 +13,14 @@ import org.stellar.anchor.api.callback.GetFeeRequest
 import org.stellar.anchor.api.callback.GetRateRequest
 import org.stellar.anchor.api.exception.*
 import org.stellar.anchor.apiclient.PlatformApiClient
+import org.stellar.anchor.platform.*
 import org.stellar.anchor.platform.callback.RestCustomerIntegration
 import org.stellar.anchor.platform.callback.RestFeeIntegration
 import org.stellar.anchor.platform.callback.RestRateIntegration
+import org.stellar.anchor.platform.extendedtest.auth.*
 import org.stellar.anchor.util.OkHttpUtil
 
-internal class PlatformJwtAuthIntegrationTest : AbstractAuthIntegrationTest() {
-  companion object {
-    @BeforeAll
-    @JvmStatic
-    fun setup() {
-      println("Running PlatformJwtAuthIntegrationTest")
-      testProfileRunner =
-        TestProfileExecutor(
-          TestConfig().also {
-            it.env[RUN_DOCKER] = "true"
-            it.env[RUN_ALL_SERVERS] = "false"
-            it.env[RUN_PLATFORM_SERVER] = "true"
-
-            // enable platform server jwt auth
-            it.env["platform_server.auth.type"] = "JWT"
-            // enable business server callback auth
-            it.env["auth.type"] = "JWT"
-            it.env["auth.platformToAnchorSecret"] =
-              AbstractIntegrationTest.PLATFORM_TO_ANCHOR_SECRET
-            it.env["auth.anchorToPlatformSecret"] =
-              AbstractIntegrationTest.ANCHOR_TO_PLATFORM_SECRET
-            it.env["auth.expirationMilliseconds"] =
-              AbstractIntegrationTest.JWT_EXPIRATION_MILLISECONDS.toString()
-          }
-        )
-      testProfileRunner.start()
-    }
-
-    @AfterAll
-    @JvmStatic
-    fun breakdown() {
-      testProfileRunner.shutdown()
-    }
-  }
-
+internal class AuthJwtPlatformTests : AbstractAuthIntegrationTest() {
   // TODO - to be deprecated by platformAPI client
   private val httpClient: OkHttpClient =
     OkHttpClient.Builder()
@@ -125,12 +89,10 @@ internal class PlatformJwtAuthIntegrationTest : AbstractAuthIntegrationTest() {
   }
 
   @Test
-  // This is disabled because it is testing the callback auth instead of platform auth
-  @Disabled
   fun `test the callback customer endpoint with JWT auth`() {
     val rci =
       RestCustomerIntegration(
-        "http://localhost:${AbstractIntegrationTest.REFERENCE_SERVER_PORT}",
+        "http://localhost:${REFERENCE_SERVER_PORT}",
         httpClient,
         jwtAuthHelper,
         gson
@@ -142,12 +104,10 @@ internal class PlatformJwtAuthIntegrationTest : AbstractAuthIntegrationTest() {
   }
 
   @Test
-  // This is disabled because it is testing the callback auth instead of platform auth
-  @Disabled
   fun `test the callback rate endpoint with JWT auth`() {
     val rri =
       RestRateIntegration(
-        "http://localhost:${AbstractIntegrationTest.REFERENCE_SERVER_PORT}",
+        "http://localhost:${REFERENCE_SERVER_PORT}",
         httpClient,
         jwtAuthHelper,
         gson
@@ -157,12 +117,10 @@ internal class PlatformJwtAuthIntegrationTest : AbstractAuthIntegrationTest() {
   }
 
   @Test
-  // This is disabled because it is testing the callback auth instead of platform auth
-  @Disabled
   fun `test the callback fee endpoint with JWT auth`() {
     val rfi =
       RestFeeIntegration(
-        "http://localhost:${AbstractIntegrationTest.REFERENCE_SERVER_PORT}",
+        "http://localhost:${REFERENCE_SERVER_PORT}",
         httpClient,
         jwtAuthHelper,
         gson
@@ -175,7 +133,7 @@ internal class PlatformJwtAuthIntegrationTest : AbstractAuthIntegrationTest() {
   fun `test JWT protection of callback customer endpoint`() {
     val badTokenClient =
       RestCustomerIntegration(
-        "http://localhost:${AbstractIntegrationTest.REFERENCE_SERVER_PORT}",
+        "http://localhost:${REFERENCE_SERVER_PORT}",
         httpClient,
         jwtWrongKeyAuthHelper,
         gson
@@ -186,7 +144,7 @@ internal class PlatformJwtAuthIntegrationTest : AbstractAuthIntegrationTest() {
 
     val expiredTokenClient =
       RestCustomerIntegration(
-        "http://localhost:${AbstractIntegrationTest.REFERENCE_SERVER_PORT}",
+        "http://localhost:${REFERENCE_SERVER_PORT}",
         httpClient,
         jwtWrongKeyAuthHelper,
         gson
@@ -200,7 +158,7 @@ internal class PlatformJwtAuthIntegrationTest : AbstractAuthIntegrationTest() {
   fun `test JWT protection of callback rate endpoint`() {
     val badTokenClient =
       RestRateIntegration(
-        "http://localhost:${AbstractIntegrationTest.REFERENCE_SERVER_PORT}",
+        "http://localhost:${REFERENCE_SERVER_PORT}",
         httpClient,
         jwtWrongKeyAuthHelper,
         gson
@@ -209,7 +167,7 @@ internal class PlatformJwtAuthIntegrationTest : AbstractAuthIntegrationTest() {
 
     val expiredTokenClient =
       RestRateIntegration(
-        "http://localhost:${AbstractIntegrationTest.REFERENCE_SERVER_PORT}",
+        "http://localhost:${REFERENCE_SERVER_PORT}",
         httpClient,
         jwtExpiredAuthHelper,
         gson
@@ -223,7 +181,7 @@ internal class PlatformJwtAuthIntegrationTest : AbstractAuthIntegrationTest() {
   fun `test JWT protection of callback fee endpoint with bad token`() {
     val badTokenClient =
       RestFeeIntegration(
-        "http://localhost:${AbstractIntegrationTest.REFERENCE_SERVER_PORT}",
+        "http://localhost:${REFERENCE_SERVER_PORT}",
         httpClient,
         jwtWrongKeyAuthHelper,
         gson
@@ -232,7 +190,7 @@ internal class PlatformJwtAuthIntegrationTest : AbstractAuthIntegrationTest() {
 
     val expiredTokenClient =
       RestFeeIntegration(
-        "http://localhost:${AbstractIntegrationTest.REFERENCE_SERVER_PORT}",
+        "http://localhost:${REFERENCE_SERVER_PORT}",
         httpClient,
         jwtExpiredAuthHelper,
         gson
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/test/CustodyApiTests.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/custody/CustodyApiTests.kt
similarity index 78%
rename from extended-tests/src/test/kotlin/org/stellar/anchor/platform/test/CustodyApiTests.kt
rename to extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/custody/CustodyApiTests.kt
index 527aac9619..2f1a39d1a2 100644
--- a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/test/CustodyApiTests.kt
+++ b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/custody/CustodyApiTests.kt
@@ -1,12 +1,12 @@
-package org.stellar.anchor.platform.test
+package org.stellar.anchor.platform.extendedtest.custody
 
+import java.util.*
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
 import okhttp3.mockwebserver.RecordedRequest
-import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.Assertions.assertInstanceOf
-import org.junit.jupiter.api.assertThrows
+import org.junit.Assert.assertTrue
+import org.junit.jupiter.api.*
 import org.skyscreamer.jsonassert.Customization
 import org.skyscreamer.jsonassert.JSONAssert
 import org.skyscreamer.jsonassert.JSONCompareMode
@@ -15,57 +15,71 @@ import org.stellar.anchor.api.custody.CreateCustodyTransactionRequest
 import org.stellar.anchor.api.exception.SepException
 import org.stellar.anchor.api.exception.SepNotFoundException
 import org.stellar.anchor.api.rpc.method.*
-import org.stellar.anchor.api.rpc.method.RpcMethod.*
 import org.stellar.anchor.api.sep.SepTransactionStatus
 import org.stellar.anchor.apiclient.PlatformApiClient
 import org.stellar.anchor.auth.AuthHelper
 import org.stellar.anchor.client.CustodyApiClient
 import org.stellar.anchor.client.Sep24Client
+import org.stellar.anchor.platform.AbstractIntegrationTests
 import org.stellar.anchor.platform.TestConfig
-import org.stellar.anchor.platform.custody.fireblocks.FireblocksEventService.FIREBLOCKS_SIGNATURE_HEADER
 import org.stellar.anchor.platform.gson
-import org.stellar.anchor.util.Sep1Helper
-
-class CustodyApiTests(val config: TestConfig, val toml: Sep1Helper.TomlContent, jwt: String) {
-
-  companion object {
-    const val TX_ID_KEY = "TX_ID"
-  }
-
-  private val custodyApiClient = CustodyApiClient(config.env["custody.server.url"]!!, jwt)
-  private val sep24Client = Sep24Client(toml.getString("TRANSFER_SERVER_SEP0024"), jwt)
+import org.stellar.anchor.util.RSAUtil
+
+class CustodyApiTests : AbstractIntegrationTests(TestConfig("custody")) {
+  private val custodyApiClient =
+    CustodyApiClient(
+      config.env["custody.server.url"]!!,
+      token.token,
+      RSAUtil.generatePrivateKey(config.env["secret.custody.fireblocks.secret_key"])
+    )
+  private val sep24Client = Sep24Client(toml.getString("TRANSFER_SERVER_SEP0024"), token.token)
   private val platformApiClient =
     PlatformApiClient(AuthHelper.forNone(), config.env["platform.server.url"]!!)
 
-  fun testAll(custodyMockServer: MockWebServer) {
-    println("Performing Custody API tests...")
-
-    val mockServerDispatcher: Dispatcher =
-      object : Dispatcher() {
-        override fun dispatch(request: RecordedRequest): MockResponse {
-          if (
-            "POST" == request.method &&
-              "//v1/vault/accounts/1/XLM_USDC_T_CEKS/addresses" == request.path
-          ) {
-            return MockResponse().setResponseCode(200).setBody(CUSTODY_DEPOSIT_ADDRESS_RESPONSE)
-          }
-          if ("POST" == request.method && "//v1/transactions" == request.path) {
-            return MockResponse().setResponseCode(200).setBody(CUSTODY_TRANSACTION_PAYMENT_RESPONSE)
+  companion object {
+    const val TX_ID_KEY = "TX_ID"
+    const val CUSTODY_TX_ID_KEY = "CUSTODY_TX_ID"
+    private val custodyTxnId = UUID.randomUUID().toString()
+    private val refundCustodyTxnId = UUID.randomUUID().toString()
+    //    private val custodyTxnId = "df0442b4-6d53-44cd-82d7-3c48edc0b1ad"
+    private val custodyMockServer = MockWebServer()
+
+    @BeforeAll
+    @JvmStatic
+    fun construct() {
+      custodyMockServer.dispatcher =
+        object : Dispatcher() {
+          override fun dispatch(request: RecordedRequest): MockResponse {
+            if (
+              "POST" == request.method &&
+                "//v1/vault/accounts/1/XLM_USDC_T_CEKS/addresses" == request.path
+            ) {
+              return MockResponse().setResponseCode(200).setBody(CUSTODY_DEPOSIT_ADDRESS_RESPONSE)
+            }
+            if ("POST" == request.method && "//v1/transactions" == request.path) {
+              return MockResponse()
+                .setResponseCode(200)
+                .setBody(
+                  CUSTODY_TRANSACTION_PAYMENT_RESPONSE.replace(CUSTODY_TX_ID_KEY, custodyTxnId)
+                )
+            }
+            return MockResponse().setResponseCode(404)
           }
-          return MockResponse().setResponseCode(404)
         }
-      }
-
-    custodyMockServer.dispatcher = mockServerDispatcher
+      custodyMockServer.start(58086)
+    }
 
-    `test generate deposit address`(custodyMockServer)
-    `test custody transaction payment`(custodyMockServer)
-    `test custody transaction refund`(custodyMockServer)
+    @AfterAll
+    @JvmStatic
+    fun destroy() {
+      custodyMockServer.shutdown()
+    }
   }
 
-  private fun `test generate deposit address`(custodyMockServer: MockWebServer) {
+  @Test
+  fun `test generate deposit address`() {
     val ex: SepException = assertThrows { custodyApiClient.generateDepositAddress("invalidAsset") }
-    assertEquals(
+    Assertions.assertEquals(
       "{\"error\":\"Unable to find Fireblocks asset code by Stellar asset code [invalidAsset]\"}",
       ex.message
     )
@@ -80,18 +94,27 @@ class CustodyApiTests(val config: TestConfig, val toml: Sep1Helper.TomlContent,
       JSONCompareMode.STRICT
     )
 
-    val recordedRequest = custodyMockServer.takeRequest()
-
-    val requestPath = recordedRequest.path
-    val requestMethod = recordedRequest.method
-    val requestBody = recordedRequest.body.readUtf8()
-
-    assertEquals("//v1/vault/accounts/1/XLM_USDC_T_CEKS/addresses", requestPath.toString())
-    assertEquals("POST", requestMethod)
-    JSONAssert.assertEquals(CUSTODY_DEPOSIT_ADDRESS_REQUEST, requestBody, JSONCompareMode.STRICT)
+    for (count in 1..custodyMockServer.requestCount) {
+      val recordedRequest = custodyMockServer.takeRequest()
+      if (
+        recordedRequest.method.equals("POST") &&
+          recordedRequest.path.toString().equals("//v1/vault/accounts/1/XLM_USDC_T_CEKS/addresses")
+      ) {
+        Assertions.assertEquals(
+          "//v1/vault/accounts/1/XLM_USDC_T_CEKS/addresses",
+          recordedRequest.path.toString()
+        )
+        JSONAssert.assertEquals(
+          CUSTODY_DEPOSIT_ADDRESS_REQUEST,
+          recordedRequest.body.readUtf8(),
+          JSONCompareMode.STRICT
+        )
+      }
+    }
   }
 
-  private fun `test custody transaction payment`(custodyMockServer: MockWebServer) {
+  @Test
+  fun `test custody transaction payment`() {
     val depositRequest = gson.fromJson(DEPOSIT_REQUEST, HashMap::class.java)
 
     @Suppress("UNCHECKED_CAST")
@@ -108,10 +131,13 @@ class CustodyApiTests(val config: TestConfig, val toml: Sep1Helper.TomlContent,
     val requestOffchainFundsParams =
       gson.fromJson(REQUEST_OFFCHAIN_FUNDS_REQUEST, RequestOffchainFundsRequest::class.java)
     requestOffchainFundsParams.transactionId = txId
-    platformApiClient.sendRpcNotification(REQUEST_OFFCHAIN_FUNDS, requestOffchainFundsParams)
+    platformApiClient.sendRpcNotification(
+      RpcMethod.REQUEST_OFFCHAIN_FUNDS,
+      requestOffchainFundsParams
+    )
 
     var txResponse = platformApiClient.getTransaction(txId)
-    assertEquals(SepTransactionStatus.PENDING_USR_TRANSFER_START, txResponse.status)
+    Assertions.assertEquals(SepTransactionStatus.PENDING_USR_TRANSFER_START, txResponse.status)
 
     val notifyOffchainFundsReceivedParams =
       gson.fromJson(
@@ -120,54 +146,55 @@ class CustodyApiTests(val config: TestConfig, val toml: Sep1Helper.TomlContent,
       )
     notifyOffchainFundsReceivedParams.transactionId = txId
     platformApiClient.sendRpcNotification(
-      NOTIFY_OFFCHAIN_FUNDS_RECEIVED,
+      RpcMethod.NOTIFY_OFFCHAIN_FUNDS_RECEIVED,
       notifyOffchainFundsReceivedParams
     )
 
     txResponse = platformApiClient.getTransaction(txId)
-    assertEquals(SepTransactionStatus.PENDING_ANCHOR, txResponse.status)
+    Assertions.assertEquals(SepTransactionStatus.PENDING_ANCHOR, txResponse.status)
 
     val ex: SepException = assertThrows { custodyApiClient.createTransactionPayment("invalidId") }
-    assertInstanceOf(SepNotFoundException::class.java, ex)
+    Assertions.assertInstanceOf(SepNotFoundException::class.java, ex)
 
     custodyApiClient.createTransactionPayment(txId)
 
-    val recordedRequest = custodyMockServer.takeRequest()
-
-    val requestPath = recordedRequest.path
-    val requestMethod = recordedRequest.method
-    val requestBody = recordedRequest.body.readUtf8()
-
-    assertEquals("//v1/transactions", requestPath.toString())
-    JSONAssert.assertEquals(
-      CUSTODY_TRANSACTION_PAYMENT_REQUEST,
-      requestBody,
-      JSONCompareMode.STRICT
-    )
-
-    assertEquals("POST", requestMethod)
-
-    custodyApiClient.sendWebhook(
-      WEBHOOK_REQUEST,
-      mapOf(FIREBLOCKS_SIGNATURE_HEADER to WEBHOOK_SIGNATURE)
-    )
-
-    txResponse = platformApiClient.getTransaction(txId)
-    txResponse.startedAt = null
-    txResponse.updatedAt = null
-
-    JSONAssert.assertEquals(
-      EXPECTED_TRANSACTION_RESPONSE.replace(TX_ID_KEY, txId),
-      gson.toJson(txResponse),
-      CustomComparator(
-        JSONCompareMode.STRICT,
-        Customization("completed_at") { _, _ -> true },
-        Customization("stellar_transactions[0].created_at") { _, _ -> true }
-      )
-    )
+    var found = false
+    for (count in 1..custodyMockServer.requestCount) {
+      val recordedRequest = custodyMockServer.takeRequest()
+      if (
+        recordedRequest.method.equals("POST") &&
+          recordedRequest.path.toString().equals("//v1/transactions")
+      ) {
+        JSONAssert.assertEquals(
+          CUSTODY_TRANSACTION_PAYMENT_REQUEST,
+          recordedRequest.body.readUtf8(),
+          JSONCompareMode.STRICT
+        )
+
+        val webhookRequest = WEBHOOK_REQUEST.replace(CUSTODY_TX_ID_KEY, custodyTxnId)
+        custodyApiClient.sendWebhook(webhookRequest)
+
+        txResponse = platformApiClient.getTransaction(txId)
+        txResponse.startedAt = null
+        txResponse.updatedAt = null
+
+        JSONAssert.assertEquals(
+          EXPECTED_TRANSACTION_RESPONSE.replace(TX_ID_KEY, txId),
+          gson.toJson(txResponse),
+          CustomComparator(
+            JSONCompareMode.STRICT,
+            Customization("completed_at") { _, _ -> true },
+            Customization("stellar_transactions[0].created_at") { _, _ -> true }
+          )
+        )
+        found = true
+      }
+    }
+    assertTrue(found)
   }
 
-  private fun `test custody transaction refund`(custodyMockServer: MockWebServer) {
+  @Test
+  fun `test custody transaction refund`() {
     val withdrawRequest = gson.fromJson(SEP_24_WITHDRAW_FLOW_REQUEST, HashMap::class.java)
 
     @Suppress("UNCHECKED_CAST")
@@ -184,7 +211,11 @@ class CustodyApiTests(val config: TestConfig, val toml: Sep1Helper.TomlContent,
             return MockResponse().setResponseCode(200).setBody(CUSTODY_DEPOSIT_ADDRESS_RESPONSE)
           }
           if ("POST" == request.method && "//v1/transactions" == request.path) {
-            return MockResponse().setResponseCode(200).setBody(CUSTODY_TRANSACTION_REFUND_RESPONSE)
+            return MockResponse()
+              .setResponseCode(200)
+              .setBody(
+                CUSTODY_TRANSACTION_REFUND_RESPONSE.replace(CUSTODY_TX_ID_KEY, refundCustodyTxnId)
+              )
           }
           return MockResponse().setResponseCode(404)
         }
@@ -197,10 +228,13 @@ class CustodyApiTests(val config: TestConfig, val toml: Sep1Helper.TomlContent,
         REQUEST_ONCHAIN_FUNDS_REQUEST.replace(TX_ID_KEY, txId),
         RequestOnchainFundsRequest::class.java
       )
-    platformApiClient.sendRpcNotification(REQUEST_ONCHAIN_FUNDS, requestOnchainFundsParams)
+    platformApiClient.sendRpcNotification(
+      RpcMethod.REQUEST_ONCHAIN_FUNDS,
+      requestOnchainFundsParams
+    )
 
     var txResponse = platformApiClient.getTransaction(txId)
-    assertEquals(SepTransactionStatus.PENDING_USR_TRANSFER_START, txResponse.status)
+    Assertions.assertEquals(SepTransactionStatus.PENDING_USR_TRANSFER_START, txResponse.status)
 
     val notifyOnchainFundsReceivedRequest =
       gson.fromJson(
@@ -208,25 +242,24 @@ class CustodyApiTests(val config: TestConfig, val toml: Sep1Helper.TomlContent,
         NotifyOnchainFundsReceivedRequest::class.java
       )
     platformApiClient.sendRpcNotification(
-      NOTIFY_ONCHAIN_FUNDS_RECEIVED,
+      RpcMethod.NOTIFY_ONCHAIN_FUNDS_RECEIVED,
       notifyOnchainFundsReceivedRequest
     )
 
     txResponse = platformApiClient.getTransaction(txId)
-    assertEquals(SepTransactionStatus.PENDING_ANCHOR, txResponse.status)
+    Assertions.assertEquals(SepTransactionStatus.PENDING_ANCHOR, txResponse.status)
 
     val doStellarRefundParams =
       gson.fromJson(
         DO_STELLAR_REFUND_REQUEST.replace(TX_ID_KEY, txId),
         DoStellarRefundRequest::class.java
       )
-    platformApiClient.sendRpcNotification(DO_STELLAR_REFUND, doStellarRefundParams)
+    platformApiClient.sendRpcNotification(RpcMethod.DO_STELLAR_REFUND, doStellarRefundParams)
     txResponse = platformApiClient.getTransaction(txId)
-    assertEquals(SepTransactionStatus.PENDING_STELLAR, txResponse.status)
+    Assertions.assertEquals(SepTransactionStatus.PENDING_STELLAR, txResponse.status)
 
     custodyApiClient.sendWebhook(
-      REFUND_WEBHOOK_REQUEST,
-      mapOf(FIREBLOCKS_SIGNATURE_HEADER to REFUND_WEBHOOK_SIGNATURE)
+      REFUND_WEBHOOK_REQUEST.replace(CUSTODY_TX_ID_KEY, refundCustodyTxnId)
     )
 
     txResponse = platformApiClient.getTransaction(txId)
@@ -327,7 +360,7 @@ private const val CUSTODY_TRANSACTION_PAYMENT_REQUEST =
 private const val CUSTODY_TRANSACTION_PAYMENT_RESPONSE =
   """
     {
-      "id":"df0442b4-6d53-44cd-82d7-3c48edc0b1ac",
+      "id":"CUSTODY_TX_ID",
       "status": "SUBMITTED"
     }
 """
@@ -335,7 +368,7 @@ private const val CUSTODY_TRANSACTION_PAYMENT_RESPONSE =
 private const val CUSTODY_TRANSACTION_REFUND_RESPONSE =
   """
     {
-      "id":"df0442b4-6d53-44cd-82d7-3c48edc0b1ad",
+      "id":"CUSTODY_TX_ID",
       "status": "SUBMITTED"
     }
 """
@@ -347,7 +380,7 @@ private const val WEBHOOK_REQUEST =
   "tenantId": "6ae8e895-7bdb-5021-b865-c65885c61068",
   "timestamp": 1687423621679,
   "data": {
-    "id": "df0442b4-6d53-44cd-82d7-3c48edc0b1ac",
+    "id": "CUSTODY_TX_ID",
     "createdAt": 1687423599336,
     "lastUpdated": 1687423620808,
     "assetId": "XLM_USDC_T_CEKS",
@@ -413,7 +446,7 @@ private const val REFUND_WEBHOOK_REQUEST =
   "tenantId": "6ae8e895-7bdb-5021-b865-c65885c61068",
   "timestamp": 1687423621679,
   "data": {
-    "id": "df0442b4-6d53-44cd-82d7-3c48edc0b1ad",
+    "id": "CUSTODY_TX_ID",
     "createdAt": 1687423599336,
     "lastUpdated": 1687423620808,
     "assetId": "XLM_USDC_T_CEKS",
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/test/PlatformApiCustodyTests.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/custody/PlatformApiCustodyTests.kt
similarity index 96%
rename from extended-tests/src/test/kotlin/org/stellar/anchor/platform/test/PlatformApiCustodyTests.kt
rename to extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/custody/PlatformApiCustodyTests.kt
index 784ce3264a..8faa99a10a 100644
--- a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/test/PlatformApiCustodyTests.kt
+++ b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/custody/PlatformApiCustodyTests.kt
@@ -1,10 +1,12 @@
-package org.stellar.anchor.platform.test
+package org.stellar.anchor.platform.extendedtest.custody
 
 import com.google.gson.reflect.TypeToken
 import okhttp3.mockwebserver.Dispatcher
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
 import okhttp3.mockwebserver.RecordedRequest
+import org.junit.jupiter.api.BeforeAll
+import org.junit.jupiter.api.Test
 import org.skyscreamer.jsonassert.Customization
 import org.skyscreamer.jsonassert.JSONAssert
 import org.skyscreamer.jsonassert.JSONCompareMode
@@ -17,52 +19,49 @@ import org.stellar.anchor.auth.AuthHelper
 import org.stellar.anchor.client.Sep12Client
 import org.stellar.anchor.client.Sep24Client
 import org.stellar.anchor.client.Sep31Client
+import org.stellar.anchor.platform.AbstractIntegrationTests
 import org.stellar.anchor.platform.TestConfig
 import org.stellar.anchor.util.GsonUtils
-import org.stellar.anchor.util.Sep1Helper
 
-class PlatformApiCustodyTests(config: TestConfig, toml: Sep1Helper.TomlContent, jwt: String) {
+class PlatformApiCustodyTests : AbstractIntegrationTests(TestConfig("custody")) {
   companion object {
     private const val TX_ID_KEY = "TX_ID"
     private const val RECEIVER_ID_KEY = "RECEIVER_ID"
     private const val SENDER_ID_KEY = "SENDER_ID"
+    private val custodyMockServer = MockWebServer()
+
+    @BeforeAll
+    @JvmStatic
+    fun construct() {
+      custodyMockServer.dispatcher =
+        object : Dispatcher() {
+          override fun dispatch(request: RecordedRequest): MockResponse {
+            if (
+              "POST" == request.method &&
+                "//v1/vault/accounts/1/XLM_USDC_T_CEKS/addresses" == request.path
+            ) {
+              return MockResponse().setResponseCode(200).setBody(CUSTODY_DEPOSIT_ADDRESS_RESPONSE)
+            }
+            if ("POST" == request.method && "//v1/transactions" == request.path) {
+              return MockResponse()
+                .setResponseCode(200)
+                .setBody(CUSTODY_TRANSACTION_PAYMENT_RESPONSE)
+            }
+            return MockResponse().setResponseCode(404)
+          }
+        }
+
+      custodyMockServer.start(58086)
+    }
   }
 
   private val gson = GsonUtils.getInstance()
 
   private val platformApiClient =
     PlatformApiClient(AuthHelper.forNone(), config.env["platform.server.url"]!!)
-  private val sep12Client = Sep12Client(toml.getString("KYC_SERVER"), jwt)
-  private val sep24Client = Sep24Client(toml.getString("TRANSFER_SERVER_SEP0024"), jwt)
-  private val sep31Client = Sep31Client(toml.getString("DIRECT_PAYMENT_SERVER"), jwt)
-
-  fun testAll(custodyMockServer: MockWebServer) {
-    println("Performing Platform API Custody tests...")
-
-    val mockServerDispatcher: Dispatcher =
-      object : Dispatcher() {
-        override fun dispatch(request: RecordedRequest): MockResponse {
-          if (
-            "POST" == request.method &&
-              "//v1/vault/accounts/1/XLM_USDC_T_CEKS/addresses" == request.path
-          ) {
-            return MockResponse().setResponseCode(200).setBody(CUSTODY_DEPOSIT_ADDRESS_RESPONSE)
-          }
-          if ("POST" == request.method && "//v1/transactions" == request.path) {
-            return MockResponse().setResponseCode(200).setBody(CUSTODY_TRANSACTION_PAYMENT_RESPONSE)
-          }
-          return MockResponse().setResponseCode(404)
-        }
-      }
-
-    custodyMockServer.dispatcher = mockServerDispatcher
-
-    `SEP-24 deposit complete full`()
-    `SEP-24 withdraw full refund`()
-    // TODO: This is temporarily disabled because of lacking support for debugging. This should be
-    // re-enabled once the tests are cleaned up.
-    `SEP-31 refunded do_stellar_refund`()
-  }
+  private val sep12Client = Sep12Client(toml.getString("KYC_SERVER"), token.token)
+  private val sep24Client = Sep24Client(toml.getString("TRANSFER_SERVER_SEP0024"), token.token)
+  private val sep31Client = Sep31Client(toml.getString("DIRECT_PAYMENT_SERVER"), token.token)
 
   /**
    * 1. incomplete -> notify_interactive_flow_complete
@@ -71,7 +70,8 @@ class PlatformApiCustodyTests(config: TestConfig, toml: Sep1Helper.TomlContent,
    * 4. pending_anchor -> do_stellar_payment
    * 5. completed
    */
-  private fun `SEP-24 deposit complete full`() {
+  @Test
+  fun `SEP-24 deposit complete full`() {
     `test deposit flow`(
       SEP_24_DEPOSIT_COMPLETE_FULL_FLOW_ACTION_REQUESTS,
       SEP_24_DEPOSIT_COMPLETE_FULL_FLOW_ACTION_RESPONSES
@@ -86,7 +86,8 @@ class PlatformApiCustodyTests(config: TestConfig, toml: Sep1Helper.TomlContent,
    * 5. pending_stellar -> notify_refund_sent
    * 6. refunded
    */
-  private fun `SEP-24 withdraw full refund`() {
+  @Test
+  fun `SEP-24 withdraw full refund`() {
     `test withdraw flow`(
       SEP_24_WITHDRAW_FULL_REFUND_FLOW_ACTION_REQUESTS,
       SEP_24_WITHDRAW_FULL_REFUND_FLOW_ACTION_RESPONSES
@@ -99,7 +100,8 @@ class PlatformApiCustodyTests(config: TestConfig, toml: Sep1Helper.TomlContent,
    * 3. pending_stellar -> notify_refund_sent
    * 3. pending_sender
    */
-  private fun `SEP-31 refunded do_stellar_refund`() {
+  @Test
+  fun `SEP-31 refunded do_stellar_refund`() {
     `test receive flow`(
       SEP_31_RECEIVE_REFUNDED_DO_STELLAR_REFUND_FLOW_ACTION_REQUESTS,
       SEP_31_RECEIVE_REFUNDED_DO_STELLAR_REFUND_FLOW_ACTION_RESPONSES
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/rpc/RpcEnd2EndTests.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/rpc/RpcEnd2EndTests.kt
new file mode 100644
index 0000000000..6945a42430
--- /dev/null
+++ b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/rpc/RpcEnd2EndTests.kt
@@ -0,0 +1,46 @@
+package org.stellar.anchor.platform.extendedtest.rpc
+
+import org.junit.jupiter.api.TestInstance
+import org.junit.jupiter.api.parallel.Execution
+import org.junit.jupiter.api.parallel.ExecutionMode
+import org.stellar.anchor.api.event.AnchorEvent
+import org.stellar.anchor.api.sep.SepTransactionStatus
+import org.stellar.anchor.platform.e2etest.Sep24End2EndTests
+import org.stellar.anchor.platform.e2etest.Sep31End2EndTests
+import org.stellar.anchor.platform.e2etest.Sep6End2EndTest
+
+// use TEST_PROFILE_NAME = "rpc"
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Execution(ExecutionMode.SAME_THREAD)
+class CustodyRpcSep31End2EndTests : Sep31End2EndTests()
+
+// use TEST_PROFILE_NAME = "rpc"
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Execution(ExecutionMode.SAME_THREAD)
+class CustodyRpcSep24End2EndTests : Sep24End2EndTests() {
+  // These are to override the default expected statuses for RPC configuration
+  override fun getExpectedDepositStatus(): List<Pair<AnchorEvent.Type, SepTransactionStatus>> {
+    return listOf(
+      AnchorEvent.Type.TRANSACTION_CREATED to SepTransactionStatus.INCOMPLETE,
+      AnchorEvent.Type.TRANSACTION_STATUS_CHANGED to
+        SepTransactionStatus.PENDING_USR_TRANSFER_START,
+      AnchorEvent.Type.TRANSACTION_STATUS_CHANGED to SepTransactionStatus.PENDING_ANCHOR,
+      AnchorEvent.Type.TRANSACTION_STATUS_CHANGED to SepTransactionStatus.COMPLETED
+    )
+  }
+
+  override fun getExpectedWithdrawalStatus(): List<Pair<AnchorEvent.Type, SepTransactionStatus>> {
+    return listOf(
+      AnchorEvent.Type.TRANSACTION_CREATED to SepTransactionStatus.INCOMPLETE,
+      AnchorEvent.Type.TRANSACTION_STATUS_CHANGED to
+        SepTransactionStatus.PENDING_USR_TRANSFER_START,
+      AnchorEvent.Type.TRANSACTION_STATUS_CHANGED to SepTransactionStatus.PENDING_ANCHOR,
+      AnchorEvent.Type.TRANSACTION_STATUS_CHANGED to SepTransactionStatus.COMPLETED
+    )
+  }
+}
+
+// use TEST_PROFILE_NAME = "rpc"
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Execution(ExecutionMode.SAME_THREAD)
+class CustodyRpcSep6End2EndTests : Sep6End2EndTest()
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/AuthApikeyCustodyTestSuite.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/AuthApikeyCustodyTestSuite.kt
new file mode 100644
index 0000000000..7fa8438cb0
--- /dev/null
+++ b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/AuthApikeyCustodyTestSuite.kt
@@ -0,0 +1,8 @@
+package org.stellar.anchor.platform.suite
+
+import org.junit.platform.suite.api.SelectPackages
+import org.junit.platform.suite.api.Suite
+
+@Suite
+@SelectPackages("org.stellar.anchor.platform.extendedtest.auth.apikey.custody")
+class AuthApikeyCustodyTestSuite
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/AuthApikeyPlatformTestSuite.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/AuthApikeyPlatformTestSuite.kt
new file mode 100644
index 0000000000..a7c6df06a8
--- /dev/null
+++ b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/AuthApikeyPlatformTestSuite.kt
@@ -0,0 +1,8 @@
+package org.stellar.anchor.platform.suite
+
+import org.junit.platform.suite.api.SelectPackages
+import org.junit.platform.suite.api.Suite
+
+@Suite
+@SelectPackages("org.stellar.anchor.platform.extendedtest.auth.apikey.platform")
+class AuthApikeyPlatformTestSuite
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/AuthJwtCustodyTestSuite.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/AuthJwtCustodyTestSuite.kt
new file mode 100644
index 0000000000..225ac4821f
--- /dev/null
+++ b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/AuthJwtCustodyTestSuite.kt
@@ -0,0 +1,8 @@
+package org.stellar.anchor.platform.suite
+
+import org.junit.platform.suite.api.SelectPackages
+import org.junit.platform.suite.api.Suite
+
+@Suite
+@SelectPackages("org.stellar.anchor.platform.extendedtest.auth.jwt.custody")
+class AuthJwtCustodyTestSuite
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/AuthJwtPlatformTestSuite.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/AuthJwtPlatformTestSuite.kt
new file mode 100644
index 0000000000..c840fde3b2
--- /dev/null
+++ b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/AuthJwtPlatformTestSuite.kt
@@ -0,0 +1,8 @@
+package org.stellar.anchor.platform.suite
+
+import org.junit.platform.suite.api.SelectPackages
+import org.junit.platform.suite.api.Suite
+
+@Suite
+@SelectPackages("org.stellar.anchor.platform.extendedtest.auth.jwt.platform")
+class AuthJwtPlatformTestSuite
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/CustodyTestSuite.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/CustodyTestSuite.kt
new file mode 100644
index 0000000000..689b1827e2
--- /dev/null
+++ b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/CustodyTestSuite.kt
@@ -0,0 +1,6 @@
+package org.stellar.anchor.platform.suite
+
+import org.junit.platform.suite.api.SelectPackages
+import org.junit.platform.suite.api.Suite
+
+@Suite @SelectPackages("org.stellar.anchor.platform.extendedtest.custody") class CustodyTestSuite
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/RpcTestSuite.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/RpcTestSuite.kt
new file mode 100644
index 0000000000..13c4c7ff80
--- /dev/null
+++ b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/suite/RpcTestSuite.kt
@@ -0,0 +1,6 @@
+package org.stellar.anchor.platform.suite
+
+import org.junit.platform.suite.api.SelectPackages
+import org.junit.platform.suite.api.Suite
+
+@Suite @SelectPackages("org.stellar.anchor.platform.extendedtest.rpc") class RpcTestSuite
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/test/ReferenceServerTests.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/test/ReferenceServerTests.kt
deleted file mode 100644
index 6438511d3f..0000000000
--- a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/test/ReferenceServerTests.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.stellar.anchor.platform.test
-
-import org.junit.jupiter.api.Assertions
-import org.stellar.anchor.client.ReferenceServerClient
-
-lateinit var referenceServerClient: ReferenceServerClient
-
-fun referenceServerTestAll() {
-  referenceServerClient = ReferenceServerClient("http://localhost:8081")
-  println("Performing Reference Server tests...")
-  testReferenceHealth()
-}
-
-fun testReferenceHealth() {
-  val response = referenceServerClient.health(listOf("all"))
-
-  Assertions.assertEquals(response["number_of_checks"], 1.0)
-  Assertions.assertNotNull(response["checks"])
-  val checks = response["checks"] as Map<*, *>
-  if (checks["kafka_listener"] != null) {
-    val kafkaListenerCheck = checks["kafka_listener"] as Map<*, *>
-    Assertions.assertEquals(kafkaListenerCheck["status"], "green")
-    Assertions.assertEquals(kafkaListenerCheck["running"], true)
-    Assertions.assertEquals(kafkaListenerCheck["kafka_available"], true)
-  }
-}
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24BaseEnd2EndTest.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24BaseEnd2EndTest.kt
deleted file mode 100644
index afd1201fdb..0000000000
--- a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/test/Sep24BaseEnd2EndTest.kt
+++ /dev/null
@@ -1,344 +0,0 @@
-package org.stellar.anchor.platform.test
-
-import io.ktor.client.*
-import io.ktor.client.plugins.*
-import io.ktor.client.request.*
-import io.ktor.http.*
-import junit.framework.TestCase.assertEquals
-import junit.framework.TestCase.fail
-import kotlin.time.Duration.Companion.seconds
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.runBlocking
-import org.assertj.core.api.Assertions
-import org.junit.jupiter.api.Assertions.assertNotNull
-import org.junit.jupiter.api.Assertions.assertTrue
-import org.springframework.web.util.UriComponentsBuilder
-import org.stellar.anchor.api.callback.SendEventRequest
-import org.stellar.anchor.api.callback.SendEventRequestPayload
-import org.stellar.anchor.api.event.AnchorEvent
-import org.stellar.anchor.api.event.AnchorEvent.Type.TRANSACTION_CREATED
-import org.stellar.anchor.api.event.AnchorEvent.Type.TRANSACTION_STATUS_CHANGED
-import org.stellar.anchor.api.sep.SepTransactionStatus
-import org.stellar.anchor.api.sep.sep24.Sep24GetTransactionResponse
-import org.stellar.anchor.auth.JwtService
-import org.stellar.anchor.auth.Sep24InteractiveUrlJwt
-import org.stellar.anchor.platform.CLIENT_WALLET_SECRET
-import org.stellar.anchor.platform.TestConfig
-import org.stellar.anchor.util.Log.info
-import org.stellar.reference.client.AnchorReferenceServerClient
-import org.stellar.reference.transactionWithRetry
-import org.stellar.reference.wallet.WalletServerClient
-import org.stellar.walletsdk.ApplicationConfiguration
-import org.stellar.walletsdk.InteractiveFlowResponse
-import org.stellar.walletsdk.StellarConfiguration
-import org.stellar.walletsdk.Wallet
-import org.stellar.walletsdk.anchor.*
-import org.stellar.walletsdk.anchor.TransactionStatus.*
-import org.stellar.walletsdk.asset.IssuedAssetId
-import org.stellar.walletsdk.asset.StellarAssetId
-import org.stellar.walletsdk.auth.AuthToken
-import org.stellar.walletsdk.horizon.SigningKeyPair
-import org.stellar.walletsdk.horizon.sign
-
-/** TODO: This should be replaced by Sep24End2EndTest */
-class Sep24BaseEnd2EndTest(config: TestConfig, val jwt: String) {
-  private val walletSecretKey = System.getenv("WALLET_SECRET_KEY") ?: CLIENT_WALLET_SECRET
-  private val keypair = SigningKeyPair.fromSecret(walletSecretKey)
-  private val wallet =
-    Wallet(
-      StellarConfiguration.Testnet,
-      ApplicationConfiguration { defaultRequest { url { protocol = URLProtocol.HTTP } } }
-    )
-  private val client = HttpClient {
-    install(HttpTimeout) {
-      requestTimeoutMillis = 300000
-      connectTimeoutMillis = 300000
-      socketTimeoutMillis = 300000
-    }
-  }
-  private val anchor =
-    wallet.anchor(config.env["anchor.domain"]!!) {
-      install(HttpTimeout) {
-        requestTimeoutMillis = 300000
-        connectTimeoutMillis = 300000
-        socketTimeoutMillis = 300000
-      }
-    }
-  private val maxTries = 30
-  private val anchorReferenceServerClient =
-    AnchorReferenceServerClient(Url(config.env["reference.server.url"]!!))
-  private val walletServerClient = WalletServerClient(Url(config.env["wallet.server.url"]!!))
-  private val jwtService: JwtService =
-    JwtService(
-      config.env["secret.sep10.jwt_secret"]!!,
-      config.env["secret.sep24.interactive_url.jwt_secret"]!!,
-      config.env["secret.sep24.more_info_url.jwt_secret"]!!,
-      config.env["secret.callback_api.auth_secret"]!!,
-      config.env["secret.platform_api.auth_secret"]!!,
-      config.env["secret.custody_server.auth_secret"]!!
-    )
-
-  private fun `test typical deposit end-to-end flow`(asset: StellarAssetId, amount: String) =
-    runBlocking {
-      walletServerClient.clearCallbacks()
-      anchorReferenceServerClient.clearEvents()
-
-      val token = anchor.auth().authenticate(keypair)
-      val response = makeDeposit(asset, amount, token)
-
-      // Assert the interactive URL JWT is valid
-      val params = UriComponentsBuilder.fromUriString(response.url).build().queryParams
-      val cipher = params["token"]!![0]
-      val interactiveJwt = jwtService.decode(cipher, Sep24InteractiveUrlJwt::class.java)
-      assertEquals("referenceCustodial", interactiveJwt.claims[JwtService.CLIENT_NAME])
-
-      // Wait for the status to change to COMPLETED
-      waitForTxnStatus(response.id, COMPLETED, ERROR, token)
-
-      // Check if the transaction can be listed by stellar transaction id
-      val fetchedTxn = anchor.interactive().getTransaction(response.id, token) as DepositTransaction
-      val transactionByStellarId =
-        anchor
-          .interactive()
-          .getTransactionBy(token, stellarTransactionId = fetchedTxn.stellarTransactionId)
-      assertEquals(fetchedTxn.id, transactionByStellarId.id)
-
-      // Check the events sent to the reference server are recorded correctly
-      val actualEvents = waitForBusinessServerEvents(response.id, 4)
-      assertEvents(actualEvents, expectedStatuses)
-
-      // Check the callbacks sent to the wallet reference server are recorded correctly
-      val actualCallbacks = waitForWalletServerCallbacks(response.id, 4)
-      assertCallbacks(actualCallbacks, expectedStatuses)
-    }
-
-  private suspend fun makeDeposit(
-    asset: StellarAssetId,
-    amount: String,
-    token: AuthToken
-  ): InteractiveFlowResponse {
-    // Start interactive deposit
-    val deposit = anchor.interactive().deposit(asset, token, mapOf("amount" to amount))
-
-    // Get transaction status and make sure it is INCOMPLETE
-    val transaction = anchor.interactive().getTransaction(deposit.id, token)
-    assertEquals(INCOMPLETE, transaction.status)
-    // Make sure the interactive url is valid. This will also start the reference server's
-    // withdrawal process.
-    val resp = client.get(deposit.url)
-    info("accessing ${deposit.url}...")
-    assertEquals(200, resp.status.value)
-
-    return deposit
-  }
-
-  private fun assertEvents(
-    actualEvents: List<SendEventRequest>?,
-    expectedStatuses: List<Pair<AnchorEvent.Type, SepTransactionStatus>>
-  ) {
-    assertNotNull(actualEvents)
-    actualEvents?.let {
-      assertEquals(expectedStatuses.size, actualEvents.size)
-
-      expectedStatuses.forEachIndexed { index, expectedStatus ->
-        actualEvents[index].let { actualEvent ->
-          assertNotNull(actualEvent.id)
-          assertNotNull(actualEvent.timestamp)
-          assertEquals(expectedStatus.first.type, actualEvent.type)
-          assertTrue(actualEvent.payload is SendEventRequestPayload)
-          assertEquals(expectedStatus.second, actualEvent.payload.transaction.status)
-        }
-      }
-    }
-  }
-
-  private fun assertCallbacks(
-    actualCallbacks: List<Sep24GetTransactionResponse>?,
-    expectedStatuses: List<Pair<AnchorEvent.Type, SepTransactionStatus>>
-  ) {
-    assertNotNull(actualCallbacks)
-    actualCallbacks?.let {
-      assertEquals(expectedStatuses.size, actualCallbacks.size)
-
-      expectedStatuses.forEachIndexed { index, expectedStatus ->
-        actualCallbacks[index].let { actualCallback ->
-          assertNotNull(actualCallback.transaction.id)
-          assertEquals(expectedStatus.second.status, actualCallback.transaction.status)
-        }
-      }
-    }
-  }
-
-  private fun `test typical withdraw end-to-end flow`(asset: StellarAssetId, amount: String) {
-    `test typical withdraw end-to-end flow`(asset, mapOf("amount" to amount))
-  }
-
-  private fun `test typical withdraw end-to-end flow`(
-    asset: StellarAssetId,
-    extraFields: Map<String, String>
-  ) = runBlocking {
-    walletServerClient.clearCallbacks()
-    anchorReferenceServerClient.clearEvents()
-
-    val token = anchor.auth().authenticate(keypair)
-    val withdrawTxn = anchor.interactive().withdraw(asset, token, extraFields)
-
-    // Get transaction status and make sure it is INCOMPLETE
-    val transaction = anchor.interactive().getTransaction(withdrawTxn.id, token)
-    assertEquals(INCOMPLETE, transaction.status)
-    // Make sure the interactive url is valid. This will also start the reference server's
-    // withdrawal process.
-    val resp = client.get(withdrawTxn.url)
-    info("accessing ${withdrawTxn.url}...")
-    assertEquals(200, resp.status.value)
-    // Wait for the status to change to PENDING_USER_TRANSFER_START
-    waitForTxnStatus(withdrawTxn.id, PENDING_USER_TRANSFER_START, ERROR, token)
-    // Submit transfer transaction
-    val walletTxn =
-      (anchor.interactive().getTransaction(withdrawTxn.id, token) as WithdrawalTransaction)
-    transactionWithRetry {
-      val transfer =
-        wallet
-          .stellar()
-          .transaction(walletTxn.from!!)
-          .transferWithdrawalTransaction(walletTxn, asset)
-          .build()
-      transfer.sign(keypair)
-      wallet.stellar().submitTransaction(transfer)
-    }
-    // Wait for the status to change to PENDING_USER_TRANSFER_END
-    waitForTxnStatus(withdrawTxn.id, COMPLETED, ERROR, token)
-
-    // Check if the transaction can be listed by stellar transaction id
-    val fetchTxn =
-      anchor.interactive().getTransaction(withdrawTxn.id, token) as WithdrawalTransaction
-    val transactionByStellarId =
-      anchor
-        .interactive()
-        .getTransactionBy(token, stellarTransactionId = fetchTxn.stellarTransactionId)
-    assertEquals(fetchTxn.id, transactionByStellarId.id)
-
-    // Check the events sent to the reference server are recorded correctly
-    val actualEvents = waitForBusinessServerEvents(withdrawTxn.id, 4)
-    assertEvents(actualEvents, expectedStatuses)
-
-    // Check the callbacks sent to the wallet reference server are recorded correctly
-    val actualCallbacks = waitForWalletServerCallbacks(withdrawTxn.id, 4)
-    assertCallbacks(actualCallbacks, expectedStatuses)
-  }
-
-  private suspend fun waitForWalletServerCallbacks(
-    txnId: String,
-    count: Int
-  ): List<Sep24GetTransactionResponse>? {
-    var retries = 5
-    var callbacks: List<Sep24GetTransactionResponse>? = null
-    while (retries > 0) {
-      callbacks = walletServerClient.getCallbacks(txnId, Sep24GetTransactionResponse::class.java)
-      if (callbacks.size == count) {
-        return callbacks
-      }
-      delay(1.seconds)
-      retries--
-    }
-    return callbacks
-  }
-
-  private suspend fun waitForBusinessServerEvents(
-    txnId: String,
-    count: Int
-  ): List<SendEventRequest>? {
-    var retries = 5
-    var events: List<SendEventRequest>? = null
-    while (retries > 0) {
-      events = anchorReferenceServerClient.getEvents(txnId)
-      if (events.size == count) {
-        return events
-      }
-      delay(1.seconds)
-      retries--
-    }
-    return events
-  }
-
-  private suspend fun waitForTxnStatus(
-    id: String,
-    expectedStatus: TransactionStatus,
-    exitStatus: TransactionStatus,
-    token: AuthToken
-  ) {
-    var status: TransactionStatus? = null
-
-    for (i in 0..maxTries) {
-      // Get transaction info
-      val transaction = anchor.interactive().getTransaction(id, token)
-      if (status != transaction.status) {
-        status = transaction.status
-        info(
-          "Transaction(id=${transaction.id}) status changed to $status. Message: ${transaction.message}"
-        )
-      }
-
-      if (transaction.status == expectedStatus) return
-
-      if (transaction.status == exitStatus) break
-
-      delay(1.seconds)
-    }
-
-    fail("Transaction wasn't $expectedStatus in $maxTries tries, last status: $status")
-  }
-
-  private fun `test created transactions show up in the get history call`(
-    asset: StellarAssetId,
-    amount: String
-  ) = runBlocking {
-    val newAcc = wallet.stellar().account().createKeyPair()
-
-    transactionWithRetry {
-      val tx =
-        wallet
-          .stellar()
-          .transaction(keypair)
-          .sponsoring(keypair, newAcc) {
-            createAccount(newAcc)
-            addAssetSupport(USDC)
-          }
-          .build()
-          .sign(keypair)
-          .sign(newAcc)
-
-      wallet.stellar().submitTransaction(tx)
-    }
-
-    val token = anchor.auth().authenticate(newAcc)
-    val deposits =
-      (0..1).map {
-        val txnId = makeDeposit(asset, amount, token).id
-        waitForTxnStatus(txnId, COMPLETED, ERROR, token)
-        txnId
-      }
-    val history = anchor.interactive().getTransactionsForAsset(asset, token)
-
-    Assertions.assertThat(history).allMatch { deposits.contains(it.id) }
-  }
-
-  fun testAll() {
-    info("Running SEP-24 USDC end-to-end tests...")
-    `test typical deposit end-to-end flow`(USDC, "0.01")
-    `test typical withdraw end-to-end flow`(USDC, "0.01")
-    `test created transactions show up in the get history call`(USDC, "1.1")
-  }
-
-  companion object {
-    private val USDC =
-      IssuedAssetId("USDC", "GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP")
-    private val expectedStatuses =
-      listOf(
-        TRANSACTION_CREATED to SepTransactionStatus.INCOMPLETE,
-        TRANSACTION_STATUS_CHANGED to SepTransactionStatus.PENDING_USR_TRANSFER_START,
-        TRANSACTION_STATUS_CHANGED to SepTransactionStatus.PENDING_ANCHOR,
-        TRANSACTION_STATUS_CHANGED to SepTransactionStatus.COMPLETED
-      )
-  }
-}
diff --git a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/dao/CustomerRepository.kt b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/dao/CustomerRepository.kt
index 3951d6c16c..03f702164f 100644
--- a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/dao/CustomerRepository.kt
+++ b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/dao/CustomerRepository.kt
@@ -1,6 +1,5 @@
 package org.stellar.reference.dao
 
-import java.time.Instant
 import org.jetbrains.exposed.sql.*
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.eq
 import org.jetbrains.exposed.sql.SqlExpressionBuilder.isNull
@@ -44,9 +43,8 @@ class JdbcCustomerRepository(private val db: Database) : CustomerRepository {
               clabeNumber = it[Customers.clabeNumber],
               idType = it[Customers.idType],
               idCountryCode = it[Customers.idCountryCode],
-              idIssueDate = it[Customers.idIssueDate]?.let { ts -> Instant.ofEpochMilli(ts) },
-              idExpirationDate =
-                it[Customers.idExpirationDate]?.let { ts -> Instant.ofEpochMilli(ts) },
+              idIssueDate = it[Customers.idIssueDate],
+              idExpirationDate = it[Customers.idExpirationDate],
               idNumber = it[Customers.idNumber]
             )
           }
@@ -86,9 +84,8 @@ class JdbcCustomerRepository(private val db: Database) : CustomerRepository {
               clabeNumber = it[Customers.clabeNumber],
               idType = it[Customers.idType],
               idCountryCode = it[Customers.idCountryCode],
-              idIssueDate = it[Customers.idIssueDate]?.let { ts -> Instant.ofEpochMilli(ts) },
-              idExpirationDate =
-                it[Customers.idExpirationDate]?.let { ts -> Instant.ofEpochMilli(ts) },
+              idIssueDate = it[Customers.idIssueDate],
+              idExpirationDate = it[Customers.idExpirationDate],
               idNumber = it[Customers.idNumber]
             )
           }
@@ -114,8 +111,8 @@ class JdbcCustomerRepository(private val db: Database) : CustomerRepository {
           it[clabeNumber] = customer.clabeNumber
           it[idType] = customer.idType
           it[idCountryCode] = customer.idCountryCode
-          it[idIssueDate] = customer.idIssueDate?.toEpochMilli()
-          it[idExpirationDate] = customer.idExpirationDate?.toEpochMilli()
+          it[idIssueDate] = customer.idIssueDate
+          it[idExpirationDate] = customer.idExpirationDate
           it[idNumber] = customer.idNumber
         }
       }
@@ -140,8 +137,8 @@ class JdbcCustomerRepository(private val db: Database) : CustomerRepository {
         it[clabeNumber] = customer.clabeNumber
         it[idType] = customer.idType
         it[idCountryCode] = customer.idCountryCode
-        it[idIssueDate] = customer.idIssueDate?.toEpochMilli()
-        it[idExpirationDate] = customer.idExpirationDate?.toEpochMilli()
+        it[idIssueDate] = customer.idIssueDate
+        it[idExpirationDate] = customer.idExpirationDate
         it[idNumber] = customer.idNumber
       }
     }
diff --git a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/dao/Customers.kt b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/dao/Customers.kt
index b50df062b4..379b26a125 100644
--- a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/dao/Customers.kt
+++ b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/dao/Customers.kt
@@ -19,7 +19,7 @@ object Customers : Table() {
   val clabeNumber = varchar("clabe_number", 255).nullable()
   val idType = varchar("id_type", 255).nullable()
   val idCountryCode = varchar("id_country_code", 255).nullable()
-  val idIssueDate = long("id_issue_date").nullable()
-  val idExpirationDate = long("id_expiration_date").nullable()
+  val idIssueDate = char("id_issue_date", 10).nullable()
+  val idExpirationDate = char("id_expiration_date", 10).nullable()
   val idNumber = varchar("id_number", 255).nullable()
 }
diff --git a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/model/Customer.kt b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/model/Customer.kt
index 901b6170d3..2110660b03 100644
--- a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/model/Customer.kt
+++ b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/model/Customer.kt
@@ -1,7 +1,5 @@
 package org.stellar.reference.model
 
-import java.time.Instant
-import kotlinx.serialization.Contextual
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -22,8 +20,8 @@ data class Customer(
   @SerialName("clabe_number") val clabeNumber: String? = null,
   @SerialName("id_type") val idType: String? = null,
   @SerialName("id_country_code") val idCountryCode: String? = null,
-  @SerialName("id_issue_date") @Contextual val idIssueDate: Instant? = null,
-  @SerialName("id_expiration_date") @Contextual val idExpirationDate: Instant? = null,
+  @SerialName("id_issue_date") val idIssueDate: String? = null,
+  @SerialName("id_expiration_date") val idExpirationDate: String? = null,
   @SerialName("id_number") val idNumber: String? = null,
 )
 
diff --git a/lib-util/build.gradle.kts b/lib-util/build.gradle.kts
index f2edb3251e..89424bfd46 100644
--- a/lib-util/build.gradle.kts
+++ b/lib-util/build.gradle.kts
@@ -10,6 +10,7 @@ dependencies {
   implementation(libs.commons.text)
   implementation(libs.coroutines.core)
   implementation(libs.google.gson)
+  implementation(libs.jjwt)
   implementation(variantOf(libs.java.stellar.sdk) { classifier("uber") })
   implementation(libs.okhttp3)
   implementation(project(":api-schema"))
diff --git a/core/src/main/java/org/stellar/anchor/util/FileUtil.java b/lib-util/src/main/java/org/stellar/anchor/util/FileUtil.java
similarity index 90%
rename from core/src/main/java/org/stellar/anchor/util/FileUtil.java
rename to lib-util/src/main/java/org/stellar/anchor/util/FileUtil.java
index ba01777d67..950ce037ba 100644
--- a/core/src/main/java/org/stellar/anchor/util/FileUtil.java
+++ b/lib-util/src/main/java/org/stellar/anchor/util/FileUtil.java
@@ -1,7 +1,5 @@
 package org.stellar.anchor.util;
 
-import static org.stellar.anchor.util.Log.errorF;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -17,7 +15,6 @@ public static String getResourceFileAsString(String fileName)
     ClassLoader classLoader = FileUtil.class.getClassLoader();
     try (InputStream is = classLoader.getResourceAsStream(fileName)) {
       if (is == null) {
-        errorF("{} was not found in class path.", fileName);
         throw new SepNotFoundException(String.format("%s was not found in classpath.", fileName));
       }
       try (InputStreamReader isr = new InputStreamReader(is);
diff --git a/platform/src/main/java/org/stellar/anchor/platform/utils/RSAUtil.java b/lib-util/src/main/java/org/stellar/anchor/util/RSAUtil.java
similarity index 74%
rename from platform/src/main/java/org/stellar/anchor/platform/utils/RSAUtil.java
rename to lib-util/src/main/java/org/stellar/anchor/util/RSAUtil.java
index eea14fe025..b9b465693c 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/utils/RSAUtil.java
+++ b/lib-util/src/main/java/org/stellar/anchor/util/RSAUtil.java
@@ -1,4 +1,4 @@
-package org.stellar.anchor.platform.utils;
+package org.stellar.anchor.util;
 
 import io.jsonwebtoken.SignatureAlgorithm;
 import java.security.InvalidKeyException;
@@ -24,6 +24,11 @@ public class RSAUtil {
   public static final String RSA_ALGORITHM = SignatureAlgorithm.RS512.getFamilyName();
   public static final String SHA512_WITH_RSA_ALGORITHM = SignatureAlgorithm.RS512.getJcaName();
 
+  public static PublicKey generatePublicKey(String publicKey)
+      throws NoSuchAlgorithmException, InvalidKeySpecException {
+    return generatePublicKey(publicKey, RSA_ALGORITHM);
+  }
+
   /**
    * Generate a public key from a provided string.
    *
@@ -51,6 +56,11 @@ public static PublicKey generatePublicKey(String publicKey, String keyFactoryAlg
     return kf.generatePublic(X509publicKey);
   }
 
+  public static PrivateKey generatePrivateKey(String privateKey)
+      throws NoSuchAlgorithmException, InvalidKeySpecException {
+    return generatePrivateKey(privateKey, RSA_ALGORITHM);
+  }
+
   /**
    * Generate a private key from a provided string.
    *
@@ -98,6 +108,11 @@ public static boolean isValidPrivateKey(String privateKey, String keyFactoryAlgo
     return true;
   }
 
+  public static boolean isValidSignature(String signature, String dataString, PublicKey publicKey)
+      throws NoSuchAlgorithmException, InvalidKeyException, SignatureException {
+    return isValidSignature(signature, dataString, publicKey, SHA512_WITH_RSA_ALGORITHM);
+  }
+
   /**
    * Verify signature
    *
@@ -120,4 +135,29 @@ public static boolean isValidSignature(
 
     return sign.verify(Base64.getDecoder().decode(signature));
   }
+
+  /**
+   * Sign dataString.
+   *
+   * @param dataString The data to sign
+   * @param privateKey The private key to sign with
+   * @return The Base64 encoded signature
+   */
+  public static String sign(String dataString, PrivateKey privateKey)
+      throws NoSuchAlgorithmException, SignatureException, InvalidKeyException {
+    return sign(dataString, privateKey, SHA512_WITH_RSA_ALGORITHM);
+  }
+
+  public static String sign(String dataString, PrivateKey privateKey, String signatureAlgorithm)
+      throws NoSuchAlgorithmException, InvalidKeyException, SignatureException {
+    if (privateKey == null) {
+      throw new IllegalArgumentException("Private key is null");
+    }
+
+    Signature sign = Signature.getInstance(signatureAlgorithm);
+    sign.initSign(privateKey);
+    sign.update(dataString.getBytes());
+
+    return new String(Base64.getEncoder().encode(sign.sign()));
+  }
 }
diff --git a/lib-util/src/main/kotlin/org/stellar/anchor/client/CustodyApiClient.kt b/lib-util/src/main/kotlin/org/stellar/anchor/client/CustodyApiClient.kt
index 28e4dbefa4..6191c92234 100644
--- a/lib-util/src/main/kotlin/org/stellar/anchor/client/CustodyApiClient.kt
+++ b/lib-util/src/main/kotlin/org/stellar/anchor/client/CustodyApiClient.kt
@@ -1,10 +1,16 @@
 package org.stellar.anchor.client
 
 import com.google.gson.reflect.TypeToken
+import java.security.PrivateKey
 import org.stellar.anchor.api.custody.CreateCustodyTransactionRequest
 import org.stellar.anchor.api.custody.GenerateDepositAddressResponse
+import org.stellar.anchor.util.RSAUtil
 
-class CustodyApiClient(private val endpoint: String, private val jwt: String) : SepClient() {
+class CustodyApiClient(
+  private val endpoint: String,
+  private val jwt: String,
+  private val webhookPrivateKey: PrivateKey
+) : SepClient() {
 
   fun generateDepositAddress(asset: String): GenerateDepositAddressResponse {
     val url = "$endpoint/assets/$asset/addresses"
@@ -24,10 +30,8 @@ class CustodyApiClient(private val endpoint: String, private val jwt: String) :
     httpPost(url, mapOf<String, String>(), jwt)
   }
 
-  fun sendWebhook(webhook: String, headers: Map<String, String>) {
-    val url = "$endpoint/webhook"
-    val type = object : TypeToken<Map<String?, *>?>() {}.type
-    val requestBody: Map<String, Any> = gson.fromJson(webhook, type)
-    httpPost(url, requestBody, headers)
+  fun sendWebhook(webhookRequest: String) {
+    val webhookSignature = RSAUtil.sign(webhookRequest, webhookPrivateKey)
+    httpPost("$endpoint/webhook", webhookRequest, mapOf("fireblocks-signature" to webhookSignature))
   }
 }
diff --git a/lib-util/src/main/kotlin/org/stellar/anchor/client/Sep38Client.kt b/lib-util/src/main/kotlin/org/stellar/anchor/client/Sep38Client.kt
index 093ea04f9a..63c781e233 100644
--- a/lib-util/src/main/kotlin/org/stellar/anchor/client/Sep38Client.kt
+++ b/lib-util/src/main/kotlin/org/stellar/anchor/client/Sep38Client.kt
@@ -26,7 +26,6 @@ class Sep38Client(private val endpoint: String, private val jwt: String) : SepCl
         .addPathSegment("prices")
         .addQueryParameter("sell_asset", sellAsset)
         .addQueryParameter("sell_amount", sellAmount)
-    println(urlBuilder.build().toString())
 
     val responseBody = httpGet(urlBuilder.build().toString(), jwt)
     return gson.fromJson(responseBody, GetPricesResponse::class.java)
@@ -48,7 +47,6 @@ class Sep38Client(private val endpoint: String, private val jwt: String) : SepCl
         .addQueryParameter("sell_amount", sellAmount)
         .addQueryParameter("buy_asset", buyAsset)
         .addQueryParameter("context", context.toString())
-    println(urlBuilder.build().toString())
 
     val responseBody = httpGet(urlBuilder.build().toString(), jwt)
     return gson.fromJson(responseBody, GetPriceResponse::class.java)
diff --git a/lib-util/src/main/kotlin/org/stellar/anchor/client/SepClient.kt b/lib-util/src/main/kotlin/org/stellar/anchor/client/SepClient.kt
index 9750175a9f..93156d8e04 100644
--- a/lib-util/src/main/kotlin/org/stellar/anchor/client/SepClient.kt
+++ b/lib-util/src/main/kotlin/org/stellar/anchor/client/SepClient.kt
@@ -41,21 +41,24 @@ open class SepClient {
     return httpPost(url, requestBody, headers)
   }
 
-  fun httpPost(url: String, requestBody: Map<String, Any>, headers: Map<String, String>): String? {
-    val requestBodyStr = gson.toJson(requestBody).toRequestBody(TYPE_JSON)
-
+  fun httpPost(url: String, requestBodyStr: String, headers: Map<String, String>): String? {
+    val requestBody = requestBodyStr.toRequestBody(TYPE_JSON)
     val request =
       Request.Builder()
         .url(url)
         .header("Content-Type", "application/json")
         .apply { headers.forEach { (key, value) -> header(key, value) } }
-        .post(requestBodyStr)
+        .post(requestBody)
         .build()
 
     val response = client.newCall(request).execute()
     return handleResponse(response)
   }
 
+  fun httpPost(url: String, requestBody: Map<String, Any>, headers: Map<String, String>): String? {
+    return httpPost(url, gson.toJson(requestBody), headers)
+  }
+
   fun handleResponse(response: Response): String? {
     val responseBody = response.body?.string()
 
diff --git a/core/src/test/kotlin/org/stellar/anchor/util/FileUtilTest.kt b/lib-util/src/test/kotlin/org/stellar/anchor/util/FileUtilTest.kt
similarity index 100%
rename from core/src/test/kotlin/org/stellar/anchor/util/FileUtilTest.kt
rename to lib-util/src/test/kotlin/org/stellar/anchor/util/FileUtilTest.kt
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/util/RSAUtilTest.kt b/lib-util/src/test/kotlin/org/stellar/anchor/util/RSAUtilTest.kt
similarity index 59%
rename from platform/src/test/kotlin/org/stellar/anchor/platform/util/RSAUtilTest.kt
rename to lib-util/src/test/kotlin/org/stellar/anchor/util/RSAUtilTest.kt
index 676fd1b64b..6e9f9c802d 100644
--- a/platform/src/test/kotlin/org/stellar/anchor/platform/util/RSAUtilTest.kt
+++ b/lib-util/src/test/kotlin/org/stellar/anchor/util/RSAUtilTest.kt
@@ -1,10 +1,11 @@
-package org.stellar.anchor.platform.util
+package org.stellar.anchor.util
 
 import com.google.common.io.BaseEncoding
 import com.google.gson.GsonBuilder
 import com.google.gson.JsonParser
 import java.io.IOException
 import java.nio.charset.Charset
+import java.security.KeyPairGenerator
 import java.security.NoSuchAlgorithmException
 import java.security.PublicKey
 import java.security.spec.InvalidKeySpecException
@@ -17,29 +18,30 @@ import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
 import org.stellar.anchor.api.exception.SepNotFoundException
-import org.stellar.anchor.platform.utils.RSAUtil.*
 import org.stellar.anchor.util.FileUtil.getResourceFileAsString
+import org.stellar.anchor.util.RSAUtil.*
 
 class RSAUtilTest {
+  private val privateKeyString =
+    "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJPq9AU6f8GrkSccloRb+UJmbxilZ7iLkvp0FeR/yymQuJDMNXPXwt5MYR9VJoY0uMDHThaEwbQAc2M4L9wl0EtsESebODUTqnsWZ8/a6GsmvIM3kz02ZOUHLst0krSkECPUHLLUKuw/HWz3LWxWLeqVRIcsCwKJNaBPZJzFw/8PAgMBAAECgYBhWXSYLFQApmW1k/8LxWxa4wei9Nk6f8GPy+7Mn76Z8IFH6t4TC6FYpHQXJvdfxDsDxSgDcgP574IBfu0gulJHEIsoDy1xR8TPobfhwoS1NJn70a8KQA6Whu+K5pjJxGUC7bpJH4ZK0O+szB1mNC0WgUywIc0lXCFFnCrgbNFWQQJBAM7+zgHAyD6rqQem09JcabMkwxu0mYih1mvQ3uv/fay8BdgZAqMuacMAPQ/A1TLeuTbMQ0LojnK/QlotbhHVnSkCQQC27684POaRrVIsVo5uKvQsKSNlYPpvGrGapHKiVgIQYfZSEY9SrazqKbA5yux0OR8ZFFSiJCThRElpzhnWFYl3AkEArNsLnVsn3W3sUX93FAwoGHlylQhTzk2XiaF7BwjsIftBxhvcn/h6SWVBmI4ne7uSX7hj0tPxYNFmz3dwm2QPQQJBAKS8mPSy2wtqoiotVBvfcHzoGujrePpednuFBXosq7UnEpN7Hq7cmW9RVVHl7CMJYXjLNx/AHroBLX8rS1bflCcCQBclpUG1PybVy1jHXTdI0w6zB6AwjaeFN5x4+b7hRe29yLNF532uIatxif19LHb5jUC7EefpLWBxx/bB4JCIyug="
+  private val publicKeyString =
+    "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCT6vQFOn/Bq5EnHJaEW/lCZm8YpWe4i5L6dBXkf8spkLiQzDVz18LeTGEfVSaGNLjAx04WhMG0AHNjOC/cJdBLbBEnmzg1E6p7FmfP2uhrJryDN5M9NmTlBy7LdJK0pBAj1Byy1CrsPx1s9y1sVi3qlUSHLAsCiTWgT2ScxcP/DwIDAQAB"
+  private val payload: String = "Test payload"
+  private val privateKey = generatePrivateKey(privateKeyString)
+  private val publicKey = generatePublicKey(publicKeyString)
+  private val signature = sign(payload, privateKey)
 
-  private val signature: String =
-    getResourceFileAsString("custody/fireblocks/webhook/submitted_event_valid_signature.txt")
-  private val eventObject: String =
-    getCompactJsonString("custody/fireblocks/webhook/submitted_event_request.json")
+  @Test
+  fun `test valid public key`() {
+    assertNotNull(generatePublicKey(publicKeyString, RSA_ALGORITHM))
+    assertTrue(isValidPublicKey(publicKeyString, RSA_ALGORITHM))
 
-  @ParameterizedTest
-  @ValueSource(strings = ["custody/fireblocks/webhook/public_key.txt"])
-  fun `test valid public key`(fileName: String) {
-    var publicKey: String = getResourceFileAsString(fileName)
-    assertNotNull(generatePublicKey(publicKey, RSA_ALGORITHM))
-    assertTrue(isValidPublicKey(publicKey, RSA_ALGORITHM))
-
-    publicKey =
-      publicKey
+    val publicKeyStr2 =
+      publicKeyString
         .replace(BEGIN_PUBLIC_KEY, StringUtils.EMPTY)
         .replace(END_PUBLIC_KEY, StringUtils.EMPTY)
-    assertNotNull(generatePublicKey(publicKey, RSA_ALGORITHM))
-    assertTrue(isValidPublicKey(publicKey, RSA_ALGORITHM))
+    assertNotNull(generatePublicKey(publicKeyStr2, RSA_ALGORITHM))
+    assertTrue(isValidPublicKey(publicKeyStr2, RSA_ALGORITHM))
   }
 
   @ParameterizedTest
@@ -73,74 +75,41 @@ class RSAUtilTest {
     assertFalse(isValidPublicKey(publicKey, RSA_ALGORITHM))
   }
 
-  @ParameterizedTest
-  @ValueSource(strings = ["custody/fireblocks/webhook/public_key.txt"])
-  fun `test isSignatureValid() returns true for valid signature, eventObject, public key and algorithm`(
-    fileName: String
-  ) {
-    val publicKeyString: String = getResourceFileAsString(fileName)
+  @Test
+  fun `test isSignatureValid() returns true for valid signature, eventObject, public key and algorithm`() {
     val publicKey: PublicKey = generatePublicKey(publicKeyString, RSA_ALGORITHM)
-    val validationResult =
-      isValidSignature(signature, eventObject, publicKey, SHA512_WITH_RSA_ALGORITHM)
+    val sig = sign(payload, privateKey)
+    val validationResult = isValidSignature(signature, payload, publicKey)
     assertTrue(validationResult)
   }
 
-  @ParameterizedTest
-  @ValueSource(strings = ["custody/fireblocks/webhook/public_key.txt"])
-  fun `test isSignatureValid() for invalid signature`(fileName: String) {
-    val publicKeyString: String = getResourceFileAsString(fileName)
+  @Test
+  fun `test isSignatureValid() for invalid signature`() {
     val publicKey: PublicKey = generatePublicKey(publicKeyString, RSA_ALGORITHM)
     val invalidSignature =
-      getResourceFileAsString("custody/fireblocks/webhook/submitted_event_invalid_signature.txt")
-    assertFalse(
-      isValidSignature(invalidSignature, eventObject, publicKey, SHA512_WITH_RSA_ALGORITHM)
-    )
+      "Yww6co109EfZ6BBam0zr1ewhv2gB3sFrfzcmbEFTttGp6GYVNEOslcMIMbjrFsFtkiEIO5ogvPI7Boz7yQUiXqh92Spj1aG5NoGDdjiW2ozTJxKq7ECK9IsS5vTjIxnBXUIXokCAN2BuiyA8d7LciJ6HwzS+DIvFNyvv7uKU6O0="
+    assertFalse(isValidSignature(invalidSignature, payload, publicKey))
   }
 
-  @ParameterizedTest
-  @ValueSource(strings = ["custody/fireblocks/webhook/public_key.txt"])
-  fun `test isSignatureValid() for invalid data`(fileName: String) {
-    val publicKeyString: String = getResourceFileAsString(fileName)
-    val publicKey: PublicKey = generatePublicKey(publicKeyString, RSA_ALGORITHM)
-    val invalidEventObject = eventObject + "test"
-    assertFalse(
-      isValidSignature(signature, invalidEventObject, publicKey, SHA512_WITH_RSA_ALGORITHM)
-    )
+  @Test
+  fun `test isSignatureValid() for invalid data`() {
+    val invalidEventObject = payload + "test"
+    assertFalse(isValidSignature(signature, invalidEventObject, publicKey))
   }
 
   @Test
   fun `test isSignatureValid() for invalid public key`() {
     val invalidPublicKey: PublicKey = generatePublicKey(invalidPublicKey, RSA_ALGORITHM)
-    assertFalse(
-      isValidSignature(signature, eventObject, invalidPublicKey, SHA512_WITH_RSA_ALGORITHM)
-    )
+    assertFalse(isValidSignature(signature, payload, invalidPublicKey))
   }
 
-  @ParameterizedTest
-  @ValueSource(strings = ["custody/fireblocks/webhook/public_key.txt"])
-  fun `test isSignatureValid() for invalid algorithm`(fileName: String) {
-    val publicKeyString: String = getResourceFileAsString(fileName)
-    val publicKey: PublicKey = generatePublicKey(publicKeyString, RSA_ALGORITHM)
+  @Test
+  fun `test isSignatureValid() for invalid algorithm`() {
     assertThrows<NoSuchAlgorithmException> {
-      isValidSignature(signature, eventObject, publicKey, "INVALID_ALGORITHM")
+      isValidSignature(signature, payload, publicKey, "INVALID_ALGORITHM")
     }
   }
 
-  @ParameterizedTest
-  @ValueSource(strings = ["custody/fireblocks/client/secret_key.txt"])
-  fun `test valid private key`(fileName: String) {
-    var privateKey: String = getResourceFileAsString(fileName)
-    assertNotNull(generatePrivateKey(privateKey, RSA_ALGORITHM))
-    assertTrue(isValidPrivateKey(privateKey, RSA_ALGORITHM))
-
-    privateKey =
-      privateKey
-        .replace(BEGIN_PUBLIC_KEY, StringUtils.EMPTY)
-        .replace(END_PUBLIC_KEY, StringUtils.EMPTY)
-    assertNotNull(generatePrivateKey(privateKey, RSA_ALGORITHM))
-    assertTrue(isValidPrivateKey(privateKey, RSA_ALGORITHM))
-  }
-
   @ParameterizedTest
   @ValueSource(strings = [""])
   fun `test empty private key`(privateKey: String) {
@@ -172,6 +141,22 @@ class RSAUtilTest {
     assertFalse(isValidPublicKey(privateKey, RSA_ALGORITHM))
   }
 
+  @Test
+  fun `test sign and verify with random key`() {
+    val kp = KeyPairGenerator.getInstance("RSA").genKeyPair()
+    val signature = sign(payload, kp.private)
+    assertTrue(isValidSignature(signature, payload, kp.public))
+  }
+
+  @Test
+  fun `test sign and verify`() {
+    val privateKey = generatePrivateKey(privateKeyString)
+    val publicKey = generatePublicKey(publicKeyString)
+
+    val signature = sign(payload, privateKey)
+    assertTrue(isValidSignature(signature, payload, publicKey))
+  }
+
   @Throws(IOException::class, SepNotFoundException::class)
   fun getCompactJsonString(fileName: String): String {
     val gson = GsonBuilder().serializeNulls().create()
diff --git a/core/src/test/resources/test_resource.txt b/lib-util/src/test/resources/test_resource.txt
similarity index 100%
rename from core/src/test/resources/test_resource.txt
rename to lib-util/src/test/resources/test_resource.txt
diff --git a/platform/src/main/java/org/stellar/anchor/platform/config/FireblocksConfig.java b/platform/src/main/java/org/stellar/anchor/platform/config/FireblocksConfig.java
index a58f105753..90493b6b6a 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/config/FireblocksConfig.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/config/FireblocksConfig.java
@@ -1,8 +1,8 @@
 package org.stellar.anchor.platform.config;
 
-import static org.stellar.anchor.platform.utils.RSAUtil.RSA_ALGORITHM;
-import static org.stellar.anchor.platform.utils.RSAUtil.generatePrivateKey;
-import static org.stellar.anchor.platform.utils.RSAUtil.generatePublicKey;
+import static org.stellar.anchor.util.RSAUtil.RSA_ALGORITHM;
+import static org.stellar.anchor.util.RSAUtil.generatePrivateKey;
+import static org.stellar.anchor.util.RSAUtil.generatePublicKey;
 import static org.stellar.anchor.util.StringHelper.isEmpty;
 
 import java.security.NoSuchAlgorithmException;
@@ -23,9 +23,9 @@
 import org.springframework.validation.Validator;
 import org.stellar.anchor.api.exception.InvalidConfigException;
 import org.stellar.anchor.config.CustodySecretConfig;
-import org.stellar.anchor.platform.utils.RSAUtil;
 import org.stellar.anchor.util.Log;
 import org.stellar.anchor.util.NetUtil;
+import org.stellar.anchor.util.RSAUtil;
 
 @Data
 public class FireblocksConfig implements Validator {
diff --git a/platform/src/main/java/org/stellar/anchor/platform/config/MetricConfig.java b/platform/src/main/java/org/stellar/anchor/platform/config/MetricConfig.java
index ca3afc8d87..0d424caed9 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/config/MetricConfig.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/config/MetricConfig.java
@@ -17,6 +17,6 @@ public boolean supports(@NotNull Class<?> clazz) {
 
   @Override
   public void validate(@NotNull Object target, @NotNull Errors errors) {
-    System.out.println("here");
+    // NOOP
   }
 }
diff --git a/platform/src/main/java/org/stellar/anchor/platform/configurator/ConfigReader.java b/platform/src/main/java/org/stellar/anchor/platform/configurator/ConfigReader.java
index 907a04fd70..8629968f49 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/configurator/ConfigReader.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/configurator/ConfigReader.java
@@ -62,9 +62,6 @@ public void validate(ConfigMap configMap) throws InvalidConfigException {
    * @return name of the array
    */
   String trimToArrayName(String fieldName) {
-    if (fieldName == null) {
-      System.out.println("hello");
-    }
     Matcher matcher = arrayPattern.matcher(fieldName);
 
     if (matcher.find()) {
diff --git a/platform/src/main/java/org/stellar/anchor/platform/controller/HealthController.java b/platform/src/main/java/org/stellar/anchor/platform/controller/HealthController.java
index 78184d5ad7..40d9f2e068 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/controller/HealthController.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/controller/HealthController.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -17,7 +18,9 @@ protected HealthController(HealthCheckService healthCheckService) {
     this.healthCheckService = healthCheckService;
   }
 
-  @RequestMapping(method = {RequestMethod.GET})
+  @RequestMapping(
+      method = {RequestMethod.GET},
+      produces = {MediaType.APPLICATION_JSON_VALUE})
   public ResponseEntity<HealthCheckResponse> health(
       @RequestParam(required = false) List<String> checks) {
     if (checks == null) {
diff --git a/platform/src/main/java/org/stellar/anchor/platform/controller/custody/CustodyHealthController.java b/platform/src/main/java/org/stellar/anchor/platform/controller/custody/CustodyHealthController.java
index 50cde8260f..58f5cb133e 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/controller/custody/CustodyHealthController.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/controller/custody/CustodyHealthController.java
@@ -1,5 +1,6 @@
 package org.stellar.anchor.platform.controller.custody;
 
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -8,7 +9,9 @@
 
 @RestController
 @CrossOrigin(origins = "*")
-@RequestMapping(value = "/health")
+@RequestMapping(
+    value = "/health",
+    produces = {MediaType.APPLICATION_JSON_VALUE})
 public class CustodyHealthController extends HealthController {
   public CustodyHealthController(HealthCheckService healthCheckService) {
     super(healthCheckService);
diff --git a/platform/src/main/java/org/stellar/anchor/platform/controller/custody/CustodyPaymentController.java b/platform/src/main/java/org/stellar/anchor/platform/controller/custody/CustodyPaymentController.java
index 93b54b80b5..79e1923b27 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/controller/custody/CustodyPaymentController.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/controller/custody/CustodyPaymentController.java
@@ -1,6 +1,7 @@
 package org.stellar.anchor.platform.controller.custody;
 
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -25,6 +26,7 @@ public CustodyPaymentController(CustodyPaymentService<?> custodyPaymentService)
   @ResponseStatus(code = HttpStatus.OK)
   @RequestMapping(
       value = "/assets/{assetId}/addresses",
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.POST})
   public GenerateDepositAddressResponse generateDepositAddress(@PathVariable String assetId)
       throws CustodyException, InvalidConfigException {
diff --git a/platform/src/main/java/org/stellar/anchor/platform/controller/custody/CustodyTransactionController.java b/platform/src/main/java/org/stellar/anchor/platform/controller/custody/CustodyTransactionController.java
index 3ea2ae750a..8f5f10592e 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/controller/custody/CustodyTransactionController.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/controller/custody/CustodyTransactionController.java
@@ -31,6 +31,7 @@ public CustodyTransactionController(CustodyTransactionService custodyTransaction
   @ResponseStatus(code = HttpStatus.OK)
   @RequestMapping(
       value = "/transactions",
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.POST})
   public void createCustodyTransaction(@RequestBody CreateCustodyTransactionRequest request) {
     custodyTransactionService.create(request, PAYMENT);
@@ -42,6 +43,7 @@ public void createCustodyTransaction(@RequestBody CreateCustodyTransactionReques
   @RequestMapping(
       value = "/transactions/{id}/payments",
       method = {RequestMethod.POST},
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       consumes = {MediaType.APPLICATION_JSON_VALUE})
   public CreateTransactionPaymentResponse createTransactionPayment(
       @PathVariable(name = "id") String txnId, @RequestBody String requestBody) {
@@ -54,6 +56,7 @@ public CreateTransactionPaymentResponse createTransactionPayment(
   @RequestMapping(
       value = "/transactions/{id}/refunds",
       method = {RequestMethod.POST},
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       consumes = {MediaType.APPLICATION_JSON_VALUE})
   public CreateTransactionPaymentResponse createTransactionRefund(
       @PathVariable(name = "id") String txnId,
diff --git a/platform/src/main/java/org/stellar/anchor/platform/controller/custody/CustodyWebhookController.java b/platform/src/main/java/org/stellar/anchor/platform/controller/custody/CustodyWebhookController.java
index 934147d00c..871d2b98f3 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/controller/custody/CustodyWebhookController.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/controller/custody/CustodyWebhookController.java
@@ -22,7 +22,8 @@ public class CustodyWebhookController {
   @RequestMapping(
       value = "/webhook",
       method = {RequestMethod.POST},
-      consumes = {MediaType.APPLICATION_JSON_VALUE})
+      consumes = {MediaType.APPLICATION_JSON_VALUE},
+      produces = {MediaType.APPLICATION_JSON_VALUE})
   public ResponseEntity<Void> handleEvent(
       @RequestBody String eventObject, @RequestHeader Map<String, String> headers) {
     custodyEventService.handleEvent(eventObject, headers);
diff --git a/platform/src/main/java/org/stellar/anchor/platform/controller/observer/ObserverHealthController.java b/platform/src/main/java/org/stellar/anchor/platform/controller/observer/ObserverHealthController.java
index 1428e0616c..447ade22b9 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/controller/observer/ObserverHealthController.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/controller/observer/ObserverHealthController.java
@@ -1,5 +1,6 @@
 package org.stellar.anchor.platform.controller.observer;
 
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -8,7 +9,9 @@
 
 @RestController
 @CrossOrigin(origins = "*")
-@RequestMapping(value = "/health")
+@RequestMapping(
+    value = "/health",
+    produces = {MediaType.APPLICATION_JSON_VALUE})
 public class ObserverHealthController extends HealthController {
   public ObserverHealthController(HealthCheckService healthCheckService) {
     super(healthCheckService);
diff --git a/platform/src/main/java/org/stellar/anchor/platform/controller/platform/PlatformController.java b/platform/src/main/java/org/stellar/anchor/platform/controller/platform/PlatformController.java
index 00e2672b1a..c431f4334f 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/controller/platform/PlatformController.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/controller/platform/PlatformController.java
@@ -40,6 +40,7 @@ public class PlatformController {
   @ResponseStatus(code = HttpStatus.OK)
   @RequestMapping(
       value = "/transactions/{id}",
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET})
   public GetTransactionResponse getTransaction(@PathVariable(name = "id") String txnId)
       throws AnchorException {
@@ -50,7 +51,8 @@ public GetTransactionResponse getTransaction(@PathVariable(name = "id") String t
   @RequestMapping(
       value = "/transactions/{id}/payments",
       method = {RequestMethod.POST},
-      consumes = {MediaType.APPLICATION_JSON_VALUE})
+      consumes = {MediaType.APPLICATION_JSON_VALUE},
+      produces = {MediaType.APPLICATION_JSON_VALUE})
   public CreateTransactionPaymentResponse createCustodyTransactionPayment(
       @PathVariable(name = "id") String txnId, @RequestBody String requestBody)
       throws AnchorException {
@@ -62,6 +64,7 @@ public CreateTransactionPaymentResponse createCustodyTransactionPayment(
   @RequestMapping(
       value = "/transactions",
       consumes = {MediaType.APPLICATION_JSON_VALUE},
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.PATCH})
   public PatchTransactionsResponse patchTransactions(@RequestBody PatchTransactionsRequest request)
       throws AnchorException {
@@ -72,6 +75,7 @@ public PatchTransactionsResponse patchTransactions(@RequestBody PatchTransaction
   @ResponseStatus(code = HttpStatus.OK)
   @RequestMapping(
       value = "/transactions",
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET})
   public GetTransactionsResponse getTransactions(
       @RequestParam(value = "sep") TransactionsSeps sep,
diff --git a/platform/src/main/java/org/stellar/anchor/platform/controller/platform/PlatformHealthController.java b/platform/src/main/java/org/stellar/anchor/platform/controller/platform/PlatformHealthController.java
index 5d2f225bc4..3e903958aa 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/controller/platform/PlatformHealthController.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/controller/platform/PlatformHealthController.java
@@ -1,5 +1,6 @@
 package org.stellar.anchor.platform.controller.platform;
 
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -8,7 +9,9 @@
 
 @RestController
 @CrossOrigin(origins = "*")
-@RequestMapping(value = "/health")
+@RequestMapping(
+    value = "/health",
+    produces = {MediaType.APPLICATION_JSON_VALUE})
 public class PlatformHealthController extends HealthController {
   public PlatformHealthController(HealthCheckService healthCheckService) {
     super(healthCheckService);
diff --git a/platform/src/main/java/org/stellar/anchor/platform/controller/platform/PlatformRpcController.java b/platform/src/main/java/org/stellar/anchor/platform/controller/platform/PlatformRpcController.java
index 46144100d2..32f551c48a 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/controller/platform/PlatformRpcController.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/controller/platform/PlatformRpcController.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -22,7 +23,9 @@ public PlatformRpcController(RpcService rpcService) {
   }
 
   @CrossOrigin(origins = "*")
-  @RequestMapping(method = {RequestMethod.POST})
+  @RequestMapping(
+      method = {RequestMethod.POST},
+      produces = {MediaType.APPLICATION_JSON_VALUE})
   @ResponseStatus(value = HttpStatus.OK)
   public List<RpcResponse> handle(@RequestBody List<RpcRequest> rpcRequests) {
     return rpcService.handle(rpcRequests);
diff --git a/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep10Controller.java b/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep10Controller.java
index 300a0ee116..b840e140ea 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep10Controller.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep10Controller.java
@@ -36,6 +36,7 @@ public Sep10Controller(Sep10Service sep10Service) {
   @CrossOrigin(origins = "*")
   @RequestMapping(
       value = "/auth",
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET})
   public ChallengeResponse createChallenge(
       @RequestParam String account,
@@ -63,10 +64,10 @@ public ChallengeResponse createChallenge(
   @RequestMapping(
       value = "/auth",
       consumes = {MediaType.APPLICATION_FORM_URLENCODED_VALUE},
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.POST})
   public ValidationResponse validateChallenge(@RequestParam String transaction)
-      throws InvalidSep10ChallengeException, IOException, URISyntaxException,
-          SepValidationException {
+      throws InvalidSep10ChallengeException, IOException, SepValidationException {
     debugF("POST /auth transaction={}", transaction);
     return validateChallenge(ValidationRequest.of(transaction));
   }
@@ -75,6 +76,7 @@ public ValidationResponse validateChallenge(@RequestParam String transaction)
   @RequestMapping(
       value = "/auth",
       consumes = {MediaType.APPLICATION_JSON_VALUE},
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.POST})
   public ValidationResponse validateChallenge(
       @RequestBody(required = false) ValidationRequest validationRequest)
diff --git a/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep12Controller.java b/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep12Controller.java
index bc65b06f53..b522103c11 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep12Controller.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep12Controller.java
@@ -31,6 +31,7 @@ public class Sep12Controller {
   @CrossOrigin(origins = "*")
   @RequestMapping(
       value = "/customer",
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET})
   public Sep12GetCustomerResponse getCustomer(
       HttpServletRequest request,
@@ -68,6 +69,7 @@ public Sep12GetCustomerResponse getCustomer(
   @RequestMapping(
       value = "/customer",
       consumes = {MediaType.APPLICATION_JSON_VALUE},
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.PUT})
   public Sep12PutCustomerResponse putCustomer(
       HttpServletRequest request, @RequestBody Sep12PutCustomerRequest putCustomerRequest) {
@@ -82,7 +84,8 @@ public Sep12PutCustomerResponse putCustomer(
   @RequestMapping(
       value = "/customer",
       method = {RequestMethod.POST, RequestMethod.PUT},
-      consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
+      consumes = {MediaType.MULTIPART_FORM_DATA_VALUE},
+      produces = {MediaType.APPLICATION_JSON_VALUE})
   public Sep12PutCustomerResponse putCustomerMultipart(HttpServletRequest request) {
     debug("PUT /customer multipart body:", request.getParameterMap());
     Gson gson = GsonUtils.getInstance();
@@ -101,6 +104,7 @@ public Sep12PutCustomerResponse putCustomerMultipart(HttpServletRequest request)
   @RequestMapping(
       value = "/customer/{account}",
       consumes = {MediaType.APPLICATION_JSON_VALUE},
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.DELETE})
   @ResponseStatus(code = HttpStatus.OK)
   public void deleteCustomer(
@@ -123,6 +127,7 @@ public void deleteCustomer(
   @RequestMapping(
       value = "/customer/{account}",
       consumes = {MediaType.APPLICATION_FORM_URLENCODED_VALUE, MediaType.MULTIPART_FORM_DATA_VALUE},
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.DELETE})
   @ResponseStatus(code = HttpStatus.OK)
   public void deleteCustomer(
diff --git a/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep1Controller.java b/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep1Controller.java
index a636ef0d33..bf18b5158a 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep1Controller.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep1Controller.java
@@ -2,6 +2,7 @@
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.view.RedirectView;
@@ -27,6 +28,7 @@ public Sep1Controller(Sep1Config sep1Config, Sep1Service sep1Service) {
   @CrossOrigin(origins = "*")
   @RequestMapping(
       value = "/",
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET, RequestMethod.OPTIONS})
   public RedirectView landingPage() throws SepNotFoundException {
     if (!sep1Config.isEnabled()) {
@@ -40,6 +42,7 @@ public RedirectView landingPage() throws SepNotFoundException {
   @CrossOrigin(origins = "*")
   @RequestMapping(
       value = "/.well-known/stellar.toml",
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET, RequestMethod.OPTIONS})
   public ResponseEntity<String> getToml() throws SepException {
     if (!sep1Config.isEnabled()) {
diff --git a/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep24Controller.java b/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep24Controller.java
index fa16233e89..76bed89f8a 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep24Controller.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep24Controller.java
@@ -43,6 +43,7 @@ public InfoResponse getInfo() {
   @RequestMapping(
       value = "/transactions/deposit/interactive",
       consumes = {MediaType.APPLICATION_JSON_VALUE},
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.POST})
   public InteractiveTransactionResponse deposit(
       HttpServletRequest request, @RequestBody HashMap<String, String> requestData)
@@ -58,7 +59,8 @@ public InteractiveTransactionResponse deposit(
   @RequestMapping(
       value = "/transactions/deposit/interactive",
       method = {RequestMethod.POST},
-      consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
+      consumes = {MediaType.MULTIPART_FORM_DATA_VALUE},
+      produces = {MediaType.APPLICATION_JSON_VALUE})
   public InteractiveTransactionResponse depositAllType(HttpServletRequest request)
       throws AnchorException, MalformedURLException, URISyntaxException {
     HashMap<String, String> requestData = new HashMap<>();
@@ -73,6 +75,7 @@ public InteractiveTransactionResponse depositAllType(HttpServletRequest request)
   @RequestMapping(
       value = "/transactions/withdraw/interactive",
       consumes = {MediaType.APPLICATION_JSON_VALUE},
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.POST})
   public InteractiveTransactionResponse withdraw(
       HttpServletRequest request, @RequestBody HashMap<String, String> requestData)
@@ -88,7 +91,8 @@ public InteractiveTransactionResponse withdraw(
   @RequestMapping(
       value = "/transactions/withdraw/interactive",
       method = {RequestMethod.POST},
-      consumes = {MediaType.MULTIPART_FORM_DATA_VALUE})
+      consumes = {MediaType.MULTIPART_FORM_DATA_VALUE},
+      produces = {MediaType.APPLICATION_JSON_VALUE})
   public InteractiveTransactionResponse withdrawAllType(HttpServletRequest request)
       throws AnchorException, MalformedURLException, URISyntaxException {
     HashMap<String, String> requestData = new HashMap<>();
@@ -103,6 +107,7 @@ public InteractiveTransactionResponse withdrawAllType(HttpServletRequest request
   @RequestMapping(
       value = "/transactions",
       consumes = {MediaType.APPLICATION_JSON_VALUE},
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET})
   public GetTransactionsResponse getTransactions(
       HttpServletRequest request, @RequestBody GetTransactionsRequest tr)
@@ -116,6 +121,7 @@ public GetTransactionsResponse getTransactions(
   @RequestMapping(
       value = "/transactions",
       consumes = {MediaType.ALL_VALUE},
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET})
   public GetTransactionsResponse getTransactions(
       HttpServletRequest request,
@@ -142,6 +148,7 @@ public GetTransactionsResponse getTransactions(
   @RequestMapping(
       value = "/transaction",
       consumes = {MediaType.APPLICATION_JSON_VALUE},
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET})
   public Sep24GetTransactionResponse getTransaction(
       HttpServletRequest request, @RequestBody(required = false) GetTransactionRequest tr)
@@ -156,6 +163,7 @@ public Sep24GetTransactionResponse getTransaction(
   @RequestMapping(
       value = "/transaction",
       consumes = {MediaType.ALL_VALUE},
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET})
   public Sep24GetTransactionResponse getTransaction(
       HttpServletRequest request,
diff --git a/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep31Controller.java b/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep31Controller.java
index f18391849a..e0f7a08b47 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep31Controller.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep31Controller.java
@@ -42,6 +42,7 @@ public Sep31InfoResponse getInfo() {
   @RequestMapping(
       value = "/transactions",
       consumes = {MediaType.APPLICATION_JSON_VALUE},
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.POST})
   public Sep31PostTransactionResponse postTransaction(
       HttpServletRequest servletRequest, @RequestBody Sep31PostTransactionRequest request)
@@ -55,6 +56,7 @@ public Sep31PostTransactionResponse postTransaction(
   @ResponseStatus(code = HttpStatus.OK)
   @RequestMapping(
       value = "/transactions/{id}",
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET})
   public Sep31GetTransactionResponse getTransaction(
       HttpServletRequest ignoredServletRequest, @PathVariable(name = "id") String txnId)
@@ -68,6 +70,7 @@ public Sep31GetTransactionResponse getTransaction(
   @RequestMapping(
       value = "/transactions/{id}",
       consumes = {MediaType.APPLICATION_JSON_VALUE},
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.PATCH})
   public Sep31GetTransactionResponse patchTransaction(
       HttpServletRequest ignoredServletRequest,
diff --git a/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep38Controller.java b/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep38Controller.java
index 20cd37a039..96d22f6469 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep38Controller.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep38Controller.java
@@ -30,6 +30,7 @@ public class Sep38Controller {
   public Sep38Controller(Sep38Service sep38Service) {
     this.sep38Service = sep38Service;
   }
+
   // TODO: add integration tests
 
   @CrossOrigin(origins = "*")
@@ -45,6 +46,7 @@ public InfoResponse getInfo() {
   @CrossOrigin(origins = "*")
   @RequestMapping(
       value = "/prices",
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET})
   public GetPricesResponse getPrices(
       @RequestParam(name = "sell_asset") String sellAssetName,
@@ -68,6 +70,7 @@ public GetPricesResponse getPrices(
   @CrossOrigin(origins = "*")
   @RequestMapping(
       value = "/price",
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET})
   public GetPriceResponse getPrice(
       HttpServletRequest request, @RequestParam Map<String, String> params) {
@@ -89,6 +92,7 @@ public GetPriceResponse getPrice(
   @RequestMapping(
       value = "/quote",
       consumes = {MediaType.APPLICATION_JSON_VALUE},
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.POST})
   public Sep38QuoteResponse postQuote(
       HttpServletRequest request, @RequestBody Sep38PostQuoteRequest postQuoteRequest) {
@@ -102,6 +106,7 @@ public Sep38QuoteResponse postQuote(
   @ResponseStatus(code = HttpStatus.OK)
   @RequestMapping(
       value = "/quote/{quote_id}",
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET})
   public Sep38QuoteResponse getQuote(
       HttpServletRequest request, @PathVariable(name = "quote_id") String quoteId) {
diff --git a/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep6Controller.java b/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep6Controller.java
index 8938c9f7e1..a6c5deb453 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep6Controller.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/controller/sep/Sep6Controller.java
@@ -3,6 +3,7 @@
 import static org.stellar.anchor.util.Log.debugF;
 
 import javax.servlet.http.HttpServletRequest;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 import org.stellar.anchor.api.exception.AnchorException;
 import org.stellar.anchor.api.exception.SepException;
@@ -25,6 +26,7 @@ public Sep6Controller(Sep6Service sep6Service) {
   @CrossOrigin(origins = "*")
   @RequestMapping(
       value = "/info",
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET})
   public InfoResponse getInfo() {
     debugF("GET /info");
@@ -34,6 +36,7 @@ public InfoResponse getInfo() {
   @CrossOrigin(origins = "*")
   @RequestMapping(
       value = "/deposit",
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET})
   public StartDepositResponse deposit(
       HttpServletRequest request,
@@ -74,6 +77,7 @@ public StartDepositResponse deposit(
   @CrossOrigin(origins = "*")
   @RequestMapping(
       value = "/deposit-exchange",
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET})
   public StartDepositResponse depositExchange(
       HttpServletRequest request,
@@ -112,6 +116,7 @@ public StartDepositResponse depositExchange(
   @CrossOrigin(origins = "*")
   @RequestMapping(
       value = "/withdraw",
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET})
   public StartWithdrawResponse withdraw(
       HttpServletRequest request,
@@ -139,6 +144,7 @@ public StartWithdrawResponse withdraw(
   @CrossOrigin(origins = "*")
   @RequestMapping(
       value = "/withdraw-exchange",
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET})
   public StartWithdrawResponse withdraw(
       HttpServletRequest request,
@@ -170,6 +176,7 @@ public StartWithdrawResponse withdraw(
   @CrossOrigin(origins = "*")
   @RequestMapping(
       value = "/transactions",
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET})
   public GetTransactionsResponse getTransactions(
       HttpServletRequest request,
@@ -206,6 +213,7 @@ public GetTransactionsResponse getTransactions(
   @CrossOrigin(origins = "*")
   @RequestMapping(
       value = "/transaction",
+      produces = {MediaType.APPLICATION_JSON_VALUE},
       method = {RequestMethod.GET})
   public GetTransactionResponse getTransaction(
       HttpServletRequest request,
diff --git a/platform/src/main/java/org/stellar/anchor/platform/controller/sep/SepHealthController.java b/platform/src/main/java/org/stellar/anchor/platform/controller/sep/SepHealthController.java
index 17079aa843..dc9f58aab2 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/controller/sep/SepHealthController.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/controller/sep/SepHealthController.java
@@ -1,5 +1,6 @@
 package org.stellar.anchor.platform.controller.sep;
 
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -8,7 +9,9 @@
 
 @RestController
 @CrossOrigin(origins = "*")
-@RequestMapping(value = "/health")
+@RequestMapping(
+    value = "/health",
+    produces = {MediaType.APPLICATION_JSON_VALUE})
 public class SepHealthController extends HealthController {
   public SepHealthController(HealthCheckService healthCheckService) {
     super(healthCheckService);
diff --git a/platform/src/main/java/org/stellar/anchor/platform/custody/fireblocks/FireblocksEventService.java b/platform/src/main/java/org/stellar/anchor/platform/custody/fireblocks/FireblocksEventService.java
index 77cdc53245..da0511ad8d 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/custody/fireblocks/FireblocksEventService.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/custody/fireblocks/FireblocksEventService.java
@@ -26,8 +26,8 @@
 import org.stellar.anchor.platform.config.FireblocksConfig;
 import org.stellar.anchor.platform.custody.*;
 import org.stellar.anchor.platform.data.JdbcCustodyTransactionRepo;
-import org.stellar.anchor.platform.utils.RSAUtil;
 import org.stellar.anchor.util.GsonUtils;
+import org.stellar.anchor.util.RSAUtil;
 import org.stellar.sdk.responses.operations.OperationResponse;
 import org.stellar.sdk.responses.operations.PathPaymentBaseOperationResponse;
 import org.stellar.sdk.responses.operations.PaymentOperationResponse;
@@ -82,8 +82,7 @@ public void handleEvent(String event, Map<String, String> headers) throws BadReq
     debugF("Fireblocks /webhook endpoint called with data '{}'", event);
 
     try {
-      if (RSAUtil.isValidSignature(
-          signature, event, publicKey, RSAUtil.SHA512_WITH_RSA_ALGORITHM)) {
+      if (RSAUtil.isValidSignature(signature, event, publicKey)) {
         FireblocksEventObject fireblocksEventObject =
             GsonUtils.getInstance().fromJson(event, FireblocksEventObject.class);
 
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/LogAppenderTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/LogAppenderTest.kt
deleted file mode 100644
index 2ae9470a88..0000000000
--- a/platform/src/test/kotlin/org/stellar/anchor/platform/LogAppenderTest.kt
+++ /dev/null
@@ -1,83 +0,0 @@
-package org.stellar.anchor.platform
-
-import io.mockk.*
-import org.apache.logging.log4j.Level
-import org.apache.logging.log4j.LogManager
-import org.apache.logging.log4j.core.Appender
-import org.apache.logging.log4j.core.LogEvent
-import org.apache.logging.log4j.core.LoggerContext
-import org.apache.logging.log4j.core.config.LoggerConfig
-import org.junit.jupiter.api.AfterEach
-import org.junit.jupiter.api.Assertions.assertEquals
-import org.junit.jupiter.api.BeforeEach
-import org.junit.jupiter.api.Disabled
-import org.junit.jupiter.params.ParameterizedTest
-import org.junit.jupiter.params.provider.CsvSource
-import org.stellar.anchor.util.*
-
-@Disabled
-class LogAppenderTest {
-  private lateinit var appender: Appender
-  private lateinit var capturedLogEvent: CapturingSlot<LogEvent>
-  private lateinit var loggerContext: LoggerContext
-  private lateinit var rootLoggerConfig: LoggerConfig
-  private lateinit var lastLevel: Level
-
-  @BeforeEach
-  fun setup() {
-    appender = mockk()
-    capturedLogEvent = slot()
-    loggerContext = LogManager.getContext(false) as LoggerContext
-    rootLoggerConfig = loggerContext.configuration.getLoggerConfig("org.stellar")
-    lastLevel = rootLoggerConfig.level
-
-    every { appender.name } returns "mock appender"
-    every { appender.isStarted } returns true
-    every { appender.append(capture(capturedLogEvent)) }
-
-    rootLoggerConfig.addAppender(appender, Level.ALL, null)
-    rootLoggerConfig.level = Level.TRACE
-  }
-
-  @AfterEach
-  fun tearDown() {
-    rootLoggerConfig.removeAppender("mock appender")
-    rootLoggerConfig.level = lastLevel
-  }
-
-  @ParameterizedTest
-  @CsvSource(
-    value =
-      [
-        "error,error_message,ERROR",
-        "warn,warn_message,WARN",
-        "info,info_message,INFO",
-        "debug,debug_message,DEBUG",
-        "trace,trace_message,TRACE",
-      ]
-  )
-  fun test_logger_outputAccurateLoggerName(
-    methodName: String,
-    wantMessage: String,
-    wantLevelName: String
-  ) {
-    when (methodName) {
-      "error" -> Log.error(wantMessage)
-      "warn" -> Log.warn(wantMessage)
-      "info" -> Log.info(wantMessage)
-      "debug" -> Log.debug(wantMessage)
-      "trace" -> Log.trace(wantMessage)
-    }
-
-    // Verify that the append method was called, which ensures that the event was captured
-    verify { appender.append(any()) }
-
-    assertEquals(
-      org.stellar.anchor.platform.LogAppenderTest::class.qualifiedName,
-      capturedLogEvent.captured.loggerName
-    )
-    assertEquals(wantLevelName, capturedLogEvent.captured.level.toString())
-    assertEquals(wantMessage, capturedLogEvent.captured.message.toString())
-    capturedLogEvent.clear()
-  }
-}
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/callback/RestCustomerIntegrationTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/callback/RestCustomerIntegrationTest.kt
index b07a856f85..79e0a15d37 100644
--- a/platform/src/test/kotlin/org/stellar/anchor/platform/callback/RestCustomerIntegrationTest.kt
+++ b/platform/src/test/kotlin/org/stellar/anchor/platform/callback/RestCustomerIntegrationTest.kt
@@ -110,8 +110,6 @@ class RestCustomerIntegrationTest {
     wantResponse.providedFields = mapOf("last_name" to lastNameProvidedField)
 
     val gotResponse = customerIntegration.getCustomer(getCustomerRequest)
-    println(gson.toJson(wantResponse))
-    println(gson.toJson(gotResponse))
 
     assertEquals(wantResponse, gotResponse)
 
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/custody/CustodyEventServiceTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/custody/CustodyEventServiceTest.kt
index 9ff0a9e28f..62b7078c61 100644
--- a/platform/src/test/kotlin/org/stellar/anchor/platform/custody/CustodyEventServiceTest.kt
+++ b/platform/src/test/kotlin/org/stellar/anchor/platform/custody/CustodyEventServiceTest.kt
@@ -10,6 +10,7 @@ import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.ValueSource
 import org.stellar.anchor.platform.data.JdbcCustodyTransaction
 import org.stellar.anchor.platform.data.JdbcCustodyTransactionRepo
+import org.stellar.anchor.util.Log.debug
 
 class CustodyEventServiceTest {
 
@@ -27,7 +28,7 @@ class CustodyEventServiceTest {
       sep31CustodyPaymentHandler
     ) {
     override fun handleEvent(event: String?, headers: MutableMap<String, String>?) {
-      println("Test implementation")
+      debug("Test implementation")
     }
   }
 
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/custody/fireblocks/FireblocksEventServiceTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/custody/fireblocks/FireblocksEventServiceTest.kt
index 62b04e4efd..061ef5ceb1 100644
--- a/platform/src/test/kotlin/org/stellar/anchor/platform/custody/fireblocks/FireblocksEventServiceTest.kt
+++ b/platform/src/test/kotlin/org/stellar/anchor/platform/custody/fireblocks/FireblocksEventServiceTest.kt
@@ -28,11 +28,11 @@ import org.stellar.anchor.platform.custody.Sep6CustodyPaymentHandler
 import org.stellar.anchor.platform.custody.fireblocks.FireblocksEventService.FIREBLOCKS_SIGNATURE_HEADER
 import org.stellar.anchor.platform.data.JdbcCustodyTransaction
 import org.stellar.anchor.platform.data.JdbcCustodyTransactionRepo
-import org.stellar.anchor.platform.utils.RSAUtil
-import org.stellar.anchor.platform.utils.RSAUtil.RSA_ALGORITHM
-import org.stellar.anchor.platform.utils.RSAUtil.SHA512_WITH_RSA_ALGORITHM
 import org.stellar.anchor.util.FileUtil.getResourceFileAsString
 import org.stellar.anchor.util.GsonUtils
+import org.stellar.anchor.util.RSAUtil
+import org.stellar.anchor.util.RSAUtil.RSA_ALGORITHM
+import org.stellar.anchor.util.RSAUtil.SHA512_WITH_RSA_ALGORITHM
 import org.stellar.sdk.Server
 import org.stellar.sdk.requests.PaymentsRequestBuilder
 import org.stellar.sdk.responses.Page
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/service/CustodyServiceTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/service/CustodyServiceTest.kt
index 952e4075a6..db00824833 100644
--- a/platform/src/test/kotlin/org/stellar/anchor/platform/service/CustodyServiceTest.kt
+++ b/platform/src/test/kotlin/org/stellar/anchor/platform/service/CustodyServiceTest.kt
@@ -74,8 +74,6 @@ class CustodyServiceTest {
 
     custodyService.createTransaction(txn)
 
-    println(gson.toJson(requestCapture.captured))
-
     JSONAssert.assertEquals(
       sep6WithdrawalRequest.replace("testKind", kind),
       gson.toJson(requestCapture.captured),
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/service/TransactionServiceTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/service/TransactionServiceTest.kt
index ab55f9a89e..c4c9b00a1c 100644
--- a/platform/src/test/kotlin/org/stellar/anchor/platform/service/TransactionServiceTest.kt
+++ b/platform/src/test/kotlin/org/stellar/anchor/platform/service/TransactionServiceTest.kt
@@ -639,8 +639,6 @@ class TransactionServiceTest {
 
     every { sep38QuoteStore.findByQuoteId(quoteId) } returns testSep38Quote
 
-    println(gson.toJson(testSep38Quote))
-
     this.assetService = DefaultAssetService.fromJsonResource("test_assets.json")
     transactionService =
       TransactionService(
diff --git a/service-runner/build.gradle.kts b/service-runner/build.gradle.kts
index e7e4803e7b..bfe3d394f6 100644
--- a/service-runner/build.gradle.kts
+++ b/service-runner/build.gradle.kts
@@ -50,6 +50,16 @@ tasks.register<JavaExec>("startAllServers") {
   mainClass.set("org.stellar.anchor.platform.run_profiles.RunAllServers")
 }
 
+/**
+ * Start all the servers based on the test configuration specified by the TEST_PROFILE_NAME envionrment variable.
+ */
+tasks.register<JavaExec>("startServersWithTestProfile") {
+  println("Starting the servers based on the test configuration specified by the TEST_PROFILE_NAME envionrment variable.")
+  group = "application"
+  classpath = sourceSets["main"].runtimeClasspath
+  mainClass.set("org.stellar.anchor.platform.run_profiles.RunTestProfile")
+}
+
 /**
  * Run docker-compose up to start Postgres, Kafka, Zookeeper,etc.
  */
diff --git a/service-runner/src/main/kotlin/org/stellar/anchor/platform/TestProfileRunner.kt b/service-runner/src/main/kotlin/org/stellar/anchor/platform/TestProfileRunner.kt
index a91eaa75b7..d979c9d7ea 100644
--- a/service-runner/src/main/kotlin/org/stellar/anchor/platform/TestProfileRunner.kt
+++ b/service-runner/src/main/kotlin/org/stellar/anchor/platform/TestProfileRunner.kt
@@ -80,8 +80,6 @@ class TestProfileExecutor(val config: TestConfig) {
     }
 
     startDocker()
-    // TODO: Check server readiness instead of wait for 5 seconds
-    sleep(5000)
     startServers(wait)
   }
 
@@ -170,6 +168,9 @@ class TestProfileExecutor(val config: TestConfig) {
           .build()
 
       docker.beforeAll(null)
+
+      // TODO: Check server readiness instead of wait for 5 seconds
+      sleep(5000)
     }
   }
 
@@ -185,8 +186,8 @@ class TestProfileExecutor(val config: TestConfig) {
       }
     }
 
-    org.stellar.reference.stop()
-    org.stellar.reference.wallet.stop()
+    if (shouldStartAllServers || shouldStartKotlinReferenceServer) org.stellar.reference.stop()
+    if (shouldStartAllServers || shouldStartWalletServer) org.stellar.reference.wallet.stop()
   }
 
   private fun shutdownDocker() {
diff --git a/service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunCustodyServer.kt b/service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunCustodyServer.kt
index 229932be97..a59ea66e7e 100644
--- a/service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunCustodyServer.kt
+++ b/service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunCustodyServer.kt
@@ -7,7 +7,7 @@ import kotlinx.coroutines.runBlocking
 import org.stellar.anchor.platform.*
 
 fun main() = runBlocking {
-  testProfileExecutor = TestProfileExecutor(TestConfig(testProfileName = "default-custody"))
+  testProfileExecutor = TestProfileExecutor(TestConfig(testProfileName = "custody"))
   launch { registerShutdownHook(testProfileExecutor) }
   testProfileExecutor.start(true) {
     it.env[RUN_DOCKER] = "false"
diff --git a/service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunSEP24NoFrontend.kt b/service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunTestProfile.kt
similarity index 53%
rename from service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunSEP24NoFrontend.kt
rename to service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunTestProfile.kt
index f6f9347bd8..d285877b4d 100644
--- a/service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunSEP24NoFrontend.kt
+++ b/service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunTestProfile.kt
@@ -1,17 +1,15 @@
-@file:JvmName("RunSEP24NoFrontend")
+@file:JvmName("RunTestProfile")
 
 package org.stellar.anchor.platform.run_profiles
 
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
-import org.stellar.anchor.platform.*
+import org.stellar.anchor.platform.TestConfig
+import org.stellar.anchor.platform.TestProfileExecutor
+import org.stellar.anchor.platform.testProfileExecutor
 
 fun main() = runBlocking {
   testProfileExecutor = TestProfileExecutor(TestConfig())
   launch { registerShutdownHook(testProfileExecutor) }
-  testProfileExecutor.start(true) {
-    it.env[RUN_DOCKER] = "false"
-    it.env[RUN_ALL_SERVERS] = "false"
-    it.env[RUN_KOTLIN_REFERENCE_SERVER] = "true"
-  }
+  testProfileExecutor.start(true)
 }
diff --git a/service-runner/src/main/resources/profiles/auth-apikey-custody/config.env b/service-runner/src/main/resources/profiles/auth-apikey-custody/config.env
new file mode 100644
index 0000000000..aa40423727
--- /dev/null
+++ b/service-runner/src/main/resources/profiles/auth-apikey-custody/config.env
@@ -0,0 +1,17 @@
+secret.custody.fireblocks.api_key=testApiKey
+secret.custody.fireblocks.secret_key=MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJPq9AU6f8GrkSccloRb+UJmbxilZ7iLkvp0FeR/yymQuJDMNXPXwt5MYR9VJoY0uMDHThaEwbQAc2M4L9wl0EtsESebODUTqnsWZ8/a6GsmvIM3kz02ZOUHLst0krSkECPUHLLUKuw/HWz3LWxWLeqVRIcsCwKJNaBPZJzFw/8PAgMBAAECgYBhWXSYLFQApmW1k/8LxWxa4wei9Nk6f8GPy+7Mn76Z8IFH6t4TC6FYpHQXJvdfxDsDxSgDcgP574IBfu0gulJHEIsoDy1xR8TPobfhwoS1NJn70a8KQA6Whu+K5pjJxGUC7bpJH4ZK0O+szB1mNC0WgUywIc0lXCFFnCrgbNFWQQJBAM7+zgHAyD6rqQem09JcabMkwxu0mYih1mvQ3uv/fay8BdgZAqMuacMAPQ/A1TLeuTbMQ0LojnK/QlotbhHVnSkCQQC27684POaRrVIsVo5uKvQsKSNlYPpvGrGapHKiVgIQYfZSEY9SrazqKbA5yux0OR8ZFFSiJCThRElpzhnWFYl3AkEArNsLnVsn3W3sUX93FAwoGHlylQhTzk2XiaF7BwjsIftBxhvcn/h6SWVBmI4ne7uSX7hj0tPxYNFmz3dwm2QPQQJBAKS8mPSy2wtqoiotVBvfcHzoGujrePpednuFBXosq7UnEpN7Hq7cmW9RVVHl7CMJYXjLNx/AHroBLX8rS1bflCcCQBclpUG1PybVy1jHXTdI0w6zB6AwjaeFN5x4+b7hRe29yLNF532uIatxif19LHb5jUC7EefpLWBxx/bB4JCIyug=
+
+# seps
+sep6.deposit_info_generator_type=custody
+sep24.deposit_info_generator_type=custody
+sep31.deposit_info_generator_type=custody
+
+# custody
+custody.type=fireblocks
+custody.fireblocks.vault_account_id=1
+custody.fireblocks.public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCT6vQFOn/Bq5EnHJaEW/lCZm8YpWe4i5L6dBXkf8spkLiQzDVz18LeTGEfVSaGNLjAx04WhMG0AHNjOC/cJdBLbBEnmzg1E6p7FmfP2uhrJryDN5M9NmTlBy7LdJK0pBAj1Byy1CrsPx1s9y1sVi3qlUSHLAsCiTWgT2ScxcP/DwIDAQAB
+custody.fireblocks.asset_mappings=XLM_USDC_T_CEKS stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5\nXLM_TEST stellar:native
+custody.fireblocks.reconciliation.cron_expression=0/10 * * * * *
+
+# Customize from custody config
+custody_server.auth.type=api_key
diff --git a/service-runner/src/main/resources/profiles/auth-apikey-custody/test.env b/service-runner/src/main/resources/profiles/auth-apikey-custody/test.env
new file mode 100644
index 0000000000..1238a8db90
--- /dev/null
+++ b/service-runner/src/main/resources/profiles/auth-apikey-custody/test.env
@@ -0,0 +1,3 @@
+run.all.servers=false
+run.custody.server=true
+app.custodyEnabled=true
diff --git a/service-runner/src/main/resources/profiles/auth-apikey-platform/config.env b/service-runner/src/main/resources/profiles/auth-apikey-platform/config.env
new file mode 100644
index 0000000000..257d952b48
--- /dev/null
+++ b/service-runner/src/main/resources/profiles/auth-apikey-platform/config.env
@@ -0,0 +1 @@
+platform_server.auth.type=api_key
\ No newline at end of file
diff --git a/service-runner/src/main/resources/profiles/auth-apikey-platform/test.env b/service-runner/src/main/resources/profiles/auth-apikey-platform/test.env
new file mode 100644
index 0000000000..8b64cb892c
--- /dev/null
+++ b/service-runner/src/main/resources/profiles/auth-apikey-platform/test.env
@@ -0,0 +1,2 @@
+run.all.servers=false
+run.platform.server=true
\ No newline at end of file
diff --git a/service-runner/src/main/resources/profiles/auth-jwt-custody/config.env b/service-runner/src/main/resources/profiles/auth-jwt-custody/config.env
new file mode 100644
index 0000000000..7af0e26d27
--- /dev/null
+++ b/service-runner/src/main/resources/profiles/auth-jwt-custody/config.env
@@ -0,0 +1,19 @@
+secret.custody.fireblocks.api_key=testApiKey
+secret.custody.fireblocks.secret_key=MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJPq9AU6f8GrkSccloRb+UJmbxilZ7iLkvp0FeR/yymQuJDMNXPXwt5MYR9VJoY0uMDHThaEwbQAc2M4L9wl0EtsESebODUTqnsWZ8/a6GsmvIM3kz02ZOUHLst0krSkECPUHLLUKuw/HWz3LWxWLeqVRIcsCwKJNaBPZJzFw/8PAgMBAAECgYBhWXSYLFQApmW1k/8LxWxa4wei9Nk6f8GPy+7Mn76Z8IFH6t4TC6FYpHQXJvdfxDsDxSgDcgP574IBfu0gulJHEIsoDy1xR8TPobfhwoS1NJn70a8KQA6Whu+K5pjJxGUC7bpJH4ZK0O+szB1mNC0WgUywIc0lXCFFnCrgbNFWQQJBAM7+zgHAyD6rqQem09JcabMkwxu0mYih1mvQ3uv/fay8BdgZAqMuacMAPQ/A1TLeuTbMQ0LojnK/QlotbhHVnSkCQQC27684POaRrVIsVo5uKvQsKSNlYPpvGrGapHKiVgIQYfZSEY9SrazqKbA5yux0OR8ZFFSiJCThRElpzhnWFYl3AkEArNsLnVsn3W3sUX93FAwoGHlylQhTzk2XiaF7BwjsIftBxhvcn/h6SWVBmI4ne7uSX7hj0tPxYNFmz3dwm2QPQQJBAKS8mPSy2wtqoiotVBvfcHzoGujrePpednuFBXosq7UnEpN7Hq7cmW9RVVHl7CMJYXjLNx/AHroBLX8rS1bflCcCQBclpUG1PybVy1jHXTdI0w6zB6AwjaeFN5x4+b7hRe29yLNF532uIatxif19LHb5jUC7EefpLWBxx/bB4JCIyug=
+
+# seps
+sep6.deposit_info_generator_type=custody
+sep24.deposit_info_generator_type=custody
+sep31.deposit_info_generator_type=custody
+
+# custody
+custody.type=fireblocks
+custody.fireblocks.vault_account_id=1
+custody.fireblocks.public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCT6vQFOn/Bq5EnHJaEW/lCZm8YpWe4i5L6dBXkf8spkLiQzDVz18LeTGEfVSaGNLjAx04WhMG0AHNjOC/cJdBLbBEnmzg1E6p7FmfP2uhrJryDN5M9NmTlBy7LdJK0pBAj1Byy1CrsPx1s9y1sVi3qlUSHLAsCiTWgT2ScxcP/DwIDAQAB
+custody.fireblocks.asset_mappings=XLM_USDC_T_CEKS stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5\nXLM_TEST stellar:native
+custody.fireblocks.reconciliation.cron_expression=0/10 * * * * *
+
+# Customize from custody config
+run.all.servers=false
+run.custody.server=true
+custody_server.auth.type=jwt
diff --git a/service-runner/src/main/resources/profiles/auth-jwt-custody/test.env b/service-runner/src/main/resources/profiles/auth-jwt-custody/test.env
new file mode 100644
index 0000000000..1238a8db90
--- /dev/null
+++ b/service-runner/src/main/resources/profiles/auth-jwt-custody/test.env
@@ -0,0 +1,3 @@
+run.all.servers=false
+run.custody.server=true
+app.custodyEnabled=true
diff --git a/service-runner/src/main/resources/profiles/auth-jwt-platform/config.env b/service-runner/src/main/resources/profiles/auth-jwt-platform/config.env
new file mode 100644
index 0000000000..493c88019a
--- /dev/null
+++ b/service-runner/src/main/resources/profiles/auth-jwt-platform/config.env
@@ -0,0 +1,14 @@
+run.all.servers=false
+run.platform.server=true
+run.kotlin.reference.server=true
+
+# Platform Server
+platform_server.auth.type=JWT
+platformToAnchorSecret=myPlatformToAnchorSecret
+anchorToPlatformSecret=myAnchorToPlatformSecret
+expirationMilliseconds=10000
+
+# Kotlin Reference Server
+auth.type=JWT
+platformToAnchorSecret=myPlatformToAnchorSecret
+anchorToPlatformSecret=myAnchorToPlatformSecret
diff --git a/service-runner/src/main/resources/profiles/auth-jwt-platform/test.env b/service-runner/src/main/resources/profiles/auth-jwt-platform/test.env
new file mode 100644
index 0000000000..8b64cb892c
--- /dev/null
+++ b/service-runner/src/main/resources/profiles/auth-jwt-platform/test.env
@@ -0,0 +1,2 @@
+run.all.servers=false
+run.platform.server=true
\ No newline at end of file
diff --git a/service-runner/src/main/resources/profiles/default-custody/config.env b/service-runner/src/main/resources/profiles/custody/config.env
similarity index 96%
rename from service-runner/src/main/resources/profiles/default-custody/config.env
rename to service-runner/src/main/resources/profiles/custody/config.env
index eff0403db4..bf1ad0737a 100644
--- a/service-runner/src/main/resources/profiles/default-custody/config.env
+++ b/service-runner/src/main/resources/profiles/custody/config.env
@@ -8,6 +8,7 @@ sep31.deposit_info_generator_type=custody
 
 # custody
 custody.type=fireblocks
+custody.fireblocks.base_url=http://localhost:58086/
 custody.fireblocks.vault_account_id=1
 custody.fireblocks.public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCT6vQFOn/Bq5EnHJaEW/lCZm8YpWe4i5L6dBXkf8spkLiQzDVz18LeTGEfVSaGNLjAx04WhMG0AHNjOC/cJdBLbBEnmzg1E6p7FmfP2uhrJryDN5M9NmTlBy7LdJK0pBAj1Byy1CrsPx1s9y1sVi3qlUSHLAsCiTWgT2ScxcP/DwIDAQAB
 custody.fireblocks.asset_mappings=XLM_USDC_T_CEKS stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5\nXLM_TEST stellar:native
diff --git a/service-runner/src/main/resources/profiles/custody/test.env b/service-runner/src/main/resources/profiles/custody/test.env
new file mode 100644
index 0000000000..1ef48514ea
--- /dev/null
+++ b/service-runner/src/main/resources/profiles/custody/test.env
@@ -0,0 +1,2 @@
+run.custody.server=true
+app.custodyEnabled=true
diff --git a/service-runner/src/main/resources/profiles/default-custody/test.env b/service-runner/src/main/resources/profiles/default-custody/test.env
deleted file mode 100644
index 1e6b699be2..0000000000
--- a/service-runner/src/main/resources/profiles/default-custody/test.env
+++ /dev/null
@@ -1 +0,0 @@
-app.custodyEnabled=true
\ No newline at end of file
diff --git a/service-runner/src/main/resources/profiles/default/test.env b/service-runner/src/main/resources/profiles/default/test.env
index 269bda0b03..2584071104 100644
--- a/service-runner/src/main/resources/profiles/default/test.env
+++ b/service-runner/src/main/resources/profiles/default/test.env
@@ -6,8 +6,10 @@ observer.server.url=http://localhost:8083
 platform.server.url=http://localhost:8085
 custody.server.url=http://localhost:8086
 wallet.server.url=http://localhost:8092
-run_docker=true
-run_all_servers=true
+
+# Start server configurations
+run.docker=false
+run.all.servers=true
 
 # Kotlin reference server configuration
 wallet.hostname=wallet-server:8092
diff --git a/service-runner/src/main/resources/profiles/default-rpc/config.env b/service-runner/src/main/resources/profiles/rpc/config.env
similarity index 100%
rename from service-runner/src/main/resources/profiles/default-rpc/config.env
rename to service-runner/src/main/resources/profiles/rpc/config.env
diff --git a/service-runner/src/main/resources/profiles/default-rpc/test.env b/service-runner/src/main/resources/profiles/rpc/test.env
similarity index 100%
rename from service-runner/src/main/resources/profiles/default-rpc/test.env
rename to service-runner/src/main/resources/profiles/rpc/test.env
diff --git a/service-runner/src/main/resources/profiles/unused-default-custody-rpc/config.env b/service-runner/src/main/resources/profiles/unused-default-custody-rpc/config.env
deleted file mode 100644
index 5ce0f9026d..0000000000
--- a/service-runner/src/main/resources/profiles/unused-default-custody-rpc/config.env
+++ /dev/null
@@ -1,61 +0,0 @@
-# secrets
-secret.data.username=postgres
-secret.data.password=password
-secret.platform_api.auth_secret=myAnchorToPlatformSecret
-secret.callback_api.auth_secret=myPlatformToAnchorSecret
-secret.sep10.jwt_secret=secret_sep10_secret
-secret.sep10.signing_seed=SAX3AH622R2XT6DXWWSRIDCMMUCCMATBZ5U6XKJWDO7M2EJUBFC3AW5X
-secret.sep24.interactive_url.jwt_secret=secret_sep24_interactive_url_jwt_secret
-secret.sep24.more_info_url.jwt_secret=secret_sep24_more_info_url_jwt_secret
-secret.custody_server.auth_secret=myPlatformToCustodySecret
-secret.custody.fireblocks.api_key=testApiKey
-secret.custody.fireblocks.secret_key=MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJPq9AU6f8GrkSccloRb+UJmbxilZ7iLkvp0FeR/yymQuJDMNXPXwt5MYR9VJoY0uMDHThaEwbQAc2M4L9wl0EtsESebODUTqnsWZ8/a6GsmvIM3kz02ZOUHLst0krSkECPUHLLUKuw/HWz3LWxWLeqVRIcsCwKJNaBPZJzFw/8PAgMBAAECgYBhWXSYLFQApmW1k/8LxWxa4wei9Nk6f8GPy+7Mn76Z8IFH6t4TC6FYpHQXJvdfxDsDxSgDcgP574IBfu0gulJHEIsoDy1xR8TPobfhwoS1NJn70a8KQA6Whu+K5pjJxGUC7bpJH4ZK0O+szB1mNC0WgUywIc0lXCFFnCrgbNFWQQJBAM7+zgHAyD6rqQem09JcabMkwxu0mYih1mvQ3uv/fay8BdgZAqMuacMAPQ/A1TLeuTbMQ0LojnK/QlotbhHVnSkCQQC27684POaRrVIsVo5uKvQsKSNlYPpvGrGapHKiVgIQYfZSEY9SrazqKbA5yux0OR8ZFFSiJCThRElpzhnWFYl3AkEArNsLnVsn3W3sUX93FAwoGHlylQhTzk2XiaF7BwjsIftBxhvcn/h6SWVBmI4ne7uSX7hj0tPxYNFmz3dwm2QPQQJBAKS8mPSy2wtqoiotVBvfcHzoGujrePpednuFBXosq7UnEpN7Hq7cmW9RVVHl7CMJYXjLNx/AHroBLX8rS1bflCcCQBclpUG1PybVy1jHXTdI0w6zB6AwjaeFN5x4+b7hRe29yLNF532uIatxif19LHb5jUC7EefpLWBxx/bB4JCIyug=
-# logging
-app_logging.stellar_level=DEBUG
-app_logging.request_logger_enabled=true
-# events
-events.enabled=true
-events.queue.type=kafka
-events.queue.kafka.bootstrap_server=kafka:29092
-# callback API endpoint
-callback_api.base_url=http://reference-server:8091/
-# platform API endpoint
-platform_api.base_url=http://platform:8085/
-custody_server.base_url=http://custody-server:8086
-# data
-data.type=postgres
-data.server=db:5432
-data.database=postgres
-data.flyway_enabled=true
-# assets
-assets.type=file
-assets.value=/config/assets.yaml
-# seps
-sep1.enabled=true
-sep1.toml.type=file
-sep1.toml.value=/config/stellar.localhost.toml
-sep6.enabled=true
-sep10.enabled=true
-sep12.enabled=true
-sep31.enabled=true
-sep38.enabled=true
-sep24.enabled=true
-sep24.interactive_url.base_url=http://localhost:8091/sep24/interactive
-sep24.more_info_url.base_url=http://localhost:8091/sep24/transaction/more_info
-sep6.deposit_info_generator_type=custody
-sep24.deposit_info_generator_type=custody
-sep31.deposit_info_generator_type=custody
-custody.type=fireblocks
-custody.fireblocks.vault_account_id=1
-custody.fireblocks.public_key=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCT6vQFOn/Bq5EnHJaEW/lCZm8YpWe4i5L6dBXkf8spkLiQzDVz18LeTGEfVSaGNLjAx04WhMG0AHNjOC/cJdBLbBEnmzg1E6p7FmfP2uhrJryDN5M9NmTlBy7LdJK0pBAj1Byy1CrsPx1s9y1sVi3qlUSHLAsCiTWgT2ScxcP/DwIDAQAB
-custody.fireblocks.asset_mappings=XLM_USDC_T_CEKS stellar:USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5\nXLM_TEST stellar:native
-custody.fireblocks.reconciliation.cron_expression=0/10 * * * * *
-# clients
-clients[0].name=reference
-clients[0].type=noncustodial
-clients[0].domain=wallet-server:8092
-clients[0].callback_url=http://wallet-server:8092/callbacks
-clients[1].name=referenceCustodial
-clients[1].type=custodial
-clients[1].signing_key=GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG
-clients[1].callback_url=http://wallet-server:8092/callbacks
\ No newline at end of file
diff --git a/service-runner/src/main/resources/profiles/unused-default-custody-rpc/test.env b/service-runner/src/main/resources/profiles/unused-default-custody-rpc/test.env
deleted file mode 100644
index 315ff221f3..0000000000
--- a/service-runner/src/main/resources/profiles/unused-default-custody-rpc/test.env
+++ /dev/null
@@ -1,16 +0,0 @@
-# Test configurations
-anchor.domain=http://localhost:8080
-sep.server.url=http://localhost:8080
-reference.server.url=http://localhost:8091
-observer.server.url=http://localhost:8083
-platform.server.url=http://localhost:8085
-custody.server.url=http://localhost:8086
-wallet.server.url=http://localhost:8092
-run_docker=true
-run_all_servers=true
-
-# Kotlin reference server configuration
-app.custodyEnabled=true
-app.rpcEnabled=true
-wallet.hostname=wallet-server:8092
-sep24.interactiveJwtKey=secret_sep24_interactive_url_jwt_secret
\ No newline at end of file