diff --git a/contracts/axelarnet-gateway/tests/execute.rs b/contracts/axelarnet-gateway/tests/execute.rs
index d7fec84a9..60ade8cfe 100644
--- a/contracts/axelarnet-gateway/tests/execute.rs
+++ b/contracts/axelarnet-gateway/tests/execute.rs
@@ -409,5 +409,6 @@ fn route_from_nexus_to_router() {
         ]
     ));
 
-    goldie::assert_json!(response.messages)
+    let msg: RouterExecuteMsg = assert_ok!(inspect_response_msg(response));
+    goldie::assert_json!(msg)
 }
diff --git a/contracts/axelarnet-gateway/tests/testdata/route_from_nexus_to_router.golden b/contracts/axelarnet-gateway/tests/testdata/route_from_nexus_to_router.golden
index 88e9bc6b5..61c5cd092 100644
--- a/contracts/axelarnet-gateway/tests/testdata/route_from_nexus_to_router.golden
+++ b/contracts/axelarnet-gateway/tests/testdata/route_from_nexus_to_router.golden
@@ -1,16 +1,24 @@
-[
-  {
-    "id": 0,
-    "msg": {
-      "wasm": {
-        "execute": {
-          "contract_addr": "router",
-          "msg": "eyJyb3V0ZV9tZXNzYWdlcyI6W3siY2NfaWQiOnsic291cmNlX2NoYWluIjoiRXRoZXJldW0iLCJtZXNzYWdlX2lkIjoic291cmNlLWNoYWluLTAifSwic291cmNlX2FkZHJlc3MiOiJzb3VyY2UtYWRkcmVzcyIsImRlc3RpbmF0aW9uX2NoYWluIjoiZGVzdGluYXRpb24tY2hhaW4iLCJkZXN0aW5hdGlvbl9hZGRyZXNzIjoiZGVzdGluYXRpb24tYWRkcmVzcyIsInBheWxvYWRfaGFzaCI6ImYxODg1ZWRhNTRiN2EwNTMzMThjZDQxZTIwOTMyMjBkYWIxNWQ2NTM4MWIxMTU3YTM2MzNhODNiZmQ1YzkyMzkifSx7ImNjX2lkIjp7InNvdXJjZV9jaGFpbiI6IkV0aGVyZXVtIiwibWVzc2FnZV9pZCI6InNvdXJjZS1jaGFpbi0wIn0sInNvdXJjZV9hZGRyZXNzIjoic291cmNlLWFkZHJlc3MiLCJkZXN0aW5hdGlvbl9jaGFpbiI6ImRlc3RpbmF0aW9uLWNoYWluIiwiZGVzdGluYXRpb25fYWRkcmVzcyI6ImRlc3RpbmF0aW9uLWFkZHJlc3MiLCJwYXlsb2FkX2hhc2giOiIyZTZhNWViY2NjODgxMGZlZTMzMjRjMGQ0NDUwMDExODg3ODdkMGQzYWM4YWJhMmNkODliNzc1MjdkMTk4YmIwIn1dfQ==",
-          "funds": []
-        }
-      }
+{
+  "route_messages": [
+    {
+      "cc_id": {
+        "source_chain": "Ethereum",
+        "message_id": "source-chain-0"
+      },
+      "source_address": "source-address",
+      "destination_chain": "destination-chain",
+      "destination_address": "destination-address",
+      "payload_hash": "f1885eda54b7a053318cd41e2093220dab15d65381b1157a3633a83bfd5c9239"
     },
-    "gas_limit": null,
-    "reply_on": "never"
-  }
-]
\ No newline at end of file
+    {
+      "cc_id": {
+        "source_chain": "Ethereum",
+        "message_id": "source-chain-0"
+      },
+      "source_address": "source-address",
+      "destination_chain": "destination-chain",
+      "destination_address": "destination-address",
+      "payload_hash": "2e6a5ebccc8810fee3324c0d445001188787d0d3ac8aba2cd89b77527d198bb0"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/contracts/axelarnet-gateway/tests/utils/messages.rs b/contracts/axelarnet-gateway/tests/utils/messages.rs
index 7de5a4699..613d28ba8 100644
--- a/contracts/axelarnet-gateway/tests/utils/messages.rs
+++ b/contracts/axelarnet-gateway/tests/utils/messages.rs
@@ -1,5 +1,4 @@
 use axelar_core_std::nexus;
-use cw_storage_plus::Prefixer;
 use router_api::{CrossChainId, Message};
 use sha3::Digest;