diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php
index 519b893..15bbacf 100755
--- a/Admin/Routes/Web/Backend.php
+++ b/Admin/Routes/Web/Backend.php
@@ -19,15 +19,6 @@ use phpOMS\Router\RouteVerb;
 
 return [
     '^.*/helper/template/create.*$' => [
-        [
-            'dest'       => '\Modules\Media\Controller\BackendController::setUpFileUploaderTrait',
-            'verb'       => RouteVerb::GET,
-            'permission' => [
-                'module' => BackendController::NAME,
-                'type'   => PermissionType::CREATE,
-                'state'  => PermissionCategory::TEMPLATE,
-            ],
-        ],
         [
             'dest'       => '\Modules\Helper\Controller\BackendController:viewTemplateCreate',
             'verb'       => RouteVerb::GET,
@@ -39,15 +30,6 @@ return [
         ],
     ],
     '^.*/helper/report/create.*$' => [
-        [
-            'dest'       => '\Modules\Media\Controller\BackendController::setUpFileUploaderTrait',
-            'verb'       => RouteVerb::GET,
-            'permission' => [
-                'module' => BackendController::NAME,
-                'type'   => PermissionType::CREATE,
-                'state'  => PermissionCategory::REPORT,
-            ],
-        ],
         [
             'dest'       => '\Modules\Helper\Controller\BackendController:viewReportCreate',
             'verb'       => RouteVerb::GET,
diff --git a/tests/Autoloader.php b/tests/Autoloader.php
index 997ae76..30b55ac 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;