diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/util/CommentMgtTestHelper.java b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/util/CommentMgtTestHelper.java
index 6367a1fa160..836d2798aed 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/util/CommentMgtTestHelper.java
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/java/org/wso2/carbon/device/application/mgt/store/api/services/util/CommentMgtTestHelper.java
@@ -1,4 +1,3 @@
-package org.wso2.carbon.device.application.mgt.store.api.services.util;
 /*
  * Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
  *
@@ -16,12 +15,10 @@ package org.wso2.carbon.device.application.mgt.store.api.services.util;
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.wso2.carbon.device.application.mgt.store.api.services.util;
 
 import org.wso2.carbon.device.application.mgt.common.Comment;
 
-
-import static org.wso2.carbon.registry.core.jdbc.DumpConstants.UUID;
-
 /**
  * Helper class for Comment Management API test cases.
  */
@@ -30,9 +27,9 @@ public class CommentMgtTestHelper {
 
     private static final String COMMENT_TEXT = "Dummy Comment";
     private static final String CREATED_BY = "TEST_CREATED_BY";
-    private static final String MODIFIED_BY="TEST_MODIFIED_BY";
-    private static final int PARENT_ID=123;
-    private static final int COMMENT_ID=1;
+    private static final String MODIFIED_BY = "TEST_MODIFIED_BY";
+    private static final int PARENT_ID = 123;
+    private static final int COMMENT_ID = 1;
 
     /**
      * Creates a Comment with given text and given uuid.
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/resources/log4j.properties b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/resources/log4j.properties
index 1dbcc0f6352..d2bd747bafb 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/resources/log4j.properties
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/resources/log4j.properties
@@ -1,4 +1,3 @@
-
 # Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
 #
 # WSO2 Inc. licenses this file to you under the Apache License,
@@ -15,7 +14,6 @@
 # specific language governing permissions and limitations
 # under the License.
 #
-
 #
 # This is the log4j configuration file used by WSO2 Carbon
 #
@@ -24,9 +22,7 @@
 # can be changed using the WSO2 Carbon Management Console, and those
 # settings will override the settings in this file.
 #
-
 log4j.rootLogger=DEBUG, STD_OUT
- 
 # Redirect log messages to console
 log4j.appender.STD_OUT=org.apache.log4j.ConsoleAppender
 log4j.appender.STD_OUT.Target=System.out
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/resources/testng.xml b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/resources/testng.xml
index ed1275edab5..ab33c9c4105 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/resources/testng.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/test/resources/testng.xml
@@ -1,4 +1,3 @@
-
 <!--
   ~ Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
   ~