diff --git a/test/test_activation.cpp b/test/test_activation.cpp
index 4beffbc..273f132 100644
--- a/test/test_activation.cpp
+++ b/test/test_activation.cpp
@@ -115,7 +115,7 @@
     activation = std::make_unique<Activation>(
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(
             Return(std::vector<std::string>({}))); // No PSU inventory
     activation->requestedActivation(RequestedStatus::Active);
@@ -136,7 +136,7 @@
     activation = std::make_unique<Activation>(
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(
             Return(std::vector<std::string>({psu0}))); // One PSU inventory
     activation->requestedActivation(RequestedStatus::Active);
@@ -165,7 +165,7 @@
     activation = std::make_unique<Activation>(
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(Return(
             std::vector<std::string>({psu0, psu1, psu2, psu3}))); // 4 PSUs
     activation->requestedActivation(RequestedStatus::Active);
@@ -217,7 +217,7 @@
     activation = std::make_unique<Activation>(
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(Return(
             std::vector<std::string>({psu0, psu1, psu2, psu3}))); // 4 PSUs
     activation->requestedActivation(RequestedStatus::Active);
@@ -249,7 +249,7 @@
     activation = std::make_unique<Activation>(
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(
             Return(std::vector<std::string>({psu0}))); // One PSU inventory
     ON_CALL(sdbusMock, sd_bus_call(_, _, _, _, nullptr))
@@ -266,7 +266,7 @@
     activation = std::make_unique<Activation>(
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(Return(std::vector<std::string>({psu0})));
     activation->requestedActivation(RequestedStatus::Active);
 
@@ -280,7 +280,7 @@
     activation = std::make_unique<Activation>(
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(Return(std::vector<std::string>({psu0})));
     activation->requestedActivation(RequestedStatus::Active);
 
@@ -297,7 +297,7 @@
     activation = std::make_unique<Activation>(
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(
             Return(std::vector<std::string>({psu0}))); // One PSU inventory
     activation->requestedActivation(RequestedStatus::Active);
@@ -325,7 +325,7 @@
     activation = std::make_unique<Activation>(
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(Return(
             std::vector<std::string>({psu0, psu1, psu2, psu3}))); // 4 PSUs
     activation->requestedActivation(RequestedStatus::Active);
@@ -366,7 +366,7 @@
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
 
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(
             Return(std::vector<std::string>({psu0}))); // One PSU inventory
 
@@ -389,7 +389,7 @@
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
 
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(
             Return(std::vector<std::string>({psu0}))); // One PSU inventory
 
@@ -410,7 +410,7 @@
         mockedBus, dBusPath, versionId, extVersion, status, associations,
         filePath, &mockedAssociationInterface, &mockedActivationListener);
 
-    ON_CALL(mockedUtils, getPSUInventoryPath(_))
+    ON_CALL(mockedUtils, getPSUInventoryPaths(_))
         .WillByDefault(
             Return(std::vector<std::string>({psu0}))); // One PSU inventory
 
