diff --git a/test/IncentivizedMessageEscrow/processMessage/GasSpendControl.sol b/test/IncentivizedMessageEscrow/processMessage/GasSpendControl.sol
index 80d92ca..3c525cf 100644
--- a/test/IncentivizedMessageEscrow/processMessage/GasSpendControl.sol
+++ b/test/IncentivizedMessageEscrow/processMessage/GasSpendControl.sol
@@ -58,7 +58,7 @@ contract GasSpendControlTest is TestCommon {
                 messageIdentifier,
                 _DESTINATION_ADDRESS_APPLICATION,
                 destinationFeeRecipient,
-                uint48(0x36996),  // Gas used
+                uint48(0x36969),  // Gas used
                 uint64(1),
                 bytes1(0xff),  // This states that the call went wrong.
                 message
diff --git a/test/IncentivizedMessageEscrow/processMessage/NoReceive.t.sol b/test/IncentivizedMessageEscrow/processMessage/NoReceive.t.sol
index ff05208..2cfeccc 100644
--- a/test/IncentivizedMessageEscrow/processMessage/NoReceive.t.sol
+++ b/test/IncentivizedMessageEscrow/processMessage/NoReceive.t.sol
@@ -54,7 +54,7 @@ contract processPacketNoReceiveTest is TestCommon {
                 messageIdentifier,
                 _DESTINATION_ADDRESS_THIS,
                 feeRecipient,
-                uint48(0x8369),  // Gas used
+                uint48(0x833c),  // Gas used
                 uint64(1),
                 abi.encodePacked(bytes1(0xff)),
                 message
diff --git a/test/IncentivizedMessageEscrow/processMessage/Reentry.call.t.sol b/test/IncentivizedMessageEscrow/processMessage/Reentry.call.t.sol
index 6f74cdc..4af7977 100644
--- a/test/IncentivizedMessageEscrow/processMessage/Reentry.call.t.sol
+++ b/test/IncentivizedMessageEscrow/processMessage/Reentry.call.t.sol
@@ -61,7 +61,7 @@ contract CallReentryTest is TestCommon, ICrossChainReceiver {
                 messageIdentifier,
                 _DESTINATION_ADDRESS_APPLICATION,
                 feeRecipient,
-                uint48(0xfcd8),  // Gas used
+                uint48(0xfcb6),  // Gas used
                 uint64(1),
                 uint8(1)
             )
diff --git a/test/IncentivizedMessageEscrow/processMessage/_handleCall.t.sol b/test/IncentivizedMessageEscrow/processMessage/_handleCall.t.sol
index aaa9b45..2ec15bc 100644
--- a/test/IncentivizedMessageEscrow/processMessage/_handleCall.t.sol
+++ b/test/IncentivizedMessageEscrow/processMessage/_handleCall.t.sol
@@ -40,7 +40,7 @@ contract processPacketCallTest is TestCommon {
                 messageIdentifier,
                 _DESTINATION_ADDRESS_APPLICATION,
                 feeRecipient,
-                uint48(0x7d7f),  // Gas used
+                uint48(0x7d49),  // Gas used
                 uint64(1),
                 mockAck
             )
diff --git a/test/TestCommon.t.sol b/test/TestCommon.t.sol
index adf23d2..b5315c4 100644
--- a/test/TestCommon.t.sol
+++ b/test/TestCommon.t.sol
@@ -21,8 +21,8 @@ interface ICansubmitMessage is IMessageEscrowStructs{
 
 contract TestCommon is Test, IMessageEscrowEvents, IMessageEscrowStructs {
     
-    uint256 constant GAS_SPENT_ON_SOURCE = 6642;
-    uint256 constant GAS_SPENT_ON_DESTINATION = 32127;
+    uint256 constant GAS_SPENT_ON_SOURCE = 6888;
+    uint256 constant GAS_SPENT_ON_DESTINATION = 32073;
     
     bytes32 constant _DESTINATION_IDENTIFIER = bytes32(uint256(0x123123) + uint256(2**255));