diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/DeviceManagementServiceImpl.java b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/DeviceManagementServiceImpl.java
index dfef5e8a60..d2763ff613 100644
--- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/DeviceManagementServiceImpl.java
+++ b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/DeviceManagementServiceImpl.java
@@ -31,7 +31,16 @@ import io.entgra.device.mgt.core.application.mgt.common.exception.SubscriptionMa
 import io.entgra.device.mgt.core.application.mgt.common.services.ApplicationManager;
 import io.entgra.device.mgt.core.application.mgt.common.services.SubscriptionManager;
 import io.entgra.device.mgt.core.application.mgt.core.util.HelperUtil;
-import io.entgra.device.mgt.core.device.mgt.api.jaxrs.beans.*;
+import io.entgra.device.mgt.core.device.mgt.api.jaxrs.beans.ApplicationList;
+import io.entgra.device.mgt.core.device.mgt.api.jaxrs.beans.ApplicationUninstallation;
+import io.entgra.device.mgt.core.device.mgt.api.jaxrs.beans.ComplianceDeviceList;
+import io.entgra.device.mgt.core.device.mgt.api.jaxrs.beans.DeviceCompliance;
+import io.entgra.device.mgt.core.device.mgt.api.jaxrs.beans.DeviceConfig;
+import io.entgra.device.mgt.core.device.mgt.api.jaxrs.beans.DeviceList;
+import io.entgra.device.mgt.core.device.mgt.api.jaxrs.beans.ErrorResponse;
+import io.entgra.device.mgt.core.device.mgt.api.jaxrs.beans.OperationList;
+import io.entgra.device.mgt.core.device.mgt.api.jaxrs.beans.OperationRequest;
+import io.entgra.device.mgt.core.device.mgt.api.jaxrs.beans.OperationStatusBean;
 import io.entgra.device.mgt.core.device.mgt.api.jaxrs.service.api.DeviceManagementService;
 import io.entgra.device.mgt.core.device.mgt.api.jaxrs.service.impl.util.APIResponseUtil;
 import io.entgra.device.mgt.core.device.mgt.api.jaxrs.service.impl.util.APIResponseUtilException;
@@ -39,7 +48,17 @@ import io.entgra.device.mgt.core.device.mgt.api.jaxrs.service.impl.util.InputVal
 import io.entgra.device.mgt.core.device.mgt.api.jaxrs.service.impl.util.RequestValidationUtil;
 import io.entgra.device.mgt.core.device.mgt.api.jaxrs.util.Constants;
 import io.entgra.device.mgt.core.device.mgt.api.jaxrs.util.DeviceMgtAPIUtils;
-import io.entgra.device.mgt.core.device.mgt.common.*;
+import io.entgra.device.mgt.core.device.mgt.common.Device;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceFilters;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceIdentifier;
+import io.entgra.device.mgt.core.device.mgt.common.DeviceManagementConstants;
+import io.entgra.device.mgt.core.device.mgt.common.EnrolmentInfo;
+import io.entgra.device.mgt.core.device.mgt.common.Feature;
+import io.entgra.device.mgt.core.device.mgt.common.FeatureManager;
+import io.entgra.device.mgt.core.device.mgt.common.MDMAppConstants;
+import io.entgra.device.mgt.core.device.mgt.common.OperationLogFilters;
+import io.entgra.device.mgt.core.device.mgt.common.PaginationRequest;
+import io.entgra.device.mgt.core.device.mgt.common.PaginationResult;
 import io.entgra.device.mgt.core.device.mgt.common.app.mgt.Application;
 import io.entgra.device.mgt.core.device.mgt.common.app.mgt.ApplicationManagementException;
 import io.entgra.device.mgt.core.device.mgt.common.authorization.DeviceAccessAuthorizationException;
@@ -49,7 +68,11 @@ import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceInfo;
 import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceLocation;
 import io.entgra.device.mgt.core.device.mgt.common.device.details.DeviceLocationHistorySnapshotWrapper;
 import io.entgra.device.mgt.core.device.mgt.common.exceptions.BadRequestException;
-import io.entgra.device.mgt.core.device.mgt.common.exceptions.*;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceManagementException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.DeviceTypeNotFoundException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.InvalidConfigurationException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.InvalidDeviceException;
+import io.entgra.device.mgt.core.device.mgt.common.exceptions.UnAuthorizedException;
 import io.entgra.device.mgt.core.device.mgt.common.group.mgt.GroupManagementException;
 import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Activity;
 import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
