diff --git a/.github/workflows/cargo-test.yml b/.github/workflows/cargo-test.yml
index 8a01ef8be..12455bd36 100644
--- a/.github/workflows/cargo-test.yml
+++ b/.github/workflows/cargo-test.yml
@@ -23,8 +23,6 @@ jobs:
         metadata:
           - parachain-metadata-interlay
           - parachain-metadata-kintsugi
-          - parachain-metadata-interlay-testnet
-          - parachain-metadata-kintsugi-testnet
 
     steps:
       - uses: actions/checkout@v3
@@ -51,7 +49,7 @@ jobs:
         run: |
           cargo check --release --workspace --features ${{ matrix.metadata }}
       - name: test
-        if: matrix.metadata == 'parachain-metadata-kintsugi-testnet'
+        if: matrix.metadata == 'parachain-metadata-kintsugi'
         env:
           RUST_LOG: info,regalloc=warn
           BITCOIN_RPC_URL: http://127.0.0.1:18443
@@ -83,7 +81,7 @@ jobs:
           path: target/release/faucet
           retention-days: 10
       - name: upload artifacts - runner
-        if: matrix.metadata == 'parachain-metadata-kintsugi-testnet'
+        if: matrix.metadata == 'parachain-metadata-kintsugi'
         uses: actions/upload-artifact@v3
         with:
           name: runner
@@ -101,8 +99,6 @@ jobs:
         metadata:
           - parachain-metadata-interlay
           - parachain-metadata-kintsugi
-          - parachain-metadata-interlay-testnet
-          - parachain-metadata-kintsugi-testnet
     steps:
       - uses: actions/checkout@v3
       - name: Prepare
