diff --git a/dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java b/dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java
index e2d0c34e81..c49aa713c7 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/JpaDaoTestSuite.java
@@ -21,7 +21,7 @@ import org.junit.runner.RunWith;
 
 @RunWith(ClasspathSuite.class)
 @ClassnameFilters({
-        "org.thingsboard.server.dao.sql.*"
+        "org.thingsboard.server.dao.sql.*.*Test"
 })
 public class JpaDaoTestSuite {
 
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java
index adffcc1bd6..833d7256bf 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/alarm/JpaAlarmDaoTest.java
@@ -43,7 +43,6 @@ public class JpaAlarmDaoTest extends AbstractJpaDaoTest {
 
     @Test
     public void testFindLatestByOriginatorAndType() throws ExecutionException, InterruptedException {
-        System.out.println(System.currentTimeMillis());
         UUID tenantId = UUID.fromString("d4b68f40-3e96-11e7-a884-898080180d6b");
         UUID originator1Id = UUID.fromString("d4b68f41-3e96-11e7-a884-898080180d6b");
         UUID originator2Id = UUID.fromString("d4b68f42-3e96-11e7-a884-898080180d6b");
diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java
index d3188f724e..e9dd6cf835 100644
--- a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java
+++ b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java
@@ -16,7 +16,7 @@
 package org.thingsboard.server.dao.sql.widget;
 
 import com.datastax.oss.driver.api.core.uuid.Uuids;
-
+import org.junit.After;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -38,55 +38,47 @@ import static org.junit.Assert.assertEquals;
  */
 public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
 
+    List<WidgetsBundle> widgetsBundles;
     @Autowired
     private WidgetsBundleDao widgetsBundleDao;
 
+    @After
+    public void tearDown() {
+        for (WidgetsBundle widgetsBundle : widgetsBundles) {
+            widgetsBundleDao.removeById(widgetsBundle.getTenantId(), widgetsBundle.getUuidId());
+        }
+
+    }
+
     @Test
     public void testFindAll() {
         createSystemWidgetBundles(7, "WB_");
-        List<WidgetsBundle> widgetsBundles = widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID);
-        try {
-            assertEquals(7, widgetsBundles.size());
-        } finally {
-            for (WidgetsBundle widgetsBundle:widgetsBundles) {
-                widgetsBundleDao.removeById(AbstractServiceTest.SYSTEM_TENANT_ID, widgetsBundle.getUuidId());
-            }
-        }
+        widgetsBundles = widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID);
+        assertEquals(7, widgetsBundles.size());
     }
 
     @Test
     public void testFindWidgetsBundleByTenantIdAndAlias() {
-        createSystemWidgetBundles(1, "CHECK");
+        createSystemWidgetBundles(1, "WB_");
         WidgetsBundle widgetsBundle = widgetsBundleDao.findWidgetsBundleByTenantIdAndAlias(
-                AbstractServiceTest.SYSTEM_TENANT_ID.getId(), "CHECK" + 0);
-        try {
-            System.out.println(widgetsBundle);
-            assertEquals("CHECK" + 0, widgetsBundle.getAlias());
-        } finally {
-            List<WidgetsBundle> allWidgets = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(AbstractServiceTest.SYSTEM_TENANT_ID.getId(),
-                    new PageLink(1, 0, "CHECK" + 0)).getData();
-            deleteWidgetBundles(allWidgets);
-        }
+                AbstractServiceTest.SYSTEM_TENANT_ID.getId(), "WB_" + 0);
+        widgetsBundles = List.of(widgetsBundle);
+        assertEquals("WB_" + 0, widgetsBundle.getAlias());
     }
 
     @Test
     public void testFindSystemWidgetsBundles() {
         createSystemWidgetBundles(30, "WB_");
-        try {
-            assertEquals(30, widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID).size());
-            // Get first page
-            PageLink pageLink = new PageLink(10, 0, "WB");
-            PageData<WidgetsBundle> widgetsBundles1 = widgetsBundleDao.findSystemWidgetsBundles(AbstractServiceTest.SYSTEM_TENANT_ID, pageLink);
-            assertEquals(10, widgetsBundles1.getData().size());
-            // Get next page
-            pageLink = pageLink.nextPageLink();
-            PageData<WidgetsBundle> widgetsBundles2 = widgetsBundleDao.findSystemWidgetsBundles(AbstractServiceTest.SYSTEM_TENANT_ID, pageLink);
-            assertEquals(10, widgetsBundles2.getData().size());
-        } finally {
-            List<WidgetsBundle> allWidgets = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(AbstractServiceTest.SYSTEM_TENANT_ID.getId(),
-                    new PageLink(500, 0, "WB")).getData();
-            deleteWidgetBundles(allWidgets);
-        }
+        widgetsBundles = widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID);
+        assertEquals(30, widgetsBundles.size());
+        // Get first page
+        PageLink pageLink = new PageLink(10, 0, "WB");
+        PageData<WidgetsBundle> widgetsBundles1 = widgetsBundleDao.findSystemWidgetsBundles(AbstractServiceTest.SYSTEM_TENANT_ID, pageLink);
+        assertEquals(10, widgetsBundles1.getData().size());
+        // Get next page
+        pageLink = pageLink.nextPageLink();
+        PageData<WidgetsBundle> widgetsBundles2 = widgetsBundleDao.findSystemWidgetsBundles(AbstractServiceTest.SYSTEM_TENANT_ID, pageLink);
+        assertEquals(10, widgetsBundles2.getData().size());
     }
 
     @Test
