diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 07bd808..d640e13 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -386,10 +386,10 @@ final class ApiController extends Controller
      */
     private function updateTaskFromRequest(RequestAbstract $request, Task $task) : Task
     {
-        $task->title          = (string) ($request->getData('title') ?? $task->title);
-        $task->description    = Markdown::parse((string) ($request->getData('plain') ?? $task->descriptionRaw));
-        $task->descriptionRaw = (string) ($request->getData('plain') ?? $task->descriptionRaw);
-        $task->due            = $request->hasData('due') ? new \DateTime((string) ($request->getData('due'))) : $task->due;
+        $task->title          = $request->getDataString('title') ?? $task->title;
+        $task->description    = Markdown::parse($request->getDataString('plain') ?? $task->descriptionRaw);
+        $task->descriptionRaw = $request->getDataString('plain') ?? $task->descriptionRaw;
+        $task->due            = $request->hasData('due') ? new \DateTime($request->getDataString('due') ?? 'now') : $task->due;
         $task->setStatus($request->getDataInt('status') ?? $task->getStatus());
         $task->setType($request->getDataInt('type') ?? $task->getType());
         $task->setPriority($request->getDataInt('priority') ?? $task->getPriority());
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';