diff --git a/src/testing/WormholeOverride.sol b/src/testing/WormholeOverride.sol
index f20bac3..99cdc8a 100644
--- a/src/testing/WormholeOverride.sol
+++ b/src/testing/WormholeOverride.sol
@@ -126,9 +126,9 @@ library WormholeOverride {
     vaa.payload = pm.payload;
 
     bytes memory encodedBody = abi.encodePacked(
-      uint32(block.timestamp),
+      pm.timestamp,
       pm.nonce,
-      wormhole.chainId(),
+      pm.emitterChainId,
       pm.emitterAddress,
       pm.sequence,
       pm.consistencyLevel,