diff --git a/test/elog_quiesce_test.cpp b/test/elog_quiesce_test.cpp
index 7894f95..9c822df 100644
--- a/test/elog_quiesce_test.cpp
+++ b/test/elog_quiesce_test.cpp
@@ -41,7 +41,8 @@
     std::string message{"test error"};
     std::string fwLevel{"level42"};
     std::string path{"/tmp/99"};
-    std::vector<std::string> testData{"no", "callout"};
+    std::map<std::string, std::string> testData{{"no", "no"},
+                                                {"callout", "callout"}};
     phosphor::logging::AssociationList associations{};
 
     Entry elog{mockedBus,
@@ -67,9 +68,9 @@
     std::string message{"test error"};
     std::string fwLevel{"level42"};
     std::string path{"/tmp/99"};
-    std::vector<std::string> testData{
-        "CALLOUT_INVENTORY_PATH=/xyz/openbmc_project/inventory/system/chassis/"
-        "motherboard/powersupply0/"};
+    std::map<std::string, std::string> testData{
+        {"CALLOUT_INVENTORY_PATH",
+         "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0/"}};
     phosphor::logging::AssociationList associations{};
 
     Entry elog{mockedBus,
@@ -95,9 +96,9 @@
     std::string message{"test error"};
     std::string fwLevel{"level42"};
     std::string path{"/tmp/99"};
-    std::vector<std::string> testData{
-        "CALLOUT_INVENTORY_PATH=/xyz/openbmc_project/inventory/system/chassis/"
-        "motherboard/powersupply0/"};
+    std::map<std::string, std::string> testData{
+        {"CALLOUT_INVENTORY_PATH",
+         "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0/"}};
     phosphor::logging::AssociationList associations{};
 
     // Ensure D-Bus object created for this blocking error
@@ -152,9 +153,9 @@
     std::string message{"test error"};
     std::string fwLevel{"level42"};
     std::string path{"/tmp/99"};
-    std::vector<std::string> testData{
-        "CALLOUT_INVENTORY_PATH=/xyz/openbmc_project/inventory/system/chassis/"
-        "motherboard/powersupply0/"};
+    std::map<std::string, std::string> testData{
+        {"CALLOUT_INVENTORY_PATH",
+         "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0/"}};
     phosphor::logging::AssociationList associations{};
 
     // Ensure D-Bus object created for this blocking error
@@ -211,9 +212,9 @@
     std::string message{"test error"};
     std::string fwLevel{"level42"};
     std::string path{"/tmp/99"};
-    std::vector<std::string> testData{
-        "CALLOUT_INVENTORY_PATH=/xyz/openbmc_project/inventory/system/chassis/"
-        "motherboard/powersupply0/"};
+    std::map<std::string, std::string> testData{
+        {"CALLOUT_INVENTORY_PATH",
+         "/xyz/openbmc_project/inventory/system/chassis/motherboard/powersupply0/"}};
     phosphor::logging::AssociationList associations{};
 
     // Ensure D-Bus object created for this blocking error
diff --git a/test/elog_update_ts_test.cpp b/test/elog_update_ts_test.cpp
index cabcb60..fe1089f 100644
--- a/test/elog_update_ts_test.cpp
+++ b/test/elog_update_ts_test.cpp
@@ -61,7 +61,7 @@
     std::string message{"test error"};
     std::string fwLevel{"level42"};
     std::string path{"/tmp/99"};
-    std::vector<std::string> testData{"additional", "data"};
+    std::map<std::string, std::string> testData{{"additional", "data"}};
     phosphor::logging::AssociationList associations{};
 
     Entry elog{bus,
@@ -132,7 +132,7 @@
     std::string message{"test error"};
     std::string fwLevel{"level42"};
     std::string path{"/tmp/99"};
-    std::vector<std::string> testData{"additional", "data"};
+    std::map<std::string, std::string> testData{{"additional", "data"}};
     phosphor::logging::AssociationList associations{};
 
     Entry elog{bus,
diff --git a/test/serialization_test_properties.cpp b/test/serialization_test_properties.cpp
index 60fc6ae..f769c93 100644
--- a/test/serialization_test_properties.cpp
+++ b/test/serialization_test_properties.cpp
@@ -13,7 +13,8 @@
 {
     auto id = 99;
     phosphor::logging::AssociationList assocations{};
-    std::vector<std::string> testData{"additional=1", "data=yes"};
+    std::map<std::string, std::string> testData = {{"additional", "1"},
+                                                   {"data", "yes"}};
     uint64_t timestamp{100};
     std::string message{"test error"};
     std::string fwLevel{"level42"};