diff --git a/src/SpendPermissionManager.sol b/src/SpendPermissionManager.sol
index 8304039..54bab06 100644
--- a/src/SpendPermissionManager.sol
+++ b/src/SpendPermissionManager.sol
@@ -154,7 +154,7 @@ contract SpendPermissionManager is EIP712 {
 
     /// @notice Approve a spend permission via a signature from the account.
     ///
-    /// @dev Implements EIP-6492 (https://eips.ethereum.org/EIPS/eip-6492)
+    /// @dev Compatible with EIP-6492 signatures (https://eips.ethereum.org/EIPS/eip-6492)
     ///
     /// @param spendPermission Details of the spend permission.
     /// @param signature Signed approval from the user.
diff --git a/test/base/Base.sol b/test/base/Base.sol
index 1501ae3..cda7ace 100644
--- a/test/base/Base.sol
+++ b/test/base/Base.sol
@@ -15,7 +15,6 @@ contract Base is Test {
     address constant ENTRY_POINT_V06 = 0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789;
     address constant CDP_PAYMASTER = 0xC484bCD10aB8AD132843872DEb1a0AdC1473189c;
     bytes4 constant EIP1271_MAGIC_VALUE = 0x1626ba7e;
-    bytes32 constant EIP6492_MAGIC_VALUE = 0x6492649264926492649264926492649264926492649264926492649264926492;
     uint256 ownerPk = uint256(keccak256("owner"));
     address owner = vm.addr(ownerPk);
     uint256 permissionSignerPk = uint256(keccak256("permissionSigner"));
diff --git a/test/base/SpendPermissionManagerBase.sol b/test/base/SpendPermissionManagerBase.sol
index 114263e..33187e8 100644
--- a/test/base/SpendPermissionManagerBase.sol
+++ b/test/base/SpendPermissionManagerBase.sol
@@ -11,6 +11,7 @@ import {CoinbaseSmartWalletFactory} from "smart-wallet/CoinbaseSmartWalletFactor
 
 contract SpendPermissionManagerBase is Base {
     address constant NATIVE_TOKEN = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE;
+    bytes32 constant EIP6492_MAGIC_VALUE = 0x6492649264926492649264926492649264926492649264926492649264926492;
     bytes32 constant CBSW_MESSAGE_TYPEHASH = keccak256("CoinbaseSmartWalletMessage(bytes32 hash)");
     MockSpendPermissionManager mockSpendPermissionManager;
     CoinbaseSmartWalletFactory mockCoinbaseSmartWalletFactory;
diff --git a/test/src/SpendPermissions/permitAndSpend.t.sol b/test/src/SpendPermissions/permitAndSpend.t.sol
index 511533f..253c576 100644
--- a/test/src/SpendPermissions/permitAndSpend.t.sol
+++ b/test/src/SpendPermissions/permitAndSpend.t.sol
@@ -18,7 +18,7 @@ contract PermitAndSpendTest is SpendPermissionManagerBase {
 
     function test_permitAndSpend_revert_invalidSender(
         address sender,
-        address permissionSigner,
+        address spender,
         address recipient,
         uint48 start,
         uint48 end,