diff --git a/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.device/src/test/resources/sql/h2.sql b/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.device/src/test/resources/sql/h2.sql
index dd09806684..f8c7785e01 100644
--- a/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.device/src/test/resources/sql/h2.sql
+++ b/components/extensions/siddhi-extensions/org.wso2.extension.siddhi.device/src/test/resources/sql/h2.sql
@@ -11,6 +11,7 @@ CREATE TABLE IF NOT EXISTS DM_DEVICE_TYPE (
 CREATE TABLE IF NOT EXISTS DM_GROUP (
   ID                  INTEGER AUTO_INCREMENT NOT NULL,
   GROUP_NAME          VARCHAR(100) DEFAULT NULL,
+  STATUS              VARCHAR(50)  DEFAULT NULL,
   DESCRIPTION         TEXT         DEFAULT NULL,
   OWNER               VARCHAR(255)  DEFAULT NULL,
   TENANT_ID           INTEGER      DEFAULT 0,
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java
index 3e3c87fb67..6d5bf8937e 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java
@@ -620,17 +620,17 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
     }
 
     @Override
-    public int getDeviceCountOfTypeByStatus(int i, String s, String s1) throws DeviceManagementException {
+    public int getDeviceCountOfTypeByStatus(String s, String s1) throws DeviceManagementException {
         return 0;
     }
 
     @Override
-    public List<String> getDeviceIdentifiersByStatus(int i, String s, String s1) throws DeviceManagementException {
+    public List<String> getDeviceIdentifiersByStatus(String s, String s1) throws DeviceManagementException {
         return null;
     }
 
     @Override
-    public boolean bulkUpdateDeviceStatus(int i, String s, List<String> list, String s1) throws DeviceManagementException {
+    public boolean bulkUpdateDeviceStatus(String s, List<String> list, String s1) throws DeviceManagementException {
         return false;
     }