diff --git a/nucypher/blockchain/economics.py b/nucypher/blockchain/economics.py
index e525cbf14..a40a28876 100644
--- a/nucypher/blockchain/economics.py
+++ b/nucypher/blockchain/economics.py
@@ -57,7 +57,7 @@ class BaseEconomics:
 
     # Value Constraints
     _default_minimum_allowed_locked = NU(15_000, 'NU').to_nunits()
-    _default_maximum_allowed_locked = NU(4_000_000, 'NU').to_nunits()
+    _default_maximum_allowed_locked = NU(30_000_000, 'NU').to_nunits()
 
     # Slashing parameters
     HASH_ALGORITHM_KECCAK256 = 0
diff --git a/nucypher/blockchain/eth/sol/source/contracts/Issuer.sol b/nucypher/blockchain/eth/sol/source/contracts/Issuer.sol
index 5a571fcc1..b19c7b52f 100644
--- a/nucypher/blockchain/eth/sol/source/contracts/Issuer.sol
+++ b/nucypher/blockchain/eth/sol/source/contracts/Issuer.sol
@@ -188,7 +188,6 @@ abstract contract Issuer is Upgradeable {
             (_totalLockedValue * coefficient);
 
         // rounding the last reward
-        // TODO optimize
         uint256 maxReward = getReservedReward();
         if (amount == 0) {
             amount = 1;
diff --git a/tests/blockchain/eth/entities/actors/test_deployer.py b/tests/blockchain/eth/entities/actors/test_deployer.py
index 75b32baa4..1bbe7c8d1 100644
--- a/tests/blockchain/eth/entities/actors/test_deployer.py
+++ b/tests/blockchain/eth/entities/actors/test_deployer.py
@@ -66,7 +66,7 @@ def test_rapid_deployment(token_economics, test_registry, tmpdir, get_random_che
                        ]
 
     # Pile on the rest
-    for _ in range(NUMBER_OF_ALLOCATIONS_IN_TESTS - len(allocation_data)):
+    for _ in range((NUMBER_OF_ALLOCATIONS_IN_TESTS - len(allocation_data)) // 2):
         checksum_address = get_random_checksum_address()
         amount = random.randint(token_economics.minimum_allowed_locked, token_economics.maximum_allowed_locked)
         duration = random.randint(token_economics.minimum_locked_periods, token_economics.maximum_rewarded_periods)
diff --git a/tests/blockchain/eth/entities/deployers/test_economics.py b/tests/blockchain/eth/entities/deployers/test_economics.py
index 3c674e46a..7895b83d5 100644
--- a/tests/blockchain/eth/entities/deployers/test_economics.py
+++ b/tests/blockchain/eth/entities/deployers/test_economics.py
@@ -142,7 +142,7 @@ def test_exact_economics():
                                       1002509479452054794520547,     # Max possible reward for one period for all stakers in the first phase
                                       30,       # Min amount of periods during which tokens can be locked
                                       15000000000000000000000,       # min locked NuNits
-                                      4000000000000000000000000,     # max locked NuNits
+                                      30000000000000000000000000,     # max locked NuNits
                                       2)        # Min worker periods
     #
     # Token Economics