diff --git a/test/openpower-pels/data_interface_test.cpp b/test/openpower-pels/data_interface_test.cpp
new file mode 100644
index 0000000..28e455f
--- /dev/null
+++ b/test/openpower-pels/data_interface_test.cpp
@@ -0,0 +1,24 @@
+#include "extensions/openpower-pels/data_interface.hpp"
+
+#include <gtest/gtest.h>
+
+using namespace openpower::pels;
+
+TEST(DataInterfaceTest, ExtractConnectorLocCode)
+{
+    {
+        auto [base, connector] =
+            DataInterface::extractConnectorFromLocCode("Ufcs-P0-C2-T11");
+
+        EXPECT_EQ(base, "Ufcs-P0-C2");
+        EXPECT_EQ(connector, "-T11");
+    }
+
+    {
+        auto [base, connector] =
+            DataInterface::extractConnectorFromLocCode("Ufcs-P0-C2");
+
+        EXPECT_EQ(base, "Ufcs-P0-C2");
+        EXPECT_TRUE(connector.empty());
+    }
+}
diff --git a/test/openpower-pels/meson.build b/test/openpower-pels/meson.build
index ebfd608..f8121f8 100644
--- a/test/openpower-pels/meson.build
+++ b/test/openpower-pels/meson.build
@@ -2,6 +2,7 @@
     'additional_data': {},
     'ascii_string': {},
     'bcd_time': {},
+    'data_interface': {},
     'device_callouts': {},
     'event_logger': {},
     'extended_user_data': {},
diff --git a/test/openpower-pels/pel_test.cpp b/test/openpower-pels/pel_test.cpp
index 984f2ec..318a218 100644
--- a/test/openpower-pels/pel_test.cpp
+++ b/test/openpower-pels/pel_test.cpp
@@ -834,9 +834,8 @@
         .Times(2)
         .WillRepeatedly(Return(names));
 
-    EXPECT_CALL(dataIface,
-                getLocationCode(
-                    "/xyz/openbmc_project/inventory/chassis/motherboard/cpu0"))
+    EXPECT_CALL(dataIface, expandLocationCode("P1", 0))
+        .Times(1)
         .WillOnce(Return("UXXX-P1"));
 
     EXPECT_CALL(dataIface, getInventoryFromLocCode("P1", 0, false))
diff --git a/test/openpower-pels/src_test.cpp b/test/openpower-pels/src_test.cpp
index dbb831f..3149378 100644
--- a/test/openpower-pels/src_test.cpp
+++ b/test/openpower-pels/src_test.cpp
@@ -865,19 +865,15 @@
         .WillRepeatedly(
             Return("/xyz/openbmc_project/inventory/chassis/motherboard/bmc"));
 
-    EXPECT_CALL(dataIface,
-                getLocationCode(
-                    "/xyz/openbmc_project/inventory/chassis/motherboard/cpu0"))
+    EXPECT_CALL(dataIface, expandLocationCode("P1-C40", 0))
         .Times(3)
         .WillRepeatedly(Return("Ufcs-P1-C40"));
-    EXPECT_CALL(
-        dataIface,
-        getLocationCode("/xyz/openbmc_project/inventory/chassis/motherboard"))
+
+    EXPECT_CALL(dataIface, expandLocationCode("P1", 0))
         .Times(3)
         .WillRepeatedly(Return("Ufcs-P1"));
-    EXPECT_CALL(dataIface,
-                getLocationCode(
-                    "/xyz/openbmc_project/inventory/chassis/motherboard/bmc"))
+
+    EXPECT_CALL(dataIface, expandLocationCode("P1-C15", 0))
         .Times(3)
         .WillRepeatedly(Return("Ufcs-P1-C15"));