diff --git a/.gas-snapshot b/.gas-snapshot
index 4cd3686b..f4394fda 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -22,7 +22,7 @@ Conditions:test_isPriceAbove() (gas: 19186)
 Conditions:test_isPriceBelow() (gas: 19092)
 Conditions:test_isTimestampAfter() (gas: 7711)
 Conditions:test_isTimestampBefore() (gas: 7645)
-DeploymentTest:test_deploy() (gas: 4550522)
+DeploymentTest:test_deploy() (gas: 4550600)
 DeploymentTest:test_deploy_oracle_zero_address() (gas: 1681379)
 DeploymentTest:test_deploy_perps_market_proxy_zero_address() (gas: 1681295)
 DeploymentTest:test_deploy_spot_market_proxy_zero_address() (gas: 1681362)
@@ -30,7 +30,7 @@ DeploymentTest:test_deploy_susd_proxy_zero_address() (gas: 1681375)
 DeploymentTest:test_deploy_trusted_forwarder_zero_address() (gas: 37411)
 Deposit:test_depositEth() (gas: 40987)
 Deposit:test_depositEth_event() (gas: 42524)
-Deposit:test_depositEth_fuzz(uint256,uint128) (runs: 256, μ: 39369, ~: 40409)
+Deposit:test_depositEth_fuzz(uint256,uint128) (runs: 256, μ: 39473, ~: 40409)
 Deposit:test_depositEth_via_trustedForwarder() (gas: 68274)
 Deposit:test_depositEth_via_trustedForwarder_value_mismatch() (gas: 72575)
 DepositCollateral:test_depositCollateral() (gas: 258530)
@@ -68,7 +68,7 @@ VerifyConditions:test_max_condition_size_exceeded() (gas: 45101)
 VerifyConditions:test_verifyConditions_InvalidConditionSelector() (gas: 14132)
 VerifyConditions:test_verify_conditions_not_verified() (gas: 29751)
 VerifyConditions:test_verify_conditions_verified() (gas: 135901)
-VerifySignature:test_verifySignature() (gas: 23931)
+VerifySignature:test_verifySignature(uint256) (runs: 256, μ: 24009, ~: 24009)
 VerifySignature:test_verifySignature_false_private_key() (gas: 26685)
 VerifySigner:test_verifySigner() (gas: 25884)
 VerifySigner:test_verifySigner_false() (gas: 28636)
diff --git a/lcov.info b/lcov.info
index 927dfc35..9d5cf331 100644
--- a/lcov.info
+++ b/lcov.info
@@ -1,17 +1,15 @@
 TN:
 SF:script/Deploy.s.sol
+FN:24,Setup.deploySystem
+FNDA:5,Setup.deploySystem
+DA:36,5
+DA:38,5
 FN:90,DeployOptimism.run
 FNDA:0,DeployOptimism.run
 DA:91,0
 DA:92,0
 DA:94,0
 DA:101,0
-FN:71,DeployBaseGoerli.run
-FNDA:0,DeployBaseGoerli.run
-DA:72,0
-DA:73,0
-DA:75,0
-DA:82,0
 FN:109,DeployOptimismGoerli.run
 FNDA:0,DeployOptimismGoerli.run
 DA:110,0
@@ -24,10 +22,12 @@ DA:53,0
 DA:54,0
 DA:56,0
 DA:63,0
-FN:24,Setup.deploySystem
-FNDA:5,Setup.deploySystem
-DA:36,5
-DA:38,5
+FN:71,DeployBaseGoerli.run
+FNDA:0,DeployBaseGoerli.run
+DA:72,0
+DA:73,0
+DA:75,0
+DA:82,0
 FNF:5
 FNH:1
 LF:18
@@ -185,8 +185,8 @@ FN:561,Engine.verifySigner
 FNDA:2,Engine.verifySigner
 DA:567,19
 FN:571,Engine.verifySignature
-FNDA:2,Engine.verifySignature
-DA:575,18
+FNDA:257,Engine.verifySignature
+DA:575,273
 FN:581,Engine.verifyConditions
 FNDA:4,Engine.verifyConditions
 DA:587,4
@@ -315,20 +315,20 @@ FNDA:0,EIP712._domainNameAndVersion
 DA:74,0
 DA:75,0
 FN:80,EIP712.DOMAIN_SEPARATOR
-FNDA:26,EIP712.DOMAIN_SEPARATOR
-DA:81,26
-DA:82,26
+FNDA:281,EIP712.DOMAIN_SEPARATOR
+DA:81,281
+DA:82,281
 BRDA:82,0,0,-
-BRDA:82,0,1,26
+BRDA:82,0,1,281
 DA:83,0
 FN:100,EIP712._hashTypedData
-FNDA:18,EIP712._hashTypedData
-DA:105,18
-DA:106,18
+FNDA:273,EIP712._hashTypedData
+DA:105,273
+DA:106,273
 BRDA:106,1,0,-
-BRDA:106,1,1,18
+BRDA:106,1,1,273
 DA:107,0
-DA:115,18
+DA:115,273
 FN:127,EIP712.eip712Domain
 FNDA:0,EIP712.eip712Domain
 DA:140,0
@@ -343,10 +343,10 @@ DA:154,0
 DA:155,0
 DA:164,0
 FN:169,EIP712._cachedDomainSeparatorInvalidated
-FNDA:44,EIP712._cachedDomainSeparatorInvalidated
-DA:174,44
-DA:175,44
-DA:178,44
+FNDA:554,EIP712._cachedDomainSeparatorInvalidated
+DA:174,554
+DA:175,554
+DA:178,554
 FNF:6
 FNH:3
 LF:21
@@ -448,6 +448,18 @@ BRH:0
 end_of_record
 TN:
 SF:test/utils/Bootstrap.sol
+FN:146,BootstrapOptimismGoerli.init
+FNDA:0,BootstrapOptimismGoerli.init
+DA:150,0
+DA:151,0
+DA:158,0
+DA:166,0
+FN:113,BootstrapOptimism.init
+FNDA:0,BootstrapOptimism.init
+DA:117,0
+DA:118,0
+DA:125,0
+DA:133,0
 FN:41,Bootstrap.initializeOptimismGoerli
 FNDA:0,Bootstrap.initializeOptimismGoerli
 DA:42,0
@@ -486,18 +498,6 @@ DA:100,0
 DA:101,0
 DA:106,0
 DA:108,0
-FN:146,BootstrapOptimismGoerli.init
-FNDA:0,BootstrapOptimismGoerli.init
-DA:150,0
-DA:151,0
-DA:158,0
-DA:166,0
-FN:113,BootstrapOptimism.init
-FNDA:0,BootstrapOptimism.init
-DA:117,0
-DA:118,0
-DA:125,0
-DA:133,0
 FNF:4
 FNH:0
 LF:42