diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
index 5d28eb34afd..5244a74201f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java
@@ -280,7 +280,10 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
                 try {
                     deviceInformationManager.addDeviceInfo(deviceIdentifier, device.getDeviceInfo());
                 } catch (DeviceDetailsMgtException e) {
-                    e.printStackTrace();
+                    String msg = "Error occurred while adding device info for the device " +
+                            device.getDeviceIdentifier();
+                   log.error(msg, e);
+                   throw new DeviceManagementException(msg, e);
                 }
             }
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/SearchManagementServiceTest.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/SearchManagementServiceTest.java
index aa179b967a1..242df3cecbb 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/SearchManagementServiceTest.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/search/SearchManagementServiceTest.java
@@ -43,12 +43,16 @@ import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
+
+/**
+ * This class contains unit tests for the class SearchManagerService
+ * */
 public class SearchManagementServiceTest extends BaseDeviceManagementTest {
 
     private static final Log log = LogFactory.getLog(SearchManagementServiceTest.class);
     private static List<DeviceIdentifier> deviceIdentifiers = new ArrayList<>();
-    private static String DEVICE_ID_PREFIX = "SEARCH-DEVICE-ID-";
-    private static String DEVICE_TYPE = "SEARCH_TYPE";
+    private static final String DEVICE_ID_PREFIX = "SEARCH-DEVICE-ID-";
+    private static final String DEVICE_TYPE = "SEARCH_TYPE";
 
     @BeforeClass
     public void init() throws Exception {
@@ -133,7 +137,7 @@ public class SearchManagementServiceTest extends BaseDeviceManagementTest {
         Assert.assertTrue(devices.size() == 0);
     }
 
-    @Test
+    @Test(description = "Search devices by string parameter.")
     public void testStringSearch() throws Exception {
         SearchContext context = new SearchContext();
         List<Condition> conditions = new ArrayList<>();
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
index 01752512bb4..e3c165ca99f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/testng.xml
@@ -32,7 +32,6 @@
             <class name="org.wso2.carbon.device.mgt.core.app.mgt.AppManagementConfigurationManagerTest"/>
             <class name="org.wso2.carbon.device.mgt.core.dao.ApplicationPersistenceTests"/>
             <class name="org.wso2.carbon.device.mgt.core.search.DeviceDetails"/>
-            <!--<class name="org.wso2.carbon.device.mgt.core.search.SearchDevice"/>-->
             <class name="org.wso2.carbon.device.mgt.core.dao.GroupPersistTests"/>
             </classes>
     </test>
@@ -50,7 +49,6 @@
             <class name="org.wso2.carbon.device.mgt.core.task.DeviceTaskManagerServiceTest"/>
             <class name="org.wso2.carbon.device.mgt.core.task.DeviceTaskManagerTest"/>
             <class name="org.wso2.carbon.device.mgt.core.authorization.DeviceAccessAuthorizationServiceTest"/>
-            <!--<class name="org.wso2.carbon.device.mgt.core.search.DeviceDetails"/>-->
             <class name="org.wso2.carbon.device.mgt.core.search.SearchManagementServiceTest"/>
         </classes>
     </test>