diff --git a/.forge-snapshots/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityOutsideActiveId_ExistingId.snap b/.forge-snapshots/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityOutsideActiveId_ExistingId.snap
index d54044a..53c0ade 100644
--- a/.forge-snapshots/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityOutsideActiveId_ExistingId.snap
+++ b/.forge-snapshots/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityOutsideActiveId_ExistingId.snap
@@ -1 +1 @@
-73618
\ No newline at end of file
+186974
\ No newline at end of file
diff --git a/.forge-snapshots/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityOutsideActiveId_NewId.snap b/.forge-snapshots/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityOutsideActiveId_NewId.snap
index a69c1a7..3161941 100644
--- a/.forge-snapshots/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityOutsideActiveId_NewId.snap
+++ b/.forge-snapshots/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityOutsideActiveId_NewId.snap
@@ -1 +1 @@
-622992
\ No newline at end of file
+656948
\ No newline at end of file
diff --git a/.forge-snapshots/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityWithActiveId.snap b/.forge-snapshots/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityWithActiveId.snap
index 3f53246..32ed4d6 100644
--- a/.forge-snapshots/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityWithActiveId.snap
+++ b/.forge-snapshots/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityWithActiveId.snap
@@ -1 +1 @@
-913401
\ No newline at end of file
+945285
\ No newline at end of file
diff --git a/.forge-snapshots/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityWithActiveId_WithHook.snap b/.forge-snapshots/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityWithActiveId_WithHook.snap
index cfed5cb..33d7e1b 100644
--- a/.forge-snapshots/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityWithActiveId_WithHook.snap
+++ b/.forge-snapshots/BinFungiblePositionManager_AddLiquidityTest#testAddLiquidityWithActiveId_WithHook.snap
@@ -1 +1 @@
-1262461
\ No newline at end of file
+1312637
\ No newline at end of file
diff --git a/.forge-snapshots/BinFungiblePositionManager_RemoveLiquidityTest#testRemoveLiquidityOutsideActiveId_ThreeBins.snap b/.forge-snapshots/BinFungiblePositionManager_RemoveLiquidityTest#testRemoveLiquidityOutsideActiveId_ThreeBins.snap
index 8244bd3..59a7363 100644
--- a/.forge-snapshots/BinFungiblePositionManager_RemoveLiquidityTest#testRemoveLiquidityOutsideActiveId_ThreeBins.snap
+++ b/.forge-snapshots/BinFungiblePositionManager_RemoveLiquidityTest#testRemoveLiquidityOutsideActiveId_ThreeBins.snap
@@ -1 +1 @@
-75516
\ No newline at end of file
+153583
\ No newline at end of file
diff --git a/.forge-snapshots/BinFungiblePositionManager_RemoveLiquidityTest#testRemoveLiquidityWithActiveId_ThreeBins.snap b/.forge-snapshots/BinFungiblePositionManager_RemoveLiquidityTest#testRemoveLiquidityWithActiveId_ThreeBins.snap
index cb9e5ad..589ff60 100644
--- a/.forge-snapshots/BinFungiblePositionManager_RemoveLiquidityTest#testRemoveLiquidityWithActiveId_ThreeBins.snap
+++ b/.forge-snapshots/BinFungiblePositionManager_RemoveLiquidityTest#testRemoveLiquidityWithActiveId_ThreeBins.snap
@@ -1 +1 @@
-111483
\ No newline at end of file
+224877
\ No newline at end of file
diff --git a/.forge-snapshots/BinFungiblePositionManager_RemoveLiquidityTest#testRemoveLiquidity_Half.snap b/.forge-snapshots/BinFungiblePositionManager_RemoveLiquidityTest#testRemoveLiquidity_Half.snap
index 11b5cc3..dd3a892 100644
--- a/.forge-snapshots/BinFungiblePositionManager_RemoveLiquidityTest#testRemoveLiquidity_Half.snap
+++ b/.forge-snapshots/BinFungiblePositionManager_RemoveLiquidityTest#testRemoveLiquidity_Half.snap
@@ -1 +1 @@
-108288
\ No newline at end of file
+252792
\ No newline at end of file
diff --git a/.forge-snapshots/BinFungibleTokenTest#testBatchTransferFrom_FromBob.snap b/.forge-snapshots/BinFungibleTokenTest#testBatchTransferFrom_FromBob.snap
index 6fa2493..41669ab 100644
--- a/.forge-snapshots/BinFungibleTokenTest#testBatchTransferFrom_FromBob.snap
+++ b/.forge-snapshots/BinFungibleTokenTest#testBatchTransferFrom_FromBob.snap
@@ -1 +1 @@
-29699
\ No newline at end of file
+54387
\ No newline at end of file
diff --git a/.forge-snapshots/BinFungibleTokenTest#testBatchTransferFrom_FromOwner.snap b/.forge-snapshots/BinFungibleTokenTest#testBatchTransferFrom_FromOwner.snap
index 4bbdc2c..93ea312 100644
--- a/.forge-snapshots/BinFungibleTokenTest#testBatchTransferFrom_FromOwner.snap
+++ b/.forge-snapshots/BinFungibleTokenTest#testBatchTransferFrom_FromOwner.snap
@@ -1 +1 @@
-29431
\ No newline at end of file
+52359
\ No newline at end of file
diff --git a/.forge-snapshots/BinFungibleTokenTest#testBurn.snap b/.forge-snapshots/BinFungibleTokenTest#testBurn.snap
index caa1741..25292f2 100644
--- a/.forge-snapshots/BinFungibleTokenTest#testBurn.snap
+++ b/.forge-snapshots/BinFungibleTokenTest#testBurn.snap
@@ -1 +1 @@
-2062
\ No newline at end of file
+27300
\ No newline at end of file
diff --git a/.forge-snapshots/BinFungibleTokenTest#testMint.snap b/.forge-snapshots/BinFungibleTokenTest#testMint.snap
index ddc6fcb..5a500c1 100644
--- a/.forge-snapshots/BinFungibleTokenTest#testMint.snap
+++ b/.forge-snapshots/BinFungibleTokenTest#testMint.snap
@@ -1 +1 @@
-43613
\ No newline at end of file
+67877
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_DifferentRecipient.snap b/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_DifferentRecipient.snap
index ade9a2f..cf85684 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_DifferentRecipient.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_DifferentRecipient.snap
@@ -1 +1 @@
-135771
\ No newline at end of file
+162255
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_EthPool_SwapEthForToken.snap b/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_EthPool_SwapEthForToken.snap
index 0e014e2..e93ca17 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_EthPool_SwapEthForToken.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_EthPool_SwapEthForToken.snap
@@ -1 +1 @@
-128493
\ No newline at end of file
+156725
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_EthPool_SwapTokenForEth.snap b/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_EthPool_SwapTokenForEth.snap
index 57da915..60f8b37 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_EthPool_SwapTokenForEth.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_EthPool_SwapTokenForEth.snap
@@ -1 +1 @@
-133310
\ No newline at end of file
+159530
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_SwapForY_1.snap b/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_SwapForY_1.snap
index 355732f..9cdcd67 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_SwapForY_1.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_SwapForY_1.snap
@@ -1 +1 @@
-129277
\ No newline at end of file
+160249
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_SwapForY_2.snap b/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_SwapForY_2.snap
index 5562ea3..1ab00a0 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_SwapForY_2.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactInputSingle_SwapForY_2.snap
@@ -1 +1 @@
-129352
\ No newline at end of file
+160312
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactInput_MultiHopDifferentRecipient.snap b/.forge-snapshots/BinSwapRouterTest#testExactInput_MultiHopDifferentRecipient.snap
index 2b1b06d..2814bdc 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactInput_MultiHopDifferentRecipient.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactInput_MultiHopDifferentRecipient.snap
@@ -1 +1 @@
-160822
\ No newline at end of file
+186338
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_DifferentRecipient.snap b/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_DifferentRecipient.snap
index 70cfb0e..44ce088 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_DifferentRecipient.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_DifferentRecipient.snap
@@ -1 +1 @@
-141280
\ No newline at end of file
+172624
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_SwapForY_1.snap b/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_SwapForY_1.snap
index 3fc0141..afdd9de 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_SwapForY_1.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_SwapForY_1.snap
@@ -1 +1 @@
-134786
\ No newline at end of file
+170630
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_SwapForY_2.snap b/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_SwapForY_2.snap
index 1b159ec..6efd550 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_SwapForY_2.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactOutputSingle_SwapForY_2.snap
@@ -1 +1 @@
-134873
\ No newline at end of file
+170705
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactOutput_MultiHopDifferentRecipient.snap b/.forge-snapshots/BinSwapRouterTest#testExactOutput_MultiHopDifferentRecipient.snap
index 21df84f..994afae 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactOutput_MultiHopDifferentRecipient.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactOutput_MultiHopDifferentRecipient.snap
@@ -1 +1 @@
-165621
\ No newline at end of file
+200509
\ No newline at end of file
diff --git a/.forge-snapshots/BinSwapRouterTest#testExactOutput_SingleHop.snap b/.forge-snapshots/BinSwapRouterTest#testExactOutput_SingleHop.snap
index 390fd96..cbcce68 100644
--- a/.forge-snapshots/BinSwapRouterTest#testExactOutput_SingleHop.snap
+++ b/.forge-snapshots/BinSwapRouterTest#testExactOutput_SingleHop.snap
@@ -1 +1 @@
-126842
\ No newline at end of file
+162954
\ No newline at end of file
diff --git a/.forge-snapshots/CLSwapRouterTest#ExactInput.snap b/.forge-snapshots/CLSwapRouterTest#ExactInput.snap
index ae63883..3ccc503 100644
--- a/.forge-snapshots/CLSwapRouterTest#ExactInput.snap
+++ b/.forge-snapshots/CLSwapRouterTest#ExactInput.snap
@@ -1 +1 @@
-243641
\ No newline at end of file
+266645
\ No newline at end of file
diff --git a/.forge-snapshots/CLSwapRouterTest#ExactInputSingle.snap b/.forge-snapshots/CLSwapRouterTest#ExactInputSingle.snap
index f16ca95..d551c2f 100644
--- a/.forge-snapshots/CLSwapRouterTest#ExactInputSingle.snap
+++ b/.forge-snapshots/CLSwapRouterTest#ExactInputSingle.snap
@@ -1 +1 @@
-177764
\ No newline at end of file
+201852
\ No newline at end of file
diff --git a/.forge-snapshots/CLSwapRouterTest#ExactOutput.snap b/.forge-snapshots/CLSwapRouterTest#ExactOutput.snap
index 2b087a2..d14a3b6 100644
--- a/.forge-snapshots/CLSwapRouterTest#ExactOutput.snap
+++ b/.forge-snapshots/CLSwapRouterTest#ExactOutput.snap
@@ -1 +1 @@
-249640
\ No newline at end of file
+272728
\ No newline at end of file
diff --git a/.forge-snapshots/CLSwapRouterTest#ExactOutputSingle.snap b/.forge-snapshots/CLSwapRouterTest#ExactOutputSingle.snap
index 95b027b..6c3d0c4 100644
--- a/.forge-snapshots/CLSwapRouterTest#ExactOutputSingle.snap
+++ b/.forge-snapshots/CLSwapRouterTest#ExactOutputSingle.snap
@@ -1 +1 @@
-177330
\ No newline at end of file
+201502
\ No newline at end of file
diff --git a/.forge-snapshots/NonfungiblePositionManager#burn.snap b/.forge-snapshots/NonfungiblePositionManager#burn.snap
index 5ab4456..0d4e47b 100644
--- a/.forge-snapshots/NonfungiblePositionManager#burn.snap
+++ b/.forge-snapshots/NonfungiblePositionManager#burn.snap
@@ -1 +1 @@
-10794
\ No newline at end of file
+62578
\ No newline at end of file
diff --git a/.forge-snapshots/NonfungiblePositionManager#collect.snap b/.forge-snapshots/NonfungiblePositionManager#collect.snap
index 26b9c4f..ee2fa4f 100644
--- a/.forge-snapshots/NonfungiblePositionManager#collect.snap
+++ b/.forge-snapshots/NonfungiblePositionManager#collect.snap
@@ -1 +1 @@
-198059
\ No newline at end of file
+276679
\ No newline at end of file
diff --git a/.forge-snapshots/NonfungiblePositionManager#decreaseLiquidity.snap b/.forge-snapshots/NonfungiblePositionManager#decreaseLiquidity.snap
index f0b6b55..b2fcfc4 100644
--- a/.forge-snapshots/NonfungiblePositionManager#decreaseLiquidity.snap
+++ b/.forge-snapshots/NonfungiblePositionManager#decreaseLiquidity.snap
@@ -1 +1 @@
-72736
\ No newline at end of file
+190144
\ No newline at end of file
diff --git a/.forge-snapshots/NonfungiblePositionManager#increaseLiquidity.snap b/.forge-snapshots/NonfungiblePositionManager#increaseLiquidity.snap
index 3dee0b7..5988a3c 100644
--- a/.forge-snapshots/NonfungiblePositionManager#increaseLiquidity.snap
+++ b/.forge-snapshots/NonfungiblePositionManager#increaseLiquidity.snap
@@ -1 +1 @@
-79553
\ No newline at end of file
+218325
\ No newline at end of file
diff --git a/.forge-snapshots/NonfungiblePositionManager#mint.snap b/.forge-snapshots/NonfungiblePositionManager#mint.snap
index 0278ff1..d407d24 100644
--- a/.forge-snapshots/NonfungiblePositionManager#mint.snap
+++ b/.forge-snapshots/NonfungiblePositionManager#mint.snap
@@ -1 +1 @@
-624105
\ No newline at end of file
+653033
\ No newline at end of file
diff --git a/README.md b/README.md
index 1bc8dce..73bb784 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,9 @@
 ## Running test
 
 1. Install dependencies with `forge install`
-2. Run test with `forge test`
+2. Run test with `forge test --isolate`
+
+See https://github.com/pancakeswap/pancake-v4-core/pull/35 on why `--isolate` flag is used.
 
 ## Update dependencies
 
diff --git a/package.json b/package.json
index fbfce70..f614057 100644
--- a/package.json
+++ b/package.json
@@ -7,8 +7,8 @@
   "devDependencies": {},
   "scripts": {
     "compile": "forge compile",
-    "test": "forge test",
-    "dev": "forge test -vvv -w",
+    "test": "forge test --isolate",
+    "dev": "forge test --isolate -vvv -w",
     "snapshot": "rm -fr .forge-snapshots && forge test",
     "prettier": "forge fmt src/ && forge fmt test/ && forge fmt script/",
     "prettier-check": "forge fmt --check"