diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 4e63e98..6f19313 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -184,6 +184,7 @@ final class ApiController extends Controller
             return;
         } elseif ($trigger === 'POST:Module:Billing-bill_element-update') {
             /** @var \Modules\Billing\Models\BillElement $new */
+            /** @var \Modules\Billing\Models\BillElement $old */
             /** @var \Modules\WarehouseManagement\Models\StockMovement[] $transactions */
             $transactions = StockMovementMapper::getAll()
                 ->where('billElement', $new->id)
diff --git a/tests/Autoloader.php b/tests/Autoloader.php
index ee70921..a7df8f7 100755
--- a/tests/Autoloader.php
+++ b/tests/Autoloader.php
@@ -83,9 +83,12 @@ final class Autoloader
         }
 
         $class2 = $class;
+        $class3 = $class;
 
         $pos = \stripos($class, '/');
         if ($pos !== false) {
+            $class3 = \substr($class, $pos + 1);
+
             $pos = \stripos($class, '/', $pos + 1);
 
             if ($pos !== false) {
@@ -94,7 +97,7 @@ final class Autoloader
         }
 
         foreach (self::$paths as $path) {
-            if (\is_file($file = $path . $class2 . '.php')) {
+            if (\is_file($file = $path . $class2 . '.php') && \stripos($file, $class3) !== false) {
                 include_once $file;
 
                 return;