diff --git a/app/Api/routes.php b/app/Api/routes.php
index 42303aca5..844fe40c9 100644
--- a/app/Api/routes.php
+++ b/app/Api/routes.php
@@ -63,7 +63,7 @@ Route::prefix('api/v1')->group(function () {
     /*
      * FCM token response
      */
-    Route::post('fcmtoken', [Common\PushNotificationController::class, 'fcmToken'])->name('fcmtoken');
+    //Route::post('fcmtoken', [Common\PushNotificationController::class, 'fcmToken'])->name('fcmtoken');
 });
 /*
  * ================================================================================================
diff --git a/phpunit.xml b/phpunit.xml
old mode 100644
new mode 100755
index 3f968c80e..45316b227
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,36 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         bootstrap="bootstrap/autoload.php"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
-    <testsuites>
-        <testsuite name="all">
-            <directory>./tests/</directory>
-        </testsuite>
-        <testsuite name="unit">
-            <directory>./tests/unit</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">app/</directory>
-        </whitelist>
-    </filter>
-    <php>
-        <env name="APP_ENV" value="testing"/> 
-        <env name="DB_CONNECTION" value="testing"/>
-        <env name="DB_DATABASE" value="testing_db"/>
-        <env name="CACHE_DRIVER" value="array"/>
-        <env name="SESSION_DRIVER" value="array"/>
-        <env name="QUEUE_CONNECTION" value="sync"/>
-        <env name="MAIL_MAILER" value="mail"/>
-        <env name="APP_URL" value="http://localhost:8000"/>
-        <env name="DB_DATABASE" value="testing_db"/>
-        <env name="DB_INSTALL" value="1"/>
-    </php>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="bootstrap/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage includeUncoveredFiles="true">
+    <include>
+      <directory suffix=".php">app/</directory>
+    </include>
+  </coverage>
+  <testsuites>
+    <testsuite name="feature">
+      <directory>tests/Feature</directory>
+    </testsuite>
+    <testsuite name="unit">
+      <directory>tests/Unit</directory>
+    </testsuite>
+  </testsuites>
+  <php>
+    <env name="APP_ENV" value="testing"/>
+   <!-- <env name="DB_CONNECTION" value="testing"/>
+    <env name="DB_DATABASE" value="testing_db"/> -->
+    <env name="CACHE_DRIVER" value="array"/>
+    <env name="SESSION_DRIVER" value="array"/>
+    <env name="QUEUE_CONNECTION" value="sync"/>
+    <env name="MAIL_MAILER" value="mail"/>
+    <env name="APP_URL" value="http://localhost:8000"/>
+    <env name="DB_INSTALL" value="1"/>
+  </php>
 </phpunit>
diff --git a/phpunit.xml.bak b/phpunit.xml.bak
new file mode 100755
index 000000000..3f968c80e
--- /dev/null
+++ b/phpunit.xml.bak
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="bootstrap/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false">
+    <testsuites>
+        <testsuite name="all">
+            <directory>./tests/</directory>
+        </testsuite>
+        <testsuite name="unit">
+            <directory>./tests/unit</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">app/</directory>
+        </whitelist>
+    </filter>
+    <php>
+        <env name="APP_ENV" value="testing"/> 
+        <env name="DB_CONNECTION" value="testing"/>
+        <env name="DB_DATABASE" value="testing_db"/>
+        <env name="CACHE_DRIVER" value="array"/>
+        <env name="SESSION_DRIVER" value="array"/>
+        <env name="QUEUE_CONNECTION" value="sync"/>
+        <env name="MAIL_MAILER" value="mail"/>
+        <env name="APP_URL" value="http://localhost:8000"/>
+        <env name="DB_DATABASE" value="testing_db"/>
+        <env name="DB_INSTALL" value="1"/>
+    </php>
+</phpunit>
diff --git a/tests/Feature/RouteTest.php b/tests/Feature/RouteTest.php
new file mode 100755
index 000000000..1f77bfb1e
--- /dev/null
+++ b/tests/Feature/RouteTest.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace Tests\Feature;
+
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Foundation\Testing\WithFaker;
+use Tests\TestCase;
+
+class RouteTest extends TestCase
+{
+    /**
+     * A basic feature test example.
+     *
+     * @return void
+     */
+    public function test_example()
+    {
+        $response = $this->get('/');
+
+        $response->assertStatus(200);
+    }
+
+}
diff --git a/tests/Unit/ArtisanCommandTest.php b/tests/Unit/ArtisanCommandTest.php
new file mode 100644
index 000000000..f169ed216
--- /dev/null
+++ b/tests/Unit/ArtisanCommandTest.php
@@ -0,0 +1,19 @@
+<?php
+
+namespace Tests\Unit;
+
+use Tests\TestCase;
+
+class ArtisanCommandTest extends TestCase
+{
+    /**
+     * A basic test example.
+     *
+     * @return void
+     */
+    public function testRouteListCommand()
+    {
+        $this->artisan('route:list')
+            ->assertExitCode(0);
+    }
+}