diff --git a/.gas-snapshot b/.gas-snapshot
index 82a7d114..2871b775 100644
--- a/.gas-snapshot
+++ b/.gas-snapshot
@@ -29,8 +29,9 @@ CanExecute:test_canExecute_false_nonce_used() (gas: 827209)
 CanExecute:test_canExecute_false_trusted_executor() (gas: 439497)
 CanExecute:test_canExecute_true() (gas: 439136)
 CommitOrder:test_commitOrder() (gas: 383166)
+CommitOrder:test_commitOrder_Unauthorized() (gas: 33210)
 CommitOrder:test_commitOrder_insufficient_collateral() (gas: 441323)
-CommitOrder:test_commitOrder_invalid_market() (gas: 38457)
+CommitOrder:test_commitOrder_invalid_market() (gas: 38435)
 Conditions:test_isMarketOpen() (gas: 26596)
 Conditions:test_isOrderFeeBelow() (gas: 179894)
 Conditions:test_isPositionSizeAbove() (gas: 18827)
diff --git a/lcov.info b/lcov.info
index 38215c3f..8e6629ae 100644
--- a/lcov.info
+++ b/lcov.info
@@ -1,26 +1,26 @@
 TN:
 SF:script/Deploy.s.sol
-FN:41,DeployBase_Synthetix.run
-FNDA:0,DeployBase_Synthetix.run
-DA:42,0
-DA:43,0
-DA:45,0
-DA:51,0
-FN:24,Setup.deploySystem
-FNDA:4,Setup.deploySystem
-DA:29,4
+FN:134,DeployOptimismGoerli_Synthetix.run
+FNDA:0,DeployOptimismGoerli_Synthetix.run
+DA:135,0
+DA:136,0
+DA:138,0
+DA:144,0
 FN:98,DeployBaseGoerli_Andromeda.run
 FNDA:0,DeployBaseGoerli_Andromeda.run
 DA:99,0
 DA:100,0
 DA:102,0
 DA:108,0
-FN:80,DeployBaseGoerli_KwentaFork.run
-FNDA:0,DeployBaseGoerli_KwentaFork.run
-DA:81,0
-DA:82,0
-DA:84,0
-DA:90,0
+FN:24,Setup.deploySystem
+FNDA:4,Setup.deploySystem
+DA:29,4
+FN:41,DeployBase_Synthetix.run
+FNDA:0,DeployBase_Synthetix.run
+DA:42,0
+DA:43,0
+DA:45,0
+DA:51,0
 FN:116,DeployOptimism_Synthetix.run
 FNDA:0,DeployOptimism_Synthetix.run
 DA:117,0
@@ -33,12 +33,12 @@ DA:60,0
 DA:61,0
 DA:63,0
 DA:69,0
-FN:134,DeployOptimismGoerli_Synthetix.run
-FNDA:0,DeployOptimismGoerli_Synthetix.run
-DA:135,0
-DA:136,0
-DA:138,0
-DA:144,0
+FN:80,DeployBaseGoerli_KwentaFork.run
+FNDA:0,DeployBaseGoerli_KwentaFork.run
+DA:81,0
+DA:82,0
+DA:84,0
+DA:90,0
 FNF:7
 FNH:1
 LF:25
@@ -50,7 +50,7 @@ TN:
 SF:src/Engine.sol
 FN:115,Engine.trustedForwarder
 FNDA:1,Engine.trustedForwarder
-DA:116,1852
+DA:116,1853
 FN:124,Engine.isAccountOwner
 FNDA:4,Engine.isAccountOwner
 DA:130,271
@@ -59,17 +59,17 @@ FN:135,Engine.isAccountDelegate
 FNDA:3,Engine.isAccountDelegate
 DA:141,3
 FN:146,Engine._isAccountOwnerOrDelegate
-FNDA:284,Engine._isAccountOwnerOrDelegate
-DA:151,284
-DA:152,284
+FNDA:285,Engine._isAccountOwnerOrDelegate
+DA:151,285
+DA:152,285
 FN:162,Engine.depositEth
 FNDA:523,Engine.depositEth
 DA:165,523
-BRDA:165,0,0,245
-BRDA:165,0,1,278
-DA:166,245
-DA:169,278
-DA:171,278
+BRDA:165,0,0,240
+BRDA:165,0,1,283
+DA:166,240
+DA:169,283
+DA:171,283
 FN:175,Engine.withdrawEth
 FNDA:261,Engine.withdrawEth
 DA:179,261
@@ -138,12 +138,12 @@ FN:373,Engine._getSynthAddress
 FNDA:17,Engine._getSynthAddress
 DA:378,17
 FN:388,Engine.commitOrder
-FNDA:3,Engine.commitOrder
-DA:402,3
+FNDA:4,Engine.commitOrder
+DA:402,4
 BRDA:402,8,0,3
-BRDA:402,8,1,-
+BRDA:402,8,1,1
 DA:403,3
