diff --git a/test/openpower-pels/Makefile.include b/test/openpower-pels/Makefile.include
index a098ad9..d250b77 100644
--- a/test/openpower-pels/Makefile.include
+++ b/test/openpower-pels/Makefile.include
@@ -183,7 +183,8 @@
 	$(test_ldadd) \
 	$(pel_test_utils_ldadd) \
 	$(top_builddir)/extensions/openpower-pels/registry.o \
-	$(top_builddir)/extensions/openpower-pels/pel_values.o
+	$(top_builddir)/extensions/openpower-pels/pel_values.o \
+	$(top_builddir)/extensions/openpower-pels/json_utils.o
 registry_test_LDFLAGS = $(test_ldflags)
 
 severity_test_SOURCES = %reldir%/severity_test.cpp
diff --git a/test/openpower-pels/registry_test.cpp b/test/openpower-pels/registry_test.cpp
index 08eefc4..2b5e482 100644
--- a/test/openpower-pels/registry_test.cpp
+++ b/test/openpower-pels/registry_test.cpp
@@ -76,13 +76,13 @@
                 {
                     "6":
                     {
-                        "description": "Failing unit number",
+                        "Description": "Failing unit number",
                         "AdditionalDataPropSource": "PS_NUM"
                     },
 
                     "7":
                     {
-                        "description": "bad voltage",
+                        "Description": "bad voltage",
                         "AdditionalDataPropSource": "VOLTAGE"
                     }
                 }
@@ -180,11 +180,11 @@
 
     auto word = (*hexwords).find(6);
     EXPECT_NE(word, (*hexwords).end());
-    EXPECT_EQ(word->second, "PS_NUM");
+    EXPECT_EQ(std::get<0>(word->second), "PS_NUM");
 
     word = (*hexwords).find(7);
     EXPECT_NE(word, (*hexwords).end());
-    EXPECT_EQ(word->second, "VOLTAGE");
+    EXPECT_EQ(std::get<0>(word->second), "VOLTAGE");
 
     auto& sid = entry->src.symptomID;
     EXPECT_TRUE(sid);
@@ -296,6 +296,7 @@
       {
         "8":
         {
+            "Description": "TEST",
             "AdditionalDataPropSource": "TEST"
         }
       }
@@ -311,6 +312,7 @@
       {
         "R":
         {
+            "Description": "TEST",
             "AdditionalDataPropSource": "TEST"
         }
       }
diff --git a/test/openpower-pels/src_test.cpp b/test/openpower-pels/src_test.cpp
index 671bd54..301faac 100644
--- a/test/openpower-pels/src_test.cpp
+++ b/test/openpower-pels/src_test.cpp
@@ -190,11 +190,12 @@
     entry.src.reasonCode = 0xABCD;
     entry.subsystem = 0x42;
     entry.src.powerFault = true;
-    entry.src.hexwordADFields = {{5, "TEST1"}, // Not a user defined word
-                                 {6, "TEST1"},
-                                 {7, "TEST2"},
-                                 {8, "TEST3"},
-                                 {9, "TEST4"}};
+    entry.src.hexwordADFields = {
+        {5, {"TEST1", "DESCR1"}}, // Not a user defined word
+        {6, {"TEST1", "DESCR1"}},
+        {7, {"TEST2", "DESCR2"}},
+        {8, {"TEST3", "DESCR3"}},
+        {9, {"TEST4", "DESCR4"}}};
 
     // Values for the SRC words pointed to above
     std::vector<std::string> adData{"TEST1=0x12345678", "TEST2=12345678",
@@ -315,7 +316,6 @@
         errorDetails.value(),
         "Comp 0x1 failed 0x4 times over 0x1E secs with ErrorCode 0x1ABCDEF");
 }
-
 // Test that an inventory path callout string is
 // converted into the appropriate FRU callout.
 TEST_F(SRCTest, InventoryCalloutTest)
@@ -1300,4 +1300,4 @@
 
     EXPECT_EQ(callout->locationCode(), "UTMS-P1");
     EXPECT_EQ(callout->priority(), 'M');
-}
\ No newline at end of file
+}