diff --git a/composer.json b/composer.json
index f7e0279..9fda7a6 100644
--- a/composer.json
+++ b/composer.json
@@ -27,6 +27,11 @@
       "Laravel\\Logzio\\": "src/"
     }
   },
+  "autoload-dev": {
+    "psr-4": {
+      "Tests\\": "tests/"
+    }
+  },
   "require": {
     "php": "^7.1.3",
     "guzzlehttp/guzzle": "^6.3|^7.0",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index d5f26c0..010554b 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -4,7 +4,7 @@
     xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
     backupGlobals="false"
     backupStaticAttributes="false"
-    bootstrap="tests/bootstrap.php"
+    bootstrap="vendor/autoload.php"
     colors="true"
     convertErrorsToExceptions="true"
     convertNoticesToExceptions="true"
diff --git a/src/Log/Formatter.php b/src/Log/Formatter.php
index c6328ad..b3e8deb 100644
--- a/src/Log/Formatter.php
+++ b/src/Log/Formatter.php
@@ -9,7 +9,7 @@
 /**
  * Class Formatter
  *
- * @package     Laravel\Logzio\Log
+ * @package     oanhnn/laravel-logzio
  * @author      Oanh Nguyen <oanhnn.bk@gmail.com>
  * @license     The MIT license
  */
diff --git a/src/Log/Handler.php b/src/Log/Handler.php
index a9a9222..bec81d4 100644
--- a/src/Log/Handler.php
+++ b/src/Log/Handler.php
@@ -13,7 +13,7 @@
 /**
  * Class Handler
  *
- * @package     Laravel\Logzio\Log
+ * @package     oanhnn/laravel-logzio
  * @author      Oanh Nguyen <oanhnn.bk@gmail.com>
  * @license     The MIT license
  *
diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
index 9c9342c..399dfd1 100644
--- a/src/ServiceProvider.php
+++ b/src/ServiceProvider.php
@@ -10,7 +10,7 @@
 /**
  * Class Service Provider
  *
- * @package     Laravel\Logzio
+ * @package     oanhnn/laravel-logzio
  * @author      Oanh Nguyen <oanhnn.bk@gmail.com>
  * @license     The MIT license
  */
diff --git a/tests/Concerns/CanProvideLogRecord.php b/tests/Concerns/CanProvideLogRecord.php
index fc58dc9..3d2348a 100644
--- a/tests/Concerns/CanProvideLogRecord.php
+++ b/tests/Concerns/CanProvideLogRecord.php
@@ -8,7 +8,7 @@
 /**
  * Trait CanProvideLogRecord
  *
- * @package     Tests\Concerns
+ * @package     oanhnn/laravel-logzio
  * @author      Oanh Nguyen <oanhnn.bk@gmail.com>
  * @license     The MIT license
  */
diff --git a/tests/Concerns/NonPublicAccessible.php b/tests/Concerns/NonPublicAccessible.php
index 07a207e..2e93d08 100644
--- a/tests/Concerns/NonPublicAccessible.php
+++ b/tests/Concerns/NonPublicAccessible.php
@@ -11,7 +11,7 @@
  *
  * Help access to non-public property and method of an object
  *
- * @package     Tests\Concerns
+ * @package     oanhnn/laravel-logzio
  * @author      Oanh Nguyen <oanhnn.bk@gmail.com>
  * @license     The MIT license
  */
diff --git a/tests/Integration/ServiceProviderTest.php b/tests/Integration/ServiceProviderTest.php
index a6edac3..8d61729 100644
--- a/tests/Integration/ServiceProviderTest.php
+++ b/tests/Integration/ServiceProviderTest.php
@@ -9,7 +9,7 @@
 /**
  * Class ServiceProviderTest
  *
- * @package     Tests\Integration
+ * @package     oanhnn/laravel-logzio
  * @author      Oanh Nguyen <oanhnn.bk@gmail.com>
  * @license     The MIT license
  */
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 719358a..e421abe 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -8,7 +8,7 @@
 /**
  * Class TestCase
  *
- * @package     Tests
+ * @package     oanhnn/laravel-logzio
  * @author      Oanh Nguyen <oanhnn.bk@gmail.com>
  * @license     The MIT license
  */
diff --git a/tests/Unit/LogzIoFormatterTest.php b/tests/Unit/LogzioFormatterTest.php
similarity index 97%
rename from tests/Unit/LogzIoFormatterTest.php
rename to tests/Unit/LogzioFormatterTest.php
index f929429..7999846 100644
--- a/tests/Unit/LogzIoFormatterTest.php
+++ b/tests/Unit/LogzioFormatterTest.php
@@ -9,7 +9,7 @@
 /**
  * Class LogzioFormatterTest
  *
- * @package     Tests\Unit
+ * @package     oanhnn/laravel-logzio
  * @author      Oanh Nguyen <oanhnn.bk@gmail.com>
  * @license     The MIT license
  */
diff --git a/tests/Unit/LogzioHandlerTest.php b/tests/Unit/LogzioHandlerTest.php
index f56f7cb..c6d8ec5 100644
--- a/tests/Unit/LogzioHandlerTest.php
+++ b/tests/Unit/LogzioHandlerTest.php
@@ -13,7 +13,7 @@
 /**
  * Class LogzioHandlerTest
  *
- * @package     Tests\Unit
+ * @package     oanhnn/laravel-logzio
  * @author      Oanh Nguyen <oanhnn.bk@gmail.com>
  * @license     The MIT license
  */
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
deleted file mode 100644
index 2a74159..0000000
--- a/tests/bootstrap.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-// Set timezone
-date_default_timezone_set('UTC');
-
-// Enable Composer autoloader
-/** @var \Composer\Autoload\ClassLoader $autoloader */
-$autoloader = require dirname(__DIR__) . '/vendor/autoload.php';
-
-// Register test classes
-$autoloader->addPsr4('Tests\\', __DIR__);