diff --git a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceManagementProviderServiceMock.java b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceManagementProviderServiceMock.java
index b4733bf70..91e6a6b75 100644
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceManagementProviderServiceMock.java
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/mocks/DeviceManagementProviderServiceMock.java
@@ -69,6 +69,7 @@ import io.entgra.device.mgt.plugins.mobile.android.api.utils.TestUtils;
 import org.apache.commons.collections.map.SingletonMap;
 
 import java.sql.Timestamp;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -917,9 +918,10 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
 
     @Override
     public List<DeviceDetailsDTO> getDevicesByTenantId(int i, int i1, String s, String s1) throws DeviceManagementDAOException {
-        return null;
+        return Collections.emptyList();
     }
 
+
     @Override
     public OperationDTO getOperationDetailsById(int i) throws OperationManagementException {
         return null;
@@ -936,4 +938,34 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
             throws DeviceManagementException, DeviceNotFoundException, ConflictException {
         return null;
     }
+
+    @Override
+    public List<Integer> getDevicesNotInGivenIdList(List<Integer> list) throws DeviceManagementException {
+        return null;
+    }
+
+    @Override
+    public List<Integer> getDevicesInGivenIdList(List<Integer> list) throws DeviceManagementException {
+        return null;
+    }
+
+    @Override
+    public int getDeviceCountNotInGivenIdList(List<Integer> list) throws DeviceManagementException {
+        return 0;
+    }
+
+    @Override
+    public List<Device> getDevicesByDeviceIds(PaginationRequest paginationRequest, List<Integer> list) throws DeviceManagementException {
+        return null;
+    }
+
+    @Override
+    public int getDeviceCountByDeviceIds(PaginationRequest paginationRequest, List<Integer> list) throws DeviceManagementException {
+        return 0;
+    }
+
+    @Override
+    public List<Integer> getDeviceIdsByStatus(List<String> list) throws DeviceManagementException {
+        return null;
+    }
 }
diff --git a/pom.xml b/pom.xml
index 9bc9802dc..ed7ee70b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -964,7 +964,7 @@
     <properties>
 
         <!-- Carbon Device Management -->
-        <io.entgra.device.mgt.core.version>5.2.1-SNAPSHOT</io.entgra.device.mgt.core.version>
+        <io.entgra.device.mgt.core.version>5.2.4-SNAPSHOT</io.entgra.device.mgt.core.version>
         <io.entgra.device.mgt.core.version.range>[5.0.0, 6.0.0)</io.entgra.device.mgt.core.version.range>
 
         <!-- Carbon Device Management Plugins -->