diff --git a/Cargo.lock b/Cargo.lock
index 15014fc86..1a696547d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -212,7 +212,7 @@ dependencies = [
 [[package]]
 name = "annuity"
 version = "1.0.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -657,7 +657,7 @@ dependencies = [
 [[package]]
 name = "bitcoin"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "bitcoin_hashes 0.7.6",
  "frame-support",
@@ -874,7 +874,7 @@ checksum = "bd769563b4ea2953e2825c9e6b7470a5f55f67e0be00030bf3e390a2a6071f64"
 [[package]]
 name = "btc-relay"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "bitcoin 1.2.0",
  "frame-benchmarking",
@@ -894,7 +894,7 @@ dependencies = [
 [[package]]
 name = "btc-relay-rpc"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "btc-relay-rpc-runtime-api",
  "jsonrpsee",
@@ -907,7 +907,7 @@ dependencies = [
 [[package]]
 name = "btc-relay-rpc-runtime-api"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -1205,7 +1205,7 @@ checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
 [[package]]
 name = "clients-info"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "fixed-hash 0.7.0",
  "frame-benchmarking",
@@ -1247,7 +1247,7 @@ dependencies = [
 [[package]]
 name = "collator-selection"
 version = "3.0.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2102,7 +2102,7 @@ dependencies = [
 [[package]]
 name = "currency"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2280,7 +2280,7 @@ dependencies = [
 [[package]]
 name = "democracy"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "chrono",
  "frame-benchmarking",
@@ -2405,7 +2405,7 @@ dependencies = [
 [[package]]
 name = "dex-general"
 version = "0.4.4"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2425,7 +2425,7 @@ dependencies = [
 [[package]]
 name = "dex-general-rpc"
 version = "0.4.4"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "dex-general",
  "dex-general-rpc-runtime-api",
@@ -2440,7 +2440,7 @@ dependencies = [
 [[package]]
 name = "dex-general-rpc-runtime-api"
 version = "0.4.4"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "dex-general",
  "parity-scale-codec",
@@ -2451,7 +2451,7 @@ dependencies = [
 [[package]]
 name = "dex-stable"
 version = "0.1.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2469,7 +2469,7 @@ dependencies = [
 [[package]]
 name = "dex-stable-rpc"
 version = "0.1.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "dex-stable-rpc-runtime-api",
  "jsonrpsee",
@@ -2483,7 +2483,7 @@ dependencies = [
 [[package]]
 name = "dex-stable-rpc-runtime-api"
 version = "0.1.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "dex-stable",
  "parity-scale-codec",
@@ -2494,7 +2494,7 @@ dependencies = [
 [[package]]
 name = "dex-swap-router"
 version = "0.1.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "dex-general",
  "dex-stable",
@@ -2865,7 +2865,7 @@ dependencies = [
 [[package]]
 name = "escrow"
 version = "1.0.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2885,7 +2885,7 @@ dependencies = [
 [[package]]
 name = "escrow-rpc"
 version = "0.3.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "escrow-rpc-runtime-api",
  "jsonrpsee",
@@ -2899,7 +2899,7 @@ dependencies = [
 [[package]]
 name = "escrow-rpc-runtime-api"
 version = "0.3.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "oracle-rpc-runtime-api",
  "parity-scale-codec",
@@ -2974,7 +2974,7 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
 [[package]]
 name = "farming"
 version = "1.0.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3066,7 +3066,7 @@ dependencies = [
 [[package]]
 name = "fee"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "currency",
  "frame-benchmarking",
@@ -4398,7 +4398,7 @@ dependencies = [
 [[package]]
 name = "interbtc-parachain"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "bitcoin 1.2.0",
  "btc-relay-rpc-runtime-api",
@@ -4483,15 +4483,13 @@ dependencies = [
  "substrate-build-script-utils",
  "substrate-frame-rpc-system",
  "substrate-prometheus-endpoint",
- "testnet-interlay-runtime-parachain",
- "testnet-kintsugi-runtime-parachain",
  "vault-registry-rpc-runtime-api",
 ]
 
 [[package]]
 name = "interbtc-primitives"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "bitcoin 1.2.0",
  "bstringify",
@@ -4507,7 +4505,7 @@ dependencies = [
 [[package]]
 name = "interbtc-rpc"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "btc-relay-rpc",
  "dex-general-rpc",
@@ -4559,7 +4557,7 @@ dependencies = [
 [[package]]
 name = "interlay-runtime-parachain"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "annuity",
  "btc-relay",
@@ -4717,7 +4715,7 @@ dependencies = [
 [[package]]
 name = "issue"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "bitcoin 1.2.0",
  "btc-relay",
@@ -4749,7 +4747,7 @@ dependencies = [
 [[package]]
 name = "issue-rpc"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "issue-rpc-runtime-api",
  "jsonrpsee",
@@ -4762,7 +4760,7 @@ dependencies = [
 [[package]]
 name = "issue-rpc-runtime-api"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -5093,7 +5091,7 @@ dependencies = [
 [[package]]
 name = "kintsugi-runtime-parachain"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "annuity",
  "btc-relay",
@@ -5863,7 +5861,7 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 [[package]]
 name = "loans"
 version = "1.9.3"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "currency",
  "frame-benchmarking",
@@ -5892,7 +5890,7 @@ dependencies = [
 [[package]]
 name = "loans-rpc"
 version = "1.9.3"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "interbtc-primitives",
  "jsonrpsee",
@@ -5909,7 +5907,7 @@ dependencies = [
 [[package]]
 name = "loans-rpc-runtime-api"
 version = "1.9.3"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "interbtc-primitives",
  "parity-scale-codec",
@@ -6270,7 +6268,7 @@ dependencies = [
 [[package]]
 name = "multi-transaction-payment"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "currency",
  "dex-general",
@@ -6601,7 +6599,7 @@ dependencies = [
 [[package]]
 name = "nomination"
 version = "0.5.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "currency",
  "fee",
@@ -6927,7 +6925,7 @@ dependencies = [
 [[package]]
 name = "oracle"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "currency",
  "frame-benchmarking",
@@ -6950,7 +6948,7 @@ dependencies = [
 [[package]]
 name = "oracle-rpc"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "jsonrpsee",
  "oracle-rpc-runtime-api",
@@ -6963,7 +6961,7 @@ dependencies = [
 [[package]]
 name = "oracle-rpc-runtime-api"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -9964,7 +9962,7 @@ dependencies = [
 [[package]]
 name = "redeem"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "bitcoin 1.2.0",
  "btc-relay",
@@ -9994,7 +9992,7 @@ dependencies = [
 [[package]]
 name = "redeem-rpc"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -10007,7 +10005,7 @@ dependencies = [
 [[package]]
 name = "redeem-rpc-runtime-api"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -10145,7 +10143,7 @@ dependencies = [
 [[package]]
 name = "replace"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "bitcoin 1.2.0",
  "btc-relay",
@@ -10175,7 +10173,7 @@ dependencies = [
 [[package]]
 name = "replace-rpc"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -10188,7 +10186,7 @@ dependencies = [
 [[package]]
 name = "replace-rpc-runtime-api"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -10246,7 +10244,7 @@ dependencies = [
 [[package]]
 name = "reward"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -10266,7 +10264,7 @@ dependencies = [
 [[package]]
 name = "reward-rpc"
 version = "0.3.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "jsonrpsee",
  "oracle-rpc-runtime-api",
@@ -10280,7 +10278,7 @@ dependencies = [
 [[package]]
 name = "reward-rpc-runtime-api"
 version = "0.3.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "frame-support",
  "oracle-rpc-runtime-api",
@@ -10430,6 +10428,7 @@ dependencies = [
  "interbtc-parachain",
  "interbtc-primitives",
  "jsonrpsee",
+ "kintsugi-runtime-parachain",
  "lazy_static",
  "log",
  "oracle-rpc-runtime-api",
@@ -10445,7 +10444,6 @@ dependencies = [
  "subxt",
  "subxt-client",
  "tempdir",
- "testnet-kintsugi-runtime-parachain",
  "thiserror",
  "tokio",
  "url 2.3.1",
@@ -10454,7 +10452,7 @@ dependencies = [
 [[package]]
 name = "runtime-common"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "annuity",
  "btc-relay",
@@ -10479,6 +10477,8 @@ dependencies = [
  "orml-vesting",
  "orml-xcm-support",
  "orml-xtokens",
+ "pallet-aura",
+ "pallet-sudo",
  "redeem",
  "replace",
  "reward",
@@ -12036,7 +12036,7 @@ dependencies = [
 [[package]]
 name = "security"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -13342,7 +13342,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 [[package]]
 name = "staking"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -13693,7 +13693,7 @@ dependencies = [
 [[package]]
 name = "supply"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -13844,228 +13844,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
-[[package]]
-name = "testnet-interlay-runtime-parachain"
-version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
-dependencies = [
- "annuity",
- "btc-relay",
- "btc-relay-rpc-runtime-api",
- "clients-info",
- "collator-selection",
- "cumulus-pallet-aura-ext",
- "cumulus-pallet-dmp-queue",
- "cumulus-pallet-parachain-system",
- "cumulus-pallet-xcm",
- "cumulus-pallet-xcmp-queue",
- "cumulus-primitives-core",
- "cumulus-primitives-timestamp",
- "cumulus-primitives-utility",
- "currency",
- "democracy",
- "dex-general",
- "dex-general-rpc-runtime-api",
- "dex-stable",
- "dex-stable-rpc-runtime-api",
- "dex-swap-router",
- "escrow",
- "escrow-rpc-runtime-api",
- "farming",
- "fee",
- "frame-benchmarking",
- "frame-executive",
- "frame-support",
- "frame-system",
- "frame-system-benchmarking",
- "frame-system-rpc-runtime-api",
- "frame-try-runtime",
- "hex-literal 0.3.4",
- "interbtc-primitives",
- "issue",
- "issue-rpc-runtime-api",
- "loans",
- "loans-rpc-runtime-api",
- "log",
- "multi-transaction-payment",
- "nomination",
- "oracle 1.2.0",
- "oracle-rpc-runtime-api",
- "orml-asset-registry",
- "orml-tokens",
- "orml-traits",
- "orml-unknown-tokens",
- "orml-vesting",
- "orml-xcm-support",
- "orml-xtokens",
- "pallet-aura",
- "pallet-authorship",
- "pallet-balances",
- "pallet-collective",
- "pallet-identity",
- "pallet-membership",
- "pallet-multisig",
- "pallet-preimage",
- "pallet-proxy",
- "pallet-scheduler",
- "pallet-session",
- "pallet-society",
- "pallet-sudo",
- "pallet-timestamp",
- "pallet-transaction-payment",
- "pallet-transaction-payment-rpc-runtime-api",
- "pallet-utility",
- "pallet-xcm",
- "parachain-info",
- "parity-scale-codec",
- "polkadot-parachain",
- "redeem",
- "redeem-rpc-runtime-api",
- "replace",
- "replace-rpc-runtime-api",
- "reward",
- "reward-rpc-runtime-api",
- "runtime-common",
- "scale-info",
- "security",
- "serde",
- "sp-api",
- "sp-arithmetic 6.0.0 (git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.40)",
- "sp-block-builder",
- "sp-consensus-aura",
- "sp-core",
- "sp-inherents",
- "sp-io",
- "sp-offchain",
- "sp-runtime 7.0.0 (git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.40)",
- "sp-session",
- "sp-std 5.0.0 (git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.40)",
- "sp-transaction-pool",
- "sp-version",
- "sp-weights 4.0.0 (git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.40)",
- "staking",
- "substrate-wasm-builder",
- "supply",
- "traits",
- "tx-pause",
- "vault-registry",
- "vault-registry-rpc-runtime-api",
- "xcm",
- "xcm-builder",
- "xcm-executor",
-]
-
-[[package]]
-name = "testnet-kintsugi-runtime-parachain"
-version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
-dependencies = [
- "annuity",
- "btc-relay",
- "btc-relay-rpc-runtime-api",
- "clients-info",
- "collator-selection",
- "cumulus-pallet-aura-ext",
- "cumulus-pallet-dmp-queue",
- "cumulus-pallet-parachain-system",
- "cumulus-pallet-xcm",
- "cumulus-pallet-xcmp-queue",
- "cumulus-primitives-core",
- "cumulus-primitives-timestamp",
- "cumulus-primitives-utility",
- "currency",
- "democracy",
- "dex-general",
- "dex-general-rpc-runtime-api",
- "dex-stable",
- "dex-stable-rpc-runtime-api",
- "dex-swap-router",
- "escrow",
- "escrow-rpc-runtime-api",
- "farming",
- "fee",
- "frame-benchmarking",
- "frame-executive",
- "frame-support",
- "frame-system",
- "frame-system-benchmarking",
- "frame-system-rpc-runtime-api",
- "frame-try-runtime",
- "hex-literal 0.3.4",
- "interbtc-primitives",
- "issue",
- "issue-rpc-runtime-api",
- "loans",
- "loans-rpc-runtime-api",
- "log",
- "multi-transaction-payment",
- "nomination",
- "oracle 1.2.0",
- "oracle-rpc-runtime-api",
- "orml-asset-registry",
- "orml-tokens",
- "orml-traits",
- "orml-unknown-tokens",
- "orml-vesting",
- "orml-xcm-support",
- "orml-xtokens",
- "pallet-aura",
- "pallet-authorship",
- "pallet-balances",
- "pallet-collective",
- "pallet-identity",
- "pallet-membership",
- "pallet-multisig",
- "pallet-preimage",
- "pallet-proxy",
- "pallet-scheduler",
- "pallet-session",
- "pallet-society",
- "pallet-sudo",
- "pallet-timestamp",
- "pallet-transaction-payment",
- "pallet-transaction-payment-rpc-runtime-api",
- "pallet-utility",
- "pallet-xcm",
- "parachain-info",
- "parity-scale-codec",
- "polkadot-parachain",
- "redeem",
- "redeem-rpc-runtime-api",
- "replace",
- "replace-rpc-runtime-api",
- "reward",
- "reward-rpc-runtime-api",
- "runtime-common",
- "scale-info",
- "security",
- "serde",
- "sp-api",
- "sp-arithmetic 6.0.0 (git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.40)",
- "sp-block-builder",
- "sp-consensus-aura",
- "sp-core",
- "sp-inherents",
- "sp-io",
- "sp-offchain",
- "sp-runtime 7.0.0 (git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.40)",
- "sp-session",
- "sp-std 5.0.0 (git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.40)",
- "sp-transaction-pool",
- "sp-version",
- "sp-weights 4.0.0 (git+https://github.com/paritytech//substrate?branch=polkadot-v0.9.40)",
- "staking",
- "substrate-wasm-builder",
- "supply",
- "traits",
- "tx-pause",
- "vault-registry",
- "vault-registry-rpc-runtime-api",
- "xcm",
- "xcm-builder",
- "xcm-executor",
-]
-
 [[package]]
 name = "thiserror"
 version = "1.0.40"
@@ -14521,7 +14299,7 @@ dependencies = [
 [[package]]
 name = "traits"
 version = "1.9.3"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -14708,7 +14486,7 @@ dependencies = [
 [[package]]
 name = "tx-pause"
 version = "4.0.0-dev"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -14918,7 +14696,7 @@ dependencies = [
 [[package]]
 name = "vault-registry"
 version = "1.2.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "bitcoin 1.2.0",
  "currency",
@@ -14951,7 +14729,7 @@ dependencies = [
 [[package]]
 name = "vault-registry-rpc"
 version = "0.3.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "jsonrpsee",
  "oracle-rpc-runtime-api",
@@ -14965,7 +14743,7 @@ dependencies = [
 [[package]]
 name = "vault-registry-rpc-runtime-api"
 version = "0.3.0"
-source = "git+https://github.com/interlay/interbtc?rev=7a2f5ee35d93feb0529a308fe87b42674bfca8e9#7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+source = "git+https://github.com/interlay/interbtc?rev=dad0db930dce16070e921c1d9f05b5244be6a995#dad0db930dce16070e921c1d9f05b5244be6a995"
 dependencies = [
  "frame-support",
  "oracle-rpc-runtime-api",
diff --git a/README.md b/README.md
index d34837d76..3e14be0b0 100644
--- a/README.md
+++ b/README.md
@@ -69,13 +69,10 @@ curl -sX POST -H "Content-Type: application/json" --data '{"jsonrpc":"2.0","meth
 To build, one of the following mutually-exclusive features must be specified:
 - parachain-metadata-interlay
 - parachain-metadata-kintsugi
-- parachain-metadata-interlay-testnet
-- parachain-metadata-kintsugi-testnet
-- standalone-metadata
 
-The default command for building the clients, assuming a standalone chain, is:
+The default command for building the clients, assuming a Kintsugi chain, is:
 ```shell
-cargo run --features=standalone-metadata --bin runner -- --parachain-ws 'ws://localhost:9944'   --vault-config-file args.txt
+cargo run --features=parachain-metadata-kintsugi --bin runner -- --parachain-ws 'ws://localhost:9944'   --vault-config-file args.txt
 ```
 
 <p align="center">
diff --git a/faucet/Cargo.toml b/faucet/Cargo.toml
index 8b6a403bd..834609070 100644
--- a/faucet/Cargo.toml
+++ b/faucet/Cargo.toml
@@ -12,8 +12,6 @@ path = "src/lib.rs"
 [features]
 parachain-metadata-interlay = ["runtime/parachain-metadata-interlay"]
 parachain-metadata-kintsugi = ["runtime/parachain-metadata-kintsugi"]
-parachain-metadata-interlay-testnet = ["runtime/parachain-metadata-interlay-testnet"]
-parachain-metadata-kintsugi-testnet = ["runtime/parachain-metadata-kintsugi-testnet"]
 
 [dependencies]
 log = "0.4.6"
diff --git a/faucet/src/http.rs b/faucet/src/http.rs
index 8e920581b..d116a642b 100644
--- a/faucet/src/http.rs
+++ b/faucet/src/http.rs
@@ -365,14 +365,14 @@ pub async fn start_http(
     close_handle
 }
 
-#[cfg(all(test, feature = "parachain-metadata-kintsugi-testnet"))]
+#[cfg(all(test, feature = "parachain-metadata-kintsugi"))]
 mod tests {
     use crate::{error::Error, Allowance, AllowanceAmount, AllowanceConfig};
     use futures::{future::join_all, TryFutureExt};
     use runtime::{
         CurrencyId::{self},
-        Error as RuntimeError, InterBtcParachain, OracleKey, RuntimeCurrencyInfo, Token, TryFromSymbol, VaultId, KBTC,
-        KINT, KSM,
+        Error as RuntimeError, InterBtcParachain, OracleKey, RuntimeCurrencyInfo, SudoPallet, Token, TryFromSymbol,
+        VaultId, KBTC, KINT, KSM,
     };
     use std::sync::Arc;
 
@@ -408,6 +408,24 @@ mod tests {
         }
     }
 
+    async fn endow_accounts(client: SubxtClient) {
+        let provider = setup_provider(client, AccountKeyring::Alice).await;
+        provider
+            .set_balances(
+                vec![AccountKeyring::Alice, AccountKeyring::Bob]
+                    .into_iter()
+                    .map(|keyring| keyring.to_account_id())
+                    .flat_map(|account_id| {
+                        vec![DEFAULT_TESTING_CURRENCY, DEFAULT_GOVERNANCE_CURRENCY]
+                            .into_iter()
+                            .map(move |currency_id| (account_id.clone(), 1 << 60, 0, currency_id))
+                    })
+                    .collect(),
+            )
+            .await
+            .expect("Should endow accounts")
+    }
+
     async fn set_exchange_rate(client: SubxtClient) {
         let oracle_provider = setup_provider(client, AccountKeyring::Bob).await;
         let dot_key = OracleKey::ExchangeRate(DEFAULT_TESTING_CURRENCY);
@@ -475,6 +493,7 @@ mod tests {
         set_concurrency_limit(999);
         let (client, tmp_dir) = default_provider_client(AccountKeyring::Alice).await;
         set_exchange_rate(client.clone()).await;
+        endow_accounts(client.clone()).await;
 
         let bob_account_id: AccountId = [3; 32].into();
         let user_allowance: Allowance = vec![
@@ -512,6 +531,7 @@ mod tests {
         set_concurrency_limit(999);
         let (client, tmp_dir) = default_provider_client(AccountKeyring::Alice).await;
         set_exchange_rate(client.clone()).await;
+        endow_accounts(client.clone()).await;
 
         // Bob's account is prefunded with lots of DOT
         let bob_account_id: AccountId = AccountKeyring::Bob.to_account_id();
@@ -546,6 +566,7 @@ mod tests {
         set_concurrency_limit(999);
         let (client, tmp_dir) = default_provider_client(AccountKeyring::Alice).await;
         set_exchange_rate(client.clone()).await;
+        endow_accounts(client.clone()).await;
 
         let bob_account_id = AccountKeyring::Bob.to_account_id();
         let bob_vault_id = VaultId::new(
@@ -606,6 +627,7 @@ mod tests {
         set_concurrency_limit(999);
         let (client, tmp_dir) = default_provider_client(AccountKeyring::Alice).await;
         set_exchange_rate(client.clone()).await;
+        endow_accounts(client.clone()).await;
 
         let bob_account_id: AccountId = [3; 32].into();
         let user_allowance: Allowance = vec![
@@ -648,6 +670,7 @@ mod tests {
         set_concurrency_limit(999);
         let (client, tmp_dir) = default_provider_client(AccountKeyring::Alice).await;
         set_exchange_rate(client.clone()).await;
+        endow_accounts(client.clone()).await;
 
         let store = Store::new(Config::new(tmp_dir.path().join("kv4"))).expect("Unable to open kv store");
         let kv = open_kv_store(store.clone()).unwrap();
@@ -704,6 +727,7 @@ mod tests {
         set_concurrency_limit(999);
         let (client, tmp_dir) = default_provider_client(AccountKeyring::Alice).await;
         set_exchange_rate(client.clone()).await;
+        endow_accounts(client.clone()).await;
 
         let bob_account_id: AccountId = AccountKeyring::Bob.to_account_id();
         let bob_vault_id = VaultId::new(
diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml
index e61383468..628f83d95 100644
--- a/oracle/Cargo.toml
+++ b/oracle/Cargo.toml
@@ -8,8 +8,6 @@ description = "Liveness service to update the exchange rate periodically."
 [features]
 parachain-metadata-interlay = ["runtime/parachain-metadata-interlay"]
 parachain-metadata-kintsugi = ["runtime/parachain-metadata-kintsugi"]
-parachain-metadata-interlay-testnet = ["runtime/parachain-metadata-interlay-testnet"]
-parachain-metadata-kintsugi-testnet = ["runtime/parachain-metadata-kintsugi-testnet"]
 
 [dependencies]
 log = "0.4.0"
diff --git a/runner/src/runner.rs b/runner/src/runner.rs
index b7429bd4b..9499d38e5 100644
--- a/runner/src/runner.rs
+++ b/runner/src/runner.rs
@@ -674,19 +674,19 @@ mod tests {
     async fn test_runner_download_binary() {
         let mut runner = MockRunner::default();
         let tmp = TempDir::new("runner-tests").expect("failed to create tempdir");
-        let mock_path = tmp.path().clone().join("vault-standalone-metadata");
-        let moved_mock_path = tmp.path().clone().join("vault-standalone-metadata");
-        let mock_bin_name = "vault-standalone-metadata".to_string();
+        let mock_path = tmp.path().clone().join("vault-parachain-metadata-kintsugi");
+        let moved_mock_path = tmp.path().clone().join("vault-parachain-metadata-kintsugi");
+        let mock_bin_name = "vault-parachain-metadata-kintsugi".to_string();
 
         let client_release = ClientRelease {
-            uri: "https://github.com/interlay/interbtc-clients/releases/download/1.15.0/vault-standalone-metadata"
+            uri: "https://github.com/interlay/interbtc-clients/releases/download/1.15.0/vault-parachain-metadata-kintsugi"
                 .to_string(),
             checksum: H256::default(),
         };
 
         runner
             .expect_get_bin_path()
-            .returning(move |_| Ok(("vault-standalone-metadata".to_string(), moved_mock_path.clone())));
+            .returning(move |_| Ok(("vault-parachain-metadata-kintsugi".to_string(), moved_mock_path.clone())));
         runner
             .expect_get_request_bytes()
             .returning(|_| Ok(Bytes::from_static(&[1, 2, 3, 4])));
@@ -756,10 +756,10 @@ mod tests {
             runner.expect_client_type().return_const(client.clone());
             let (bin_name, bin_path) = Runner::get_bin_path(
                 &runner,
-                "https://github.com/interlay/interbtc-clients/releases/download/1.17.2/vault-standalone-metadata",
+                "https://github.com/interlay/interbtc-clients/releases/download/1.17.2/vault-parachain-metadata-kintsugi",
             )
             .unwrap();
-            assert_eq!(bin_name, "vault-standalone-metadata");
+            assert_eq!(bin_name, "vault-parachain-metadata-kintsugi");
             assert_eq!(bin_path, mock_path.join(bin_name));
         }
     }
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index 9d191c2aa..a929dd57f 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -15,8 +15,6 @@ testing-utils = [
 ]
 parachain-metadata-interlay = []
 parachain-metadata-kintsugi = []
-parachain-metadata-interlay-testnet = []
-parachain-metadata-kintsugi-testnet = []
 
 [dependencies]
 serde = { version = "1.0.136", features = ["derive"] }
@@ -50,28 +48,28 @@ bitcoin = { path = "../bitcoin" }
 
 # Dependencies for the testing utils for integration tests
 tempdir = { version = "0.3.7", optional = true }
-interbtc = { package = "interbtc-parachain", git = "https://github.com/interlay/interbtc", rev = "7a2f5ee35d93feb0529a308fe87b42674bfca8e9", optional = true }
-interbtc-runtime = { package = "testnet-kintsugi-runtime-parachain", git = "https://github.com/interlay/interbtc", rev = "7a2f5ee35d93feb0529a308fe87b42674bfca8e9", optional = true }
+interbtc = { package = "interbtc-parachain", git = "https://github.com/interlay/interbtc", rev = "dad0db930dce16070e921c1d9f05b5244be6a995", optional = true }
+interbtc-runtime = { package = "kintsugi-runtime-parachain", git = "https://github.com/interlay/interbtc", rev = "dad0db930dce16070e921c1d9f05b5244be6a995", optional = true }
 rand = { version = "0.7", optional = true }
 
 [dependencies.primitives]
 git = "https://github.com/interlay/interbtc"
-rev = "7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+rev = "dad0db930dce16070e921c1d9f05b5244be6a995"
 package = "interbtc-primitives"
 
 [dependencies.module-bitcoin]
 git = "https://github.com/interlay/interbtc"
-rev = "7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+rev = "dad0db930dce16070e921c1d9f05b5244be6a995"
 package = "bitcoin"
 
 [dependencies.module-btc-relay]
 git = "https://github.com/interlay/interbtc"
-rev = "7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+rev = "dad0db930dce16070e921c1d9f05b5244be6a995"
 package = "btc-relay"
 
 [dependencies.module-oracle-rpc-runtime-api]
 git = "https://github.com/interlay/interbtc"
-rev = "7a2f5ee35d93feb0529a308fe87b42674bfca8e9"
+rev = "dad0db930dce16070e921c1d9f05b5244be6a995"
 package = "oracle-rpc-runtime-api"
 
 [dev-dependencies]
diff --git a/runtime/build.rs b/runtime/build.rs
index 6d6142c62..86b25119b 100644
--- a/runtime/build.rs
+++ b/runtime/build.rs
@@ -2,6 +2,4 @@ fn main() {
     // Tell Cargo that if the given file changes, to rerun this build script (i.e. recompile)
     println!("cargo:rerun-if-changed=metadata-parachain-interlay.scale");
     println!("cargo:rerun-if-changed=metadata-parachain-kintsugi.scale");
-    println!("cargo:rerun-if-changed=metadata-parachain-kintsugi-testnet.scale");
-    println!("cargo:rerun-if-changed=metadata-parachain-interlay-testnet.scale");
 }
diff --git a/runtime/metadata-parachain-interlay-testnet.scale b/runtime/metadata-parachain-interlay-testnet.scale
deleted file mode 100644
index 1b5554d55..000000000
Binary files a/runtime/metadata-parachain-interlay-testnet.scale and /dev/null differ
diff --git a/runtime/metadata-parachain-kintsugi-testnet.scale b/runtime/metadata-parachain-kintsugi-testnet.scale
deleted file mode 100644
index f28057b15..000000000
Binary files a/runtime/metadata-parachain-kintsugi-testnet.scale and /dev/null differ
diff --git a/runtime/src/cli.rs b/runtime/src/cli.rs
index fd1cdbb61..1a1a2fd8d 100644
--- a/runtime/src/cli.rs
+++ b/runtime/src/cli.rs
@@ -100,14 +100,6 @@ pub fn parse_duration_minutes(src: &str) -> Result<Duration, ParseIntError> {
 #[derive(Parser, Debug, Clone)]
 pub struct ConnectionOpts {
     /// Parachain websocket URL.
-    #[cfg_attr(
-        feature = "parachain-metadata-interlay-testnet",
-        clap(long, default_value = "wss://staging.interlay-dev.interlay.io:443/parachain")
-    )]
-    #[cfg_attr(
-        feature = "parachain-metadata-kintsugi-testnet",
-        clap(long, default_value = "wss://api-dev-kintsugi.interlay.io:443/parachain")
-    )]
     #[cfg_attr(
         feature = "parachain-metadata-kintsugi",
         clap(long, default_value = "wss://api-kusama.interlay.io:443/parachain")
diff --git a/runtime/src/integration/bitcoin_simulator.rs b/runtime/src/integration/bitcoin_simulator.rs
index a1c24fab7..105d6c703 100644
--- a/runtime/src/integration/bitcoin_simulator.rs
+++ b/runtime/src/integration/bitcoin_simulator.rs
@@ -1,4 +1,4 @@
-#![cfg(all(feature = "testing-utils", feature = "parachain-metadata-kintsugi-testnet"))]
+#![cfg(all(feature = "testing-utils", feature = "parachain-metadata-kintsugi"))]
 #![allow(dead_code)]
 #![allow(unused_imports)]
 #![allow(unused_variables)]
diff --git a/runtime/src/integration/mod.rs b/runtime/src/integration/mod.rs
index 63694ff23..db0228f64 100644
--- a/runtime/src/integration/mod.rs
+++ b/runtime/src/integration/mod.rs
@@ -81,7 +81,7 @@ pub async fn default_provider_client(key: AccountKeyring) -> (SubxtClient, TempD
 
     let (task_manager, rpc_handlers) = interbtc::service::start_instant::<
         interbtc_runtime::RuntimeApi,
-        interbtc::service::TestnetKintsugiRuntimeExecutor,
+        interbtc::service::KintsugiRuntimeExecutor,
     >(service_config)
     .await
     .unwrap();
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index 239f5ff07..10b3f4ef3 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -60,6 +60,7 @@ pub const VAULT_REGISTRY_MODULE: &str = "VaultRegistry";
 
 pub const STABLE_BITCOIN_CONFIRMATIONS: &str = "StableBitcoinConfirmations";
 pub const STABLE_PARACHAIN_CONFIRMATIONS: &str = "StableParachainConfirmations";
+pub const DISABLE_DIFFICULTY_CHECK: &str = "DisableDifficultyCheck";
 
 // TODO: possibly substitute CurrencyId, VaultId, H256Le
 #[cfg_attr(
@@ -100,44 +101,6 @@ pub const STABLE_PARACHAIN_CONFIRMATIONS: &str = "StableParachainConfirmations";
         derive_for_type(type = "security::types::StatusCode", derive = "Eq, PartialEq"),
     )
 )]
-#[cfg_attr(
-    feature = "parachain-metadata-interlay-testnet",
-    subxt(
-        runtime_metadata_path = "metadata-parachain-interlay-testnet.scale",
-        derive_for_all_types = "Clone",
-        derive_for_type(type = "bitcoin::address::PublicKey", derive = "Eq, PartialEq"),
-        derive_for_type(type = "bitcoin::types::H256Le", derive = "Eq, PartialEq"),
-        derive_for_type(type = "interbtc_primitives::issue::IssueRequestStatus", derive = "Eq, PartialEq"),
-        derive_for_type(type = "interbtc_primitives::redeem::RedeemRequestStatus", derive = "Eq, PartialEq"),
-        derive_for_type(
-            type = "interbtc_primitives::replace::ReplaceRequestStatus",
-            derive = "Eq, PartialEq"
-        ),
-        derive_for_type(type = "interbtc_primitives::VaultCurrencyPair", derive = "Eq, PartialEq"),
-        derive_for_type(type = "interbtc_primitives::VaultId", derive = "Eq, PartialEq"),
-        derive_for_type(type = "security::types::ErrorCode", derive = "Eq, PartialEq, Ord, PartialOrd"),
-        derive_for_type(type = "security::types::StatusCode", derive = "Eq, PartialEq"),
-    )
-)]
-#[cfg_attr(
-    feature = "parachain-metadata-kintsugi-testnet",
-    subxt(
-        runtime_metadata_path = "metadata-parachain-kintsugi-testnet.scale",
-        derive_for_all_types = "Clone",
-        derive_for_type(type = "bitcoin::address::PublicKey", derive = "Eq, PartialEq"),
-        derive_for_type(type = "bitcoin::types::H256Le", derive = "Eq, PartialEq"),
-        derive_for_type(type = "interbtc_primitives::issue::IssueRequestStatus", derive = "Eq, PartialEq"),
-        derive_for_type(type = "interbtc_primitives::redeem::RedeemRequestStatus", derive = "Eq, PartialEq"),
-        derive_for_type(
-            type = "interbtc_primitives::replace::ReplaceRequestStatus",
-            derive = "Eq, PartialEq"
-        ),
-        derive_for_type(type = "interbtc_primitives::VaultCurrencyPair", derive = "Eq, PartialEq"),
-        derive_for_type(type = "interbtc_primitives::VaultId", derive = "Eq, PartialEq"),
-        derive_for_type(type = "security::types::ErrorCode", derive = "Eq, PartialEq, Ord, PartialOrd"),
-        derive_for_type(type = "security::types::StatusCode", derive = "Eq, PartialEq"),
-    )
-)]
 pub mod metadata {
     #[subxt(substitute_type = "BTreeSet")]
     use crate::BTreeSet;
diff --git a/runtime/src/rpc.rs b/runtime/src/rpc.rs
index bb08f2fd0..d1a3c6aca 100644
--- a/runtime/src/rpc.rs
+++ b/runtime/src/rpc.rs
@@ -49,11 +49,8 @@ const BLAKE2_128_HASH_PREFIX_LENGTH: usize = 48;
 const TWOX_64_HASH_PREFIX_LENGTH: usize = 40;
 
 // sanity check to be sure that testing-utils is not accidentally selected
-#[cfg(all(
-    any(test, feature = "testing-utils"),
-    not(feature = "parachain-metadata-kintsugi-testnet")
-))]
-compile_error!("Tests are only supported for the kintsugi testnet metadata");
+#[cfg(all(any(test, feature = "testing-utils"), not(feature = "parachain-metadata-kintsugi")))]
+compile_error!("Tests are only supported for the kintsugi runtime");
 
 cfg_if::cfg_if! {
     if #[cfg(feature = "parachain-metadata-interlay")] {
@@ -64,14 +61,6 @@ cfg_if::cfg_if! {
         const DEFAULT_SPEC_VERSION: Range<u32> = 1024000..1025000;
         pub const DEFAULT_SPEC_NAME: &str = "kintsugi-parachain";
         pub const SS58_PREFIX: u16 = 2092;
-    } else if #[cfg(feature = "parachain-metadata-interlay-testnet")] {
-        const DEFAULT_SPEC_VERSION: Range<u32> = 1024000..1025000;
-        pub const DEFAULT_SPEC_NAME: &str = "testnet-interlay";
-        pub const SS58_PREFIX: u16 = 2032;
-    }  else if #[cfg(feature = "parachain-metadata-kintsugi-testnet")] {
-        const DEFAULT_SPEC_VERSION: Range<u32> = 1024000..1025000;
-        pub const DEFAULT_SPEC_NAME: &str = "testnet-kintsugi";
-        pub const SS58_PREFIX: u16 = 2092;
     }
 }
 
@@ -1872,15 +1861,13 @@ pub trait SudoPallet {
     async fn set_redeem_period(&self, period: BlockNumber) -> Result<(), Error>;
     async fn set_parachain_confirmations(&self, value: BlockNumber) -> Result<(), Error>;
     async fn set_bitcoin_confirmations(&self, value: u32) -> Result<(), Error>;
+    async fn disable_difficulty_check(&self) -> Result<(), Error>;
     async fn set_issue_period(&self, period: u32) -> Result<(), Error>;
     async fn insert_authorized_oracle(&self, account_id: AccountId, name: String) -> Result<(), Error>;
     async fn set_replace_period(&self, period: u32) -> Result<(), Error>;
+    async fn set_balances(&self, amounts: Vec<(AccountId, u128, u128, CurrencyId)>) -> Result<(), Error>;
 }
 
-#[cfg(any(
-    feature = "parachain-metadata-interlay-testnet",
-    feature = "parachain-metadata-kintsugi-testnet"
-))]
 #[async_trait]
 impl SudoPallet for InterBtcParachain {
     async fn sudo(&self, call: EncodedCall) -> Result<(), Error> {
@@ -1921,6 +1908,11 @@ impl SudoPallet for InterBtcParachain {
             .await
     }
 
+    async fn disable_difficulty_check(&self) -> Result<(), Error> {
+        self.set_storage(crate::BTC_RELAY_MODULE, crate::DISABLE_DIFFICULTY_CHECK, true)
+            .await
+    }
+
     async fn set_issue_period(&self, period: u32) -> Result<(), Error> {
         Ok(self
             .sudo(EncodedCall::Issue(
@@ -1952,4 +1944,23 @@ impl SudoPallet for InterBtcParachain {
             ))
             .await?)
     }
+
+    async fn set_balances(&self, amounts: Vec<(AccountId, u128, u128, CurrencyId)>) -> Result<(), Error> {
+        self.sudo(EncodedCall::Utility(
+            metadata::runtime_types::pallet_utility::pallet::Call::batch {
+                calls: amounts
+                    .into_iter()
+                    .map(|(recipient, free, reserved, currency_id)| {
+                        EncodedCall::Tokens(metadata::runtime_types::orml_tokens::module::Call::set_balance {
+                            who: recipient,
+                            currency_id,
+                            new_free: free,
+                            new_reserved: reserved,
+                        })
+                    })
+                    .collect(),
+            },
+        ))
+        .await
+    }
 }
diff --git a/runtime/src/tests.rs b/runtime/src/tests.rs
index 11c192342..66acfea9e 100644
--- a/runtime/src/tests.rs
+++ b/runtime/src/tests.rs
@@ -4,8 +4,8 @@ const DEFAULT_TESTING_CURRENCY: CurrencyId = Token(KSM);
 
 use super::{
     BtcAddress, BtcPublicKey, BtcRelayPallet, CollateralBalancesPallet, CurrencyId, FixedPointNumber, FixedU128,
-    OraclePallet, RawBlockHeader, ReplacePallet, SecurityPallet, StatusCode, Token, TryFromSymbol, VaultRegistryPallet,
-    KBTC, KINT, KSM,
+    OraclePallet, RawBlockHeader, ReplacePallet, SecurityPallet, StatusCode, SudoPallet, Token, TryFromSymbol,
+    VaultRegistryPallet, KBTC, KINT, KSM,
 };
 use crate::{integration::*, FeedValuesEvent, OracleKey, RuntimeCurrencyInfo, VaultId, H160, U256};
 use module_bitcoin::{formatter::TryFormat, types::BlockBuilder};
@@ -40,7 +40,7 @@ async fn test_getters() {
 
     tokio::join!(
         async {
-            assert_eq!(parachain_rpc.get_free_balance(Token(KSM)).await.unwrap(), 1 << 60);
+            assert_eq!(parachain_rpc.get_free_balance(Token(KINT)).await.unwrap(), 1 << 60);
         },
         async {
             assert_eq!(parachain_rpc.get_parachain_status().await.unwrap(), StatusCode::Error);
@@ -104,6 +104,15 @@ async fn test_register_vault() {
     let (client, _tmp_dir) = default_provider_client(AccountKeyring::Alice).await;
     let parachain_rpc = setup_provider(client.clone(), AccountKeyring::Alice).await;
     set_exchange_rate(client.clone()).await;
+    parachain_rpc
+        .set_balances(vec![(
+            AccountKeyring::Alice.to_account_id(),
+            1 << 60,
+            0,
+            DEFAULT_TESTING_CURRENCY,
+        )])
+        .await
+        .expect("Should endow account");
 
     let vault_id = VaultId::new(AccountKeyring::Alice.into(), Token(KSM), Token(KBTC));
 
diff --git a/runtime/src/types.rs b/runtime/src/types.rs
index 765b008e7..181a0e814 100644
--- a/runtime/src/types.rs
+++ b/runtime/src/types.rs
@@ -129,10 +129,6 @@ mod metadata_aliases {
     pub type EncodedCall = metadata::runtime_types::interlay_runtime_parachain::RuntimeCall;
     #[cfg(feature = "parachain-metadata-kintsugi")]
     pub type EncodedCall = metadata::runtime_types::kintsugi_runtime_parachain::RuntimeCall;
-    #[cfg(feature = "parachain-metadata-interlay-testnet")]
-    pub type EncodedCall = metadata::runtime_types::testnet_interlay_runtime_parachain::RuntimeCall;
-    #[cfg(feature = "parachain-metadata-kintsugi-testnet")]
-    pub type EncodedCall = metadata::runtime_types::testnet_kintsugi_runtime_parachain::RuntimeCall;
 
     pub use metadata::runtime_types::security::pallet::Call as SecurityCall;
 
diff --git a/vault/Cargo.toml b/vault/Cargo.toml
index 3761fe5e9..68a5cb963 100644
--- a/vault/Cargo.toml
+++ b/vault/Cargo.toml
@@ -7,9 +7,7 @@ description = "The Vault client intermediates between Bitcoin Core and the BTC P
 
 [features]
 parachain-metadata-interlay = ["runtime/parachain-metadata-interlay"]
-parachain-metadata-kintsugi = ["runtime/parachain-metadata-kintsugi"]
-parachain-metadata-interlay-testnet = ["runtime/parachain-metadata-interlay-testnet", "bitcoin/light-client"]
-parachain-metadata-kintsugi-testnet = ["runtime/parachain-metadata-kintsugi-testnet", "bitcoin/light-client"]
+parachain-metadata-kintsugi = ["runtime/parachain-metadata-kintsugi", "bitcoin/light-client"]
 uses-bitcoind = [] # run tests relying on bitcoind regtest node
 
 [dependencies]
diff --git a/vault/src/cancellation.rs b/vault/src/cancellation.rs
index 81f2f4ba7..e9c41f439 100644
--- a/vault/src/cancellation.rs
+++ b/vault/src/cancellation.rs
@@ -313,7 +313,7 @@ impl<P: IssuePallet + ReplacePallet + UtilFuncs + SecurityPallet + Clone> Cancel
     }
 }
 
-#[cfg(all(test, feature = "parachain-metadata-kintsugi-testnet"))]
+#[cfg(all(test, feature = "parachain-metadata-kintsugi"))]
 mod tests {
     use super::*;
     use async_trait::async_trait;
diff --git a/vault/src/main.rs b/vault/src/main.rs
index 272fda403..f29493034 100644
--- a/vault/src/main.rs
+++ b/vault/src/main.rs
@@ -259,7 +259,7 @@ mod tests {
     #[tokio::test]
     async fn test_vault_pid_file() {
         let dummy_account_id = AccountId::new(Default::default());
-        let dummy_spec_name = "kintsugi-testnet".to_string();
+        let dummy_spec_name = "kintsugi".to_string();
         let termination_signals = &[SIGHUP, SIGTERM, SIGINT, SIGQUIT];
         let mut sys = System::new_all();
 
diff --git a/vault/src/metrics.rs b/vault/src/metrics.rs
index ca407687c..5bae2cade 100644
--- a/vault/src/metrics.rs
+++ b/vault/src/metrics.rs
@@ -668,7 +668,7 @@ pub async fn publish_tokio_metrics(
     }
 }
 
-#[cfg(all(test, feature = "parachain-metadata-kintsugi-testnet"))]
+#[cfg(all(test, feature = "parachain-metadata-kintsugi"))]
 mod tests {
     use super::*;
     use async_trait::async_trait;
diff --git a/vault/src/process.rs b/vault/src/process.rs
index 9bcd77ce6..8d6797790 100644
--- a/vault/src/process.rs
+++ b/vault/src/process.rs
@@ -141,7 +141,7 @@ pub fn pid_name_matches_existing_client(
     Ok(sys.process_name(client_pid)? == sys.process_name(pidfile_value)?)
 }
 
-#[cfg(all(test, feature = "parachain-metadata-kintsugi-testnet"))]
+#[cfg(all(test, feature = "parachain-metadata-kintsugi"))]
 mod tests {
     use super::*;
     use serial_test::serial;
diff --git a/vault/src/replace.rs b/vault/src/replace.rs
index d36527f11..cbb373de9 100644
--- a/vault/src/replace.rs
+++ b/vault/src/replace.rs
@@ -204,7 +204,7 @@ pub async fn listen_for_execute_replace(
     Ok(())
 }
 
-#[cfg(all(test, feature = "parachain-metadata-kintsugi-testnet"))]
+#[cfg(all(test, feature = "parachain-metadata-kintsugi"))]
 mod tests {
     use super::*;
     use async_trait::async_trait;
diff --git a/vault/tests/vault_integration_tests.rs b/vault/tests/vault_integration_tests.rs
index 20e50388f..c20c49e7d 100644
--- a/vault/tests/vault_integration_tests.rs
+++ b/vault/tests/vault_integration_tests.rs
@@ -31,8 +31,34 @@ where
     service::init_subscriber();
     let (client, _tmp_dir) = default_provider_client(AccountKeyring::Alice).await;
 
-    let parachain_rpc = setup_provider(client.clone(), AccountKeyring::Bob).await;
+    let parachain_rpc = setup_provider(client.clone(), AccountKeyring::Alice).await;
+    parachain_rpc
+        .set_balances(
+            vec![
+                AccountKeyring::Alice,
+                AccountKeyring::Bob,
+                AccountKeyring::Charlie,
+                AccountKeyring::Dave,
+                AccountKeyring::Eve,
+                AccountKeyring::Ferdie,
+            ]
+            .into_iter()
+            .map(|keyring| keyring.to_account_id())
+            .flat_map(|account_id| {
+                vec![DEFAULT_TESTING_CURRENCY, DEFAULT_NATIVE_CURRENCY]
+                    .into_iter()
+                    .map(move |currency_id| (account_id.clone(), 1 << 60, 0, currency_id))
+            })
+            .collect(),
+        )
+        .await
+        .expect("Should endow accounts");
+    parachain_rpc
+        .disable_difficulty_check()
+        .await
+        .expect("Should disable difficulty check");
 
+    let parachain_rpc = setup_provider(client.clone(), AccountKeyring::Bob).await;
     set_exchange_rate_and_wait(&parachain_rpc, DEFAULT_TESTING_CURRENCY, FixedU128::from(100000000)).await;
     set_exchange_rate_and_wait(
         &parachain_rpc,