diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/admin/ChangeApiProviderTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/admin/ChangeApiProviderTestCase.java
index e227b3dc22..7266ee9399 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/admin/ChangeApiProviderTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/admin/ChangeApiProviderTestCase.java
@@ -169,6 +169,5 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         restAPIPublisher.deleteAPI(apiID);
         userManagementClient.deleteUser(newUser);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIAccessibilityOfPublishedOldAPIAndPublishedCopyAPITestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIAccessibilityOfPublishedOldAPIAndPublishedCopyAPITestCase.java
index 45ce1e7a25..f75dc6eb30 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIAccessibilityOfPublishedOldAPIAndPublishedCopyAPITestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIAccessibilityOfPublishedOldAPIAndPublishedCopyAPITestCase.java
@@ -239,7 +239,6 @@ public void cleanUpArtifacts() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
         restAPIPublisher.deleteAPI(newApiId);
 
-        super.cleanUp();
     }
 
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIMANAGER5337SubscriptionRetainTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIMANAGER5337SubscriptionRetainTestCase.java
index fe35d326c0..c8823f1bd5 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIMANAGER5337SubscriptionRetainTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIMANAGER5337SubscriptionRetainTestCase.java
@@ -118,6 +118,5 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(applicationID);
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIPublishingAndVisibilityInStoreTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIPublishingAndVisibilityInStoreTestCase.java
index 86f060ce69..9f0a08b42a 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIPublishingAndVisibilityInStoreTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIPublishingAndVisibilityInStoreTestCase.java
@@ -131,7 +131,6 @@ public void testAPIPublishing() throws Exception {
     public void cleanUpArtifacts() throws Exception {
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIVisibilityByRoleTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIVisibilityByRoleTestCase.java
index 6fb5b27c44..18e08c4add 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIVisibilityByRoleTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/APIVisibilityByRoleTestCase.java
@@ -486,7 +486,6 @@ public void cleanUpArtifacts() throws Exception {
         deleteAPI(apiVisibilityByRoleId, apiPublisherClientCarbonSuperAdmin);
         userManagementClient1.deleteUser(CARBON_SUPER_SUBSCRIBER_USERNAME);
         userManagementClient2.deleteUser(TENANT_SUBSCRIBER_USERNAME);
-        super.cleanUp();
     }
 
 }
\ No newline at end of file
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AccessibilityOfBlockAPITestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AccessibilityOfBlockAPITestCase.java
index ef88bc42cf..3d7c9c5cf5 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AccessibilityOfBlockAPITestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AccessibilityOfBlockAPITestCase.java
@@ -155,7 +155,6 @@ public void testInvokeAPIAfterChangeAPILifecycleToBlock() throws Exception {
     public void cleanUpArtifacts() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AccessibilityOfOldAPIAndCopyAPIWithOutReSubscriptionTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AccessibilityOfOldAPIAndCopyAPIWithOutReSubscriptionTestCase.java
index f1737dfd38..fc700b3a09 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AccessibilityOfOldAPIAndCopyAPIWithOutReSubscriptionTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AccessibilityOfOldAPIAndCopyAPIWithOutReSubscriptionTestCase.java
@@ -174,7 +174,5 @@ public void cleanUpArtifacts() throws Exception {
         undeployAndDeleteAPIRevisionsUsingRest(newApiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
         restAPIPublisher.deleteAPI(newApiId);
-
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AccessibilityOfOldAPIAndCopyAPIWithReSubscriptionTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AccessibilityOfOldAPIAndCopyAPIWithReSubscriptionTestCase.java
index 55db09e9ff..65aca1eed7 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AccessibilityOfOldAPIAndCopyAPIWithReSubscriptionTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AccessibilityOfOldAPIAndCopyAPIWithReSubscriptionTestCase.java
@@ -232,8 +232,6 @@ public void cleanUpArtifacts() throws Exception {
         undeployAndDeleteAPIRevisionsUsingRest(newApiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
         restAPIPublisher.deleteAPI(newApiId);
-
-        super.cleanUp();
     }
 
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AccessibilityOfRetireAPITestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AccessibilityOfRetireAPITestCase.java
index d20883fc52..d74de639dd 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AccessibilityOfRetireAPITestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AccessibilityOfRetireAPITestCase.java
@@ -172,7 +172,6 @@ public void testInvokeAPIAfterChangeAPILifecycleToRetired() throws Exception {
     public void cleanUpArtifacts() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AddEndPointSecurityPerTypeTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AddEndPointSecurityPerTypeTestCase.java
index 9e5999a500..9dd46f82de 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AddEndPointSecurityPerTypeTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AddEndPointSecurityPerTypeTestCase.java
@@ -606,7 +606,6 @@ public void cleanUpArtifacts() throws Exception {
             undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
             restAPIPublisher.deleteAPI(apiId);
         }
-        super.cleanUp();
     }
 
     private void validateIntrospectionResponse(User user, String accessToken, String clientId) throws Exception {
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AudienceValidationTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AudienceValidationTestCase.java
index bfc6b24bd4..909adfe339 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AudienceValidationTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/AudienceValidationTestCase.java
@@ -357,7 +357,6 @@ public void testInvokeApiWithAudienceValidationPass() throws Exception {
     public void cleanUpArtifacts() throws Exception {
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         undeployAndDeleteAPIProductRevisionsUsingRest(apiProductDTO.getId(), restAPIPublisher);
-        super.cleanUp();
         userManagementClient.deleteUser(STANDARD_SUBSCRIBER);
     }
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeAPITagsTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeAPITagsTestCase.java
index 4152ce3dd2..c810104749 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeAPITagsTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeAPITagsTestCase.java
@@ -138,7 +138,6 @@ public void testUpdateTagsAndFilterByTags() throws Exception {
     public void cleanUpArtifacts() throws Exception {
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeApplicationTierAndTestInvokingTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeApplicationTierAndTestInvokingTestCase.java
index 69750c7b7f..45d2dfaaec 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeApplicationTierAndTestInvokingTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeApplicationTierAndTestInvokingTestCase.java
@@ -212,7 +212,6 @@ public void cleanUpArtifacts() throws Exception {
         apiStoreClientUser1.removeAPISubscriptionByApplicationName (API_NAME, API_VERSION_1_0_0, providerName, applicationNameSilver);
         apiStoreClientUser1.removeApplication(applicationNameSilver);
         deleteAPI(apiIdentifier, apiPublisherClientUser1);
-        super.cleanUp();
     }
 
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeAuthTypeOfResourceTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeAuthTypeOfResourceTestCase.java
index 5546838e3b..f91cfbf9f5 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeAuthTypeOfResourceTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeAuthTypeOfResourceTestCase.java
@@ -280,7 +280,6 @@ public void cleanUpArtifacts() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeEndPointSecurityOfAPITestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeEndPointSecurityOfAPITestCase.java
index 801ab08c75..af36c27812 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeEndPointSecurityOfAPITestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeEndPointSecurityOfAPITestCase.java
@@ -227,6 +227,5 @@ public void cleanUpArtifacts() throws Exception {
         restAPIStore.removeApplicationById(applicationID);
         undeployAndDeleteAPIRevisionsUsingRest(apiID, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiID);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeEndPointSecurityPerTypeTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeEndPointSecurityPerTypeTestCase.java
index 2ec0968dcc..28fc4e55d4 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeEndPointSecurityPerTypeTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/ChangeEndPointSecurityPerTypeTestCase.java
@@ -514,7 +514,6 @@ public void cleanUpArtifacts() throws Exception {
         restAPIStore.removeApplicationById(applicationID);
         undeployAndDeleteAPIRevisionsUsingRest(apiID, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiID);
-        super.cleanUp();
     }
 
     private void validateIntrospectionResponse(User user, String accessToken, String clientId) throws UnsupportedEncodingException {
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/CustomLifeCycleTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/CustomLifeCycleTestCase.java
index 54c9561e5e..5de3707daa 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/CustomLifeCycleTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/CustomLifeCycleTestCase.java
@@ -118,6 +118,5 @@ public void testCustomLifeCycle() throws Exception {
     public void cleanupArtifacts() throws Exception {
         //Remove test api and revert to original lifecycle config
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/DynamicAPIContextTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/DynamicAPIContextTestCase.java
index 76764c0a0b..fac28b86b9 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/DynamicAPIContextTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/DynamicAPIContextTestCase.java
@@ -173,7 +173,6 @@ public void cleanUpArtifacts() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/EditAPIAndCheckUpdatedInformationTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/EditAPIAndCheckUpdatedInformationTestCase.java
index 24b2ead902..4266027d62 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/EditAPIAndCheckUpdatedInformationTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/EditAPIAndCheckUpdatedInformationTestCase.java
@@ -134,8 +134,6 @@ public void testUpdatedAPIInformationFromAPIPublisher() throws APIManagerIntegra
     public void cleanUpArtifacts() throws Exception {
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
-
     }
 
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/EditAPIContextAndCheckAccessibilityTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/EditAPIContextAndCheckAccessibilityTestCase.java
index f17e885ff3..2b5504e840 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/EditAPIContextAndCheckAccessibilityTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/EditAPIContextAndCheckAccessibilityTestCase.java
@@ -212,7 +212,6 @@ public void cleanUpArtifacts() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/RegistryLifeCycleInclusionTest.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/RegistryLifeCycleInclusionTest.java
index d038b6795d..60c8d12d31 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/RegistryLifeCycleInclusionTest.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/RegistryLifeCycleInclusionTest.java
@@ -215,6 +215,5 @@ public void testLCStateChangeVisibility() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
         restAPIPublisher.deleteAPI(apiID);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/UpdateAPINullPointerTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/UpdateAPINullPointerTestCase.java
index 79503a35bc..46a6ca62ef 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/UpdateAPINullPointerTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/lifecycle/UpdateAPINullPointerTestCase.java
@@ -98,7 +98,6 @@ public void testBadRequestWithEndpointConfigAsNull() throws APIManagerIntegratio
     @AfterClass(alwaysRun = true)
     public void cleanUpArtifacts() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/revision/APIProductRevisionTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/revision/APIProductRevisionTestCase.java
index d24e36c41f..5650cdddbc 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/revision/APIProductRevisionTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/api/revision/APIProductRevisionTestCase.java
@@ -18,7 +18,6 @@
 
 package org.wso2.am.integration.tests.api.revision;
 
-import com.google.gson.Gson;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONArray;
@@ -28,7 +27,6 @@
 import org.testng.annotations.Test;
 import org.wso2.am.integration.clients.publisher.api.v1.dto.APIDTO;
 import org.wso2.am.integration.clients.publisher.api.v1.dto.APIProductDTO;
-import org.wso2.am.integration.clients.publisher.api.v1.dto.APIRevisionListDTO;
 import org.wso2.am.integration.test.Constants;
 import org.wso2.am.integration.test.impl.ApiProductTestHelper;
 import org.wso2.am.integration.test.impl.ApiTestHelper;
@@ -55,6 +53,7 @@ public class APIProductRevisionTestCase extends APIMIntegrationBaseTest {
     private ApiProductTestHelper apiProductTestHelper;
     protected static final String TIER_UNLIMITED = "Unlimited";
     protected static final String TIER_GOLD = "Gold";
+    List<APIDTO> apisToBeUsed = new ArrayList<>();
 
     @BeforeClass(alwaysRun = true)
     public void setEnvironment() throws Exception {
@@ -68,7 +67,6 @@ public void setEnvironment() throws Exception {
     @Test(groups = {"wso2.am"}, description = "API Product Revision create test case")
     public void testAddingAPIProductRevision() throws Exception {
         // Pre-Conditions : Create APIs
-        List<APIDTO> apisToBeUsed = new ArrayList<>();
 
         apisToBeUsed.add(apiTestHelper.
                 createApiOne(getBackendEndServiceEndPointHttp("wildcard/resources")));
@@ -105,7 +103,7 @@ public void testAddingAPIProductRevision() throws Exception {
     @Test(groups = {"wso2.am"}, description = "Check the availability of API Product Revision in publisher before deploying.",
             dependsOnMethods = "testAddingAPIProductRevision")
     public void testGetAPIProductRevisions() throws Exception {
-        HttpResponse apiRevisionsGetResponse = restAPIPublisher.getAPIProductRevisions(apiId,null);
+        HttpResponse apiRevisionsGetResponse = restAPIPublisher.getAPIProductRevisions(apiId, null);
         assertEquals(apiRevisionsGetResponse.getResponseCode(), HTTP_RESPONSE_CODE_OK,
                 "Unable to retrieve revisions" + apiRevisionsGetResponse.getData());
         List<JSONObject> revisionList = new ArrayList<>();
@@ -115,7 +113,7 @@ public void testGetAPIProductRevisions() throws Exception {
         for (int i = 0, l = arrayList.length(); i < l; i++) {
             revisionList.add(arrayList.getJSONObject(i));
         }
-        for (JSONObject revision :revisionList) {
+        for (JSONObject revision : revisionList) {
             revisionUUID = revision.getString("id");
         }
         assertNotNull(revisionUUID, "Unable to retrieve revision UUID");
@@ -131,7 +129,7 @@ public void testDeployAPIProductRevisions() throws Exception {
         apiRevisionDeployRequest.setDisplayOnDevportal(true);
         apiRevisionDeployRequestList.add(apiRevisionDeployRequest);
         HttpResponse apiRevisionsDeployResponse = restAPIPublisher.deployAPIProductRevision(apiId, revisionUUID,
-                apiRevisionDeployRequestList,"APIProduct");
+                apiRevisionDeployRequestList, "APIProduct");
         assertEquals(apiRevisionsDeployResponse.getResponseCode(), HTTP_RESPONSE_CODE_CREATED,
                 "Unable to deploy API Product Revisions:" + apiRevisionsDeployResponse.getData());
     }
@@ -174,6 +172,9 @@ public void testDeleteAPIProductRevision() throws Exception {
 
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
-        super.cleanUp();
+        restAPIPublisher.deleteAPI(apiId);
+        for (APIDTO api : apisToBeUsed) {
+            restAPIPublisher.deleteAPI(api.getId());
+        }
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/apiproduct/APIProductCreationTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/apiproduct/APIProductCreationTestCase.java
index 4d00b19ce8..1723133622 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/apiproduct/APIProductCreationTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/apiproduct/APIProductCreationTestCase.java
@@ -815,7 +815,6 @@ public void cleanUpArtifacts() throws Exception {
 
         restAPIPublisher.deleteAPI(apiID1);
         restAPIPublisher.deleteAPI(apiID2);
-        super.cleanUp();
         userManagementClient.deleteUser(RESTRICTED_SUBSCRIBER);
         userManagementClient.deleteUser(STANDARD_SUBSCRIBER);
         userManagementClient.deleteRole(RESTRICTED_ROLE);
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/ApplicationCallbackURLTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/ApplicationCallbackURLTestCase.java
index a6fbb5d782..de743884e0 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/ApplicationCallbackURLTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/ApplicationCallbackURLTestCase.java
@@ -163,7 +163,6 @@ public void testApplicationUpdateValidIpAsCallBackURL() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
         apiStore.removeApplication(appName);
-        super.cleanUp();
     }
 
     @DataProvider
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/ApplicationConsumerSecretRegenerateTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/ApplicationConsumerSecretRegenerateTestCase.java
index 123c8c675e..2fab7751c3 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/ApplicationConsumerSecretRegenerateTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/ApplicationConsumerSecretRegenerateTestCase.java
@@ -98,7 +98,6 @@ public void testRegenerateConsumerSecret() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
         restAPIStore.deleteApplication(applicationID);
-        super.cleanUp();
     }
 
     @DataProvider
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/groupSharing/ApplicationSharingTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/groupSharing/ApplicationSharingTestCase.java
index cf3c85c829..b0f651a741 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/groupSharing/ApplicationSharingTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/application/groupSharing/ApplicationSharingTestCase.java
@@ -144,12 +144,6 @@ public void testAPIKeyRevocationBySharedUser()
         restAPIStoreClientUser2.revokeAPIKey(userOneSharedApplicationId, key.getApikey());
     }
 
-    @AfterClass(alwaysRun = true)
-    public void destroy() throws Exception {
-        restAPIStoreClientUser2.removeApplicationById(userTwoApplicationId);
-        super.cleanUp();
-    }
-
     private void createUsersAndApplications() throws Exception {
         //signup of user one
         UserManagementUtils.signupUser(USER_ONE, PASSWORD, FIRST_NAME, ORGANIZATION);
@@ -176,4 +170,9 @@ private void createUsersAndApplications() throws Exception {
                 ApplicationDTO.TokenTypeEnum.JWT, groups);
         userOneSharedApplicationId = appCreationResponse3.getData();
     }
+
+    @AfterClass(alwaysRun = true)
+    public void destroy() throws Exception {
+        restAPIStoreClientUser2.removeApplicationById(userTwoApplicationId);
+    }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/comments/DevPortalCommentTest.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/comments/DevPortalCommentTest.java
index 7d5037a4e5..d79387e6e3 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/comments/DevPortalCommentTest.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/comments/DevPortalCommentTest.java
@@ -659,6 +659,5 @@ public void testVerifyPublisherAdminDeleteCommentTest() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/comments/PublisherCommentTest.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/comments/PublisherCommentTest.java
index 43a7bb6b61..0ca8d57cb2 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/comments/PublisherCommentTest.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/comments/PublisherCommentTest.java
@@ -630,6 +630,5 @@ public void testVerifyDevPortalAdminDeleteCommentTest() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/crossSubscription/CrossTenantSubscriptionTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/crossSubscription/CrossTenantSubscriptionTestCase.java
index 6aa2b03f87..0fd0eec877 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/crossSubscription/CrossTenantSubscriptionTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/crossSubscription/CrossTenantSubscriptionTestCase.java
@@ -880,6 +880,5 @@ public void destroyAPIs() throws Exception {
         tenant2UserStoreManager.deleteRole("role1");
         tenantManagementServiceClient.deleteTenant(tenant1Name);
         tenantManagementServiceClient.deleteTenant(tenant2Name);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/graphql/GraphqlSubscriptionTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/graphql/GraphqlSubscriptionTestCase.java
index c848ea2a27..65709a4271 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/graphql/GraphqlSubscriptionTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/graphql/GraphqlSubscriptionTestCase.java
@@ -1074,6 +1074,5 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(depthAppId);
         restAPIStore.deleteApplication(throttleAppId);
         undeployAndDeleteAPIRevisionsUsingRest(graphqlApiId, restAPIPublisher);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/graphql/GraphqlTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/graphql/GraphqlTestCase.java
index 7fccde5a77..440a9c74c0 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/graphql/GraphqlTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/graphql/GraphqlTestCase.java
@@ -493,6 +493,5 @@ public void cleanUpArtifacts() throws Exception {
         restAPIStore.deleteApplication(testAppId4);
         undeployAndDeleteAPIRevisionsUsingRest(graphqlAPIId, restAPIPublisher);
         restAPIPublisher.deleteAPI(graphqlAPIId);
-        super.cleanUp();
     }
 }
\ No newline at end of file
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/graphqlqueryanalysis/GraphQLQueryAnalysisTest.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/graphqlqueryanalysis/GraphQLQueryAnalysisTest.java
index a77fdbc106..826fbcae58 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/graphqlqueryanalysis/GraphQLQueryAnalysisTest.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/graphqlqueryanalysis/GraphQLQueryAnalysisTest.java
@@ -301,6 +301,5 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(tokenTestApiAppId);
         undeployAndDeleteAPIRevisionsUsingRest(graphqlApiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(graphqlApiId);
-        super.cleanUp();
     }
 }
\ No newline at end of file
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/header/CORSAccessControlAllowCredentialsHeaderTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/header/CORSAccessControlAllowCredentialsHeaderTestCase.java
index 8bea9b697f..d8dfc7edf6 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/header/CORSAccessControlAllowCredentialsHeaderTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/header/CORSAccessControlAllowCredentialsHeaderTestCase.java
@@ -192,7 +192,6 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
     @DataProvider
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/header/CORSHeadersTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/header/CORSHeadersTestCase.java
index c249f6a082..727110a33f 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/header/CORSHeadersTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/header/CORSHeadersTestCase.java
@@ -316,8 +316,6 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-
-        super.cleanUp();
     }
 
     @DataProvider
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/FederatedUserJWTTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/FederatedUserJWTTestCase.java
index a3fc1c107c..b37592d5cf 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/FederatedUserJWTTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/FederatedUserJWTTestCase.java
@@ -498,7 +498,6 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(jwtApplicationId);
         restAPIPublisher.deleteAPI(apiId);
         identityProviderMgtClient.deleteIdp("federated-idp");
-        super.cleanUp();
 
     }
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/JWTGrantTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/JWTGrantTestCase.java
index 9550184eac..7f60253510 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/JWTGrantTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/JWTGrantTestCase.java
@@ -390,6 +390,5 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(jwtApplicationId);
         identityProviderMgtServiceClient.deleteIdP(jwtIssuer);
         restAPIPublisher.removeSharedScope(scopeId);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/JWTTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/JWTTestCase.java
index ba4b642a18..b32d0fae49 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/JWTTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/JWTTestCase.java
@@ -489,7 +489,6 @@ public void destroy() throws Exception {
         undeployAndDeleteAPIRevisionsUsingRest(api2Id, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
         restAPIPublisher.deleteAPI(api2Id);
-        super.cleanUp();
 
     }
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/idp/ExternalIDPJWTTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/idp/ExternalIDPJWTTestCase.java
index 7b80ab0de3..cec76724a9 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/idp/ExternalIDPJWTTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/idp/ExternalIDPJWTTestCase.java
@@ -762,7 +762,6 @@ public void destroy() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
         undeployAndDeleteAPIRevisionsUsingRest(apiIdOnlyKm1, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiIdOnlyKm1);
-        super.cleanUp();
     }
 
     @DataProvider
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/jwtdecoding/JWTDecodingTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/jwtdecoding/JWTDecodingTestCase.java
index b6a6b4de74..a7e6090723 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/jwtdecoding/JWTDecodingTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/jwtdecoding/JWTDecodingTestCase.java
@@ -164,8 +164,6 @@ public void testJWTDecodingforCustomApplication() throws Exception {
         restAPIStore.deleteApplication(decodingApplicationId);
         undeployAndDeleteAPIRevisionsUsingRest(decodingApiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(decodingApiId);
-        super.cleanUp();
-
     }
 
     private void createUser()
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/urlsafe/URLSafeJWTTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/urlsafe/URLSafeJWTTestCase.java
index b9ca8cd356..bec611e49f 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/urlsafe/URLSafeJWTTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/jwt/urlsafe/URLSafeJWTTestCase.java
@@ -248,8 +248,6 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(jwtApplicationId);
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
-
     }
 
     private void checkDefaultUserClaims(JSONObject jsonObject, String applicationName) throws JSONException {
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APICategoriesTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APICategoriesTestCase.java
index fb918ffa3d..5291fe30a7 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APICategoriesTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APICategoriesTestCase.java
@@ -227,6 +227,5 @@ public void testDeleteAPICategory() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIEndpointTypeUpdateTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIEndpointTypeUpdateTestCase.java
index 427843439d..5f621303e2 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIEndpointTypeUpdateTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIEndpointTypeUpdateTestCase.java
@@ -212,6 +212,5 @@ public void destroy() throws Exception {
         }
         restAPIStore.deleteApplication(applicationID);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIImportExportTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIImportExportTestCase.java
index 00d9144a38..b1b411d740 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIImportExportTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIImportExportTestCase.java
@@ -941,7 +941,6 @@ public void destroy() throws Exception {
         Assert.assertTrue(deleteStatus, "temp file delete not successful");
         FileUtils.deleteDirectory(zipTempDir);
         Assert.assertTrue(deleteStatus, "temp directory delete not successful");
-        super.cleanUp();
     }
 
     @DataProvider
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIInvocationFailureTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIInvocationFailureTestCase.java
index ec0fc1d4a6..e43cd56d5c 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIInvocationFailureTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIInvocationFailureTestCase.java
@@ -108,7 +108,6 @@ public void APIInvocationFailure() throws Exception {
     public void destroy() throws Exception {
         undeployAndDeleteAPIRevisionsUsingRest(apiID, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiID);
-        super.cleanUp();
     }
 
     @DataProvider
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIMANAGER2611EndpointValidationTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIMANAGER2611EndpointValidationTestCase.java
index 7faa9e5343..1ceb754cae 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIMANAGER2611EndpointValidationTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIMANAGER2611EndpointValidationTestCase.java
@@ -81,6 +81,5 @@ public void checkEndpointValidation() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIMANAGER3226APINameWithDifferentCaseTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIMANAGER3226APINameWithDifferentCaseTestCase.java
index e86e6e8f24..ee94b3255d 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIMANAGER3226APINameWithDifferentCaseTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIMANAGER3226APINameWithDifferentCaseTestCase.java
@@ -104,6 +104,5 @@ public void testValidateAddAPIsWithDifferentCase() throws Exception {
     @AfterClass (alwaysRun = true)
     public void destroy() throws Exception {
         restAPIPublisher.deleteAPI(apiID);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIMANAGER5417PrototypedAPIsInMonetizedTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIMANAGER5417PrototypedAPIsInMonetizedTestCase.java
index 2887eee921..d44a4397b5 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIMANAGER5417PrototypedAPIsInMonetizedTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIMANAGER5417PrototypedAPIsInMonetizedTestCase.java
@@ -159,7 +159,6 @@ public void testVisibilityOfPrototypedAPIInStoreAfterMonetizationEnabled() throw
     public void cleanUpArtifacts() throws Exception {
         resourceAdminServiceClient.updateTextContent(TENANT_CONFIG_LOCATION, tenantConfigBeforeTestCase);
         apiPublisher.deleteAPI(apiName, apiVersion, apiProvider);
-        super.cleanUp();
         serverConfigurationManager.restoreToLastConfiguration();
     }
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIScopeTestForTenantsTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIScopeTestForTenantsTestCase.java
index f648c9f61e..30e96a1621 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIScopeTestForTenantsTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APIScopeTestForTenantsTestCase.java
@@ -293,8 +293,6 @@ public void destroy() throws Exception {
             userManagementClient2.deleteUser(USER_PETER);
             userManagementClient2.deleteRole(TENANT2_SUBSCRIBER_ROLE);
         }
-
-        super.cleanUp();
     }
 
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APISearchAPIByTagTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APISearchAPIByTagTestCase.java
index 5c53727af4..9a90a8ba1b 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APISearchAPIByTagTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/APISearchAPIByTagTestCase.java
@@ -144,7 +144,6 @@ public void destroy() throws Exception {
         undeployAndDeleteAPIRevisionsUsingRest(api4, restAPIPublisher);
         undeployAndDeleteAPIRevisionsUsingRest(api5, restAPIPublisher);
         undeployAndDeleteAPIRevisionsUsingRest(api6, restAPIPublisher);
-        super.cleanUp();
     }
 
     @Test(groups = { "wso2.am" }, description = "API search by TAG", dependsOnMethods = "testAPICreation")
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/CopyNewVersionTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/CopyNewVersionTestCase.java
index 6e1b282fc7..0a506d7ed8 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/CopyNewVersionTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/CopyNewVersionTestCase.java
@@ -130,7 +130,6 @@ public void copyApiNewVersion() throws Exception{
     public void destroy() throws Exception{
         apiPublisher.deleteAPI(API_NAME,version,providerName);
         apiPublisher.deleteAPI(API_NAME,newVersion,providerName);
-        super.cleanUp();
     }
 
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/DAOTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/DAOTestCase.java
index 14a30741ec..0f8514eb9b 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/DAOTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/DAOTestCase.java
@@ -131,7 +131,6 @@ public void testDAOTestCase() throws Exception {
     public void destroy() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/DeleteSubscribedApiFromPublisherTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/DeleteSubscribedApiFromPublisherTestCase.java
index bb29f61d4b..cd2f418a77 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/DeleteSubscribedApiFromPublisherTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/DeleteSubscribedApiFromPublisherTestCase.java
@@ -230,7 +230,6 @@ public void deleteApiFromSubscriberPublisher() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
         apiStore.removeApplication(applicationName);
-        super.cleanUp();
     }
 
     @DataProvider
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/DevPortalVisibilityTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/DevPortalVisibilityTestCase.java
index 2f971dad22..7079b1f752 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/DevPortalVisibilityTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/DevPortalVisibilityTestCase.java
@@ -372,7 +372,5 @@ public void destroy() throws Exception {
 
         userManagementClient1.deleteRole(DEV_USER_A_ROLE);
         userManagementClient1.deleteRole(DEV_USER_B_ROLE);
-        super.cleanUp();
-
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/HttpPATCHSupportTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/HttpPATCHSupportTestCase.java
index c9e2679f12..333b4ee2d2 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/HttpPATCHSupportTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/HttpPATCHSupportTestCase.java
@@ -151,7 +151,6 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 }
\ No newline at end of file
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/InvalidAuthTokenLargePayloadTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/InvalidAuthTokenLargePayloadTestCase.java
index 3a38ff38c1..9f6843fa36 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/InvalidAuthTokenLargePayloadTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/InvalidAuthTokenLargePayloadTestCase.java
@@ -174,7 +174,6 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
     @DataProvider
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/MandatoryPropertiesTestWithRestart.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/MandatoryPropertiesTestWithRestart.java
index 8eba2050d6..2019c75e6c 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/MandatoryPropertiesTestWithRestart.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/MandatoryPropertiesTestWithRestart.java
@@ -141,6 +141,5 @@ public void testCreateAnAPIThroughThePublisherRestWithMandatoryProperties() thro
     public void destroy() throws Exception {
         serverConfigurationManager.restoreToLastConfiguration();
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }
\ No newline at end of file
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/SOAPAPIImportExportTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/SOAPAPIImportExportTestCase.java
index 9ad843e699..20ee4de37b 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/SOAPAPIImportExportTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/SOAPAPIImportExportTestCase.java
@@ -231,7 +231,6 @@ public void destroy() throws Exception {
         Assert.assertTrue(deleteStatus, "temp file deletion not successful");
         FileUtils.deleteDirectory(zipTempDir);
         Assert.assertTrue(deleteStatus, "temp directory deletion not successful");
-        super.cleanUp();
     }
 
     private void startWiremockServer() {
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/SoapToRestTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/SoapToRestTestCase.java
index 66d0e394e5..9831bc9ec8 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/SoapToRestTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/SoapToRestTestCase.java
@@ -689,7 +689,6 @@ public void cleanUpArtifacts() throws Exception {
         undeployAndDeleteAPIRevisionsUsingRest(soapToRestAPIId, restAPIPublisher);
         restAPIPublisher.deleteAPI(soapToRestAPIId);
         wireMockServer.stop();
-        super.cleanUp();
     }
 }
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/TagsRatingTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/TagsRatingTestCase.java
index 35d393a3ba..2ccce9284d 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/TagsRatingTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/other/TagsRatingTestCase.java
@@ -126,6 +126,5 @@ public void testRatingTest() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/prototype/APIM23VisibilityOfPrototypedAPIInStoreTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/prototype/APIM23VisibilityOfPrototypedAPIInStoreTestCase.java
index 0257bdabde..7650a17540 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/prototype/APIM23VisibilityOfPrototypedAPIInStoreTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/prototype/APIM23VisibilityOfPrototypedAPIInStoreTestCase.java
@@ -122,6 +122,5 @@ public void testVisibilityInPrototypedAPI() throws Exception {
     @AfterClass(alwaysRun = true)
     public void cleanUpArtifacts() throws Exception {
         restAPIPublisher.deleteAPI(apiID);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/prototype/PrototypedAPITestcase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/prototype/PrototypedAPITestcase.java
index 7db731390a..14890736e3 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/prototype/PrototypedAPITestcase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/prototype/PrototypedAPITestcase.java
@@ -401,7 +401,6 @@ public void destroyAPIs() throws Exception {
         restAPIStore.deleteApplication(applicationId1);
         restAPIStore.deleteApplication(applicationId2);
         restAPIStore.deleteApplication(applicationId3);
-        super.cleanUp();
     }
 
     private File getTempFileWithContent(String swagger) throws Exception {
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM18CreateAnAPIThroughThePublisherRestAPITestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM18CreateAnAPIThroughThePublisherRestAPITestCase.java
index 09122d34c1..8b447f8c50 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM18CreateAnAPIThroughThePublisherRestAPITestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM18CreateAnAPIThroughThePublisherRestAPITestCase.java
@@ -383,7 +383,6 @@ private void validateRemoteReference(String swaggerContent) {
     @AfterClass(alwaysRun = true)
     public void destroyAPIs() throws Exception {
         restAPIPublisher.deleteAPI(apiId2);
-        super.cleanUp();
     }
 
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM520UpdateAnAPIThroughThePublisherRestAPITestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM520UpdateAnAPIThroughThePublisherRestAPITestCase.java
index cd8417f364..53fba2ee95 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM520UpdateAnAPIThroughThePublisherRestAPITestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM520UpdateAnAPIThroughThePublisherRestAPITestCase.java
@@ -183,7 +183,6 @@ public void testUpdateAnAPIThroughThePublisherRestAfterRename() throws Exception
     @AfterClass(alwaysRun = true)
     public void destroyAPIs() throws Exception {
         restAPIPublisher.deleteAPI(id);
-        super.cleanUp();
     }
 
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM534GetAllTheAPIsCreatedThroughThePublisherRestAPITestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM534GetAllTheAPIsCreatedThroughThePublisherRestAPITestCase.java
index 819e38c3e1..08f2daa48b 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM534GetAllTheAPIsCreatedThroughThePublisherRestAPITestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM534GetAllTheAPIsCreatedThroughThePublisherRestAPITestCase.java
@@ -175,7 +175,6 @@ public void destroyAPIs() throws Exception {
         for (String id : idList) {
             restAPIPublisher.deleteAPI(id);
         }
-        super.cleanUp();
     }
 
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM548CopyAnAPIToANewerVersionThroughThePublisherRestAPITestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM548CopyAnAPIToANewerVersionThroughThePublisherRestAPITestCase.java
index 4b64f3c0a6..6219ae6e3d 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM548CopyAnAPIToANewerVersionThroughThePublisherRestAPITestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM548CopyAnAPIToANewerVersionThroughThePublisherRestAPITestCase.java
@@ -193,7 +193,6 @@ public void testCopyAnAPIToANewerVersionThroughThePublisherRest() throws Excepti
     public void destroyAPIs() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
         restAPIPublisher.deleteAPI(copyAPIId);
-        super.cleanUp();
     }
 
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM570CheckIfAnOlderVersionOfTheAPIExistsThroughThePublisherRestAPITestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM570CheckIfAnOlderVersionOfTheAPIExistsThroughThePublisherRestAPITestCase.java
index 1216b4fa33..dab0f7e3c0 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM570CheckIfAnOlderVersionOfTheAPIExistsThroughThePublisherRestAPITestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM570CheckIfAnOlderVersionOfTheAPIExistsThroughThePublisherRestAPITestCase.java
@@ -179,7 +179,6 @@ public void destroyAPIs() throws Exception {
         apiPublisher.deleteAPI(apiNameTest, apiVersion1, apiProviderName);
         apiPublisher.deleteAPI(apiNameTest, apiVersion2, apiProviderName);
         apiPublisher.deleteAPI(apiNameTest, apiVersion3, apiProviderName);
-        super.cleanUp();
     }
 
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM611AddDocumentationToAnAPIWithDocTypeHowToThroughPublisherRestAPITestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM611AddDocumentationToAnAPIWithDocTypeHowToThroughPublisherRestAPITestCase.java
index 93b6666be8..74e45d48ad 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM611AddDocumentationToAnAPIWithDocTypeHowToThroughPublisherRestAPITestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM611AddDocumentationToAnAPIWithDocTypeHowToThroughPublisherRestAPITestCase.java
@@ -164,6 +164,5 @@ public void testAddDocumentToAnAPIHowToUrl() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroyAPIs() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM614AddDocumentationToAnAPIWithDocTypeSampleAndSDKThroughPublisherRestAPITestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM614AddDocumentationToAnAPIWithDocTypeSampleAndSDKThroughPublisherRestAPITestCase.java
index 6abf939f15..41279a6d60 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM614AddDocumentationToAnAPIWithDocTypeSampleAndSDKThroughPublisherRestAPITestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM614AddDocumentationToAnAPIWithDocTypeSampleAndSDKThroughPublisherRestAPITestCase.java
@@ -202,6 +202,5 @@ public void testAddDocumentToAnAPIOtherFile() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroyAPIs() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM620AddDocumentationToAnAPIWithDocTypeSampleAndSDKThroughPublisherRestAPITestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM620AddDocumentationToAnAPIWithDocTypeSampleAndSDKThroughPublisherRestAPITestCase.java
index dac162fb25..16b158651b 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM620AddDocumentationToAnAPIWithDocTypeSampleAndSDKThroughPublisherRestAPITestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM620AddDocumentationToAnAPIWithDocTypeSampleAndSDKThroughPublisherRestAPITestCase.java
@@ -158,7 +158,6 @@ public void testAddDocumentToAnAPISDKUrl() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroyAPIs() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM623AddDocumentationToAnAPIWithDocTypePublicForumThroughPublisherRestAPITestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM623AddDocumentationToAnAPIWithDocTypePublicForumThroughPublisherRestAPITestCase.java
index 548c894a3f..773b0e4590 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM623AddDocumentationToAnAPIWithDocTypePublicForumThroughPublisherRestAPITestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM623AddDocumentationToAnAPIWithDocTypePublicForumThroughPublisherRestAPITestCase.java
@@ -136,6 +136,5 @@ public void testAddDocumentToAnAPIPublicInline() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroyAPIs() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM625AddDocumentationToAnAPIWithDocTypeSupportForumThroughPublisherRestAPITestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM625AddDocumentationToAnAPIWithDocTypeSupportForumThroughPublisherRestAPITestCase.java
index 777a655593..c1c84ca131 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM625AddDocumentationToAnAPIWithDocTypeSupportForumThroughPublisherRestAPITestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM625AddDocumentationToAnAPIWithDocTypeSupportForumThroughPublisherRestAPITestCase.java
@@ -129,6 +129,5 @@ public void testAddDocumentToAnAPISupportInline() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroyAPIs() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM627AddDocumentationToAnAPIWithDocTypeOtherThroughPublisherRestAPITestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM627AddDocumentationToAnAPIWithDocTypeOtherThroughPublisherRestAPITestCase.java
index ca180be04b..9a795d3f9a 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM627AddDocumentationToAnAPIWithDocTypeOtherThroughPublisherRestAPITestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIM627AddDocumentationToAnAPIWithDocTypeOtherThroughPublisherRestAPITestCase.java
@@ -169,6 +169,5 @@ public void testRemoveDocumentationOtherTheAPI() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroyAPIs() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIMANAGER5834APICreationWithInvalidInputsTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIMANAGER5834APICreationWithInvalidInputsTestCase.java
index 6ee3f40df7..210f3c5c4a 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIMANAGER5834APICreationWithInvalidInputsTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIMANAGER5834APICreationWithInvalidInputsTestCase.java
@@ -101,6 +101,5 @@ public void cleanUpArtifacts() throws Exception {
         if (apiId != null) {
             restAPIPublisher.deleteAPI(apiId);
         }
-        super.cleanUp();
     }
 }
\ No newline at end of file
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIResourceWithTemplateTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIResourceWithTemplateTestCase.java
index c65a3506cd..72e7d0dfff 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIResourceWithTemplateTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/APIResourceWithTemplateTestCase.java
@@ -241,6 +241,5 @@ public void cleanUpArtifacts() throws Exception {
         restAPIPublisher.deleteAPI(apiId1);
         restAPIPublisher.deleteAPI(apiId2);
         restAPIPublisher.deleteAPI(apiId3);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/ChangeSubscriptionBusinessPlanForcefullyTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/ChangeSubscriptionBusinessPlanForcefullyTestCase.java
index afe251c64a..b013765861 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/ChangeSubscriptionBusinessPlanForcefullyTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/ChangeSubscriptionBusinessPlanForcefullyTestCase.java
@@ -286,6 +286,5 @@ public void destroy() throws Exception {
         userManagementClient.deleteUser(SUBSCRIBER_USER_NAME);
         resourceAdminServiceClient.updateTextContent(DEFAULT_WF_EXTENSIONS_XML_REG_CONFIG_LOCATION,
                 originalWFExtensionsXML);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/DeleteTierAlreadyAttachedToAPITestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/DeleteTierAlreadyAttachedToAPITestCase.java
index 239f205b52..44abaed934 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/DeleteTierAlreadyAttachedToAPITestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/publisher/DeleteTierAlreadyAttachedToAPITestCase.java
@@ -177,6 +177,5 @@ public void testUpdateAPIAfterDeletingAttachedSubscriptionTier()
     public void cleanup() throws Exception {
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/resources/APIResourceModificationTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/resources/APIResourceModificationTestCase.java
index cc71e53f5a..ffe0325619 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/resources/APIResourceModificationTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/resources/APIResourceModificationTestCase.java
@@ -201,6 +201,5 @@ public void testSetScopeToResourceTestCase() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/restapi/ContentSearchTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/restapi/ContentSearchTestCase.java
index d2487ac180..e82feefc0c 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/restapi/ContentSearchTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/restapi/ContentSearchTestCase.java
@@ -376,7 +376,6 @@ public void destroyAPIs() throws Exception {
         }
         userManagementClient1.deleteUser(user1);
         userManagementClient1.deleteUser(user2);
-        super.cleanUp();
     }
 
     private APIRequest createAPIRequest(String name, String context, String url, String version, String provider,
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/restapi/GIT_1638_UrlEncodedApiNameTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/restapi/GIT_1638_UrlEncodedApiNameTestCase.java
index 2b8a2319b3..ba905315cb 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/restapi/GIT_1638_UrlEncodedApiNameTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/restapi/GIT_1638_UrlEncodedApiNameTestCase.java
@@ -215,7 +215,6 @@ public void testChangeLifeCycleToPublish() throws Exception {
     @AfterClass(alwaysRun = true)
     public void destroy() throws Exception {
         restAPIStore.deleteApplication(applicationId);
-        super.cleanUp();
     }
 
     private String generateOAuthAccessToken(String username, String password, String consumerKey, String consumerSecret)
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/restapi/ServiceCatalogRestAPITestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/restapi/ServiceCatalogRestAPITestCase.java
index ea85dd77fd..7919a369aa 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/restapi/ServiceCatalogRestAPITestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/restapi/ServiceCatalogRestAPITestCase.java
@@ -466,7 +466,6 @@ public void destroy() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
         restAPIServiceCatalog.deleteService(serviceIdOne);
         restAPIServiceCatalog.deleteService(importedServiceId);
-        super.cleanUp();
     }
 
     private String validateCreateServiceRes(ServiceDTO createServiceRes, String name, String version, String serviceKey) {
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/restapi/admin/throttlingpolicy/DenyPolicySearchTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/restapi/admin/throttlingpolicy/DenyPolicySearchTestCase.java
index ecfc066b3e..1471749ad2 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/restapi/admin/throttlingpolicy/DenyPolicySearchTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/restapi/admin/throttlingpolicy/DenyPolicySearchTestCase.java
@@ -166,6 +166,5 @@ private String apiContextResolver(String context, String version) {
     public void destroy() throws Exception {
         restAPIAdmin.deleteDenyThrottlingPolicy(blockingCondition1ID);
         restAPIAdmin.deleteDenyThrottlingPolicy(blockingCondition2ID);
-        super.cleanUp();
     }
 }
\ No newline at end of file
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/sequence/DefaultEndpointTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/sequence/DefaultEndpointTestCase.java
index 3d79ee63dc..8c9f2e02cc 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/sequence/DefaultEndpointTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/sequence/DefaultEndpointTestCase.java
@@ -155,7 +155,6 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(applicationID);
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 
 }
\ No newline at end of file
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/throttling/APIThrottlingTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/throttling/APIThrottlingTestCase.java
index df3a28673f..a85f09b432 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/throttling/APIThrottlingTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/throttling/APIThrottlingTestCase.java
@@ -191,6 +191,5 @@ public void destroy() throws Exception {
         restAPIStore.deleteApplication(applicationId);
         undeployAndDeleteAPIRevisionsUsingRest(apiId, restAPIPublisher);
         restAPIPublisher.deleteAPI(apiId);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/throttling/ApplicationThrottlingResetTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/throttling/ApplicationThrottlingResetTestCase.java
index 1a5876588e..b1bdfa2914 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/throttling/ApplicationThrottlingResetTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/throttling/ApplicationThrottlingResetTestCase.java
@@ -283,6 +283,5 @@ public void destroy() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
         restAPIAdmin.deleteApplicationThrottlingPolicy(applicationThrottlePolicyDTO1.getPolicyId());
         restAPIAdmin.deleteApplicationThrottlingPolicy(applicationThrottlePolicyDTO2.getPolicyId());
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/throttling/BurstControlTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/throttling/BurstControlTestCase.java
index a16fb0da42..5b863c1360 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/throttling/BurstControlTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/throttling/BurstControlTestCase.java
@@ -243,6 +243,5 @@ public void destroy() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
         restAPIAdmin.deleteSubscriptionThrottlingPolicy(subscriptionThrottlePolicyDTO1.getPolicyId());
         restAPIAdmin.deleteSubscriptionThrottlingPolicy(subscriptionThrottlePolicyDTO2.getPolicyId());
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/throttling/unlimitedDisable/ConfigurableDefaultPolicyTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/throttling/unlimitedDisable/ConfigurableDefaultPolicyTestCase.java
index c7066d47e5..ef71e0616c 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/throttling/unlimitedDisable/ConfigurableDefaultPolicyTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/throttling/unlimitedDisable/ConfigurableDefaultPolicyTestCase.java
@@ -323,7 +323,6 @@ public void destroy() throws Exception {
         restAPIAdmin.deleteAdvancedThrottlingPolicy(advancedThrottlePolicyDTO.getPolicyId());
         restAPIAdmin.deleteSubscriptionThrottlingPolicy(defaultSubscriptionPolicy.getPolicyId());
         restAPIAdmin.deleteApplicationThrottlingPolicy(defaultApplicationThrottlePolicyDTO.getPolicyId());
-        super.cleanUp();
     }
 
     private void validateThrottlingPolicy(String swaggerContent) throws APIManagementException {
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/token/APIM34InvokeAPIWithSandboxTokenTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/token/APIM34InvokeAPIWithSandboxTokenTestCase.java
index c7cff7b8aa..549762c4f2 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/token/APIM34InvokeAPIWithSandboxTokenTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/token/APIM34InvokeAPIWithSandboxTokenTestCase.java
@@ -527,7 +527,6 @@ public void destroyAPIs() throws Exception {
         apiPublisher.deleteAPI(apiNameTest3, apiVersion, apiProviderName);
         apiPublisher.deleteAPI(apiNameTest4, apiVersion, apiProviderName);
         apiPublisher.deleteAPI(apiNameTest5, apiVersion, apiProviderName);
-        super.cleanUp();
     }
 
     @DataProvider
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/token/InvalidTokenTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/token/InvalidTokenTestCase.java
index d8434b98b1..25947dfac2 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/token/InvalidTokenTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/token/InvalidTokenTestCase.java
@@ -146,6 +146,5 @@ public void testAPIAccessWithInvalidToken()
     public void destroy() throws Exception {
         undeployAndDeleteAPIRevisionsUsingRest(id, restAPIPublisher);
         restAPIPublisher.deleteAPI(id);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM366PublishNewCopyGivenDeprecateOldVersionTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM366PublishNewCopyGivenDeprecateOldVersionTestCase.java
index 496ec89338..a36a8cc17f 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM366PublishNewCopyGivenDeprecateOldVersionTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM366PublishNewCopyGivenDeprecateOldVersionTestCase.java
@@ -253,7 +253,6 @@ public void destroyAPIs() throws Exception {
         apiStore.removeApplication(applicationName);
         apiPublisher.deleteAPI(apiName, apiVersionOld, providerNameApi);
         apiPublisher.deleteAPI(apiName, apiVersionNew, providerNameApi);
-        super.cleanUp();
     }
 
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM370PublishNewCopyGivenRequireReSubscriptionTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM370PublishNewCopyGivenRequireReSubscriptionTestCase.java
index c764d7a0ff..9c3d0001cd 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM370PublishNewCopyGivenRequireReSubscriptionTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM370PublishNewCopyGivenRequireReSubscriptionTestCase.java
@@ -292,7 +292,6 @@ public void destroyAPIs() throws Exception {
         apiStore.removeApplication(applicationName);
         apiPublisher.deleteAPI(apiName, apiVersionOld, providerNameApi);
         apiPublisher.deleteAPI(apiName, apiVersionNew, providerNameApi);
-        super.cleanUp();
     }
  }
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM371PublishNewCopyGivenDeprecateOldVersionAndRequireReSubscriptionTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM371PublishNewCopyGivenDeprecateOldVersionAndRequireReSubscriptionTestCase.java
index 228dda1754..432f05c8b9 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM371PublishNewCopyGivenDeprecateOldVersionAndRequireReSubscriptionTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM371PublishNewCopyGivenDeprecateOldVersionAndRequireReSubscriptionTestCase.java
@@ -280,6 +280,5 @@ public void destroyAPIs() throws Exception {
         apiStore.removeApplication(applicationName);
         apiPublisher.deleteAPI(apiName, apiVersionOld, providerNameApi);
         apiPublisher.deleteAPI(apiName, apiVersionNew, providerNameApi);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM372PublishNewCopyGivenDeprecateOldVersionTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM372PublishNewCopyGivenDeprecateOldVersionTestCase.java
index f8a0f82c9e..98c85c1f1b 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM372PublishNewCopyGivenDeprecateOldVersionTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM372PublishNewCopyGivenDeprecateOldVersionTestCase.java
@@ -390,7 +390,6 @@ public void destroyAPIs() throws Exception {
         apiStore.removeApplication(applicationName);
         apiPublisher.deleteAPI(apiName, apiVersionOld, providerNameApi);
         apiPublisher.deleteAPI(apiName, apiVersionNew, providerNameApi);
-        super.cleanUp();
     }
 
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM373PublishNewCopyGivenRequireReSubscriptionTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM373PublishNewCopyGivenRequireReSubscriptionTestCase.java
index 954b2a8b20..9f15c8e6be 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM373PublishNewCopyGivenRequireReSubscriptionTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM373PublishNewCopyGivenRequireReSubscriptionTestCase.java
@@ -372,7 +372,6 @@ public void destroyAPIs() throws Exception {
         apiStore.removeApplication(applicationName);
         apiPublisher.deleteAPI(apiName, apiVersionOld, providerNameApi);
         apiPublisher.deleteAPI(apiName, apiVersionNew, providerNameApi);
-        super.cleanUp();
     }
 
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM374PublishNewCopyGivenDeprecateOldVersionAndRequireReSubscriptionTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM374PublishNewCopyGivenDeprecateOldVersionAndRequireReSubscriptionTestCase.java
index 73a2dbb7c6..f23f5e5364 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM374PublishNewCopyGivenDeprecateOldVersionAndRequireReSubscriptionTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/APIM374PublishNewCopyGivenDeprecateOldVersionAndRequireReSubscriptionTestCase.java
@@ -420,7 +420,6 @@ public void destroyAPIs() throws Exception {
         apiStore.removeApplication(applicationName);
         apiPublisher.deleteAPI(apiName, apiVersionOld, providerNameApi);
         apiPublisher.deleteAPI(apiName, apiVersionNew, providerNameApi);
-        super.cleanUp();
     }
 
 
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/DefaultVersionAPITestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/DefaultVersionAPITestCase.java
index ef299e9677..fdb1e49a42 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/DefaultVersionAPITestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/DefaultVersionAPITestCase.java
@@ -324,7 +324,6 @@ public void destroy() throws Exception {
         restAPIPublisher.deleteAPI(apiId);
         restAPIPublisher.deleteAPI(newAPIVersion);
         restAPIPublisher.deleteAPI(newApiId);
-        super.cleanUp();
     }
 
     private HttpResponse invokeDefaultAPIWithWait(String invocationUrl, Map<String, String> headers,
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/DefaultVersionWithScopesTestCase.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/DefaultVersionWithScopesTestCase.java
index 690164342e..029b5206bf 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/DefaultVersionWithScopesTestCase.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/version/DefaultVersionWithScopesTestCase.java
@@ -216,6 +216,5 @@ public void destroy() throws Exception {
             userManagementClient.deleteUser(USER_MIKE);
             userManagementClient.deleteRole(SUBSCRIBER_ROLE);
         }
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/workflow/WorkflowApprovalExecutorTest.java b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/workflow/WorkflowApprovalExecutorTest.java
index 45b85a52d1..006619d756 100644
--- a/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/workflow/WorkflowApprovalExecutorTest.java
+++ b/modules/integration/tests-integration/tests-backend/src/test/java/org/wso2/am/integration/tests/workflow/WorkflowApprovalExecutorTest.java
@@ -1335,6 +1335,5 @@ public void destroy() throws Exception {
         userManagementClient.deleteUser(USER_ADMIN);
         userManagementClient.deleteUser("JaneDoe");
         resourceAdminServiceClient.updateTextContent(DEFAULT_WF_EXTENTIONS_XML_REG_CONFIG_LOCATION, originalWFExtentionsXML);
-        super.cleanUp();
     }
 }
diff --git a/modules/integration/tests-integration/tests-benchmark/src/test/resources/automation.xml b/modules/integration/tests-integration/tests-benchmark/src/test/resources/automation.xml
index 1d287d3672..e68b698feb 100644
--- a/modules/integration/tests-integration/tests-benchmark/src/test/resources/automation.xml
+++ b/modules/integration/tests-integration/tests-benchmark/src/test/resources/automation.xml
@@ -17,356 +17,651 @@
   ~  under the License.
 
 --><automation xmlns="automation_mapping.xsd">
+        
     <!--  =================================================  -->
+        
     <!--                   Parameters                        -->
+        
     <!--  =================================================  -->
+        
     <configurations>
+                
         <!--
          Change this to edit wait time for test artifact deployment
         -->
+                
         <deploymentDelay>60000</deploymentDelay>
+                
         <!--
          Change this to product|platform/cloud to execute test on specific environment
         -->
+                
         <executionEnvironment>standalone</executionEnvironment>
+                
         <!--
          Change this to user/tenant to execute test with user mode or tenant mode
         -->
-
+                
         <!--
          Change this to true if you want to generate coverage statistics
         -->
+                
         <coverage>false</coverage>
+                
         <!--
          Change this to true if you want to enable framework dashboard
         -->
+                
         <frameworkDashboard>false</frameworkDashboard>
+                
         <!--
          Browser type with used by framework to execute UI test, supported types - chrome|firefox|opera|ie|htmlUnit
         -->
+            
     </configurations>
+        
     <tools>
+                
         <selenium>
+                        
             <!-- Change to enable remote webDriver -->
+                        
             <!-- URL of remote webDriver server  -->
+                        
             <remoteDriverUrl enable="true">http://10.100.2.51:4444/wd/hub/</remoteDriverUrl>
-
+                        
             <!-- Type of the browser selenium tests are running" -->
+                        
             <browser>
+                                
                 <browserType>firefox</browserType>
+                                
                 <!-- path to webDriver executable - required only for chrome-->
+                                
                 <webdriverPath enable="false">/home/test/name/webDriver</webdriverPath>
+                            
             </browser>
+                    
         </selenium>
+            
     </tools>
+        
     <!--
     Database configuration to be used for data service testing. DB configuration in dbs files will be replaced with
                below configuration at test run time
     -->
+        
     <datasources>
+                
         <datasource name="dataService">
+                        
             <url>jdbc:h2:testDB</url>
+                        
             <username>wso2carbon</username>
+                        
             <password>wso2carbon</password>
+                        
             <driverClassName>org.h2.Driver</driverClassName>
+                    
         </datasource>
+                
         <datasource name="dataService1">
+                        
             <url>jdbc:h2:testDB</url>
+                        
             <username>wso2carbon</username>
+                        
             <password>wso2carbon</password>
+                        
             <driverClassName>org.h2.Driver</driverClassName>
+                    
         </datasource>
+            
     </datasources>
+        
     <security>
+                
         <!--
                     KeyStore which will be used for encrypting/decrypting passwords
                     and other sensitive information.
         -->
+                
         <keystore name="wso2">
+                        
             <!--  Keystore file location -->
+                        
             <fileName>keystores/products/wso2carbon.jks</fileName>
+                        
             <!--  Keystore type (JKS/PKCS12 etc.) -->
+                        
             <type>JKS</type>
+                        
             <!--  Keystore password -->
+                        
             <password>wso2carbon</password>
+                        
             <!--  Private Key alias -->
+                        
             <keyAlias>wso2carbon</keyAlias>
+                        
             <!--  Private Key password -->
+                        
             <keyPassword>wso2carbon</keyPassword>
+                    
         </keystore>
+                
         <!--
                     System wide trust-store which is used to maintain the certificates of all
                     the trusted parties.
         -->
+                
         <truststore name="wso2">
+                        
             <!--  trust-store file location  -->
+                        
             <fileName>keystores/products/client-truststore.jks</fileName>
+                        
             <!--  trust-store type (JKS/PKCS12 etc.)  -->
+                        
             <type>JKS</type>
+                        
             <!--  trust-store password  -->
+                        
             <password>wso2carbon</password>
+                    
         </truststore>
+            
     </security>
+        
     <featureManagement>
+                
         <p2Repositories>
+                        
             <repository name="localDefault">
+                                
                 <repository repo-id="online-repository">https://wso2.org/repo</repository>
+                                
                 <repository repo-id="file-repository">file:///home/krishantha/test</repository>
+                            
             </repository>
+                    
         </p2Repositories>
+            
     </featureManagement>
+        
     <!--
                System wide users who to be registered at the test initiation
     -->
+        
     <userManagement>
+                
         <superTenant>
+                        
             <tenant domain="carbon.super" key="superTenant">
+                                
                 <admin>
+                                        
                     <user key="admin">
+                                                
                         <userName>admin</userName>
+                                                
                         <password>admin</password>
+                                            
                     </user>
+                                    
                 </admin>
+                                
                 <users>
-<!--                    <user key="userKey1">-->
-<!--                        <userName>testu1</userName>-->
-<!--                        <password>testu1pass</password>-->
-<!--                    </user>-->
-<!--                    <user key="userKey2">-->
-<!--                        <userName>testu2</userName>-->
-<!--                        <password>testu2pass</password>-->
-<!--                    </user>-->
-<!--                    <user key="userKey3">-->
-<!--                        <userName>testu3</userName>-->
-<!--                        <password>testu3pass</password>-->
-<!--                    </user>-->
-<!--                    <user key="emailUser">-->
-<!--                        <userName>test@gmail.com</userName>-->
-<!--                        <password>testuser31</password>-->
-<!--                        <roles>-->
-<!--                            <role>Internal/publisher</role>-->
-<!--                            <role>Internal/creator</role>-->
-<!--                            <role>Internal/subscriber</role>-->
-<!--                            <role>admin</role>-->
-<!--                        </roles>-->
-<!--                    </user>-->
-<!--                    <user key="emailUser2">-->
-<!--                        <userName>test2@gmail.com</userName>-->
-<!--                        <password>testuser31</password>-->
-<!--                        <roles>-->
-<!--                            <role>Internal/publisher</role>-->
-<!--                            <role>Internal/creator</role>-->
-<!--                            <role>Internal/subscriber</role>-->
-<!--                        </roles>-->
-<!--                    </user>-->
-<!--                    <user key="emailUser3">-->
-<!--                        <userName>test3@gmail.com</userName>-->
-<!--                        <password>testuser31</password>-->
-<!--                        <roles>-->
-<!--                            <role>Internal/publisher</role>-->
-<!--                            <role>Internal/creator</role>-->
-<!--                            <role>Internal/subscriber</role>-->
-<!--                        </roles>-->
-<!--                    </user>-->
-<!--                    <user key="userStoreUser">-->
-<!--                        <userName>secondary/secondaryuser</userName>-->
-<!--                        <password>testuser31</password>-->
-<!--                        <roles>-->
-<!--                            <role>Internal/publisher</role>-->
-<!--                            <role>Internal/creator</role>-->
-<!--                            <role>Internal/subscriber</role>-->
-<!--                        </roles>-->
-<!--                    </user>-->
+                    
+                    <!--                    <user key="userKey1">-->
+                    
+                    <!--                        <userName>testu1</userName>-->
+                    
+                    <!--                        <password>testu1pass</password>-->
+                    
+                    <!--                    </user>-->
+                    
+                    <!--                    <user key="userKey2">-->
+                    
+                    <!--                        <userName>testu2</userName>-->
+                    
+                    <!--                        <password>testu2pass</password>-->
+                    
+                    <!--                    </user>-->
+                    
+                    <!--                    <user key="userKey3">-->
+                    
+                    <!--                        <userName>testu3</userName>-->
+                    
+                    <!--                        <password>testu3pass</password>-->
+                    
+                    <!--                    </user>-->
+                    
+                    <!--                    <user key="emailUser">-->
+                    
+                    <!--                        <userName>test@gmail.com</userName>-->
+                    
+                    <!--                        <password>testuser31</password>-->
+                    
+                    <!--                        <roles>-->
+                    
+                    <!--                            <role>Internal/publisher</role>-->
+                    
+                    <!--                            <role>Internal/creator</role>-->
+                    
+                    <!--                            <role>Internal/subscriber</role>-->
+                    
+                    <!--                            <role>admin</role>-->
+                    
+                    <!--                        </roles>-->
+                    
+                    <!--                    </user>-->
+                    
+                    <!--                    <user key="emailUser2">-->
+                    
+                    <!--                        <userName>test2@gmail.com</userName>-->
+                    
+                    <!--                        <password>testuser31</password>-->
+                    
+                    <!--                        <roles>-->
+                    
+                    <!--                            <role>Internal/publisher</role>-->
+                    
+                    <!--                            <role>Internal/creator</role>-->
+                    
+                    <!--                            <role>Internal/subscriber</role>-->
+                    
+                    <!--                        </roles>-->
+                    
+                    <!--                    </user>-->
+                    
+                    <!--                    <user key="emailUser3">-->
+                    
+                    <!--                        <userName>test3@gmail.com</userName>-->
+                    
+                    <!--                        <password>testuser31</password>-->
+                    
+                    <!--                        <roles>-->
+                    
+                    <!--                            <role>Internal/publisher</role>-->
+                    
+                    <!--                            <role>Internal/creator</role>-->
+                    
+                    <!--                            <role>Internal/subscriber</role>-->
+                    
+                    <!--                        </roles>-->
+                    
+                    <!--                    </user>-->
+                    
+                    <!--                    <user key="userStoreUser">-->
+                    
+                    <!--                        <userName>secondary/secondaryuser</userName>-->
+                    
+                    <!--                        <password>testuser31</password>-->
+                    
+                    <!--                        <roles>-->
+                    
+                    <!--                            <role>Internal/publisher</role>-->
+                    
+                    <!--                            <role>Internal/creator</role>-->
+                    
+                    <!--                            <role>Internal/subscriber</role>-->
+                    
+                    <!--                        </roles>-->
+                    
+                    <!--                    </user>-->
+                                    
                 </users>
+                            
             </tenant>
+                    
         </superTenant>
+                
         <tenants>
+                        
             <tenant domain="wso2.com" key="wso2.com">
+                                
                 <admin>
+                                        
                     <user key="admin">
+                                                
                         <userName>admin</userName>
-                            <password>admin</password>
+                                                    
+                        <password>admin</password>
+                                            
                     </user>
+                                    
                 </admin>
+                                
                 <users>
-<!--                    <user key="user1">-->
-<!--                        <userName>testuser11</userName>-->
-<!--                        <password>testuser11</password>-->
-<!--                    </user>-->
-<!--                    <user key="user2">-->
-<!--                        <userName>testuser21</userName>-->
-<!--                        <password>testuser21</password>-->
-<!--                    </user>-->
-<!--                    <user key="emailUser">-->
-<!--                        <userName>test@gmail.com</userName>-->
-<!--                        <password>testuser31</password>-->
-<!--                        <roles>-->
-<!--                            <role>Internal/publisher</role>-->
-<!--                            <role>Internal/creator</role>-->
-<!--                            <role>Internal/subscriber</role>-->
-<!--                            <role>admin</role>-->
-<!--                        </roles>-->
-<!--                    </user>-->
-<!--                    <user key="emailUser2">-->
-<!--                        <userName>test2@gmail.com</userName>-->
-<!--                        <password>testuser31</password>-->
-<!--                        <roles>-->
-<!--                            <role>Internal/publisher</role>-->
-<!--                            <role>Internal/creator</role>-->
-<!--                            <role>Internal/subscriber</role>-->
-<!--                        </roles>-->
-<!--                    </user>-->
-<!--                    <user key="emailUser3">-->
-<!--                        <userName>test3@gmail.com</userName>-->
-<!--                        <password>testuser31</password>-->
-<!--                        <roles>-->
-<!--                            <role>Internal/publisher</role>-->
-<!--                            <role>Internal/creator</role>-->
-<!--                            <role>Internal/subscriber</role>-->
-<!--                        </roles>-->
-<!--                    </user>-->
+                    
+                    <!--                    <user key="user1">-->
+                    
+                    <!--                        <userName>testuser11</userName>-->
+                    
+                    <!--                        <password>testuser11</password>-->
+                    
+                    <!--                    </user>-->
+                    
+                    <!--                    <user key="user2">-->
+                    
+                    <!--                        <userName>testuser21</userName>-->
+                    
+                    <!--                        <password>testuser21</password>-->
+                    
+                    <!--                    </user>-->
+                    
+                    <!--                    <user key="emailUser">-->
+                    
+                    <!--                        <userName>test@gmail.com</userName>-->
+                    
+                    <!--                        <password>testuser31</password>-->
+                    
+                    <!--                        <roles>-->
+                    
+                    <!--                            <role>Internal/publisher</role>-->
+                    
+                    <!--                            <role>Internal/creator</role>-->
+                    
+                    <!--                            <role>Internal/subscriber</role>-->
+                    
+                    <!--                            <role>admin</role>-->
+                    
+                    <!--                        </roles>-->
+                    
+                    <!--                    </user>-->
+                    
+                    <!--                    <user key="emailUser2">-->
+                    
+                    <!--                        <userName>test2@gmail.com</userName>-->
+                    
+                    <!--                        <password>testuser31</password>-->
+                    
+                    <!--                        <roles>-->
+                    
+                    <!--                            <role>Internal/publisher</role>-->
+                    
+                    <!--                            <role>Internal/creator</role>-->
+                    
+                    <!--                            <role>Internal/subscriber</role>-->
+                    
+                    <!--                        </roles>-->
+                    
+                    <!--                    </user>-->
+                    
+                    <!--                    <user key="emailUser3">-->
+                    
+                    <!--                        <userName>test3@gmail.com</userName>-->
+                    
+                    <!--                        <password>testuser31</password>-->
+                    
+                    <!--                        <roles>-->
+                    
+                    <!--                            <role>Internal/publisher</role>-->
+                    
+                    <!--                            <role>Internal/creator</role>-->
+                    
+                    <!--                            <role>Internal/subscriber</role>-->
+                    
+                    <!--                        </roles>-->
+                    
+                    <!--                    </user>-->
+                                    
                 </users>
+                            
             </tenant>
-
+                    
         </tenants>
+                
         <roles>
+                        
             <role name="role1">
+                                
                 <permissions>
+                                        
                     <permission>/permission/admin/configure</permission>
+                                        
                     <permission>/permission/admin/login</permission>
+                                        
                     <permission>/permission/admin/manage</permission>
+                                        
                     <permission>/permission/admin/monitor</permission>
+                                    
                 </permissions>
+                            
             </role>
+                        
             <role name="role2">
+                                
                 <permissions>
+                                        
                     <permission>/permission/admin/configure</permission>
+                                        
                     <permission>/permission/admin/login</permission>
+                                    
                 </permissions>
+                            
             </role>
+                    
         </roles>
+            
     </userManagement>
+        
     <!--
    This section will initiate the initial deployment of the platform required by
    the test suites.
 -->
+        
     <platform>
+                
         <!--
         cluster instance details to be used to platform test execution
         -->
+                
         <productGroup name="APIM" clusteringEnabled="false" default="true">
+                        
             <!--configuration of APIM Store instance -->
+                        
             <instance name="store-old" type="standalone" nonBlockingTransportEnabled="false">
+                                
                 <hosts>
+                                        
                     <host type="default">localhost</host>
+                                    
                 </hosts>
+                                
                 <ports>
+                                        
                     <port type="http">10263</port>
+                                        
                     <port type="https">9943</port>
+                                    
                 </ports>
+                                
                 <properties>
                 </properties>
+                            
             </instance>
+                        
             <instance name="publisher-old" type="standalone" nonBlockingTransportEnabled="false">
+                                
                 <hosts>
+                                        
                     <host type="default">localhost</host>
+                                    
                 </hosts>
+                                
                 <ports>
+                                        
                     <port type="http">10263</port>
+                                        
                     <port type="https">9943</port>
+                                    
                 </ports>
+                                
                 <properties>
                 </properties>
+                            
             </instance>
+                        
             <instance name="keyManager" type="standalone" nonBlockingTransportEnabled="false">
+                                
                 <hosts>
+                                        
                     <host type="default">localhost</host>
+                                    
                 </hosts>
+                                
                 <ports>
+                                        
                     <port type="http">10263</port>
+                                        
                     <port type="https">9943</port>
+                                    
                 </ports>
+                                
                 <properties>
                 </properties>
+                            
             </instance>
+                        
             <instance name="gateway-mgt" type="standalone" nonBlockingTransportEnabled="false">
+                                
                 <hosts>
+                                        
                     <host type="default">localhost</host>
+                                    
                 </hosts>
+                                
                 <ports>
+                                        
                     <port type="http">10263</port>
+                                        
                     <port type="https">9943</port>
+                                    
                 </ports>
+                                
                 <properties>
                 </properties>
+                            
             </instance>
+                        
             <instance name="gateway-wrk" type="standalone" nonBlockingTransportEnabled="true">
+                                
                 <hosts>
+                                        
                     <host type="default">localhost</host>
+                                    
                 </hosts>
+                                
                 <ports>
+                                        
                     <port type="http">10263</port>
+                                        
                     <port type="https">9943</port>
+                                        
                     <port type="nhttps">8743</port>
+                                        
                     <port type="nhttp">8780</port>
+                                    
                 </ports>
+                                
                 <properties>
                 </properties>
+                            
             </instance>
+                        
             <!--Backend server where the actual services deployed-->
+                        
             <instance name="backend-server" type="standalone" nonBlockingTransportEnabled="true">
+                                
                 <hosts>
+                                        
                     <host type="default">backend.wso2.org</host>
+                                    
                 </hosts>
+                                
                 <ports>
+                                        
                     <port type="http">10263</port>
+                                        
                     <port type="https">9943</port>
+                                        
                     <!--<port type="nhttps">8780</port>-->
+                                        
                     <!--<port type="nhttp">8743</port>-->
+                                    
                 </ports>
+                                
                 <properties>
                 </properties>
+                            
             </instance>
+                    
         </productGroup>
+            
     </platform>
-
+        
     <listenerExtensions>
+                
         <platformExecutionManager>
+                        
             <extentionClasses>
+                                
                 <class>
+                                        
                     <!--<name>org.wso2.carbon.automation.extensions.servers.carbonserver.CarbonServerExtension</name>-->
+                                        
                     <name>org.wso2.am.integration.tests.util.APIMCarbonServerExtension</name>
+                                        
                     <parameter name="-DportOffset" value="500"/>
+                                        
                     <parameter name="-DenableCorrelationLogs" value="true"/>
-               <!--                    <parameter name="-Dsetup" value="true"/>-->
+                                   
+                    <!--                    <parameter name="-Dsetup" value="true"/>-->
+                                        
                     <!--<parameter name="cmdArg" value="debug 5005"/>-->
+                                    
                 </class>
+                                
                 <class>
+                                        
                     <name>org.wso2.carbon.integration.common.extensions.usermgt.UserPopulateExtension</name>
+                                    
                 </class>
+                            
             </extentionClasses>
+                    
         </platformExecutionManager>
-
-
+                
         <PlatformSuiteManager>
+                        
             <extentionClasses>
             </extentionClasses>
+                    
         </PlatformSuiteManager>
-
+                
         <PlatformAnnotationTransferManager>
+                        
             <extentionClasses>
             </extentionClasses>
+                    
         </PlatformAnnotationTransferManager>
-
+                
         <PlatformTestManager>
+                        
             <extentionClasses>
             </extentionClasses>
+                    
         </PlatformTestManager>
-
+                
         <PlatformReportManager>
+                        
             <extentionClasses>
             </extentionClasses>
+                    
         </PlatformReportManager>
-
+            
     </listenerExtensions>
+    
 </automation>
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 cb9bd083c8..e68208b2f8 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
@@ -710,8 +710,6 @@ void destroy() throws Exception {
 
         restAPIStore.deleteApplication(apiLoggingApplicationId);
         restAPIPublisher.deleteAPI(apiLoggingApiId);
-
-        super.cleanUp();
     }
 
 }
diff --git a/modules/integration/tests-integration/tests-restart/src/test/resources/artifacts/AS/ghost/APIStatusMonitor.war b/modules/integration/tests-integration/tests-restart/src/test/resources/artifacts/AS/ghost/APIStatusMonitor.war
index 5b58f30432..ceb4f2aaa4 100644
Binary files a/modules/integration/tests-integration/tests-restart/src/test/resources/artifacts/AS/ghost/APIStatusMonitor.war and b/modules/integration/tests-integration/tests-restart/src/test/resources/artifacts/AS/ghost/APIStatusMonitor.war differ