diff --git a/apps/whale-api/src/module.api/defid-e2e/address.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/address.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/address.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/address.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/block.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/block.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/block.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/block.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/fee.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/fee.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/fee.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/fee.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/governance.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/governance.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/governance.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/governance.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/loan.auction.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/loan.auction.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/loan.auction.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/loan.auction.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/loan.auction.history.e2e.ts b/apps/whale-api/src/module.api/__defid__/loan.auction.history.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/loan.auction.history.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/loan.auction.history.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/loan.collateral.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/loan.collateral.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/loan.collateral.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/loan.collateral.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/loan.scheme.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/loan.scheme.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/loan.scheme.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/loan.scheme.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/loan.token.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/loan.token.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/loan.token.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/loan.token.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/loan.vault.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/loan.vault.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/loan.vault.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/loan.vault.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/masternode.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/masternode.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/masternode.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/masternode.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/poolpair.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/poolpair.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/poolpair.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/poolpair.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/poolpair.fees.service.e2e.ts b/apps/whale-api/src/module.api/__defid__/poolpair.fees.service.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/poolpair.fees.service.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/poolpair.fees.service.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/rawtx.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/rawtx.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/rawtx.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/rawtx.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/stats.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/stats.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/stats.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/stats.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/token.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/token.controller.defid.ts
similarity index 100%
rename from apps/whale-api/src/module.api/defid-e2e/token.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/token.controller.defid.ts
diff --git a/apps/whale-api/src/module.api/defid-e2e/transaction.controller.e2e.ts b/apps/whale-api/src/module.api/__defid__/transaction.controller.defid.ts
similarity index 98%
rename from apps/whale-api/src/module.api/defid-e2e/transaction.controller.e2e.ts
rename to apps/whale-api/src/module.api/__defid__/transaction.controller.defid.ts
index a33ddfcaac..7c784c22a0 100644
--- a/apps/whale-api/src/module.api/defid-e2e/transaction.controller.e2e.ts
+++ b/apps/whale-api/src/module.api/__defid__/transaction.controller.defid.ts
@@ -15,7 +15,7 @@ beforeAll(async () => {
   await app.waitForWalletCoinbaseMaturity()
   await app.waitForWalletBalanceGTE(100)
 
-  client = new JsonRpcClient(app.url)
+  client = new JsonRpcClient(app.rpcUrl)
 
   await app.waitForIndexedHeight(100)
 })
@@ -81,7 +81,7 @@ describe('get', () => {
     expect.assertions(2)
     try {
       await controller.get('invalidtransactionid')
-    } catch (err) {
+    } catch (err: any) {
       expect(err).toBeInstanceOf(NotFoundException)
       expect(err.response).toStrictEqual({
         statusCode: 404,