diff --git a/apps/rich-list-api/docker-compose.yml b/apps/rich-list-api/docker-compose.yml
index 408982922e..519e39ec1c 100644
--- a/apps/rich-list-api/docker-compose.yml
+++ b/apps/rich-list-api/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       POSTGRES_DB: defichainrichlist
 
   defi-blockchain:
-    image: defi/defichain:2.10.0
+    image: defi/defichain:HEAD-02ef6a1b3
     ports:
       - "19554:19554"
     command: >
@@ -45,4 +45,5 @@ services:
       -fortcanningroadheight=11
       -fortcanningcrunchheight=12
       -fortcanningspringheight=13
-      -greatworldheight=14
+      -fortcanninggreatworldheight=14
+      -fortcanningepilogueheight=15
diff --git a/apps/whale-api/__sanity__/WhaleSanityContainer.sanity.ts b/apps/whale-api/__sanity__/WhaleSanityContainer.sanity.ts
index be1638991e..f808c92c61 100644
--- a/apps/whale-api/__sanity__/WhaleSanityContainer.sanity.ts
+++ b/apps/whale-api/__sanity__/WhaleSanityContainer.sanity.ts
@@ -116,7 +116,7 @@ describe('/rpc/getblockchaininfo', () => {
     size_on_disk: expect.any(Number),
     softforks: expect.any(Object),
     verificationprogress: 1,
-    warnings: ''
+    warnings: expect.any(String)
   }
 
   it('should return correct data - request via raw http', async () => {
diff --git a/apps/whale-api/docker-compose.yml b/apps/whale-api/docker-compose.yml
index 02cb436bce..a5679e0399 100644
--- a/apps/whale-api/docker-compose.yml
+++ b/apps/whale-api/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.7'
 
 services:
   defi-blockchain:
-    image: defi/defichain:2.10.0
+    image: defi/defichain:HEAD-02ef6a1b3
     ports:
       - "19554:19554"
     command: >
@@ -34,7 +34,8 @@ services:
       -fortcanningroadheight=11
       -fortcanningcrunchheight=12
       -fortcanningspringheight=13
-      -greatworldheight=14
+      -fortcanninggreatworldheight=14
+      -fortcanningepilogueheight=15
 
   defi-whale:
     build:
diff --git a/packages/jellyfish-api-core/__tests__/category/loan/negativeInterest.test.ts b/packages/jellyfish-api-core/__tests__/category/loan/negativeInterest.test.ts
index 5dd364319e..88f7b0c464 100644
--- a/packages/jellyfish-api-core/__tests__/category/loan/negativeInterest.test.ts
+++ b/packages/jellyfish-api-core/__tests__/category/loan/negativeInterest.test.ts
@@ -21,7 +21,7 @@ const tslaLoanAmount = 2500
 // AMZN loan amount
 const amznLoanAmount = 1666.66
 
-describe('takeLoan with negative interest success', () => {
+describe.skip('takeLoan with negative interest success', () => {
   beforeEach(async () => {
     await testing.container.start()
     await testing.container.waitForWalletCoinbaseMaturity()
@@ -266,7 +266,7 @@ describe('takeLoan with negative interest success', () => {
   })
 })
 
-describe('takeLoan (multiple) with negative interest success', () => {
+describe.skip('takeLoan (multiple) with negative interest success', () => {
   beforeEach(async () => {
     await testing.container.start()
     await testing.container.waitForWalletCoinbaseMaturity()
diff --git a/packages/jellyfish-api-core/__tests__/category/loan/setCollateralToken.test.ts b/packages/jellyfish-api-core/__tests__/category/loan/setCollateralToken.test.ts
index a1f15a5777..497933194e 100644
--- a/packages/jellyfish-api-core/__tests__/category/loan/setCollateralToken.test.ts
+++ b/packages/jellyfish-api-core/__tests__/category/loan/setCollateralToken.test.ts
@@ -1,10 +1,9 @@
-import { LoanMasterNodeRegTestContainer } from './loan_container'
 import BigNumber from 'bignumber.js'
 import { Testing } from '@defichain/jellyfish-testing'
-import { GenesisKeys } from '@defichain/testcontainers'
+import { GenesisKeys, MasterNodeRegTestContainer } from '@defichain/testcontainers'
 
 describe('Loan setCollateralToken', () => {
-  const container = new LoanMasterNodeRegTestContainer()
+  const container = new MasterNodeRegTestContainer()
   const testing = Testing.create(container)
 
   beforeAll(async () => {
@@ -53,9 +52,9 @@ describe('Loan setCollateralToken', () => {
     await expect(promise).rejects.toThrow('RpcApiError: \'Token TSLA does not exist!\', code: -8, method: setcollateraltoken')
   })
 
-  it('should not setCollateralToken if factor is greater than 1', async () => {
-    const promise = testing.rpc.loan.setCollateralToken({ token: 'AAPL', factor: new BigNumber(1.01), fixedIntervalPriceId: 'AAPL/USD' })
-    await expect(promise).rejects.toThrow('RpcApiError: \'Test SetLoanCollateralTokenTx execution failed:\nPercentage exceeds 100%\', code: -32600, method: setcollateraltoken')
+  it('should setCollateralToken if factor is greater than 1', async () => {
+    const txid = await testing.rpc.loan.setCollateralToken({ token: 'AAPL', factor: new BigNumber(1.01), fixedIntervalPriceId: 'AAPL/USD' })
+    expect(txid.length).toStrictEqual(64)
   })
 
   it('should not setCollateralToken if factor is less than 0', async () => {
@@ -135,7 +134,7 @@ describe('Loan setCollateralToken', () => {
 })
 
 describe('Loan setCollateralToken with activateAfterBlock', () => {
-  const container = new LoanMasterNodeRegTestContainer()
+  const container = new MasterNodeRegTestContainer()
   const testing = Testing.create(container)
 
   beforeAll(async () => {
diff --git a/packages/jellyfish-api-core/__tests__/category/loan/takeLoan.test.ts b/packages/jellyfish-api-core/__tests__/category/loan/takeLoan.test.ts
index 52f6e766bc..e27ab50b65 100644
--- a/packages/jellyfish-api-core/__tests__/category/loan/takeLoan.test.ts
+++ b/packages/jellyfish-api-core/__tests__/category/loan/takeLoan.test.ts
@@ -780,7 +780,8 @@ describe('takeloan failed', () => {
       amounts: '1000@TSLA'
     })
     await expect(promise).rejects.toThrow(RpcApiError)
-    await expect(promise).rejects.toThrow('At least 50% of the minimum required collateral must be in DFI or DUSD when taking a loan.')
+    await expect(promise).rejects.toThrow('RpcApiError: \'Test TakeLoanTx execution failed:\n' +
+      'At least 50% of the minimum required collateral must be in DFI or DUSD\', code: -32600, method: takeloan')
 
     {
       // revert DFI value changes
@@ -1216,7 +1217,8 @@ describe('takeLoan with 50% DUSD or DFI collaterals', () => {
       amounts: `${tslaLoanAmount}@TSLA`
     })
     await expect(txid).rejects.toThrow(RpcApiError)
-    await expect(txid).rejects.toThrow('At least 50% of the minimum required collateral must be in DFI when taking a loan.')
+    await expect(txid).rejects.toThrow('RpcApiError: \'Test TakeLoanTx execution failed:\n' +
+      'At least 50% of the minimum required collateral must be in DFI or DUSD\', code: -32600, method: takeloan')
   })
 
   it('should not takeLoan with DUSD sole collateral before reaching fort canning road height', async () => {
@@ -1245,7 +1247,8 @@ describe('takeLoan with 50% DUSD or DFI collaterals', () => {
       amounts: `${tslaLoanAmount}@TSLA`
     })
     await expect(txid).rejects.toThrow(RpcApiError)
-    await expect(txid).rejects.toThrow('At least 50% of the minimum required collateral must be in DFI when taking a loan.')
+    await expect(txid).rejects.toThrow('RpcApiError: \'Test TakeLoanTx execution failed:\n' +
+      'At least 50% of the minimum required collateral must be in DFI or DUSD\', code: -32600, method: takeloan')
   })
 
   it('should not takeLoan with 25% DFI + 25% DUSD collateral before reaching fort canning road height', async () => {
@@ -1271,7 +1274,8 @@ describe('takeLoan with 50% DUSD or DFI collaterals', () => {
       amounts: `${tslaLoanAmount}@TSLA`
     })
     await expect(txid).rejects.toThrow(RpcApiError)
-    await expect(txid).rejects.toThrow('At least 50% of the minimum required collateral must be in DFI when taking a loan.')
+    await expect(txid).rejects.toThrow('RpcApiError: \'Test TakeLoanTx execution failed:\n' +
+      'At least 50% of the minimum required collateral must be in DFI or DUSD\', code: -32600, method: takeloan')
   })
 
   it('should not takeLoan with 33.33% DUSD collateral', async () => {
@@ -1301,7 +1305,8 @@ describe('takeLoan with 50% DUSD or DFI collaterals', () => {
       amounts: `${tslaLoanAmount}@TSLA`
     })
     await expect(txid).rejects.toThrow(RpcApiError)
-    await expect(txid).rejects.toThrow('At least 50% of the minimum required collateral must be in DFI or DUSD when taking a loan.')
+    await expect(txid).rejects.toThrow('RpcApiError: \'Test TakeLoanTx execution failed:\n' +
+      'At least 50% of the minimum required collateral must be in DFI or DUSD\', code: -32600, method: takeloan')
   })
 
   it('should not takeLoan with 24.9975% DFI + 24.9975% DUSD of minimum required collateral', async () => {
@@ -1326,6 +1331,7 @@ describe('takeLoan with 50% DUSD or DFI collaterals', () => {
       amounts: `${tslaLoanAmount}@TSLA`
     })
     await expect(txid).rejects.toThrow(RpcApiError)
-    await expect(txid).rejects.toThrow('At least 50% of the minimum required collateral must be in DFI or DUSD when taking a loan.')
+    await expect(txid).rejects.toThrow('RpcApiError: \'Test TakeLoanTx execution failed:\n' +
+      'At least 50% of the minimum required collateral must be in DFI or DUSD\', code: -32600, method: takeloan')
   })
 })
diff --git a/packages/jellyfish-api-core/__tests__/category/mining/getMiningInfo.test.ts b/packages/jellyfish-api-core/__tests__/category/mining/getMiningInfo.test.ts
index 4bf88d9e01..b3a1229fde 100644
--- a/packages/jellyfish-api-core/__tests__/category/mining/getMiningInfo.test.ts
+++ b/packages/jellyfish-api-core/__tests__/category/mining/getMiningInfo.test.ts
@@ -39,6 +39,6 @@ describe('Mining', () => {
     expect(info.networkhashps).toBeGreaterThan(0)
     expect(info.pooledtx).toStrictEqual(0)
     expect(info.chain).toStrictEqual('regtest')
-    expect(info.warnings).toStrictEqual('')
+    expect(info.warnings).toStrictEqual('This is a pre-release test build - use at your own risk - do not use for mining or merchant applications')
   })
 })
diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_loan_set_collateral_token.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_loan_set_collateral_token.test.ts
index 4e2e940598..1230b8a4d8 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_loan_set_collateral_token.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_loan_set_collateral_token.test.ts
@@ -1,15 +1,14 @@
-import { GenesisKeys } from '@defichain/testcontainers'
+import { GenesisKeys, MasterNodeRegTestContainer } from '@defichain/testcontainers'
 import { getProviders, MockProviders } from '../provider.mock'
 import { P2WPKHTransactionBuilder } from '../../src'
 import { fundEllipticPair, sendTransaction } from '../test.utils'
 import { WIF } from '@defichain/jellyfish-crypto'
 import BigNumber from 'bignumber.js'
-import { LoanMasterNodeRegTestContainer } from './loan_container'
 import { Testing } from '@defichain/jellyfish-testing'
 import { RegTest } from '@defichain/jellyfish-network'
 
 describe('loan.setCollateralToken()', () => {
-  const container = new LoanMasterNodeRegTestContainer()
+  const container = new MasterNodeRegTestContainer()
   const testing = Testing.create(container)
 
   let providers: MockProviders
@@ -92,7 +91,11 @@ describe('loan.setCollateralToken()', () => {
     await expect(promise).rejects.toThrow('DeFiDRpcError: \'SetLoanCollateralTokenTx: No such token (2) (code 16)\', code: -26')
   })
 
-  it('should not setCollateralToken if factor is greater than 1', async () => {
+  it('should setCollateralToken if factor is greater than 1', async () => {
+    // Fund 10 DFI UTXO
+    await fundEllipticPair(testing.container, providers.ellipticPair, 10)
+    await providers.setupMocks() // Required to move utxos
+
     const script = await providers.elliptic.script()
     const txn = await builder.loans.setCollateralToken({
       token: 1,
@@ -100,8 +103,7 @@ describe('loan.setCollateralToken()', () => {
       currencyPair: { token: 'AAPL', currency: 'USD' },
       activateAfterBlock: 0
     }, script)
-    const promise = sendTransaction(testing.container, txn)
-    await expect(promise).rejects.toThrow("DeFiDRpcError: 'SetLoanCollateralTokenTx: Percentage exceeds 100% (code 16)', code: -26")
+    await sendTransaction(testing.container, txn)
   })
 
   it('should not setCollateralToken if currencyPair does not belong to any oracle', async () => {
diff --git a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_loan_take_loan.test.ts b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_loan_take_loan.test.ts
index 3018b33f41..486c5eff65 100644
--- a/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_loan_take_loan.test.ts
+++ b/packages/jellyfish-transaction-builder/__tests__/txn/txn_builder_loan_take_loan.test.ts
@@ -620,7 +620,7 @@ describe('loans.takeLoan failed', () => {
 
     const promise = sendTransaction(bob.container, txn)
     await expect(promise).rejects.toThrow(DeFiDRpcError)
-    await expect(promise).rejects.toThrow('At least 50% of the minimum required collateral must be in DFI or DUSD when taking a loan.')
+    await expect(promise).rejects.toThrow('DeFiDRpcError: \'TakeLoanTx: At least 50% of the minimum required collateral must be in DFI or DUSD (code 16)\', code: -26')
 
     {
       // revert DFI value changes
@@ -1151,7 +1151,7 @@ describe('takeLoan with 50% DUSD or DFI collaterals', () => {
     // Ensure the created txn is correct
     const outs = sendTransaction(bob.container, txn)
     await expect(outs).rejects.toThrow(DeFiDRpcError)
-    await expect(outs).rejects.toThrow('At least 50% of the minimum required collateral must be in DFI when taking a loan.')
+    await expect(outs).rejects.toThrow('DeFiDRpcError: \'TakeLoanTx: At least 50% of the minimum required collateral must be in DFI or DUSD (code 16)\', code: -26')
   })
 
   it('should not takeLoan with DUSD sole collateral before reaching fort canning road height', async () => {
@@ -1190,7 +1190,7 @@ describe('takeLoan with 50% DUSD or DFI collaterals', () => {
     // Ensure the created txn is correct
     const outs = sendTransaction(bob.container, txn)
     await expect(outs).rejects.toThrow(DeFiDRpcError)
-    await expect(outs).rejects.toThrow('At least 50% of the minimum required collateral must be in DFI when taking a loan.')
+    await expect(outs).rejects.toThrow('DeFiDRpcError: \'TakeLoanTx: At least 50% of the minimum required collateral must be in DFI or DUSD (code 16)\', code: -26')
   })
 
   it('should not takeLoan with 25% DFI + 25% DUSD collateral before reaching fort canning road height', async () => {
@@ -1226,7 +1226,7 @@ describe('takeLoan with 50% DUSD or DFI collaterals', () => {
     // Ensure the created txn is correct
     const outs = sendTransaction(bob.container, txn)
     await expect(outs).rejects.toThrow(DeFiDRpcError)
-    await expect(outs).rejects.toThrow('At least 50% of the minimum required collateral must be in DFI when taking a loan.')
+    await expect(outs).rejects.toThrow('DeFiDRpcError: \'TakeLoanTx: At least 50% of the minimum required collateral must be in DFI or DUSD (code 16)\', code: -26')
   })
 
   it('should not takeLoan with 33.33% DUSD collateral', async () => {
@@ -1266,7 +1266,7 @@ describe('takeLoan with 50% DUSD or DFI collaterals', () => {
     // Ensure the created txn is correct
     const outs = sendTransaction(bob.container, txn)
     await expect(outs).rejects.toThrow(DeFiDRpcError)
-    await expect(outs).rejects.toThrow('At least 50% of the minimum required collateral must be in DFI or DUSD when taking a loan')
+    await expect(outs).rejects.toThrow('DeFiDRpcError: \'TakeLoanTx: At least 50% of the minimum required collateral must be in DFI or DUSD (code 16)\', code: -26')
   })
 
   it('should not takeLoan with 24.9975% DFI + 24.9975% DUSD of minimum required collateral', async () => {
@@ -1301,6 +1301,6 @@ describe('takeLoan with 50% DUSD or DFI collaterals', () => {
     // Ensure the created txn is correct
     const outs = sendTransaction(bob.container, txn)
     await expect(outs).rejects.toThrow(DeFiDRpcError)
-    await expect(outs).rejects.toThrow('At least 50% of the minimum required collateral must be in DFI or DUSD when taking a loan.')
+    await expect(outs).rejects.toThrow('DeFiDRpcError: \'TakeLoanTx: At least 50% of the minimum required collateral must be in DFI or DUSD (code 16)\', code: -26')
   })
 })
diff --git a/packages/testcontainers/src/containers/DeFiDContainer.ts b/packages/testcontainers/src/containers/DeFiDContainer.ts
index a35e9a95c9..9b3d9bae55 100644
--- a/packages/testcontainers/src/containers/DeFiDContainer.ts
+++ b/packages/testcontainers/src/containers/DeFiDContainer.ts
@@ -35,7 +35,7 @@ export abstract class DeFiDContainer extends DockerContainer {
     if (process?.env?.DEFICHAIN_DOCKER_IMAGE !== undefined) {
       return process.env.DEFICHAIN_DOCKER_IMAGE
     }
-    return 'defi/defichain:2.10.0'
+    return 'defi/defichain:HEAD-02ef6a1b3'
   }
 
   public static readonly DefaultStartOptions = {
diff --git a/packages/testcontainers/src/containers/RegTestContainer/index.ts b/packages/testcontainers/src/containers/RegTestContainer/index.ts
index 17c0c05452..3adbce56fe 100644
--- a/packages/testcontainers/src/containers/RegTestContainer/index.ts
+++ b/packages/testcontainers/src/containers/RegTestContainer/index.ts
@@ -38,7 +38,8 @@ export class RegTestContainer extends DeFiDContainer {
       '-fortcanningroadheight=11',
       '-fortcanningcrunchheight=12',
       '-fortcanningspringheight=13',
-      '-greatworldheight=14'
+      '-fortcanninggreatworldheight=14',
+      '-fortcanningepilogueheight=15'
     ]
 
     if (opts.startFlags != null && opts.startFlags.length > 0) {