diff --git a/package.json b/package.json
index 8529f8ac..505ed586 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "compile": "forge build",
     "deploy": "bash setupInfraContracts.sh"
   },
+  "pre-commit": [],
   "author": "",
   "license": "ISC",
   "devDependencies": {
diff --git a/script/counter/deployEVMxCounterApp.s.sol b/script/counter/DeployEVMxCounterApp.s.sol
similarity index 100%
rename from script/counter/deployEVMxCounterApp.s.sol
rename to script/counter/DeployEVMxCounterApp.s.sol
diff --git a/script/counter/deployOnchainCounters.s.sol b/script/counter/DeployOnchainCounters.s.sol
similarity index 100%
rename from script/counter/deployOnchainCounters.s.sol
rename to script/counter/DeployOnchainCounters.s.sol
diff --git a/script/helpers/WithdrawFeesArbitrumFeesPlug.s.sol b/script/counter/WithdrawFeesArbitrumFeesPlug.s.sol
similarity index 100%
rename from script/helpers/WithdrawFeesArbitrumFeesPlug.s.sol
rename to script/counter/WithdrawFeesArbitrumFeesPlug.s.sol
diff --git a/test/DeliveryHelper.t.sol b/test/DeliveryHelper.t.sol
index 4135b3fc..04dc0d3e 100644
--- a/test/DeliveryHelper.t.sol
+++ b/test/DeliveryHelper.t.sol
@@ -352,16 +352,11 @@ contract DeliveryHelperTest is SetupTest {
         watcherPrecompile.setAppGateways(gateways, signatureNonce++, watcherSignature);
     }
 
-    function _executeReadBatchSingleChain(
-        uint32 chainSlug_,
-        uint256 totalPayloads
-    ) internal returns (bytes32 asyncId) {
+    function _executeReadBatchSingleChain() internal returns (bytes32 asyncId) {
         asyncId = getNextAsyncId();
     }
 
-    function _executeReadBatchMultiChain(
-        uint32[] memory chainSlugs_
-    ) internal returns (bytes32 asyncId) {
+    function _executeReadBatchMultiChain() internal returns (bytes32 asyncId) {
         asyncId = getNextAsyncId();
     }
 
diff --git a/test/Storage.t.sol b/test/Storage.t.sol
index d5e91d60..25b684e0 100644
--- a/test/Storage.t.sol
+++ b/test/Storage.t.sol
@@ -10,13 +10,13 @@ contract StorageTest is DeliveryHelperTest {
         setUpDeliveryHelper();
     }
 
-    function testAddressResolverSlot() public {
+    function testAddressResolverSlot() public view {
         // Test AddressResolver version at slot 59
         bytes32 versionSlot = vm.load(address(addressResolver), bytes32(uint256(59)));
         assertEq(uint64(uint256(versionSlot)), 1);
     }
 
-    function testWatcherPrecompileSlot() public {
+    function testWatcherPrecompileSlot() public view {
         // Test AddressResolver address at slot 109 in WatcherPrecompile
         bytes32 slotValue = vm.load(address(watcherPrecompile), bytes32(uint256(52)));
         assertEq(uint256(slotValue), evmxSlug);
@@ -25,7 +25,7 @@ contract StorageTest is DeliveryHelperTest {
         assertEq(address(uint160(uint256(slotValue))), address(addressResolver));
     }
 
-    function testFeesManagerSlot() public {
+    function testFeesManagerSlot() public view {
         bytes32 slotValue = vm.load(address(feesManager), bytes32(uint256(51)));
         assertEq(uint32(uint256(slotValue)), evmxSlug);
 
@@ -33,7 +33,7 @@ contract StorageTest is DeliveryHelperTest {
         assertEq(address(uint160(uint256(slotValue))), address(addressResolver));
     }
 
-    function testAuctionManagerSlot() public {
+    function testAuctionManagerSlot() public view {
         bytes32 slotValue = vm.load(address(auctionManager), bytes32(uint256(50)));
         assertEq(uint32(uint256(slotValue)), evmxSlug);
 
@@ -65,7 +65,7 @@ contract StorageTest is DeliveryHelperTest {
         assertEq(address(uint160(uint256(slotValue))), address(addressResolver));
     }
 
-    function testDeliveryHelperSlot() public {
+    function testDeliveryHelperSlot() public view {
         bytes32 slotValue = vm.load(address(deliveryHelper), bytes32(uint256(50)));
         assertEq(uint256(uint256(slotValue)), 0);
 
diff --git a/test/apps/SuperTokenLockable.t.sol b/test/apps/SuperTokenLockable.t.sol
index 749a3067..aee20b19 100644
--- a/test/apps/SuperTokenLockable.t.sol
+++ b/test/apps/SuperTokenLockable.t.sol
@@ -323,7 +323,6 @@ contract SuperTokenLockableTest is DeliveryHelperTest {
         vm.expectEmit(true, true, false, true);
         emit BatchCancelled(bridgeAsyncId);
         finalizeQuery(payloadIds[1], abi.encode(0.001 ether));
-        bytes32 cancelAsyncId = getNextAsyncId();
 
         bytes32[] memory cancelPayloadIds = new bytes32[](1);
         uint32 srcChainSlug = IForwarder(userOrder.srcToken).getChainSlug();
@@ -334,6 +333,7 @@ contract SuperTokenLockableTest is DeliveryHelperTest {
             payloadIdCounter++
         );
 
+        // bytes32 cancelAsyncId = getNextAsyncId();
         // bidAndEndAuction(cancelAsyncId);
         // finalizeAndExecute(
         //     cancelPayloadIds[0],