diff --git a/packages/jellyfish-api-core/__tests__/category/mining.test.ts b/packages/jellyfish-api-core/__tests__/category/mining.test.ts
deleted file mode 100644
index f080a2f3fb..0000000000
--- a/packages/jellyfish-api-core/__tests__/category/mining.test.ts
+++ /dev/null
@@ -1,157 +0,0 @@
-import { RegTestContainer, MasterNodeRegTestContainer } from '@defichain/testcontainers'
-import { ContainerAdapterClient } from '../container_adapter_client'
-import waitForExpect from 'wait-for-expect'
-import { wallet } from '../../src'
-import { EstimateMode } from '../../src/category/mining'
-
-describe('non masternode', () => {
-  const container = new RegTestContainer()
-  const client = new ContainerAdapterClient(container)
-
-  beforeAll(async () => {
-    await container.start()
-    await container.waitForReady()
-  })
-
-  afterAll(async () => {
-    await container.stop()
-  })
-
-  it('should getMintingInfo', async () => {
-    const info = await client.mining.getMintingInfo()
-
-    expect(info.blocks).toStrictEqual(0)
-    expect(info.difficulty).toBeDefined()
-    expect(info.isoperator).toStrictEqual(false)
-    expect(info.networkhashps).toStrictEqual(0)
-    expect(info.pooledtx).toStrictEqual(0)
-    expect(info.chain).toStrictEqual('regtest')
-    expect(info.warnings).toStrictEqual('')
-  })
-
-  it('should getNetworkHashPerSecond', async () => {
-    const result = await client.mining.getNetworkHashPerSecond()
-    expect(result).toStrictEqual(0)
-  })
-
-  it('should have an error with estimateSmartFee', async () => {
-    const result = await client.mining.estimateSmartFee(6)
-    const errors = (result.errors != null) ? result.errors : []
-    expect(errors.length).toBeGreaterThan(0)
-    expect(errors[0]).toStrictEqual('Insufficient data or no feerate found')
-    expect(result.feerate).toBeUndefined()
-  })
-})
-
-describe('masternode', () => {
-  const container = new MasterNodeRegTestContainer()
-  const client = new ContainerAdapterClient(container)
-
-  beforeAll(async () => {
-    await container.start()
-    await container.waitForReady()
-  })
-
-  afterAll(async () => {
-    await container.stop()
-  })
-
-  it('should getMintingInfo', async () => {
-    await waitForExpect(async () => {
-      const info = await client.mining.getMintingInfo()
-      await expect(info.blocks).toBeGreaterThan(1)
-    })
-
-    const info = await client.mining.getMintingInfo()
-
-    expect(info.blocks).toBeGreaterThan(0)
-
-    expect(info.currentblockweight).toBeGreaterThan(0)
-    expect(info.currentblocktx).toStrictEqual(0)
-
-    expect(info.difficulty).toBeDefined()
-    expect(info.isoperator).toStrictEqual(true)
-
-    expect(info.masternodeid).toBeDefined()
-    expect(info.masternodeoperator).toBeDefined()
-    expect(info.masternodestate).toStrictEqual('ENABLED')
-    expect(info.generate).toStrictEqual(true)
-    expect(info.mintedblocks).toStrictEqual(0)
-
-    expect(info.networkhashps).toBeGreaterThan(0)
-    expect(info.pooledtx).toStrictEqual(0)
-    expect(info.chain).toStrictEqual('regtest')
-    expect(info.warnings).toStrictEqual('')
-  })
-
-  it('should getNetworkHashPerSecond', async () => {
-    return await waitForExpect(async () => {
-      const result = await client.mining.getNetworkHashPerSecond()
-      expect(result).toBeGreaterThan(0)
-    })
-  })
-
-  it('should getMiningInfo', async () => {
-    await waitForExpect(async () => {
-      const info = await client.mining.getMiningInfo()
-      await expect(info.blocks).toBeGreaterThan(1)
-    })
-
-    const info = await client.mining.getMiningInfo()
-    const mn1 = info.masternodes[0]
-
-    expect(info.blocks).toBeGreaterThan(0)
-
-    expect(info.currentblockweight).toBeGreaterThan(0)
-    expect(info.currentblocktx).toStrictEqual(0)
-
-    expect(info.difficulty).toBeDefined()
-    expect(info.isoperator).toStrictEqual(true)
-
-    expect(mn1.masternodeid).toBeDefined()
-    expect(mn1.masternodeoperator).toBeDefined()
-    expect(mn1.masternodestate).toStrictEqual('ENABLED')
-    expect(mn1.generate).toStrictEqual(true)
-    expect(mn1.mintedblocks).toStrictEqual(0)
-    expect(mn1.lastblockcreationattempt).not.toStrictEqual('0')
-
-    expect(info.networkhashps).toBeGreaterThan(0)
-    expect(info.pooledtx).toStrictEqual(0)
-    expect(info.chain).toStrictEqual('regtest')
-    expect(info.warnings).toStrictEqual('')
-  })
-})
-
-describe('estimatesmartfees', () => {
-  const container = new MasterNodeRegTestContainer()
-  const client = new ContainerAdapterClient(container)
-
-  beforeAll(async () => {
-    await container.start()
-    await container.waitForReady()
-    await container.waitForWalletCoinbaseMaturity()
-    await container.waitForBlock(125)
-    await client.wallet.setWalletFlag(wallet.WalletFlag.AVOID_REUSE)
-  })
-
-  afterAll(async () => {
-    await container.stop()
-  })
-
-  it('should have estimated smart fees', async () => {
-    await waitForExpect(async () => {
-      for (let i = 0; i < 20; i++) {
-        for (let x = 0; x < 20; x++) {
-          const address = await client.wallet.getNewAddress()
-          await client.wallet.sendToAddress(address, 0.1, { subtractFeeFromAmount: true })
-        }
-        await container.generate(1)
-      }
-    })
-
-    const result = await client.mining.estimateSmartFee(6, EstimateMode.ECONOMICAL)
-    expect(result.errors).toBeUndefined()
-    expect(result.blocks).toBeGreaterThan(0)
-    expect(result.feerate).toBeGreaterThan(0)
-  })
-})
diff --git a/packages/jellyfish-api-core/__tests__/category/mining/estimateSmartFee.test.ts b/packages/jellyfish-api-core/__tests__/category/mining/estimateSmartFee.test.ts
new file mode 100644
index 0000000000..93b713aa51
--- /dev/null
+++ b/packages/jellyfish-api-core/__tests__/category/mining/estimateSmartFee.test.ts
@@ -0,0 +1,58 @@
+import { MasterNodeRegTestContainer, RegTestContainer } from '@defichain/testcontainers'
+import { ContainerAdapterClient } from '../../container_adapter_client'
+import waitForExpect from 'wait-for-expect'
+import { EstimateMode } from '../../../src/category/mining'
+
+describe('Mining without masternode', () => {
+  const container = new RegTestContainer()
+  const client = new ContainerAdapterClient(container)
+
+  beforeAll(async () => {
+    await container.start()
+    await container.waitForReady()
+  })
+
+  afterAll(async () => {
+    await container.stop()
+  })
+
+  it('should have an error with estimateSmartFee', async () => {
+    const result = await client.mining.estimateSmartFee(6)
+    const errors = (result.errors != null) ? result.errors : []
+    expect(errors.length).toBeGreaterThan(0)
+    expect(errors[0]).toStrictEqual('Insufficient data or no feerate found')
+    expect(result.feerate).toBeUndefined()
+  })
+})
+
+describe('Mining on masternode', () => {
+  const container = new MasterNodeRegTestContainer()
+  const client = new ContainerAdapterClient(container)
+
+  beforeAll(async () => {
+    await container.start()
+    await container.waitForReady()
+    await container.waitForWalletCoinbaseMaturity()
+  })
+
+  afterAll(async () => {
+    await container.stop()
+  })
+
+  it('should have estimated smart fees', async () => {
+    await waitForExpect(async () => {
+      for (let i = 0; i < 20; i++) {
+        for (let x = 0; x < 20; x++) {
+          const address = await client.wallet.getNewAddress()
+          await client.wallet.sendToAddress(address, 0.1, { subtractFeeFromAmount: true })
+        }
+        await container.generate(1)
+      }
+    })
+
+    const result = await client.mining.estimateSmartFee(6, EstimateMode.ECONOMICAL)
+    expect(result.errors).toBeUndefined()
+    expect(result.blocks).toBeGreaterThan(0)
+    expect(result.feerate).toBeGreaterThan(0)
+  })
+})
diff --git a/packages/jellyfish-api-core/__tests__/category/mining/getMiningInfo.test.ts b/packages/jellyfish-api-core/__tests__/category/mining/getMiningInfo.test.ts
new file mode 100644
index 0000000000..34fdad8a07
--- /dev/null
+++ b/packages/jellyfish-api-core/__tests__/category/mining/getMiningInfo.test.ts
@@ -0,0 +1,47 @@
+import { MasterNodeRegTestContainer } from '@defichain/testcontainers'
+import { ContainerAdapterClient } from '../../container_adapter_client'
+import waitForExpect from 'wait-for-expect'
+
+describe('Mining', () => {
+  const container = new MasterNodeRegTestContainer()
+  const client = new ContainerAdapterClient(container)
+
+  beforeAll(async () => {
+    await container.start()
+    await container.waitForReady()
+  })
+
+  afterAll(async () => {
+    await container.stop()
+  })
+
+  it('should getMiningInfo', async () => {
+    await waitForExpect(async () => {
+      const info = await client.mining.getMiningInfo()
+      await expect(info.blocks).toBeGreaterThan(1)
+    })
+
+    const info = await client.mining.getMiningInfo()
+    const mn1 = info.masternodes[0]
+
+    expect(info.blocks).toBeGreaterThan(0)
+
+    expect(info.currentblockweight).toBeGreaterThan(0)
+    expect(info.currentblocktx).toStrictEqual(0)
+
+    expect(info.difficulty).toBeDefined()
+    expect(info.isoperator).toStrictEqual(true)
+
+    expect(mn1.masternodeid).toBeDefined()
+    expect(mn1.masternodeoperator).toBeDefined()
+    expect(mn1.masternodestate).toStrictEqual('ENABLED')
+    expect(mn1.generate).toStrictEqual(true)
+    expect(mn1.mintedblocks).toStrictEqual(0)
+    expect(mn1.lastblockcreationattempt).not.toStrictEqual('0')
+
+    expect(info.networkhashps).toBeGreaterThan(0)
+    expect(info.pooledtx).toStrictEqual(0)
+    expect(info.chain).toStrictEqual('regtest')
+    expect(info.warnings).toStrictEqual('')
+  })
+})
diff --git a/packages/jellyfish-api-core/__tests__/category/mining/getMintingInfo.test.ts b/packages/jellyfish-api-core/__tests__/category/mining/getMintingInfo.test.ts
new file mode 100644
index 0000000000..8a70b3768a
--- /dev/null
+++ b/packages/jellyfish-api-core/__tests__/category/mining/getMintingInfo.test.ts
@@ -0,0 +1,71 @@
+import { MasterNodeRegTestContainer, RegTestContainer } from '@defichain/testcontainers'
+import { ContainerAdapterClient } from '../../container_adapter_client'
+import waitForExpect from 'wait-for-expect'
+
+describe('Mining without masternode', () => {
+  const container = new RegTestContainer()
+  const client = new ContainerAdapterClient(container)
+
+  beforeAll(async () => {
+    await container.start()
+    await container.waitForReady()
+  })
+
+  afterAll(async () => {
+    await container.stop()
+  })
+
+  it('should getMintingInfo', async () => {
+    const info = await client.mining.getMintingInfo()
+
+    expect(info.blocks).toStrictEqual(0)
+    expect(info.difficulty).toBeDefined()
+    expect(info.isoperator).toStrictEqual(false)
+    expect(info.networkhashps).toStrictEqual(0)
+    expect(info.pooledtx).toStrictEqual(0)
+    expect(info.chain).toStrictEqual('regtest')
+    expect(info.warnings).toStrictEqual('')
+  })
+})
+
+describe('Mining on masternode', () => {
+  const container = new MasterNodeRegTestContainer()
+  const client = new ContainerAdapterClient(container)
+
+  beforeAll(async () => {
+    await container.start()
+    await container.waitForReady()
+  })
+
+  afterAll(async () => {
+    await container.stop()
+  })
+
+  it('should getMintingInfo', async () => {
+    await waitForExpect(async () => {
+      const info = await client.mining.getMintingInfo()
+      await expect(info.blocks).toBeGreaterThan(1)
+    })
+
+    const info = await client.mining.getMintingInfo()
+
+    expect(info.blocks).toBeGreaterThan(0)
+
+    expect(info.currentblockweight).toBeGreaterThan(0)
+    expect(info.currentblocktx).toStrictEqual(0)
+
+    expect(info.difficulty).toBeDefined()
+    expect(info.isoperator).toStrictEqual(true)
+
+    expect(info.masternodeid).toBeDefined()
+    expect(info.masternodeoperator).toBeDefined()
+    expect(info.masternodestate).toStrictEqual('ENABLED')
+    expect(info.generate).toStrictEqual(true)
+    expect(info.mintedblocks).toStrictEqual(0)
+
+    expect(info.networkhashps).toBeGreaterThan(0)
+    expect(info.pooledtx).toStrictEqual(0)
+    expect(info.chain).toStrictEqual('regtest')
+    expect(info.warnings).toStrictEqual('')
+  })
+})
diff --git a/packages/jellyfish-api-core/__tests__/category/mining/getNetworkHashPerSecond.test.ts b/packages/jellyfish-api-core/__tests__/category/mining/getNetworkHashPerSecond.test.ts
new file mode 100644
index 0000000000..a37de65111
--- /dev/null
+++ b/packages/jellyfish-api-core/__tests__/category/mining/getNetworkHashPerSecond.test.ts
@@ -0,0 +1,43 @@
+import { MasterNodeRegTestContainer, RegTestContainer } from '@defichain/testcontainers'
+import { ContainerAdapterClient } from '../../container_adapter_client'
+import waitForExpect from 'wait-for-expect'
+
+describe('Mining without masternode', () => {
+  const container = new RegTestContainer()
+  const client = new ContainerAdapterClient(container)
+
+  beforeAll(async () => {
+    await container.start()
+    await container.waitForReady()
+  })
+
+  afterAll(async () => {
+    await container.stop()
+  })
+
+  it('should getNetworkHashPerSecond', async () => {
+    const result = await client.mining.getNetworkHashPerSecond()
+    expect(result).toStrictEqual(0)
+  })
+})
+
+describe('Mining on masternode', () => {
+  const container = new MasterNodeRegTestContainer()
+  const client = new ContainerAdapterClient(container)
+
+  beforeAll(async () => {
+    await container.start()
+    await container.waitForReady()
+  })
+
+  afterAll(async () => {
+    await container.stop()
+  })
+
+  it('should getNetworkHashPerSecond', async () => {
+    return await waitForExpect(async () => {
+      const result = await client.mining.getNetworkHashPerSecond()
+      expect(result).toBeGreaterThan(0)
+    })
+  })
+})