diff --git a/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java b/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java
index 59ede61621..31349ebec4 100644
--- a/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java
@@ -24,7 +24,6 @@ import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.server.common.data.EntityInfo;
-import org.thingsboard.server.common.data.OtaPackage;
 import org.thingsboard.server.common.data.ResourceType;
 import org.thingsboard.server.common.data.TbResource;
 import org.thingsboard.server.common.data.TbResourceInfo;
@@ -173,7 +172,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         resource.setResourceType(ResourceType.JKS);
         resource.setFileName(filename);
         resource.setData("1");
-        return resourceService.saveResource(resource);
+        return resourceService.saveResourceInternal(resource);
     }
 
     @Test
@@ -185,7 +184,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         resource.setFileName(DEFAULT_FILE_NAME);
         resource.setData("Test Data");
 
-        TbResource savedResource = resourceService.saveResource(resource);
+        TbResource savedResource = resourceService.saveResourceInternal(resource);
 
         Assert.assertNotNull(savedResource);
         Assert.assertNotNull(savedResource.getId());
@@ -197,11 +196,11 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
 
         savedResource.setTitle("My new resource");
 
-        resourceService.saveResource(savedResource);
+        resourceService.saveResourceInternal(savedResource);
         TbResource foundResource = resourceService.findResourceById(tenantId, savedResource.getId());
         Assert.assertEquals(foundResource.getTitle(), savedResource.getTitle());
 
-        resourceService.deleteResource(tenantId, savedResource.getId());
+        resourceService.delete(savedResource, null);
     }
 
     @Test
@@ -212,7 +211,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         resource.setFileName("test_model.xml");
         resource.setData(Base64.getEncoder().encodeToString(LWM2M_TEST_MODEL.getBytes()));
 
-        TbResource savedResource = resourceService.saveResource(resource);
+        TbResource savedResource = resourceService.saveResourceInternal(resource);
 
         Assert.assertNotNull(savedResource);
         Assert.assertNotNull(savedResource.getId());
@@ -222,7 +221,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         Assert.assertEquals("0_1.0", savedResource.getResourceKey());
         Assert.assertEquals(resource.getData(), savedResource.getData());
 
-        resourceService.deleteResource(tenantId, savedResource.getId());
+        resourceService.delete(savedResource, null);
     }
 
     @Test
@@ -232,11 +231,11 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         resource.setTitle("My resource");
         resource.setFileName(DEFAULT_FILE_NAME);
         resource.setData("Test Data");
-        TbResource savedResource = resourceService.saveResource(resource);
+        TbResource savedResource = resourceService.saveResourceInternal(resource);
 
         Assert.assertEquals(TenantId.SYS_TENANT_ID, savedResource.getTenantId());
 
-        resourceService.deleteResource(tenantId, savedResource.getId());
+        resourceService.delete(savedResource, null);
     }
 
     @Test(expected = DataValidationException.class)
@@ -248,7 +247,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         resource.setFileName(DEFAULT_FILE_NAME);
         resource.setData("Test Data");
 
-        TbResource savedResource = resourceService.saveResource(resource);
+        TbResource savedResource = resourceService.saveResourceInternal(resource);
 
         TbResource resource2 = new TbResource();
         resource.setTenantId(tenantId);
@@ -258,9 +257,9 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         resource.setData("Test Data");
 
         try {
-            resourceService.saveResource(resource2);
+            resourceService.saveResourceInternal(resource2);
         } finally {
-            resourceService.deleteResource(tenantId, savedResource.getId());
+            resourceService.delete(savedResource, null);
         }
     }
 
@@ -271,7 +270,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         resource.setResourceType(ResourceType.JKS);
         resource.setFileName(DEFAULT_FILE_NAME);
         resource.setData("Test Data");
-        resourceService.saveResource(resource);
+        resourceService.saveResourceInternal(resource);
     }
 
     @Test(expected = DataValidationException.class)
@@ -282,7 +281,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         resource.setTitle("My resource");
         resource.setFileName(DEFAULT_FILE_NAME);
         resource.setData("Test Data");
-        resourceService.saveResource(resource);
+        resourceService.saveResourceInternal(resource);
     }
 
     @Test
@@ -292,12 +291,12 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         resource.setTitle("My resource");
         resource.setFileName(DEFAULT_FILE_NAME);
         resource.setData("Test Data");
-        TbResource savedResource = resourceService.saveResource(resource);
+        TbResource savedResource = resourceService.saveResourceInternal(resource);
 
         TbResource foundResource = resourceService.findResourceById(tenantId, savedResource.getId());
         Assert.assertNotNull(foundResource);
         Assert.assertEquals(savedResource, foundResource);
-        resourceService.deleteResource(tenantId, savedResource.getId());
+        resourceService.delete(savedResource, null);
     }
 
     @Test
@@ -308,12 +307,12 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         resource.setTitle("My resource");
         resource.setFileName(DEFAULT_FILE_NAME);
         resource.setData("Test Data");
-        TbResource savedResource = resourceService.saveResource(resource);
+        TbResource savedResource = resourceService.saveResourceInternal(resource);
 
         TbResource foundResource = resourceService.getResource(tenantId, savedResource.getResourceType(), savedResource.getResourceKey());
         Assert.assertNotNull(foundResource);
         Assert.assertEquals(savedResource, foundResource);
-        resourceService.deleteResource(tenantId, savedResource.getId());
+        resourceService.delete(savedResource, null);
     }
 
     @Test
@@ -323,11 +322,11 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
         resource.setTitle("My resource");
         resource.setFileName(DEFAULT_FILE_NAME);
         resource.setData("Test Data");
-        TbResource savedResource = resourceService.saveResource(resource);
+        TbResource savedResource = resourceService.saveResourceInternal(resource);
 
         TbResource foundResource = resourceService.findResourceById(tenantId, savedResource.getId());
         Assert.assertNotNull(foundResource);
-        resourceService.deleteResource(tenantId, savedResource.getId());
+        resourceService.delete(savedResource, null);
         foundResource = resourceService.findResourceById(tenantId, savedResource.getId());
         Assert.assertNull(foundResource);
     }
@@ -349,7 +348,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
             resource.setResourceType(ResourceType.JKS);
             resource.setFileName(i + DEFAULT_FILE_NAME);
             resource.setData("Test Data");
-            resources.add(new TbResourceInfo(resourceService.saveResource(resource)));
+            resources.add(new TbResourceInfo(resourceService.saveResourceInternal(resource)));
         }
 
         List<TbResourceInfo> loadedResources = new ArrayList<>();
@@ -397,7 +396,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
             resource.setResourceType(ResourceType.JKS);
             resource.setFileName(i + DEFAULT_FILE_NAME);
             resource.setData("Test Data");
-            TbResourceInfo tbResourceInfo = new TbResourceInfo(resourceService.saveResource(resource));
+            TbResourceInfo tbResourceInfo = new TbResourceInfo(resourceService.saveResourceInternal(resource));
             if (i >= 50) {
                 resources.add(tbResourceInfo);
             }
@@ -410,7 +409,7 @@ public class BaseTbResourceServiceTest extends AbstractControllerTest {
             resource.setResourceType(ResourceType.JKS);
             resource.setFileName(i + DEFAULT_FILE_NAME);
             resource.setData("Test Data");
-            resources.add(new TbResourceInfo(resourceService.saveResource(resource)));
+            resources.add(new TbResourceInfo(resourceService.saveResourceInternal(resource)));
         }
 
         List<TbResourceInfo> loadedResources = new ArrayList<>();