diff --git a/bin/mock.sh b/bin/mock.sh
index 4a587c9..0522b0e 100755
--- a/bin/mock.sh
+++ b/bin/mock.sh
@@ -11,6 +11,7 @@ anvil -f arbitrum_mock --chain-id 31337 &
 ANVIL_PID=$!
 sleep 2
 
+forge script script/Deploy.sol -vvvv --fork-url http://localhost:8545 --broadcast
 forge script script/DeployMock.sol -vvvv --fork-url http://localhost:8545 --broadcast
 
 trap_ctrlc() {
diff --git a/script/DeployMock.sol b/script/DeployMock.sol
index 990245c..838af52 100644
--- a/script/DeployMock.sol
+++ b/script/DeployMock.sol
@@ -12,19 +12,9 @@ contract DeployMock is Script {
     function run() external {
         uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
         vm.startBroadcast(deployerPrivateKey);
-        // hardhat often breaks on the CREATE2 so we disable it for mock
-        //        Factory deployer = new Factory{salt:keccak256(abi.encode(1))}(); // version 1
-        Factory deployer = new Factory();
-        QueryHelper query = new QueryHelper();
-        Dexorder dexorder = new Dexorder();
         MockEnv mock = new MockEnv();
+        mock.init();
         vm.stopBroadcast();
-        console2.log('Factory');
-        console2.log(address(deployer));
-        console2.log('QueryHelper');
-        console2.log(address(query));
-        console2.log('Dexorder');
-        console2.log(address(dexorder));
         console2.log('MockEnv');
         console2.log(address(mock));
     }
diff --git a/test/MockEnv.sol b/test/MockEnv.sol
index c879f2d..38887e0 100644
--- a/test/MockEnv.sol
+++ b/test/MockEnv.sol
@@ -47,14 +47,9 @@ contract MockEnv {
         pool = IUniswapV3Pool(nfpm.createAndInitializePoolIfNecessary(token0, token1, fee, initialPrice));
         console2.log('v3 pool');
         console2.log(address(pool));
-        int24 ts = pool.tickSpacing();
         (, int24 lower, , , , ,) = pool.slot0();
-        int24 upper = lower;
-        for (int8 i = 0; i < 10; i++) {
-            lower -= ts;
-            upper += ts;
-            stake(1000 * 10**12, lower, upper);
-        }
+        // stake a super wide range so we have liquidity everywhere.
+        stake(1_000_000 * 10**12, lower-10000, lower+100000);
     }