diff --git a/test/mock/messages/Message_VehicleMission.json b/test/mock/messages/Message_VehicleMission.json
index 1036455bf142f2a44938fc053974fbdac3b204bb..eeecae9f59319340bd6931e94d2d16bda9887d62 100644
--- a/test/mock/messages/Message_VehicleMission.json
+++ b/test/mock/messages/Message_VehicleMission.json
@@ -1,17 +1,19 @@
 {
-  "message_type": "VehicleMission",
   "metadata": {
     "source": "ae",
     "destination": "soar.po.ecosub.eco1",
     "delivery_type": "publish",
     "message_id": "test"
   },
-  "operator_id": "po",
-  "vehicle_id": "eco1",
-  "coordinates": {
-    "latitude": 59.234,
-    "longitude": -10.432,
-    "depth": 50,
-    "projection": 4326
+  "payload": {
+    "message_type": "VehicleMission",
+    "operator_id": "po",
+    "vehicle_id": "eco1",
+    "coordinates": {
+      "latitude": 59.234,
+      "longitude": -10.432,
+      "depth": 50,
+      "projection": 4326
+    }
   }
 }
diff --git a/test/mock/messages/Message_VehicleMissionActions.json b/test/mock/messages/Message_VehicleMissionActions.json
index 921bf26414980e06febccd4acf79fcb1a24f2703..6435e44969dd8bfd8206d0f2f9e45d25decf8ce3 100644
--- a/test/mock/messages/Message_VehicleMissionActions.json
+++ b/test/mock/messages/Message_VehicleMissionActions.json
@@ -1,37 +1,39 @@
 {
-  "message_type": "VehicleMission",
   "metadata": {
     "source": "ae",
     "destination": "soar.po.ecosub.eco1",
     "delivery_type": "publish",
     "message_id": "test"
   },
-  "operator_id": "po",
-  "vehicle_id": "eco1",
-  "coordinates": {
-    "latitude": 59.234,
-    "longitude": -10.432,
-    "depth": 50,
-    "projection": 4326
-  },
-  "actions": [
-    {
-      "action_type": "GoToWaypoint",
-      "coordinates": {
-        "latitude": 59.234,
-        "longitude": -10.432,
-        "depth": 50,
-        "projection": 4326
-      }
+  "payload": {
+    "message_type": "VehicleMission",
+    "operator_id": "po",
+    "vehicle_id": "eco1",
+    "coordinates": {
+      "latitude": 59.234,
+      "longitude": -10.432,
+      "depth": 50,
+      "projection": 4326
     },
-    {
-      "action_type": "DescendToAltitude",
-      "coordinates": {
-        "latitude": 59.234,
-        "longitude": -10.432,
-        "altitude": 50,
-        "projection": 4326
+    "actions": [
+      {
+        "action_type": "GoToWaypoint",
+        "coordinates": {
+          "latitude": 59.234,
+          "longitude": -10.432,
+          "depth": 50,
+          "projection": 4326
+        }
+      },
+      {
+        "action_type": "DescendToAltitude",
+        "coordinates": {
+          "latitude": 59.234,
+          "longitude": -10.432,
+          "altitude": 50,
+          "projection": 4326
+        }
       }
-    }
-  ]
+    ]
+  }
 }
diff --git a/test/mock/messages/Message_VehicleStatus.json b/test/mock/messages/Message_VehicleStatus.json
index 5891bbab19f73c31f1815f3b4cb298acff043e23..55cdd818781ab404ebf70d3087a7f6c83396cc3a 100644
--- a/test/mock/messages/Message_VehicleStatus.json
+++ b/test/mock/messages/Message_VehicleStatus.json
@@ -1,18 +1,20 @@
 {
-  "message_type": "VehicleStatus",
   "metadata": {
     "source": "ae",
     "destination": "soar.po.ecosub.eco1",
     "delivery_type": "publish",
     "message_id": "test"
   },
-  "operator_id": "po",
-  "vehicle_id": "eco1",
-  "coordinates": {
-    "latitude": 57.234,
-    "longitude": -8.432,
-    "depth": 50,
-    "projection": 4326
-  },
-  "battery_percentage": 64
-}
+  "payload": {
+    "message_type": "VehicleStatus",
+    "operator_id": "po",
+    "vehicle_id": "eco1",
+    "coordinates": {
+      "latitude": 57.234,
+      "longitude": -8.432,
+      "depth": 50,
+      "projection": 4326
+    },
+    "battery_percentage": 64
+  }
+}
\ No newline at end of file