-DA:413,0
+DA:413,1
 FN:417,Engine._commitOrder
 FNDA:13,Engine._commitOrder
 DA:426,13
@@ -269,9 +269,9 @@ DA:732,4
 FNF:30
 FNH:30
 LF:108
-LH:105
+LH:106
 BRF:50
-BRH:42
+BRH:43
 end_of_record
 TN:
 SF:src/libraries/ConditionalOrderHashLib.sol
@@ -432,42 +432,42 @@ end_of_record
 TN:
 SF:src/utils/TrustedForwarder.sol
 FN:30,TrustedForwarder.aggregate
-FNDA:1452,TrustedForwarder.aggregate
-DA:35,1452
-DA:36,1452
-DA:38,1452
-DA:39,1452
-DA:41,1452
-DA:43,1459
-DA:47,1459
+FNDA:1441,TrustedForwarder.aggregate
+DA:35,1441
+DA:36,1441
+DA:38,1441
+DA:39,1441
+DA:41,1441
+DA:43,1448
+DA:47,1448
 BRDA:47,0,0,1
-BRDA:47,0,1,1458
+BRDA:47,0,1,1447
 DA:48,1
-DA:52,1458
-DA:57,1458
-DA:60,1458
-DA:67,1458
+DA:52,1447
+DA:57,1447
+DA:60,1447
+DA:67,1447
 BRDA:67,1,0,1026
-BRDA:67,1,1,432
+BRDA:67,1,1,421
 DA:68,1026
 DA:69,1026
-DA:75,432
-DA:78,432
-DA:83,425
+DA:75,421
+DA:78,421
+DA:83,414
 BRDA:83,2,0,2
-BRDA:83,2,1,423
+BRDA:83,2,1,412
 DA:84,2
 FN:91,TrustedForwarder._isTrustedByTarget
-FNDA:1459,TrustedForwarder._isTrustedByTarget
-DA:92,1459
-DA:93,1459
-DA:95,1459
-DA:96,1459
-DA:97,1459
-DA:105,1459
-DA:114,1459
-DA:115,1459
-DA:118,1459
+FNDA:1448,TrustedForwarder._isTrustedByTarget
+DA:92,1448
+DA:93,1448
+DA:95,1448
+DA:96,1448
+DA:97,1448
+DA:105,1448
+DA:114,1448
+DA:115,1448
+DA:118,1448
 FNF:2
 FNH:2
 LF:27
@@ -477,14 +477,14 @@ BRH:6
 end_of_record
 TN:
 SF:test/AsyncOrder.t.sol
-FN:9,AsyncOrderTest.setUp
+FN:10,AsyncOrderTest.setUp
 FNDA:0,AsyncOrderTest.setUp
-DA:10,0
 DA:11,0
-DA:13,0
-DA:15,0
-DA:17,0
-DA:23,0
+DA:12,0
+DA:14,0
+DA:16,0
+DA:18,0
+DA:24,0
 FNF:1
 FNH:0
 LF:6
@@ -577,6 +577,11 @@ BRH:0
 end_of_record
 TN:
 SF:test/utils/Bootstrap.sol
+FN:98,BootstrapOptimism.init
+FNDA:0,BootstrapOptimism.init
+DA:102,0
+DA:108,0
+DA:114,0
 FN:125,BootstrapOptimismGoerli.init
 FNDA:0,BootstrapOptimismGoerli.init
 DA:129,0
@@ -616,11 +621,6 @@ DA:85,0
 DA:86,0
 DA:91,0
 DA:93,0
-FN:98,BootstrapOptimism.init
-FNDA:0,BootstrapOptimism.init
-DA:102,0
-DA:108,0
-DA:114,0
 FNF:4
 FNH:0
 LF:36
@@ -712,9 +712,6 @@ BRH:0
 end_of_record
 TN:
 SF:test/utils/mocks/EIP7412Mock.sol
-FN:23,EIP7412MockRevert.fulfillOracleQuery
-FNDA:512,EIP7412MockRevert.fulfillOracleQuery
-DA:24,512
 FN:15,EIP7412MockRefund.fulfillOracleQuery
 FNDA:512,EIP7412MockRefund.fulfillOracleQuery
 DA:16,512
@@ -730,6 +727,9 @@ DA:8,1024
 BRDA:8,0,0,512
 BRDA:8,0,1,512
 DA:10,512
+FN:23,EIP7412MockRevert.fulfillOracleQuery
+FNDA:512,EIP7412MockRevert.fulfillOracleQuery
+DA:24,512
 FNF:3
 FNH:3
 LF:6
@@ -759,8 +759,8 @@ DA:29,1
 BRDA:29,1,0,1
 BRDA:29,1,1,-
 FN:32,MockCalleeWithContext.lockEth
-FNDA:173,MockCalleeWithContext.lockEth
-DA:34,173
+FNDA:162,MockCalleeWithContext.lockEth
+DA:34,162
 FNF:6
 FNH:4
 LF:6