diff --git a/core/packages/contracts/test/GatewayUpgradeMock.sol b/core/packages/contracts/test/GatewayUpgradeMock.sol
index 28241d9071..d59bcb93fd 100644
--- a/core/packages/contracts/test/GatewayUpgradeMock.sol
+++ b/core/packages/contracts/test/GatewayUpgradeMock.sol
@@ -11,23 +11,41 @@ contract GatewayUpgradeMock is IGateway {
      * Getters
      */
 
-    function operatingMode() external pure returns (OperatingMode) { return OperatingMode.Normal; }
-    function channelOperatingModeOf(ParaID) external pure returns (OperatingMode) { return OperatingMode.Normal; }
-    function channelFeeRewardOf(ParaID) external pure returns (uint256, uint256) { return (0, 0); }
-    function channelNoncesOf(ParaID) external pure returns (uint64, uint64) { return (0, 0); }
-    function agentOf(bytes32) external pure returns (address) { return address(0); }
-    function implementation() external pure returns (address) { return address(0); }
+    function operatingMode() external pure returns (OperatingMode) {
+        return OperatingMode.Normal;
+    }
+
+    function channelOperatingModeOf(ParaID) external pure returns (OperatingMode) {
+        return OperatingMode.Normal;
+    }
+
+    function channelFeeRewardOf(ParaID) external pure returns (uint256, uint256) {
+        return (0, 0);
+    }
+
+    function channelNoncesOf(ParaID) external pure returns (uint64, uint64) {
+        return (0, 0);
+    }
+
+    function agentOf(bytes32) external pure returns (address) {
+        return address(0);
+    }
 
-    function submitInbound( InboundMessage calldata, bytes32[] calldata, Verification.Proof calldata) external {}
+    function implementation() external pure returns (address) {
+        return address(0);
+    }
+
+    function submitInbound(InboundMessage calldata, bytes32[] calldata, Verification.Proof calldata) external {}
 
     function registerToken(address) external payable {}
-    function sendToken(address, ParaID, bytes32, uint128) external payable{}
+    function sendToken(address, ParaID, bytes32, uint128) external payable {}
     function sendToken(address, ParaID, address, uint128) external payable {}
 
-    event Initialized(uint d0, uint d1);
+    event Initialized(uint256 d0, uint256 d1);
+
     function initialize(bytes memory data) external {
         // Just decode and exit
-        (uint d0, uint d1) = abi.decode(data, (uint, uint));
+        (uint256 d0, uint256 d1) = abi.decode(data, (uint256, uint256));
         emit Initialized(d0, d1);
     }
 }