@@ -94,35 +86,25 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
         UUID tenantId1 = Uuids.timeBased();
         UUID tenantId2 = Uuids.timeBased();
         // Create a bunch of widgetBundles
-        for (int i= 0; i < 10; i++) {
+        for (int i = 0; i < 10; i++) {
             createWidgetBundles(3, tenantId1, "WB1_");
             createWidgetBundles(5, tenantId2, "WB2_");
             createSystemWidgetBundles(10, "WB_SYS_");
         }
-        try {
-            assertEquals(180, widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID).size());
-
-            PageLink pageLink1 = new PageLink(40, 0,  "WB");
-            PageData<WidgetsBundle> widgetsBundles1 = widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId1, pageLink1);
-            assertEquals(30, widgetsBundles1.getData().size());
-
-            PageLink pageLink2 = new PageLink(40, 0,  "WB");
-            PageData<WidgetsBundle> widgetsBundles2 = widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId2, pageLink2);
-            assertEquals(40, widgetsBundles2.getData().size());
-
-            pageLink2 = pageLink2.nextPageLink();
-            PageData<WidgetsBundle> widgetsBundles3 = widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId2, pageLink2);
-            assertEquals(10, widgetsBundles3.getData().size());
-        } finally {
-            List<WidgetsBundle> allWidgets =
-                    widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1,
-                            new PageLink(500, 0, "WB1_")).getData();
-            allWidgets.addAll(widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId2,
-                    new PageLink(500, 0, "WB2_")).getData());
-            allWidgets.addAll(widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(AbstractServiceTest.SYSTEM_TENANT_ID.getId(),
-                    new PageLink(500, 0, "WB_SYS_")).getData());
-            deleteWidgetBundles(allWidgets);
-        }
+        widgetsBundles = widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID);
+        assertEquals(180, widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID).size());
+
+        PageLink pageLink1 = new PageLink(40, 0, "WB");
+        PageData<WidgetsBundle> widgetsBundles1 = widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId1, pageLink1);
+        assertEquals(30, widgetsBundles1.getData().size());
+
+        PageLink pageLink2 = new PageLink(40, 0, "WB");
+        PageData<WidgetsBundle> widgetsBundles2 = widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId2, pageLink2);
+        assertEquals(40, widgetsBundles2.getData().size());
+
+        pageLink2 = pageLink2.nextPageLink();
+        PageData<WidgetsBundle> widgetsBundles3 = widgetsBundleDao.findTenantWidgetsBundlesByTenantId(tenantId2, pageLink2);
+        assertEquals(10, widgetsBundles3.getData().size());
     }
 
     @Test
@@ -130,37 +112,29 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
         UUID tenantId1 = Uuids.timeBased();
         UUID tenantId2 = Uuids.timeBased();
         // Create a bunch of widgetBundles