diff --git a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/test/resources/google-credentials.json b/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/test/resources/google-credentials.json
deleted file mode 100644
index 7f91b7ae24..0000000000
--- a/components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/test/resources/google-credentials.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "type": "service_account",
-  "project_id": "apicall-382608",
-  "private_key_id": "48aa6a62800d6395fec77b5c86abcc08c48556f0",
-  "private_key": "-----BEGIN PRIVATE KEY-----\nMIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDcJPEUsPn9ouwm\nkBpSz2dgmtq3A/bwbXzvlhe1/U4W3kq+vaSBPJ54tzKLx23pR6h9fxzljfDTLhZr\nBEhZFVKKSwbtlGaVA+6mJcnV2DT5S1bDqdMOs5y9CXsqZ+Xl2apYiryyKwWneKs5\nc5gU914QnxRDRskdxVUYMsAvwTU9A1aEHzRAaSuriH/1y6P8mpCBQtn7NAIt4Don\ntyzk2B2lC8HVZsMfup0zzut7quvwiYvly0pijCa9/pRTn/6BMFsVMUvqy8qa8PhX\nBIQ1SnehF4VW0h9fgljL9Bbu3m57IwxaVIcy8b61dTVUNVB1LgQ7NtmOdFG56bOy\nUXK8javlAgMBAAECggEAAtHoUqsHsMOPAdlztN7aRKcHKTQATEkiwhDqodaqUumr\nDHFyc4NaxlIWcCrwUf4sftsLfDdKv/HFsL4/zQBUa9gVMSLnA36m5nLyeG5KE21v\nIZeB0Bzl45gE/2CQVdbpczPnweKCMoh9rQE5j/8xMcZP5KK5/csi0WoJAzOW4n6r\n24JHoc82jqJKw0s91ZkzBTD3uoi3WbuRlKFzzRmRCJEIdY8VRR4/oZ4lphX26+hn\n3F5kuqWGsYItqZwNrbgtB4oiYXz2g2rIko2tj2FOvRNtE+6HmdH+hRlXasjcjnb9\ng/MZ9SOH852kXKh8SAWo3cWfWo5cvXYYYjGeQt41awKBgQD8uB3g46YLZrsp+fvK\nGxSzyf0fzSsgj0Byd7j8E703DE2yjZ+wybWjTyC+J+S2wLHoNNB5yMoTdte4m1ry\nnZvbVZuwS8tOb4HlriBm57Akp64A8Bhgi7VA+kbzGEV8ATdr2VvrBvTaVOsFqpL5\nIUWJuRWsKvjCJNEKyQdFq0e1gwKBgQDfAJDpNv8WjqT2W5AULIdZxqz5m4a0p/MW\nJk0KErVQXxZ8RQUuBkVlRi1o32dePZ4TXpFGS+txpbkt0HJlJ3lvhUpPpyFrISC0\nomkwChkk9p4Ss2LTm/eubsOzbZynqmRj/ahJJ2rL79WqnaKqHhqF9u0lZ9amDK8y\nWkVPh8DEdwKBgQC/6HTP/S9vQwDoHGxHCo+LA90TFDMm04GmKyIvUjICpnYuG/vj\nPRmQvRrpK9Qzr1qqMckKYh6J71pbVqYWzPa49WZ31ua5VlX2+2ahnlkVTLwG/EwW\nrKDkiens2kaRpz7VyEZT0IGJdqjOMbzQMKLktccuaadjjp+rqAK8theLTwKBgE8j\nykmZpOmCcfSkBfvC2b34jgZ/NU0DlXc03H5IqWP+euJbND1jKFmKkC75qZt+To0d\nMH08EDBi2dbydMaFPclgCkE+VNPKC+tO//l2e/nsM6j7VIU4gqu6z2Tr735pL/t0\nV7aucG4zjSZhjwrEaDFGsl5l/X0sXziFZLeWu8h9AoGBAL3DH0K1JZK4oNVIEeC9\nmOlSxTysDU7irrONUqB8l+J/gpAY732Tjrly+mHBSl5XIbHqv/68a4jArmfTvDMP\n1OAZxcYIoo97g/04mCV3m/FP/Wbfq9n6pUZPkh+BP9djLAqT9MsCkafGv+/W1GY6\nsWJ+swf3TwkD4S9EcVfNduNa\n-----END PRIVATE KEY-----\n",
-  "client_email": "apicall@apicall-382608.iam.gserviceaccount.com",
-  "client_id": "102201293562575371700",
-  "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-  "token_uri": "https://oauth2.googleapis.com/token",
-  "auth_provider_x509_cert_url": "https://www.googleapis.com/oauth2/v1/certs",
-  "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/apicall%40apicall-382608.iam.gserviceaccount.com"
-}