diff --git a/modules/distribution/product/src/main/assembly/bin.xml b/modules/distribution/product/src/main/assembly/bin.xml
index 21ebb6f194..b43d05f262 100644
--- a/modules/distribution/product/src/main/assembly/bin.xml
+++ b/modules/distribution/product/src/main/assembly/bin.xml
@@ -28,6 +28,7 @@
wso2am-${pom.version}
**/bin/wso2server.sh
+ **/bin/carbondump.sh
**/bin/wso2server.bat
**/conf/axis2/*.j2
**/conf/axis2/axis2.xml
diff --git a/modules/integration/tests-integration/pom.xml b/modules/integration/tests-integration/pom.xml
index f4c17a4ee9..15a92d26ff 100644
--- a/modules/integration/tests-integration/pom.xml
+++ b/modules/integration/tests-integration/pom.xml
@@ -30,10 +30,41 @@ under the License.
org.wso2.carbon.am.integration.test
pom
-
-
- tests-backend
-
-
-
+
+
+ default
+
+ true
+
+
+ tests-benchmark
+ tests-backend
+ tests-restart
+
+
+
+ without-restart
+
+ tests-backend
+
+
+
+ benchmark-restart
+
+ tests-benchmark
+ tests-restart
+
+
+
+ benchmark-test
+
+ tests-benchmark
+
+
+
+ skip-test
+
+
+
+
diff --git a/modules/integration/tests-integration/tests-benchmark/src/test/java/org/wso2/am/integration/tests/util/APIMCarbonServerExtension.java b/modules/integration/tests-integration/tests-benchmark/src/test/java/org/wso2/am/integration/tests/util/APIMCarbonServerExtension.java
index 363a200bae..f7280ad84a 100644
--- a/modules/integration/tests-integration/tests-benchmark/src/test/java/org/wso2/am/integration/tests/util/APIMCarbonServerExtension.java
+++ b/modules/integration/tests-integration/tests-benchmark/src/test/java/org/wso2/am/integration/tests/util/APIMCarbonServerExtension.java
@@ -139,14 +139,10 @@ public void configureServer() throws AutomationFrameworkException {
WebAppDeploymentUtil.copyWebApp(relativeResourcePath + File.separator + "war" + File.separator
+ APIMIntegrationConstants.JAXRS_BASIC_WEB_APP_NAME + ".war",
webappsPath + APIMIntegrationConstants.JAXRS_BASIC_WEB_APP_NAME);
- WebAppDeploymentUtil.waitForWebappToDeploy(
- webappsPath + APIMIntegrationConstants.JAXRS_BASIC_WEB_APP_NAME + ".war", 120000L);
WebAppDeploymentUtil.copyWebApp(relativeResourcePath + File.separator + "war" + File.separator
+ APIMIntegrationConstants.AM_MONITORING_WEB_APP_NAME + ".war",
webappsPath + APIMIntegrationConstants.AM_MONITORING_WEB_APP_NAME);
- WebAppDeploymentUtil.waitForWebappToDeploy(
- webappsPath + APIMIntegrationConstants.AM_MONITORING_WEB_APP_NAME + ".war", 120000L);
log.info("Web Apps Deployed");
} catch (IOException e) {
diff --git a/modules/integration/tests-integration/tests-restart/pom.xml b/modules/integration/tests-integration/tests-restart/pom.xml
index 508497c9b5..ef748542a1 100644
--- a/modules/integration/tests-integration/tests-restart/pom.xml
+++ b/modules/integration/tests-integration/tests-restart/pom.xml
@@ -662,6 +662,11 @@ under the License.
xmlunit-core
test
+
+ net.minidev
+ json-smart
+ test
+
org.xmlunit
xmlunit-matchers
diff --git a/modules/integration/tests-integration/tests-restart/src/test/java/org/wso2/am/integration/tests/server/restart/ServerRestartTestCase.java b/modules/integration/tests-integration/tests-restart/src/test/java/org/wso2/am/integration/tests/server/restart/ServerRestartTestCase.java
index d5465b32e5..cb9bd083c8 100644
--- a/modules/integration/tests-integration/tests-restart/src/test/java/org/wso2/am/integration/tests/server/restart/ServerRestartTestCase.java
+++ b/modules/integration/tests-integration/tests-restart/src/test/java/org/wso2/am/integration/tests/server/restart/ServerRestartTestCase.java
@@ -616,7 +616,7 @@ public void setEnvironment(ITestContext ctx) throws Exception {
HttpResponse apiLoggingLoggingResponse = HTTPSClientUtils.doGet(getStoreURLHttps()
+ "api/am/devops/v0/tenant-logs/carbon.super/apis?log-level=full", apiLoggingHeader);
Assert.assertEquals(apiLoggingLoggingResponse.getData(), "{\"apis\":[{\"context\":\"/" + "apiloggingtest" + "/" + "1.0.0" + "\","
- + "\"logLevel\":\"FULL\",\"apiId\":\"" + apiLoggingApiId + "\"}]}");
+ + "\"logLevel\":\"FULL\",\"apiId\":\"" + apiLoggingApiId + "\",\"resourceMethod\":null,\"resourcePath\":null}]}");
ctx.setAttribute("apiLoggingApplicationId", apiLoggingApplicationId);
/*