-        for (int i= 0; i < 10; i++) {
-            createWidgetBundles( 5, tenantId1,"WB1_");
+        for (int i = 0; i < 10; i++) {
+            createWidgetBundles(5, tenantId1, "WB1_");
             createWidgetBundles(3, tenantId2, "WB2_");
             createSystemWidgetBundles(2, "WB_SYS_");
         }
-        try {
-            PageLink pageLink = new PageLink(30, 0, "WB");
-            PageData<WidgetsBundle> widgetsBundles1 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, pageLink);
-            assertEquals(30, widgetsBundles1.getData().size());
-
-            pageLink = pageLink.nextPageLink();
-            PageData<WidgetsBundle> widgetsBundles2 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, pageLink);
-            assertEquals(30, widgetsBundles2.getData().size());
-
-            pageLink = pageLink.nextPageLink();
-            PageData<WidgetsBundle> widgetsBundles3 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, pageLink);
-            assertEquals(10, widgetsBundles3.getData().size());
-
-            pageLink = pageLink.nextPageLink();
-            PageData<WidgetsBundle> widgetsBundles4 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, pageLink);
-            assertEquals(0, widgetsBundles4.getData().size());
-        } finally {
-            List<WidgetsBundle> allWidgets =
-                    widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1,
-                            new PageLink(500, 0, "WB1_")).getData();
-            allWidgets.addAll(widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId2,
-                    new PageLink(500, 0, "WB2_")).getData());
-            allWidgets.addAll(widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(AbstractServiceTest.SYSTEM_TENANT_ID.getId(),
-                    new PageLink(500, 0, "WB_SYS_")).getData());
-            deleteWidgetBundles(allWidgets);
-        }
+        widgetsBundles = widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID);
+        assertEquals(100, widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID).size());
+
+        PageLink pageLink = new PageLink(30, 0, "WB");
+        PageData<WidgetsBundle> widgetsBundles1 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, pageLink);
+        assertEquals(30, widgetsBundles1.getData().size());
+
+        pageLink = pageLink.nextPageLink();
+        PageData<WidgetsBundle> widgetsBundles2 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, pageLink);
+        assertEquals(30, widgetsBundles2.getData().size());
+
+        pageLink = pageLink.nextPageLink();
+        PageData<WidgetsBundle> widgetsBundles3 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, pageLink);
+        assertEquals(10, widgetsBundles3.getData().size());
+
+        pageLink = pageLink.nextPageLink();
+        PageData<WidgetsBundle> widgetsBundles4 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId1, pageLink);
+        assertEquals(0, widgetsBundles4.getData().size());
     }
 
     @Test
@@ -168,18 +142,11 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
         UUID tenantId = Uuids.timeBased();
         createWidgetBundles(5, tenantId, "ABC_");
         createSystemWidgetBundles(5, "SYS_");
-        try {
-            PageLink textPageLink = new PageLink(30, 0, "TEXT_NOT_FOUND");
-            PageData<WidgetsBundle> widgetsBundles4 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId, textPageLink);
-            assertEquals(0, widgetsBundles4.getData().size());
-        } finally {
-            List<WidgetsBundle> allWidgets =
-                    widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId,
-                            new PageLink(500, 0, "ABC_")).getData();
-            allWidgets.addAll(widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(AbstractServiceTest.SYSTEM_TENANT_ID.getId(),
-                    new PageLink(500, 0, "SYS_")).getData());
-            deleteWidgetBundles(allWidgets);
-        }
+        widgetsBundles = widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID);
+        assertEquals(10, widgetsBundleDao.find(AbstractServiceTest.SYSTEM_TENANT_ID).size());
+        PageLink textPageLink = new PageLink(30, 0, "TEXT_NOT_FOUND");
+        PageData<WidgetsBundle> widgetsBundles4 = widgetsBundleDao.findAllTenantWidgetsBundlesByTenantId(tenantId, textPageLink);
+        assertEquals(0, widgetsBundles4.getData().size());
     }
 
     private void createWidgetBundles(int count, UUID tenantId, String prefix) {
@@ -203,10 +170,4 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest {
             widgetsBundleDao.save(AbstractServiceTest.SYSTEM_TENANT_ID, widgetsBundle);
         }
     }
-
-    void deleteWidgetBundles(List<WidgetsBundle> widgetsBundles) {
-        for (WidgetsBundle widgetsBundle : widgetsBundles) {
-            widgetsBundleDao.removeById(widgetsBundle.getTenantId(), widgetsBundle.getUuidId());
-        }
-    }
 }