diff --git a/Admin/Installer.php b/Admin/Installer.php
index faa5c52..50c974b 100755
--- a/Admin/Installer.php
+++ b/Admin/Installer.php
@@ -45,11 +45,15 @@ final class Installer extends InstallerAbstract
      */
     public static function install(ApplicationAbstract $app, ModuleInfo $info, SettingsInterface $cfgHandler) : void
     {
-        if (!\is_writable(__DIR__ . '/SearchCommands.php')) {
-            throw new PermissionException(__DIR__ . '/SearchCommands.php');
+        if (!\is_writable(__DIR__ . '/')) {
+            throw new PermissionException(__DIR__ . '/');
         }
 
         if (\is_file(__DIR__ . '/SearchCommands.php')) {
+            if (!\is_writable(__DIR__ . '/SearchCommands.php')) {
+                throw new PermissionException(__DIR__ . '/SearchCommands.php');
+            }
+
             \unlink(__DIR__ . '/SearchCommands.php');
         }
 
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index 8e927c6..b8abe7d 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -98,6 +98,9 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
      */
     public function testApiSearch() : void
     {
+        $searchRoutes = include __DIR__ . '/../../Admin/SearchCommands.php';
+        self::assertGreaterThan(0, \count($searchRoutes));
+
         $response = new HttpResponse();
         $request  = new HttpRequest(new HttpUri(''));
 
@@ -105,6 +108,6 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
         $request->setData('search', ':help introduction');
 
         $this->module->routeSearch($request, $response);
-        self::assertGreaterThan(0, \count($response->get('')));
+        self::assertGreaterThan(0, \count($response->get($request->uri->__toString())));
     }
 }