diff --git a/Controller/BackendController.php b/Controller/BackendController.php
index 96ef12d..b7da18e 100755
--- a/Controller/BackendController.php
+++ b/Controller/BackendController.php
@@ -93,7 +93,7 @@ final class BackendController extends Controller
         $view = new View($this->app->l11nManager, $request, $response);
 
         /** @var \Modules\Draw\Models\DrawImage $draw */
-        $draw      = DrawImageMapper::get()->where('id', (int) ($request->getData('id')))->execute();
+        $draw      = DrawImageMapper::get()->where('id', (int) $request->getData('id'))->execute();
         $accountId = $request->header->account;
 
         $view->setTemplate('/Modules/Draw/Theme/Backend/draw-single');
diff --git a/tests/Autoloader.php b/tests/Autoloader.php
index 80a0a1e..d2d0080 100755
--- a/tests/Autoloader.php
+++ b/tests/Autoloader.php
@@ -71,14 +71,12 @@ final class Autoloader
      *
      * @return void
      *
-     * @throws AutoloadException Throws this exception if the class to autoload doesn't exist. This could also be related to a wrong namespace/file path correlation.
-     *
      * @since 1.0.0
      */
     public static function defaultAutoloader(string $class) : void
     {
         $class = \ltrim($class, '\\');
-        $class = \str_replace(['_', '\\'], '/', $class);
+        $class = \strtr($class, '_\\', '//');
 
         foreach (self::$paths as $path) {
             $file = $path . $class . '.php';