minor edits

solidity/test/isms/ArbL2ToL1Ism.t.sol

@@ -24,15 +24,12 @@ contract ArbL2ToL1IsmTest is ExternalBridgeTest {
     MockArbBridge internal arbBridge;
 
     function setUp() public override {
-        ORIGIN_DOMAIN = 42161;
-        DESTINATION_DOMAIN = 1;
-        GAS_QUOTE = 120_000;
-        super.setUp();
-
         // Arbitrum bridge mock setup
+        GAS_QUOTE = 120_000;
         vm.etch(L2_ARBSYS_ADDRESS, address(new MockArbSys()).code);
 
         deployAll();
+        super.setUp();
     }
 
     ///////////////////////////////////////////////////////////////////

solidity/test/isms/ERC5164ISM.t.sol

@@ -41,10 +41,6 @@ contract ERC5164IsmTest is ExternalBridgeTest {
     ///////////////////////////////////////////////////////////////////
 
     function setUp() public override {
-        ORIGIN_DOMAIN = 1;
-        DESTINATION_DOMAIN = 2;
-        super.setUp();
-
         dispatcher = new MockMessageDispatcher();
         executor = new MockMessageExecutor();
         originMailbox = new TestMailbox(ORIGIN_DOMAIN);
@@ -56,6 +52,7 @@ contract ERC5164IsmTest is ExternalBridgeTest {
             address(dispatcher)
         );
         ism.setAuthorizedHook(TypeCasts.addressToBytes32(address(hook)));
+        super.setUp();
     }
 
     ///////////////////////////////////////////////////////////////////

solidity/test/isms/ExternalBridgeTest.sol

@@ -16,8 +16,8 @@ abstract contract ExternalBridgeTest is Test {
     using MessageUtils for bytes;
 
     uint8 internal constant HYPERLANE_VERSION = 1;
-    uint32 internal ORIGIN_DOMAIN;
-    uint32 internal DESTINATION_DOMAIN;
+    uint32 internal constant ORIGIN_DOMAIN = 1;
+    uint32 internal constant DESTINATION_DOMAIN = 2;
     uint256 internal GAS_QUOTE;
 
     bytes internal unauthorizedHookError;
@@ -52,13 +52,9 @@ abstract contract ExternalBridgeTest is Test {
     }
 
     function test_postDispatch_revertWhen_chainIDNotSupported() public {
-        bytes memory message = MessageUtils.formatMessage(
-            0,
-            uint32(0),
-            DESTINATION_DOMAIN,
+        bytes memory message = originMailbox.buildOutboundMessage(
+            3,
             TypeCasts.addressToBytes32(address(this)),
-            3, // wrong domain
-            TypeCasts.addressToBytes32(address(testRecipient)),
             testMessage
         );
 
@@ -223,11 +219,7 @@ abstract contract ExternalBridgeTest is Test {
 
     function _encodeTestMessage() internal view returns (bytes memory) {
         return
-            MessageUtils.formatMessage(
-                HYPERLANE_VERSION,
-                uint32(0),
-                ORIGIN_DOMAIN,
-                TypeCasts.addressToBytes32(address(this)),
+            originMailbox.buildOutboundMessage(
                 DESTINATION_DOMAIN,
                 TypeCasts.addressToBytes32(address(testRecipient)),
                 testMessage

solidity/test/isms/OPL2ToL1Ism.t.sol

@@ -29,18 +29,15 @@ contract OPL2ToL1IsmTest is ExternalBridgeTest {
     ///////////////////////////////////////////////////////////////////
 
     function setUp() public override {
-        ORIGIN_DOMAIN = 10;
-        DESTINATION_DOMAIN = 1;
-        GAS_QUOTE = 120_000;
-        super.setUp();
-
         // Optimism messenger mock setup
+        GAS_QUOTE = 120_000;
         vm.etch(
             L2_MESSENGER_ADDRESS,
             address(new MockOptimismMessenger()).code
         );
 
         deployAll();
+        super.setUp();
     }
 
     function deployHook() public {

solidity/test/isms/OPStackIsm.t.sol

@@ -49,10 +49,7 @@ contract OPStackIsmTest is ExternalBridgeTest {
     event ReceivedMessage(bytes32 indexed messageId);
 
     function setUp() public override {
-        ORIGIN_DOMAIN = 1;
-        DESTINATION_DOMAIN = 10;
         GAS_QUOTE = 1_920_000; // optimism subsidized gas limit
-        super.setUp();
 
         vm.etch(
             L1_MESSENGER_ADDRESS,
@@ -66,6 +63,7 @@ contract OPStackIsmTest is ExternalBridgeTest {
         l2Messenger = MockOptimismMessenger(L2_MESSENGER_ADDRESS);
 
         deployAll();
+        super.setUp();
     }
 
     ///////////////////////////////////////////////////////////////////