diff --git a/bittensor/core/async_subtensor.py b/bittensor/core/async_subtensor.py
index aaaa58bde9..e01efec761 100644
--- a/bittensor/core/async_subtensor.py
+++ b/bittensor/core/async_subtensor.py
@@ -979,9 +979,9 @@ async def get_balance(
         """
         block_hash = await self.determine_block_hash(block, block_hash, reuse_block)
         balance = await self.substrate.query(
-            "System",
-            "Account",
-            [address],
+            module="System",
+            storage_function="Account",
+            params=[address],
             block_hash=block_hash,
             reuse_block_hash=reuse_block,
         )
@@ -1786,11 +1786,13 @@ async def get_total_stake_for_coldkey(
         Returns:
             Balance of the stake held on the coldkey.
         """
-        block_hash = await self.determine_block_hash(block, block_hash, reuse_block)
+        block_hash = await self.determine_block_hash(
+            block=block, block_hash=block_hash, reuse_block=reuse_block
+        )
         result = await self.substrate.query(
-            "SubtensorModule",
-            "TotalColdkeyStake",
-            [ss58_address],
+            module="SubtensorModule",
+            storage_function="TotalColdkeyStake",
+            params=[ss58_address],
             block_hash=block_hash,
             reuse_block_hash=reuse_block,
         )
@@ -1857,7 +1859,9 @@ async def get_total_stake_for_hotkey(
         Returns:
             Balance of the stake held on the hotkey.
         """
-        block_hash = await self.determine_block_hash(block, block_hash, reuse_block)
+        block_hash = await self.determine_block_hash(
+            block=block, block_hash=block_hash, reuse_block=reuse_block
+        )
         result = await self.substrate.query(
             module="SubtensorModule",
             storage_function="TotalHotkeyStake",
diff --git a/tests/unit_tests/test_async_subtensor.py b/tests/unit_tests/test_async_subtensor.py
index 52ac0de2ec..8a129f45e4 100644
--- a/tests/unit_tests/test_async_subtensor.py
+++ b/tests/unit_tests/test_async_subtensor.py
@@ -1,9 +1,9 @@
 import pytest
 from bittensor_wallet import Wallet
 
-from bittensor import AsyncSubtensor
 from bittensor.core import async_subtensor
 from bittensor.core.chain_data import proposal_vote_data
+from bittensor.core.subtensor import AsyncSubtensor
 
 
 @pytest.fixture(autouse=True)
@@ -579,8 +579,6 @@ async def test_get_balance(subtensor, mocker):
     fake_block_hash = None
     reuse_block = True
 
-    expected_balance = async_subtensor.Balance(1000)
-
     mocked_determine_block_hash = mocker.AsyncMock()
     mocker.patch.object(
         async_subtensor.AsyncSubtensor,
@@ -588,12 +586,7 @@ async def test_get_balance(subtensor, mocker):
         mocked_determine_block_hash,
     )
 
-    mocked_get_balances = mocker.AsyncMock(
-        return_value={fake_address: expected_balance}
-    )
-    mocker.patch.object(
-        async_subtensor.AsyncSubtensor, "get_balances", mocked_get_balances
-    )
+    mocked_balance = mocker.patch.object(async_subtensor, "Balance")
 
     # Call
     result = await subtensor.get_balance(
@@ -603,12 +596,17 @@ async def test_get_balance(subtensor, mocker):
     mocked_determine_block_hash.assert_awaited_once_with(
         fake_block, fake_block_hash, reuse_block
     )
-    mocked_get_balances.assert_awaited_once_with(
-        *[fake_address],
+    subtensor.substrate.query.assert_awaited_once_with(
+        module="System",
+        storage_function="Account",
+        params=[fake_address],
         block_hash=mocked_determine_block_hash.return_value,
-        reuse_block=reuse_block,
+        reuse_block_hash=reuse_block,
+    )
+    mocked_balance.assert_called_once_with(
+        subtensor.substrate.query.return_value.__getitem__.return_value.__getitem__.return_value
     )
-    assert result == expected_balance
+    assert result == mocked_balance.return_value
 
 
 @pytest.mark.parametrize("balance", [100, 100.1])
@@ -689,63 +687,68 @@ async def test_get_transfer_with_exception(subtensor, mocker):
 async def test_get_total_stake_for_coldkey(subtensor, mocker):
     """Tests get_total_stake_for_coldkey method."""
     # Preps
-    fake_addresses = ("a1", "a2")
+    fake_addresses = "a1"
     fake_block_hash = None
 
-    mocked_substrate_create_storage_key = mocker.AsyncMock()
-    subtensor.substrate.create_storage_key = mocked_substrate_create_storage_key
-
-    mocked_batch_0_call = mocker.Mock(
-        params=[
-            0,
-        ]
-    )
-    mocked_batch_1_call = 0
-    mocked_substrate_query_multi = mocker.AsyncMock(
-        return_value=[
-            (mocked_batch_0_call, mocked_batch_1_call),
-        ]
+    mocked_determine_block_hash = mocker.AsyncMock()
+    mocker.patch.object(
+        async_subtensor.AsyncSubtensor,
+        "determine_block_hash",
+        mocked_determine_block_hash,
     )
 
-    subtensor.substrate.query_multi = mocked_substrate_query_multi
+    mocked_balance_from_rao = mocker.patch.object(async_subtensor.Balance, "from_rao")
 
     # Call
     result = await subtensor.get_total_stake_for_coldkey(
-        *fake_addresses, block_hash=fake_block_hash
+        fake_addresses, block_hash=fake_block_hash
     )
 
-    assert mocked_substrate_create_storage_key.call_count == len(fake_addresses)
-    mocked_substrate_query_multi.assert_called_once()
-    assert result == {0: async_subtensor.Balance(mocked_batch_1_call)}
+    mocked_determine_block_hash.assert_awaited_once_with(
+        block=None, block_hash=None, reuse_block=False
+    )
+    subtensor.substrate.query.assert_awaited_once_with(
+        module="SubtensorModule",
+        storage_function="TotalColdkeyStake",
+        params=[fake_addresses],
+        block_hash=mocked_determine_block_hash.return_value,
+        reuse_block_hash=False,
+    )
+    assert result == mocked_balance_from_rao.return_value
 
 
 @pytest.mark.asyncio
 async def test_get_total_stake_for_hotkey(subtensor, mocker):
     """Tests get_total_stake_for_hotkey method."""
     # Preps
-    fake_addresses = ("a1", "a2")
+    fake_addresses = "a1"
     fake_block_hash = None
-    reuse_block = True
 
-    mocked_substrate_query_multiple = mocker.AsyncMock(return_value={0: 1})
+    mocked_determine_block_hash = mocker.AsyncMock()
+    mocker.patch.object(
+        async_subtensor.AsyncSubtensor,
+        "determine_block_hash",
+        mocked_determine_block_hash,
+    )
 
-    subtensor.substrate.query_multiple = mocked_substrate_query_multiple
+    mocked_balance_from_rao = mocker.patch.object(async_subtensor.Balance, "from_rao")
 
     # Call
     result = await subtensor.get_total_stake_for_hotkey(
-        *fake_addresses, block_hash=fake_block_hash, reuse_block=reuse_block
+        fake_addresses, block_hash=fake_block_hash
     )
 
-    # Assertions
-    mocked_substrate_query_multiple.assert_called_once_with(
-        params=list(fake_addresses),
+    mocked_determine_block_hash.assert_awaited_once_with(
+        block=None, block_hash=None, reuse_block=False
+    )
+    subtensor.substrate.query.assert_awaited_once_with(
         module="SubtensorModule",
         storage_function="TotalHotkeyStake",
-        block_hash=fake_block_hash,
-        reuse_block_hash=reuse_block,
+        params=[fake_addresses],
+        block_hash=mocked_determine_block_hash.return_value,
+        reuse_block_hash=False,
     )
-    mocked_substrate_query_multiple.assert_called_once()
-    assert result == {0: async_subtensor.Balance(1)}
+    assert result == mocked_balance_from_rao.return_value
 
 
 @pytest.mark.parametrize(
diff --git a/tests/unit_tests/test_subtensor.py b/tests/unit_tests/test_subtensor.py
index 259893f878..49c02e246b 100644
--- a/tests/unit_tests/test_subtensor.py
+++ b/tests/unit_tests/test_subtensor.py
@@ -18,6 +18,8 @@ def test_methods_comparable(mocker):
         "encode_params",
         "get_hyperparameter",
         "sign_and_send_extrinsic",
+        "get_total_stake_for_coldkeys",
+        "get_total_stake_for_hotkeys",
     ]
     subtensor_methods = [
         m