diff --git a/composer.json b/composer.json
index 822b663ab..261b2afd0 100755
--- a/composer.json
+++ b/composer.json
@@ -110,7 +110,10 @@
 
     "autoload-dev": {
         "psr-4": {
-            "Tests\\": "tests/"
+            "Tests\\Acceptance\\": "tests/acceptance/",
+            "Tests\\Functional\\": "tests/functional/",
+            "Tests\\Unit\\": "tests/unit/",
+            "Tests\\Trigger\\": "tests/trigger/"
         }
     },
 
diff --git a/packages/Webkul/Admin/src/DataGrids/CouponsDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CartRuleCouponsDataGrid.php
similarity index 100%
rename from packages/Webkul/Admin/src/DataGrids/CouponsDataGrid.php
rename to packages/Webkul/Admin/src/DataGrids/CartRuleCouponsDataGrid.php
diff --git a/tests/functional/Admin/Catalog/ProductCest.php b/tests/functional/Admin/Catalog/ProductCest.php
index 9d2d3461a..ef49cb1ce 100644
--- a/tests/functional/Admin/Catalog/ProductCest.php
+++ b/tests/functional/Admin/Catalog/ProductCest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Functional\Webkul\Admin;
+namespace Tests\Functional\Admin\Catalog;
 
 use FunctionalTester;
 use Faker\Factory;
diff --git a/tests/functional/CartRule/CartRuleCest.php b/tests/functional/CartRule/CartRuleCest.php
index 18191ff9b..7cb82e1fb 100644
--- a/tests/functional/CartRule/CartRuleCest.php
+++ b/tests/functional/CartRule/CartRuleCest.php
@@ -1,10 +1,12 @@
 <?php
 
+namespace Tests\Functional\CartRule;
+
 use Webkul\Product\Models\ProductAttributeValue;
 use Webkul\Product\Models\ProductFlat;
+use FunctionalTester;
 
 use Webkul\CartRule\Models\CartRule;
-use Haendlerbund\SalesforceApi\Models\HbCartRule;
 
 class CartRuleCest
 {
diff --git a/tests/functional/Checkout/Order/OrderCest.php b/tests/functional/Checkout/Order/OrderCest.php
index 8d7e47f13..f2a833b44 100644
--- a/tests/functional/Checkout/Order/OrderCest.php
+++ b/tests/functional/Checkout/Order/OrderCest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Functional\Checkout\Cart;
+namespace Tests\Functional\Checkout\Order;
 
 use Faker\Factory;
 use FunctionalTester;
diff --git a/tests/functional/Customer/CustomerCest.php b/tests/functional/Customer/CustomerCest.php
index 873761be9..c9fb53d6c 100644
--- a/tests/functional/Customer/CustomerCest.php
+++ b/tests/functional/Customer/CustomerCest.php
@@ -1,7 +1,10 @@
 <?php
 
+namespace Tests\Functional\Customer;
+
 use Webkul\Customer\Models\Customer;
 use Webkul\Customer\Models\CustomerAddress;
+use FunctionalTester;
 
 class CustomerCest
 {
diff --git a/tests/functional/Shop/CartTaxesCest.php b/tests/functional/Shop/CartTaxesCest.php
index af1c338a1..9474e2e3f 100644
--- a/tests/functional/Shop/CartTaxesCest.php
+++ b/tests/functional/Shop/CartTaxesCest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Functional\Cart;
+namespace Tests\Functional\Shop;
 
 use FunctionalTester;
 use Illuminate\Support\Facades\Config;
diff --git a/tests/trigger/Shop/DatabaseLogicCest.php b/tests/trigger/Shop/DatabaseLogicCest.php
index bd446683e..4b640e127 100644
--- a/tests/trigger/Shop/DatabaseLogicCest.php
+++ b/tests/trigger/Shop/DatabaseLogicCest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit\Shop;
+namespace Tests\Trigger\Shop;
 
 use UnitTester;
 use Webkul\Category\Models\Category;
@@ -17,7 +17,7 @@ class DatabaseLogicCest
     private $localeEn;
     /** @var Locale $localeDe */
     private $localeDe;
-    
+
     public function _before(UnitTester $I)
     {
         $this->faker = Factory::create();
@@ -45,7 +45,7 @@ class DatabaseLogicCest
         ]);
 
         $parentCategoryName = $this->faker->word;
-        
+
         $parentCategoryAttributes = [
             'parent_id'           => $rootCategory->id,
             'position'            => 1,
@@ -68,7 +68,7 @@ class DatabaseLogicCest
         $rootCategory->prependNode($parentCategory);
         $I->assertNotNull($parentCategory);
 
-        $categoryName = $this->faker->word; 
+        $categoryName = $this->faker->word;
         $categoryAttributes = [
             'position'            => 1,
             'status'              => 1,
diff --git a/tests/trigger/Shop/TriggerCest.php b/tests/trigger/Shop/TriggerCest.php
index 2be0f75d0..704a08fb6 100644
--- a/tests/trigger/Shop/TriggerCest.php
+++ b/tests/trigger/Shop/TriggerCest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit\Shop;
+namespace Tests\Trigger\Shop;
 
 use Faker\Factory;
 use UnitTester;
diff --git a/tests/unit/CartRule/CartRuleCest.php b/tests/unit/CartRule/CartRuleCest.php
index cf8e4b683..153af3627 100644
--- a/tests/unit/CartRule/CartRuleCest.php
+++ b/tests/unit/CartRule/CartRuleCest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Unit\Category;
+namespace Tests\Unit\CartRule;
 
 use UnitTester;
 use Codeception\Example;