diff --git a/tests/unit/Espo/Core/Select/AccessControl/FilterResolverTest.php b/tests/unit/Espo/Core/Select/AccessControl/FilterResolverTest.php
index a161ebc0cc..d2e679e4eb 100644
--- a/tests/unit/Espo/Core/Select/AccessControl/FilterResolverTest.php
+++ b/tests/unit/Espo/Core/Select/AccessControl/FilterResolverTest.php
@@ -134,7 +134,6 @@ class FilterResolverTest extends \PHPUnit\Framework\TestCase
         if (!$isPortal) {
             $this->resolver = new DefaultFilterResolver(
                 $this->entityType,
-                $this->user,
                 $acl
             );
         }
@@ -142,7 +141,6 @@ class FilterResolverTest extends \PHPUnit\Framework\TestCase
         if ($isPortal) {
             $this->resolver = new DefaultPortalFilterResolver(
                 $this->entityType,
-                $this->user,
                 $acl
             );
         }
diff --git a/tests/unit/Espo/Core/Select/AccessControl/FiltersTest.php b/tests/unit/Espo/Core/Select/AccessControl/FiltersTest.php
index 5fb03ceeac..b701ba0bef 100644
--- a/tests/unit/Espo/Core/Select/AccessControl/FiltersTest.php
+++ b/tests/unit/Espo/Core/Select/AccessControl/FiltersTest.php
@@ -52,6 +52,10 @@ class FiltersTest extends \PHPUnit\Framework\TestCase
 
         $this->user->id = 'user-id';
 
+        $this->user
+            ->method('getId')
+            ->willReturn('user-id');
+
         $this->entityType = 'Test';
 
         $this->user
@@ -521,7 +525,6 @@ class FiltersTest extends \PHPUnit\Framework\TestCase
     protected function createFilter(string $className) : AccessControlFilter
     {
         return new $className(
-            $this->entityType,
             $this->user,
             $this->fieldHelper
         );
diff --git a/tests/unit/Espo/Core/Select/Applier/Appliers/TextFilterApplierTest.php b/tests/unit/Espo/Core/Select/Applier/Appliers/TextFilterApplierTest.php
index 6459625d64..e0a80bdd8f 100644
--- a/tests/unit/Espo/Core/Select/Applier/Appliers/TextFilterApplierTest.php
+++ b/tests/unit/Espo/Core/Select/Applier/Appliers/TextFilterApplierTest.php
@@ -45,7 +45,6 @@ use Espo\Core\{
 
 use Espo\{
     ORM\Query\SelectBuilder as QueryBuilder,
-    ORM\Query\Part\WhereClause,
     ORM\Query\Part\Where\OrGroup,
     ORM\Entity,
     Entities\User,
@@ -68,7 +67,6 @@ class TextFilterApplierTest extends \PHPUnit\Framework\TestCase
         $this->applier = new TextFilterApplier(
             $this->entityType,
             $this->user,
-            $this->config,
             $this->metadataProvider,
             $this->fullTextSearchDataComposerFactory,
             $this->filterFactory
diff --git a/tests/unit/Espo/Core/Utils/LanguageTest.php b/tests/unit/Espo/Core/Utils/LanguageTest.php
index 5b948c5719..517e10cc8e 100644
--- a/tests/unit/Espo/Core/Utils/LanguageTest.php
+++ b/tests/unit/Espo/Core/Utils/LanguageTest.php
@@ -100,7 +100,6 @@ class LanguageTest extends \PHPUnit\Framework\TestCase
         $this->object = new Language(
             null,
             $this->fileManager,
-            $this->metadata,
             $reader,
             $this->dataCache,
             false