diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f57f786..411a43e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -40,21 +40,14 @@ jobs:
     uses: "rhinestonewtf/reusable-workflows/.github/workflows/forge-release.yaml@main"
     strategy:
       matrix:
-        contract-name:
+        contract-path:
           [
-            "AutoSavings",
-            "ColdStorageFlashloan",
-            "ColdStorageHook",
-            "DeadmanSwitch",
-            "HookMultiPlexer",
-            "MultiFactor",
-            "OwnableExecutor",
-            "OwnableValidator",
-            "RegistryHook",
-            "SocialRecovery",
-            "ScheduledOrders",
-            "ScheduledTransfers",
+            "src/MultiFactor/MultiFactor",
+            "src/OwnableExecutor/OwnableExecutor",
+            "src/OwnableValidator/OwnableValidator",
+            "src/SocialRecovery/SocialRecovery",
+            "src/WebAuthnValidator/WebAuthnValidator",
           ]
     with:
-      contract-name: ${{ matrix.contract-name }}
+      contract-path: ${{ matrix.contract-path }}
       store-artifacts: true
diff --git a/build-artifacts.sh b/build-artifacts.sh
index 9a754dc..0d5221f 100755
--- a/build-artifacts.sh
+++ b/build-artifacts.sh
@@ -8,6 +8,12 @@ if [ $# -eq 0 ]; then
 fi
 
 CONTRACT_PATH=$1
+
+# Add .sol extension if not present
+if [[ ! "$CONTRACT_PATH" == *.sol ]]; then
+    CONTRACT_PATH="${CONTRACT_PATH}.sol"
+fi
+
 CONTRACT_NAME=$(basename "$CONTRACT_PATH" .sol)
 
 mkdir -p ./artifacts/$CONTRACT_NAME
diff --git a/foundry.toml b/foundry.toml
index cc109a8..dcae0b6 100644
--- a/foundry.toml
+++ b/foundry.toml
@@ -20,3 +20,6 @@ wrap_comments = true
 
 [fuzz]
 runs=1000
+
+[rpc_endpoints]
+mainnet = "https://mainnet.gateway.tenderly.co"
\ No newline at end of file
diff --git a/test/DeadmanSwitch/integration/concrete/DeadmanSwitch.t.sol b/test/DeadmanSwitch/integration/concrete/DeadmanSwitch.t.sol
index 73903bf..ca872e7 100644
--- a/test/DeadmanSwitch/integration/concrete/DeadmanSwitch.t.sol
+++ b/test/DeadmanSwitch/integration/concrete/DeadmanSwitch.t.sol
@@ -102,6 +102,8 @@ contract DeadmanSwitchIntegrationTest is BaseIntegrationTest {
     }
 
     function test_ValidateUserOp_RevertWhen_TimeoutNotDue() public {
+        // Set simulate mode to false
+        instance.simulateUserOp(false);
         // it should revert
         UserOpData memory userOpData = instance.getExecOps({
             target: address(1),
@@ -110,12 +112,13 @@ contract DeadmanSwitchIntegrationTest is BaseIntegrationTest {
             txValidator: address(dms)
         });
         userOpData.userOp.signature = signHash(_nomineePk, userOpData.userOpHash);
-
         instance.expect4337Revert();
         userOpData.execUserOps();
     }
 
     function test_ValidateUserOp() public {
+        // Set simulate mode to false
+        instance.simulateUserOp(false);
         // it should revert
         vm.warp(block.timestamp + _timeout);