diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index a195341..270b1a6 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -92,12 +92,12 @@ final class ApiController extends Controller
         $navElement->id                 = (int) $request->getData('id');
         $navElement->pid                = \sha1(\str_replace('/', '', $request->getDataString('pid') ?? ''));
         $navElement->pidRaw             = $request->getDataString('pid') ?? '';
-        $navElement->name               = (string) ($request->getDataString('name') ?? '');
+        $navElement->name               = $request->getDataString('name') ?? '';
         $navElement->type               = $request->getDataInt('type') ?? 1;
         $navElement->subtype            = $request->getDataInt('subtype') ?? 2;
         $navElement->icon               = $request->getDataString('icon');
         $navElement->uri                = $request->getDataString('uri');
-        $navElement->target             = (string) ($request->getData('target') ?? 'self');
+        $navElement->target             = $request->getDataString('target') ?? 'self';
         $navElement->action             = $request->getDataString('action');
         $navElement->app                = $request->getDataInt('app') ?? 2;
         $navElement->from               = empty($from = $request->getDataString('from') ?? '') ? '0' : $from;
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';