diff --git a/packages/contracts/test/helpers/DeploymentHelper.sol b/packages/contracts/test/helpers/DeploymentHelper.sol
index 28022a6e..e3386f33 100644
--- a/packages/contracts/test/helpers/DeploymentHelper.sol
+++ b/packages/contracts/test/helpers/DeploymentHelper.sol
@@ -81,12 +81,14 @@ contract DeploymentHelper is Test {
         SimpleWallet simpleWalletImpl = new SimpleWallet();
         ERC1967Proxy simpleWalletProxy = new ERC1967Proxy(
             address(simpleWalletImpl),
-            abi.encodeWithSelector(
-                simpleWalletImpl.initialize.selector,
-                signer,
-                address(verifier),
-                address(dkim),
-                address(emailAuthImpl)
+            abi.encodeCall(
+                simpleWalletImpl.initialize,
+                (
+                    signer,
+                    address(verifier),
+                    address(dkim),
+                    address(emailAuthImpl)
+                )
             )
         );
         simpleWallet = SimpleWallet(payable(address(simpleWalletProxy)));
diff --git a/packages/contracts/test/helpers/SimpleWallet.sol b/packages/contracts/test/helpers/SimpleWallet.sol
index 52a994c6..ff47fd7b 100644
--- a/packages/contracts/test/helpers/SimpleWallet.sol
+++ b/packages/contracts/test/helpers/SimpleWallet.sol
@@ -3,6 +3,7 @@ pragma solidity ^0.8.12;
 
 import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 import {EmailAccountRecovery} from "../../src/EmailAccountRecovery.sol";
+import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 
 contract SimpleWallet is OwnableUpgradeable, EmailAccountRecovery {
     enum GuardianStatus {
@@ -54,7 +55,7 @@ contract SimpleWallet is OwnableUpgradeable, EmailAccountRecovery {
         uint256 amount
     ) public onlyNotRecoveringOwner {
         require(address(this).balance >= amount, "insufficient balance");
-        payable(to).transfer(amount);
+        Address.sendValue(payable(to), amount);
     }
 
     function withdraw(uint256 amount) public onlyNotRecoveringOwner {
diff --git a/packages/contracts/test/helpers/StructHelper.sol b/packages/contracts/test/helpers/StructHelper.sol
index 84ef6c66..cae1eb2f 100644
--- a/packages/contracts/test/helpers/StructHelper.sol
+++ b/packages/contracts/test/helpers/StructHelper.sol
@@ -34,11 +34,8 @@ contract StructHelper is DeploymentHelper {
 
         vm.mockCall(
             address(verifier),
-            abi.encodeWithSelector(
-                Verifier.verifyEmailProof.selector,
-                emailProof
-            ),
+            abi.encodeCall(Verifier.verifyEmailProof, (emailProof)),
             abi.encode(true)
         );
     }
-}
\ No newline at end of file
+}