diff --git a/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/TenantAware.java b/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/TenantAware.java
index 35199774a..689f5b01a 100644
--- a/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/TenantAware.java
+++ b/hawkbit-core/src/main/java/org/eclipse/hawkbit/tenancy/TenantAware.java
@@ -55,7 +55,7 @@ public interface TenantAware {
      *            the return type of the runner
      */
     @FunctionalInterface
-    public interface TenantRunner<T> {
+    interface TenantRunner<T> {
         /**
          * Called to run specific code and a given tenant.
          *
diff --git a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListenerTest.java b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListenerTest.java
index 05e27ae08..0bad51a3a 100644
--- a/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListenerTest.java
+++ b/hawkbit-repository/hawkbit-repository-jpa/src/test/java/org/eclipse/hawkbit/repository/jpa/model/EntityInterceptorListenerTest.java
@@ -76,7 +76,7 @@ public class EntityInterceptorListenerTest extends AbstractJpaIntegrationTest {
 
     @Test
     @Description("Verfies that the post remove is called after a entity deletion.")
-    public void postRemoveIsCalledWhenDeletinggATarget() {
+    public void postRemoveIsCalledWhenDeletingATarget() {
         executeDeleteAndAssertCallbackResult(new PostRemoveEntityListener());
     }
 
diff --git a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java
index a101ac755..3d09fabc3 100644
--- a/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java
+++ b/hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/AbstractIntegrationTest.java
@@ -182,9 +182,6 @@ public abstract class AbstractIntegrationTest implements EnvironmentAware {
     @After
     public void after() {
         testRepositoryManagement.clearTestRepository();
-
-        targetManagement.findAllTargetIds();
-
     }
 
     protected DefaultMockMvcBuilder createMvcWebAppContext() {