diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index d337449..8f30402 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -200,7 +200,7 @@ final class ApiController extends Controller
         $account->name3 = $request->getDataString('email') ?? '';
 
         $profile           = new Profile($account);
-        $profile->birthday = new \DateTime((string) ($request->getData('birthday') ?? 'now'));
+        $profile->birthday = new \DateTime($request->getDataString('birthday') ?? 'now');
 
         $employee = new Employee($profile);
 
@@ -421,7 +421,7 @@ final class ApiController extends Controller
         $history->end              = $request->getDataDateTime('end');
         $history->educationTitle   = $request->getDataString('title') ?? '';
         $history->score            = $request->getDataString('score') ?? '';
-        $history->passed           = (bool) ($request->getData('passed') ?? true);
+        $history->passed           = $request->getDataBool('passed') ?? true;
         $history->address->name    = $request->getDataString('name') ?? '';
         $history->address->address = $request->getDataString('address') ?? '';
         $history->address->postal  = $request->getDataString('postal') ?? '';
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';