diff --git a/Test/Integration/Controller/Adminhtml/Request/SaveTest.php b/Test/Integration/Controller/Adminhtml/Request/SaveTest.php
index 826cb61..d6a4cff 100644
--- a/Test/Integration/Controller/Adminhtml/Request/SaveTest.php
+++ b/Test/Integration/Controller/Adminhtml/Request/SaveTest.php
@@ -24,7 +24,7 @@ class SaveTest extends TestCase
     protected function setUp(): void
     {
         // Create a mock for the audit request factory
-        $this->auditRequestFactoryMock = $this->createPartialMock(\Crealoz\EasyAudit\Model\AuditRequestFactory::class, ['create']);
+        $this->auditRequestFactoryMock = $this->getMockBuilder('\Crealoz\EasyAudit\Model\AuditRequestFactory')->setMethods(['create'])->getMock();
         $this->auditRequestFactoryMock->method('create')->willReturn($this->createMock(AuditRequest::class));
 
         // Create a mock for the audit request repository
diff --git a/Test/Integration/Model/AuditRequestRepositoryTest.php b/Test/Integration/Model/AuditRequestRepositoryTest.php
index 9c9adf0..e7f11f4 100644
--- a/Test/Integration/Model/AuditRequestRepositoryTest.php
+++ b/Test/Integration/Model/AuditRequestRepositoryTest.php
@@ -10,14 +10,13 @@ protected function setUp(): void
     {
         $this->resource = $this->createMock(AuditRequest::class);
         $auditRequest = $this->createMock(\Crealoz\EasyAudit\Model\AuditRequest::class);
-        $this->requestFactory = $this->getMockBuilder(\Crealoz\EasyAudit\Model\AuditRequestFactory::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['create'])
+        $this->requestFactory = $this->getMockBuilder('\Crealoz\EasyAudit\Model\AuditRequestFactory')
+            ->setMethods(['create'])
             ->getMock();
         $this->requestFactory->method('create')->willReturn($auditRequest);
         $this->searchResultFactory = $this->createMock(\Magento\Framework\Api\Search\SearchResultFactory::class);
         $this->collectionProcessor = $this->createMock(\Magento\Framework\Api\SearchCriteria\CollectionProcessorInterface::class);
-        $this->collectionFactory = $this->createMock(\Crealoz\EasyAudit\Model\ResourceModel\AuditRequest\CollectionFactory::class);
+        $this->collectionFactory = $this->getMockBuilder('\Crealoz\EasyAudit\Model\ResourceModel\AuditRequest\CollectionFactory')->setMethods(['create'])->getMock();
 
         $this->auditRequestRepository = new \Crealoz\EasyAudit\Model\AuditRequestRepository(
             $this->resource,
@@ -68,14 +67,20 @@ public function testDeleteById()
 
     public function testGetList()
     {
+        $auditRequest1 = $this->createMock(\Crealoz\EasyAudit\Model\AuditRequest::class);
+        $auditRequest2 = $this->createMock(\Crealoz\EasyAudit\Model\AuditRequest::class);
+        $auditRequest3 = $this->createMock(\Crealoz\EasyAudit\Model\AuditRequest::class);
+        $auditRequestArray = [$auditRequest1, $auditRequest2, $auditRequest3];
         $searchCriteria = $this->createMock(\Magento\Framework\Api\SearchCriteriaInterface::class);
-        $searchResult = $this->createMock(\Magento\Framework\Api\SearchResultsInterface::class);
+        $searchResult = $this->createMock(\Magento\Framework\Api\Search\SearchResultInterface::class);
+        $searchResult->expects($this->once())->method('setItems')->with($auditRequestArray);
+        $this->searchResultFactory->expects($this->once())->method('create')->willReturn($searchResult);
         $collection = $this->createMock(\Crealoz\EasyAudit\Model\ResourceModel\AuditRequest\Collection::class);
+        $collection->expects($this->once())->method('getSize')->willReturn(1);
+        $collection->expects($this->once())->method('getItems')->willReturn($auditRequestArray);
 
         $this->collectionFactory->expects($this->once())->method('create')->willReturn($collection);
         $this->collectionProcessor->expects($this->once())->method('process')->with($searchCriteria, $collection);
-        $collection->expects($this->once())->method('getSize')->willReturn(1);
-        $collection->expects($this->once())->method('getItems')->willReturn([$this->createMock(\Crealoz\EasyAudit\Model\AuditRequest::class)]);
 
         $this->searchResultFactory->expects($this->once())->method('create')->willReturn($searchResult);
         $this->assertEquals($searchResult, $this->auditRequestRepository->getList($searchCriteria));
@@ -84,8 +89,8 @@ public function testGetList()
     public function testGetAuditsToBeRun()
     {
         $collection = $this->createMock(\Crealoz\EasyAudit\Model\ResourceModel\AuditRequest\Collection::class);
-        $this->collectionFactory->expects($this->once())->method('create')->willReturn($collection);
         $collection->expects($this->once())->method('addFieldToFilter')->with('execution_time', ['null' => true]);
+        $this->collectionFactory->expects($this->once())->method('create')->willReturn($collection);
         $this->assertEquals($collection, $this->auditRequestRepository->getAuditsToBeRun());
     }
 }
\ No newline at end of file
diff --git a/Test/Integration/Model/FileRepositoryTest.php b/Test/Integration/Model/FileRepositoryTest.php
index c2759b5..883a280 100644
--- a/Test/Integration/Model/FileRepositoryTest.php
+++ b/Test/Integration/Model/FileRepositoryTest.php
@@ -26,12 +26,8 @@ class FileRepositoryTest extends TestCase
     protected function setUp(): void
     {
         $this->resource = $this->createMock(File::class);
-        $this->fileFactory = $this->getMockBuilder(\Crealoz\EasyAudit\Model\Request\FileFactory::class)
-            ->disableOriginalConstructor()
-            ->onlyMethods(['create'])
-            ->getMock()
-        ;
-        $this->collectionFactory = $this->createMock(\Crealoz\EasyAudit\Model\ResourceModel\Request\File\CollectionFactory::class);
+        $this->fileFactory = $this->getMockBuilder('\Crealoz\EasyAudit\Model\Request\FileFactory')->setMethods(['create'])->getMock();
+        $this->collectionFactory = $this->getMockBuilder('\Crealoz\EasyAudit\Model\ResourceModel\Request\File\CollectionFactory')->setMethods(['create'])->getMock();
         $this->searchResultFactory = $this->createMock(\Magento\Framework\Api\Search\SearchResultFactory::class);
         $this->collectionProcessor = $this->createMock(CollectionProcessorInterface::class);
         $this->searchCriteriaBuilder = $this->createMock(SearchCriteriaBuilder::class);
@@ -90,19 +86,26 @@ public function testGetByIdException()
 
     public function testGetList()
     {
+        // Set dummy files
+        $file1 = $this->createMock(\Crealoz\EasyAudit\Model\Request\File::class);
+        $file2 = $this->createMock(\Crealoz\EasyAudit\Model\Request\File::class);
+        $file3 = $this->createMock(\Crealoz\EasyAudit\Model\Request\File::class);
+        $fileArray = [$file1, $file2, $file3];
+
+        // Prepare mocks
         $searchCriteria = $this->createMock(\Magento\Framework\Api\SearchCriteriaInterface::class);
         $collection = $this->createMock(\Crealoz\EasyAudit\Model\ResourceModel\Request\File\Collection::class);
-        $searchResults = $this->createMock(\Magento\Framework\Api\SearchResultsInterface::class);
+        $collection->method('getItems')->willReturn($fileArray);
+        $collection->method('getSize')->willReturn(count($fileArray));
+
+        $searchResults = $this->createMock(\Magento\Framework\Api\Search\SearchResultInterface::class);
+        $searchResults->expects($this->once())->method('setSearchCriteria')->with($searchCriteria);
+        $searchResults->expects($this->once())->method('setItems')->with($fileArray);
+        $searchResults->expects($this->once())->method('setTotalCount')->with(count($fileArray));
 
         $this->collectionFactory->method('create')->willReturn($collection);
         $this->collectionProcessor->method('process')->with($searchCriteria, $collection);
         $this->searchResultFactory->method('create')->willReturn($searchResults);
-        $collection->method('getItems')->willReturn(['item1', 'item2']);
-        $collection->method('getSize')->willReturn(2);
-
-        $searchResults->expects($this->once())->method('setSearchCriteria')->with($searchCriteria);
-        $searchResults->expects($this->once())->method('setItems')->with(['item1', 'item2']);
-        $searchResults->expects($this->once())->method('setTotalCount')->with(2);
 
         $this->assertSame($searchResults, $this->fileRepository->getList($searchCriteria));
     }
diff --git a/Test/Integration/Service/AuditTest.php b/Test/Integration/Service/AuditTest.php
index e028185..cedaea2 100644
--- a/Test/Integration/Service/AuditTest.php
+++ b/Test/Integration/Service/AuditTest.php
@@ -4,9 +4,7 @@
 
 use Crealoz\EasyAudit\Api\AuditRequestRepositoryInterface;
 use Crealoz\EasyAudit\Model\AuditRequest;
-use Crealoz\EasyAudit\Model\AuditRequestFactory;
 use Crealoz\EasyAudit\Model\Request\File;
-use Crealoz\EasyAudit\Processor\Files\AbstractAuditProcessor;
 use Crealoz\EasyAudit\Processor\Results\ErroneousFiles;
 use Crealoz\EasyAudit\Processor\Type\Logic;
 use Crealoz\EasyAudit\Processor\Type\PHPCode;
@@ -143,14 +141,14 @@ protected function setUp(): void
 
         $this->logger = $this->createMock(LoggerInterface::class);
         $this->auditRequestFactory = $this->getMockBuilder('\Crealoz\EasyAudit\Model\AuditRequestFactory')
-            ->allowMockingUnknownTypes()
-            ->disableOriginalConstructor()
-            ->onlyMethods(['create'])
+            ->setMethods(['create'])
             ->getMock();
         $this->auditRequestRepository = $this->createMock(AuditRequestRepositoryInterface::class);
         $this->serializer = $this->createMock(SerializerInterface::class);
         $this->localization = $this->createMock(Localization::class);
-        $this->fileFactory = $this->createPartialMock('\Crealoz\EasyAudit\Model\Request\FileFactory', ['create']);
+        $this->fileFactory = $this->getMockBuilder('\Crealoz\EasyAudit\Model\Request\FileFactory')
+            ->setMethods(['create'])
+            ->getMock();
 
         $this->auditRequestFactory->method('create')->willReturn($this->createMock(AuditRequest::class));
 
diff --git a/build/logs/clover.xml b/build/logs/clover.xml
index 1815fa7..e24a3c8 100644
--- a/build/logs/clover.xml
+++ b/build/logs/clover.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<coverage generated="1736954318">
-  <project timestamp="1736954318">
+<coverage generated="1737022623">
+  <project timestamp="1737022623">
     <file name="/local-packages/crealoz/easy-audit/Block/Adminhtml/Widget/Button/Back.php">
       <class name="Crealoz\EasyAudit\Block\Adminhtml\Widget\Button\Back" namespace="global">
         <metrics complexity="2" methods="2" coveredmethods="2" conditionals="0" coveredconditionals="0" statements="6" coveredstatements="6" elements="8" coveredelements="8"/>
@@ -1212,13 +1212,13 @@
     </file>
     <file name="/local-packages/crealoz/easy-audit/Processor/Type/AbstractType.php">
       <class name="Crealoz\EasyAudit\Processor\Type\AbstractType" namespace="global">
-        <metrics complexity="19" methods="7" coveredmethods="6" conditionals="0" coveredconditionals="0" statements="35" coveredstatements="32" elements="42" coveredelements="38"/>
+        <metrics complexity="19" methods="7" coveredmethods="5" conditionals="0" coveredconditionals="0" statements="35" coveredstatements="28" elements="42" coveredelements="33"/>
       </class>
       <line num="22" type="method" name="__construct" visibility="public" complexity="1" crap="1" count="11"/>
       <line num="26" type="stmt" count="11"/>
       <line num="28" type="method" name="hasErrors" visibility="public" complexity="1" crap="1" count="1"/>
       <line num="30" type="stmt" count="1"/>
-      <line num="42" type="method" name="process" visibility="public" complexity="7" crap="7" count="7"/>
+      <line num="42" type="method" name="process" visibility="public" complexity="7" crap="7.54" count="7"/>
       <line num="44" type="stmt" count="7"/>
       <line num="45" type="stmt" count="7"/>
       <line num="46" type="stmt" count="7"/>
@@ -1227,15 +1227,15 @@
       <line num="49" type="stmt" count="7"/>
       <line num="50" type="stmt" count="7"/>
       <line num="51" type="stmt" count="7"/>
-      <line num="52" type="stmt" count="1"/>
-      <line num="54" type="stmt" count="1"/>
-      <line num="55" type="stmt" count="1"/>
+      <line num="52" type="stmt" count="0"/>
+      <line num="54" type="stmt" count="0"/>
+      <line num="55" type="stmt" count="0"/>
       <line num="57" type="stmt" count="7"/>
       <line num="58" type="stmt" count="5"/>
       <line num="59" type="stmt" count="3"/>
       <line num="61" type="stmt" count="5"/>
       <line num="62" type="stmt" count="5"/>
-      <line num="63" type="stmt" count="1"/>
+      <line num="63" type="stmt" count="0"/>
       <line num="67" type="stmt" count="5"/>
       <line num="78" type="method" name="initResults" visibility="public" complexity="3" crap="3" count="1"/>
       <line num="80" type="stmt" count="1"/>
@@ -1256,7 +1256,7 @@
       <line num="129" type="stmt" count="0"/>
       <line num="140" type="method" name="getErroneousFiles" visibility="public" complexity="1" crap="1" count="1"/>
       <line num="142" type="stmt" count="1"/>
-      <metrics loc="145" ncloc="102" classes="1" methods="7" coveredmethods="6" conditionals="0" coveredconditionals="0" statements="35" coveredstatements="32" elements="42" coveredelements="38"/>
+      <metrics loc="145" ncloc="102" classes="1" methods="7" coveredmethods="5" conditionals="0" coveredconditionals="0" statements="35" coveredstatements="28" elements="42" coveredelements="33"/>
     </file>
     <file name="/local-packages/crealoz/easy-audit/Processor/Type/Logic.php">
       <class name="Crealoz\EasyAudit\Processor\Type\Logic" namespace="global">
@@ -2305,6 +2305,6 @@
       <line num="25" type="stmt" count="0"/>
       <metrics loc="27" ncloc="27" classes="1" methods="2" coveredmethods="0" conditionals="0" coveredconditionals="0" statements="9" coveredstatements="0" elements="11" coveredelements="0"/>
     </file>
-    <metrics files="73" loc="5013" ncloc="4169" classes="65" methods="298" coveredmethods="187" conditionals="0" coveredconditionals="0" statements="1571" coveredstatements="1116" elements="1869" coveredelements="1303"/>
+    <metrics files="73" loc="5013" ncloc="4169" classes="65" methods="298" coveredmethods="186" conditionals="0" coveredconditionals="0" statements="1571" coveredstatements="1112" elements="1869" coveredelements="1298"/>
   </project>
 </coverage>
diff --git a/etc/di.xml b/etc/di.xml
index 3be1892..9e6e227 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -169,12 +169,6 @@
             <argument name="modulelPath" xsi:type="object">Crealoz\EasyAudit\Service\FileSystem\ModulePaths\Proxy</argument>
         </arguments>
     </type>
-    <type name="Crealoz\EasyAudit\Processor\Files\Logic\Modules\CheckEnabled">
-        <arguments>
-            <argument name="driver" xsi:type="object">Magento\Framework\Filesystem\Driver\File\Proxy</argument>
-            <argument name="logger" xsi:type="object">Crealoz\EasyAudit\Logger\Logger</argument>
-        </arguments>
-    </type>
     <type name="Crealoz\EasyAudit\Service\FileSystem\ClassNameGetter">
         <arguments>
             <argument name="driver" xsi:type="object">Magento\Framework\Filesystem\Driver\File\Proxy</argument>