diff --git a/tests/Aggregation/CardinalityAggregationTest.php b/tests/Aggregation/CardinalityAggregationTest.php
index 607948f2fb9ddfab25484333be0fd8979a4cc370..934f2743dadd86cabe6e4d134939ea58a8dfc996 100644
--- a/tests/Aggregation/CardinalityAggregationTest.php
+++ b/tests/Aggregation/CardinalityAggregationTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\CardinalityAggregation;
 
diff --git a/tests/Aggregation/ChildrenAggregationTest.php b/tests/Aggregation/ChildrenAggregationTest.php
index ceb7e3d065d256e551f44b52fa4d90677a3d2ae6..89eeced273842f01835a75a11cca86a767f08766 100644
--- a/tests/Aggregation/ChildrenAggregationTest.php
+++ b/tests/Aggregation/ChildrenAggregationTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\ChildrenAggregation;
 
diff --git a/tests/Aggregation/DateRangeAggregationTest.php b/tests/Aggregation/DateRangeAggregationTest.php
index e9050240650d76e9f989b6196186ff2b6a02c04c..718f8a85a590d37dae20d1592874d9396f25c779 100644
--- a/tests/Aggregation/DateRangeAggregationTest.php
+++ b/tests/Aggregation/DateRangeAggregationTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\DateRangeAggregation;
 
diff --git a/tests/Aggregation/FilterAggregationTest.php b/tests/Aggregation/FilterAggregationTest.php
index 27d0b0c87eda9d58c8c87390f706a2ef206fb647..43de57d04210065994d0e6d758cd264914812e3c 100644
--- a/tests/Aggregation/FilterAggregationTest.php
+++ b/tests/Aggregation/FilterAggregationTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\FilterAggregation;
diff --git a/tests/Aggregation/FiltersAggregationTest.php b/tests/Aggregation/FiltersAggregationTest.php
index 3a6a9025116bbb43a5637ad52da0c767fff85da3..379f3da100f33088cdc231c02106b76d34e6d3aa 100644
--- a/tests/Aggregation/FiltersAggregationTest.php
+++ b/tests/Aggregation/FiltersAggregationTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\FiltersAggregation;
diff --git a/tests/Aggregation/GeoBoundsAggregationTest.php b/tests/Aggregation/GeoBoundsAggregationTest.php
index ac1ebfaad3f84df7eef908e5e04b8769392e0dc4..24376fb71fce5cdbf1f9a2a2070a1d182299db9d 100644
--- a/tests/Aggregation/GeoBoundsAggregationTest.php
+++ b/tests/Aggregation/GeoBoundsAggregationTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\GeoBoundsAggregation;
diff --git a/tests/Aggregation/GeoDistanceAggregationTest.php b/tests/Aggregation/GeoDistanceAggregationTest.php
index b4ec0f3359ea5ec355e1be3ea53f21a1d72c3ac5..513f246b552931f07ec376cf243ffa5b5e3bd689 100644
--- a/tests/Aggregation/GeoDistanceAggregationTest.php
+++ b/tests/Aggregation/GeoDistanceAggregationTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\GeoDistanceAggregation;
 
diff --git a/tests/Aggregation/GeoHashGridAggregationTest.php b/tests/Aggregation/GeoHashGridAggregationTest.php
index 489d1715d4166303ca4f447cb89327b5b7ca6975..e97a022b6919668df575e80037e9f7a0468ec14a 100644
--- a/tests/Aggregation/GeoHashGridAggregationTest.php
+++ b/tests/Aggregation/GeoHashGridAggregationTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\GeoHashGridAggregation;
 
diff --git a/tests/Aggregation/GlobalAggregationTest.php b/tests/Aggregation/GlobalAggregationTest.php
index 357eb4c6500f0da9613239944be29ffbdc93c895..b2e8850053b383933948a1fbd3a745f95dbc999c 100644
--- a/tests/Aggregation/GlobalAggregationTest.php
+++ b/tests/Aggregation/GlobalAggregationTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\GlobalAggregation;
 
diff --git a/tests/Aggregation/Ipv4RangeAggregationTest.php b/tests/Aggregation/Ipv4RangeAggregationTest.php
index 846c4dda34281566857ceb7a59f3e7b9ca7aab27..0582f68082862f7a8cdd4a560cd8d0f3773b1a62 100644
--- a/tests/Aggregation/Ipv4RangeAggregationTest.php
+++ b/tests/Aggregation/Ipv4RangeAggregationTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\Ipv4RangeAggregation;
diff --git a/tests/Aggregation/MissingAggregationTest.php b/tests/Aggregation/MissingAggregationTest.php
index 1caae742cb3e3f1e3cfdec0cc4a085f8006b1728..ffa66d57c6f2b9cfbc2113e00fee91c4c4213f93 100644
--- a/tests/Aggregation/MissingAggregationTest.php
+++ b/tests/Aggregation/MissingAggregationTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\MissingAggregation;
 
diff --git a/tests/Aggregation/NestedAggregationTest.php b/tests/Aggregation/NestedAggregationTest.php
index fd592944d69898c0771b61df63e0e172e5aa24e2..736ac533a945bdc87cfb593a3efdfad60f95aea4 100644
--- a/tests/Aggregation/NestedAggregationTest.php
+++ b/tests/Aggregation/NestedAggregationTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\NestedAggregation;
diff --git a/tests/Aggregation/PercentileRanksAggregationTest.php b/tests/Aggregation/PercentileRanksAggregationTest.php
index 95d93d6508a580fa3d712c76c7867a239bac6cde..e2f8914c2d0964384e23e721c33550eebb6b7e83 100644
--- a/tests/Aggregation/PercentileRanksAggregationTest.php
+++ b/tests/Aggregation/PercentileRanksAggregationTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\PercentileRanksAggregation;
diff --git a/tests/Aggregation/PercentilesAggregationTest.php b/tests/Aggregation/PercentilesAggregationTest.php
index b4492f42d416b986e7f66425b33f27506a3659c7..2357f356034461862e09edf43495ad38e9f3a749 100644
--- a/tests/Aggregation/PercentilesAggregationTest.php
+++ b/tests/Aggregation/PercentilesAggregationTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\PercentilesAggregation;
 
diff --git a/tests/Aggregation/RangeAggregationTest.php b/tests/Aggregation/RangeAggregationTest.php
index 87c5be36acf5e1485c22872eff53c8488c796cbc..dec054e8cd5deec081918ac8ce08357fde91a72e 100644
--- a/tests/Aggregation/RangeAggregationTest.php
+++ b/tests/Aggregation/RangeAggregationTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\RangeAggregation;
diff --git a/tests/Aggregation/ReverseNestedAggregationTest.php b/tests/Aggregation/ReverseNestedAggregationTest.php
index 0c797121fdc9839b97434199131483d9ac4e6f62..407073826addf87dabbd6c068f796c86b78cd255 100644
--- a/tests/Aggregation/ReverseNestedAggregationTest.php
+++ b/tests/Aggregation/ReverseNestedAggregationTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\ReverseNestedAggregation;
diff --git a/tests/Aggregation/StatsAggregationTest.php b/tests/Aggregation/StatsAggregationTest.php
index cd85cd986d9d645d2babb2acffbabd6a8b3428ee..8ed469b831266fb98424c80b87986430bed35129 100644
--- a/tests/Aggregation/StatsAggregationTest.php
+++ b/tests/Aggregation/StatsAggregationTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\StatsAggregation;
diff --git a/tests/Aggregation/TermsAggregationTest.php b/tests/Aggregation/TermsAggregationTest.php
index 52f724a4dfe41e69ff99a4b18d78fca0cd166edd..dab248a0462d54033fdd74651fd0d5745869dda5 100644
--- a/tests/Aggregation/TermsAggregationTest.php
+++ b/tests/Aggregation/TermsAggregationTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\AbstractAggregation;
 use ONGR\ElasticsearchDSL\Aggregation\TermsAggregation;
diff --git a/tests/Aggregation/TopHitsAggregationTest.php b/tests/Aggregation/TopHitsAggregationTest.php
index 5ac784df04aaf968ca48310034b4ffb8cc25fe4c..70b18ae3657792d15f0cc51b04b630ddf0ad22d0 100644
--- a/tests/Aggregation/TopHitsAggregationTest.php
+++ b/tests/Aggregation/TopHitsAggregationTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
 use ONGR\ElasticsearchDSL\Aggregation\TopHitsAggregation;
 use ONGR\ElasticsearchDSL\Sort\FieldSort;
diff --git a/tests/Filter/AndFilterTest.php b/tests/Filter/AndFilterTest.php
index b7c60aba1ede6fe3006124270fcf151e1ee082d5..e768a506672c50b70b566f9d83650caca7b22dff 100644
--- a/tests/Filter/AndFilterTest.php
+++ b/tests/Filter/AndFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\AndFilter;
 
diff --git a/tests/Filter/ExistsFilterTest.php b/tests/Filter/ExistsFilterTest.php
index 76524c6d3bad61ee5fa095663df7d7a7842b3e23..fa46ac6ca4bcdf2d6b92751c79c5fe208b1cf683 100644
--- a/tests/Filter/ExistsFilterTest.php
+++ b/tests/Filter/ExistsFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\ExistsFilter;
 
diff --git a/tests/Filter/GeoBoundingBoxFilterTest.php b/tests/Filter/GeoBoundingBoxFilterTest.php
index 6ab76b7d56aa4086980d186ed6794b2ef665da8a..69abbc94e1ac4beb95e5d53e8e528c1f21101c96 100644
--- a/tests/Filter/GeoBoundingBoxFilterTest.php
+++ b/tests/Filter/GeoBoundingBoxFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\GeoBoundingBoxFilter;
 
diff --git a/tests/Filter/GeoDistanceFilterTest.php b/tests/Filter/GeoDistanceFilterTest.php
index 888ccbc94983294266c96744bad7c14073e068e2..f76eb3b92d73bc2cc161311f39c1637372d28e17 100644
--- a/tests/Filter/GeoDistanceFilterTest.php
+++ b/tests/Filter/GeoDistanceFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\GeoDistanceFilter;
 
diff --git a/tests/Filter/GeoDistanceRangeFilterTest.php b/tests/Filter/GeoDistanceRangeFilterTest.php
index 206d9d1434b2986fb4ab6e8d76065252fa9e7b78..69087113b8ffdc686375d3e0f688b3139fc8909a 100644
--- a/tests/Filter/GeoDistanceRangeFilterTest.php
+++ b/tests/Filter/GeoDistanceRangeFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\GeoDistanceRangeFilter;
 
diff --git a/tests/Filter/GeoPolygonFilterTest.php b/tests/Filter/GeoPolygonFilterTest.php
index bc0e8d5644d7921d1ea53bfa1d636403e83055fc..97c3c7eda7c5efbb94b5d4c5fe6853bac848e6f0 100644
--- a/tests/Filter/GeoPolygonFilterTest.php
+++ b/tests/Filter/GeoPolygonFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\GeoPolygonFilter;
 
diff --git a/tests/Filter/HasChildFilterTest.php b/tests/Filter/HasChildFilterTest.php
index bfce34420a7ca65bc3f4bb8783c89bc45d05e9a5..0be852a44e1d0338285110297c0811f4e478fbee 100644
--- a/tests/Filter/HasChildFilterTest.php
+++ b/tests/Filter/HasChildFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\HasChildFilter;
 
diff --git a/tests/Filter/HasParentFilterTest.php b/tests/Filter/HasParentFilterTest.php
index b08ed84b2f261c413fa63094563cd66cd0e3a548..d0ad8a56b8730effbc30762645b8bbbb1fa594b6 100644
--- a/tests/Filter/HasParentFilterTest.php
+++ b/tests/Filter/HasParentFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\HasParentFilter;
 
diff --git a/tests/Filter/IdsFilterTest.php b/tests/Filter/IdsFilterTest.php
index ca68d4320b6951981bd719bc156c1088b2d60590..84ff9e9dd4c4cbcf790abc0dcbe920283cc2063e 100644
--- a/tests/Filter/IdsFilterTest.php
+++ b/tests/Filter/IdsFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\IdsFilter;
 
diff --git a/tests/Filter/IndicesFilterTest.php b/tests/Filter/IndicesFilterTest.php
index 3afbffa3c5f20cd0356b2c1e2b2da3a0d6673b04..d6c602718348d6bedd4689b9bc58a742c30eff95 100644
--- a/tests/Filter/IndicesFilterTest.php
+++ b/tests/Filter/IndicesFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\IndicesFilter;
 
diff --git a/tests/Filter/LimitFilterTest.php b/tests/Filter/LimitFilterTest.php
index d60caf751ed26b2612825333d57713007394c14c..41b963f2620c706f0e1b3b89981d9fd8c9785d3c 100644
--- a/tests/Filter/LimitFilterTest.php
+++ b/tests/Filter/LimitFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\LimitFilter;
 
diff --git a/tests/Filter/MatchAllFilterTest.php b/tests/Filter/MatchAllFilterTest.php
index 3019a8e9291aec872b52fa896fc192b8bf8bdbce..eb2b2f6f14e85fb16c4af2a1df0a4f2ca16ff067 100644
--- a/tests/Filter/MatchAllFilterTest.php
+++ b/tests/Filter/MatchAllFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\MatchAllFilter;
 
diff --git a/tests/Filter/MissingFilterTest.php b/tests/Filter/MissingFilterTest.php
index 65534a2a38ad3ea65f9dc2340991be82dff4f546..7ebab6b0ea588e0247c1519d17e1b9c0446e8e52 100644
--- a/tests/Filter/MissingFilterTest.php
+++ b/tests/Filter/MissingFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\MissingFilter;
 
diff --git a/tests/Filter/NestedFilterTest.php b/tests/Filter/NestedFilterTest.php
index b201973e24ae0cf3d107eb73ed4a44b56a610c4b..361a0279bd90d3663ba36939e3906214795f7b1f 100644
--- a/tests/Filter/NestedFilterTest.php
+++ b/tests/Filter/NestedFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\NestedFilter;
 use ONGR\ElasticsearchDSL\Filter\TermFilter;
diff --git a/tests/Filter/NotFilterTest.php b/tests/Filter/NotFilterTest.php
index 409408c366e6acb994da31df596e1228ee05379f..c35e234631e77f3b56c3800b4c70031ad2dfeafe 100644
--- a/tests/Filter/NotFilterTest.php
+++ b/tests/Filter/NotFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\NotFilter;
 
diff --git a/tests/Filter/OrFilterTest.php b/tests/Filter/OrFilterTest.php
index 77c43a1194c8aa61d9b33190128ea72e6dcb79a0..94682db0356ae78c04b73528897ddc2faa32c654 100644
--- a/tests/Filter/OrFilterTest.php
+++ b/tests/Filter/OrFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\OrFilter;
 
diff --git a/tests/Filter/PrefixFilterTest.php b/tests/Filter/PrefixFilterTest.php
index 2cf76131a46936d4529c5c5823c6f187f79eb0f4..cb154d2569ee7c355a801d60c8409be8237c5784 100644
--- a/tests/Filter/PrefixFilterTest.php
+++ b/tests/Filter/PrefixFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\PrefixFilter;
 
diff --git a/tests/Filter/QueryFilterTest.php b/tests/Filter/QueryFilterTest.php
index 71608e96565088b22b4ce5d02dfd7352ea328002..ceeeff4681e9548529427c327c05594b68eb12fa 100644
--- a/tests/Filter/QueryFilterTest.php
+++ b/tests/Filter/QueryFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\QueryFilter;
 
diff --git a/tests/Filter/RangeFilterTest.php b/tests/Filter/RangeFilterTest.php
index 0b62a1037b138dcc632a316fc6d54347fcca28f6..ab59eec4b215fe3e13da5141c29aa4a45eea7fdd 100644
--- a/tests/Filter/RangeFilterTest.php
+++ b/tests/Filter/RangeFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\RangeFilter;
 
diff --git a/tests/Filter/RegexpFilterTest.php b/tests/Filter/RegexpFilterTest.php
index d0f3e91e29b9f38956f1367c62b01c6adc666143..1f7aa947e3524a4c7d99c94bdf4d1d6bd1a7d2e1 100644
--- a/tests/Filter/RegexpFilterTest.php
+++ b/tests/Filter/RegexpFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\RegexpFilter;
 
diff --git a/tests/Filter/ScriptFilterTest.php b/tests/Filter/ScriptFilterTest.php
index 2125fb7466b22dafeae4ab22e6210f1b0a026e01..514af912f20907672e4f356d1552c1526da01057 100644
--- a/tests/Filter/ScriptFilterTest.php
+++ b/tests/Filter/ScriptFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\ScriptFilter;
 
diff --git a/tests/Filter/TermFilterTest.php b/tests/Filter/TermFilterTest.php
index ec7f5f00428b2cd40edb4e3d1d4845c78a58a376..07b775ef31704f504f03918f956ef3e69052e2c3 100644
--- a/tests/Filter/TermFilterTest.php
+++ b/tests/Filter/TermFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\TermFilter;
 
diff --git a/tests/Filter/TermsFilterTest.php b/tests/Filter/TermsFilterTest.php
index 7f5a797ad060f01243c629f631ead8feb9037f57..1fd3286f66e31effb6ab9de6517b5e375034165c 100644
--- a/tests/Filter/TermsFilterTest.php
+++ b/tests/Filter/TermsFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\TermsFilter;
 
diff --git a/tests/Filter/TypeFilterTest.php b/tests/Filter/TypeFilterTest.php
index 7ffb00caff562319ec4ddcb02e393d1a53b99fb2..18ae31589f29becbcb36d857e4f814956eed66fc 100644
--- a/tests/Filter/TypeFilterTest.php
+++ b/tests/Filter/TypeFilterTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Filter;
+namespace ONGR\ElasticsearchDSL\Tests\Filter;
 
 use ONGR\ElasticsearchDSL\Filter\TypeFilter;
 
diff --git a/tests/Highlight/HighlightTest.php b/tests/Highlight/HighlightTest.php
index a774a2f3eb4815e607b8b2b3ec4bec91a2a3ffcd..1b75447bfd19eabcb9642c6d494cd6ac4f40517b 100644
--- a/tests/Highlight/HighlightTest.php
+++ b/tests/Highlight/HighlightTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Highlight;
+namespace ONGR\ElasticsearchDSL\Tests\Highlight;
 
 use ONGR\ElasticsearchDSL\Highlight\Highlight;
 
diff --git a/tests/Query/BoolQueryTest.php b/tests/Query/BoolQueryTest.php
index dfe985196653b35c5a4ea08994e3cbaf4aeba2b2..dd0147faa32624267271cfdc96123e61d6fa1fda 100644
--- a/tests/Query/BoolQueryTest.php
+++ b/tests/Query/BoolQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Aggregation;
+namespace ONGR\ElasticsearchDSL\Tests\Aggregation;
 
 use ONGR\ElasticsearchDSL\Query\BoolQuery;
 use ONGR\ElasticsearchDSL\Query\MatchAllQuery;
diff --git a/tests/Query/FunctionScoreQueryTest.php b/tests/Query/FunctionScoreQueryTest.php
index 85c034da46fb0d7d5597c2ccf19f855bb9f2de4d..7e2fbb45005a60ca7722530a22c746f71d4f2c18 100644
--- a/tests/Query/FunctionScoreQueryTest.php
+++ b/tests/Query/FunctionScoreQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Tests\Query;
 
 use ONGR\ElasticsearchDSL\BuilderInterface;
 use ONGR\ElasticsearchDSL\Query\FunctionScoreQuery;
diff --git a/tests/Query/FuzzyLikeThisQueryTest.php b/tests/Query/FuzzyLikeThisQueryTest.php
index 3563b6455f9fee75c1e1a16398b40ce3eef6b583..ce68de1c70951c6b3b563be25771a55252aac23d 100644
--- a/tests/Query/FuzzyLikeThisQueryTest.php
+++ b/tests/Query/FuzzyLikeThisQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Tests\Query;
 
 use ONGR\ElasticsearchDSL\Query\FuzzyLikeThisQuery;
 
diff --git a/tests/Query/GeoBoundingBoxQueryTest.php b/tests/Query/GeoBoundingBoxQueryTest.php
index 5d297a2b186e498133ae3e9222920c645ea75c51..93c70ab75d601a0bd1941f889df695493baeed13 100644
--- a/tests/Query/GeoBoundingBoxQueryTest.php
+++ b/tests/Query/GeoBoundingBoxQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Tests\Query;
 
 use ONGR\ElasticsearchDSL\Filter\GeoBoundingBoxFilter;
 
diff --git a/tests/Query/GeoDistanceQueryTest.php b/tests/Query/GeoDistanceQueryTest.php
index 5b99600c61ab2da82bc21c25974afc65d4de80c1..a69a4ab4eb3b71b9820ecef54028716045beaf05 100644
--- a/tests/Query/GeoDistanceQueryTest.php
+++ b/tests/Query/GeoDistanceQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Tests\Query;
 
 use ONGR\ElasticsearchDSL\Query\GeoDistanceQuery;
 
diff --git a/tests/Query/GeoDistanceRangeQueryTest.php b/tests/Query/GeoDistanceRangeQueryTest.php
index d686232e48c562437b266a5d13f17fe73022365e..d8e5227cd3ec066747248cf525867c73f79d99b5 100644
--- a/tests/Query/GeoDistanceRangeQueryTest.php
+++ b/tests/Query/GeoDistanceRangeQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Tests\Query;
 
 use ONGR\ElasticsearchDSL\Query\GeoDistanceRangeQuery;
 
diff --git a/tests/Query/GeoPolygonQueryTest.php b/tests/Query/GeoPolygonQueryTest.php
index a3444ef29e1b40235b5f0b899145b1b8453e589d..abf344f036c7969e4cdfa491be29e60a61957469 100644
--- a/tests/Query/GeoPolygonQueryTest.php
+++ b/tests/Query/GeoPolygonQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Tests\Query;
 
 use ONGR\ElasticsearchDSL\Query\GeoPolygonQuery;
 
diff --git a/tests/Query/GeoShapeQueryTest.php b/tests/Query/GeoShapeQueryTest.php
index c610c16c082c92506ae7fb5737c3f970a1ba6e57..47ac4965b3c8e462834a166a8f6190cf6b0a82e9 100644
--- a/tests/Query/GeoShapeQueryTest.php
+++ b/tests/Query/GeoShapeQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Tests\Query;
 
 use ONGR\ElasticsearchDSL\Query\GeoShapeQuery;
 
diff --git a/tests/Query/GeohashCellQueryTest.php b/tests/Query/GeohashCellQueryTest.php
index bb0d7db13792467804379a9f29d1aeb755379048..208e09fa2c3e86ebdfda5dc34b5a5ae018b8af94 100644
--- a/tests/Query/GeohashCellQueryTest.php
+++ b/tests/Query/GeohashCellQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Tests\Query;
 
 use ONGR\ElasticsearchDSL\Query\GeohashCellQuery;
 
diff --git a/tests/Query/HasChildQueryTest.php b/tests/Query/HasChildQueryTest.php
index a2f420563a398059ea2a07712eff7c96c53b8533..2caa3a0f0fde7aed1ff6299611909c4eba7f0acf 100644
--- a/tests/Query/HasChildQueryTest.php
+++ b/tests/Query/HasChildQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Tests\Query;
 
 use ONGR\ElasticsearchDSL\Query\HasChildQuery;
 
diff --git a/tests/Query/HasParentQueryTest.php b/tests/Query/HasParentQueryTest.php
index 6efcef5875182a77d704f604bb229af8c86c42fb..623d914451def0531666e58fb59e1677649b0b18 100644
--- a/tests/Query/HasParentQueryTest.php
+++ b/tests/Query/HasParentQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Tests\Query;
 
 use ONGR\ElasticsearchDSL\Query\HasParentQuery;
 
diff --git a/tests/Query/LimitQueryTest.php b/tests/Query/LimitQueryTest.php
index 7162ebfdc7d9bda5b717e293f1a1c838ed343086..c2aba613f8de7c404b51508a09e81d4a57ef7b81 100644
--- a/tests/Query/LimitQueryTest.php
+++ b/tests/Query/LimitQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Tests\Query;
 
 use ONGR\ElasticsearchDSL\Query\LimitQuery;
 
diff --git a/tests/Query/MissingQueryTest.php b/tests/Query/MissingQueryTest.php
index 4db348be4acff5d1171dffb2e68d4d42a9997892..f571aeb1a985b1ea39aafe57db3b7ce103ff8251 100644
--- a/tests/Query/MissingQueryTest.php
+++ b/tests/Query/MissingQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Tests\Query;
 
 use ONGR\ElasticsearchDSL\Query\MissingQuery;
 
diff --git a/tests/Query/NestedQueryTest.php b/tests/Query/NestedQueryTest.php
index 6d766df62018e23c8316915bc5e1ac9405b89834..6a21f7f705f6e06ca8751c54541970f3b77f735f 100644
--- a/tests/Query/NestedQueryTest.php
+++ b/tests/Query/NestedQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Tests\Query;
 
 use ONGR\ElasticsearchDSL\Query\BoolQuery;
 use ONGR\ElasticsearchDSL\Query\NestedQuery;
diff --git a/tests/Query/ScriptQueryTest.php b/tests/Query/ScriptQueryTest.php
index ee1e5b720c16abaf3519821c49e29b21c47237fa..12aab734c835dfd916d1c9cd1477cc37a4b4c896 100644
--- a/tests/Query/ScriptQueryTest.php
+++ b/tests/Query/ScriptQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Tests\Query;
 
 use ONGR\ElasticsearchDSL\Query\ScriptQuery;
 
diff --git a/tests/Query/Span/SpanFirstQueryTest.php b/tests/Query/Span/SpanFirstQueryTest.php
index 9af18fb8fa08075fe16f8e1ddcb6d37328f4dff7..33122bbf05a0e526a5f89c6f9d4d220ab27c5afe 100644
--- a/tests/Query/Span/SpanFirstQueryTest.php
+++ b/tests/Query/Span/SpanFirstQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query\Span;
+namespace ONGR\ElasticsearchDSL\Tests\Query\Span;
 
 use ONGR\ElasticsearchDSL\Query\Span\SpanFirstQuery;
 use ONGR\ElasticsearchDSL\Query\Span\SpanQueryInterface;
diff --git a/tests/Query/Span/SpanMultiTermQueryTest.php b/tests/Query/Span/SpanMultiTermQueryTest.php
index 59553c42988b5685396026da8901960fcb7ec227..f89c44dfeb8dedd81150fdd1fd14abc17e43b3d7 100644
--- a/tests/Query/Span/SpanMultiTermQueryTest.php
+++ b/tests/Query/Span/SpanMultiTermQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query\Span;
+namespace ONGR\ElasticsearchDSL\Tests\Query\Span;
 
 use ONGR\ElasticsearchDSL\BuilderInterface;
 use ONGR\ElasticsearchDSL\Query\Span\SpanMultiTermQuery;
diff --git a/tests/Query/Span/SpanNearQueryTest.php b/tests/Query/Span/SpanNearQueryTest.php
index f01a38fd595e020fb2972b57a6eb4c37f4125030..0843dfa7cd3d6127f9aca5b83a87d04494886a3e 100644
--- a/tests/Query/Span/SpanNearQueryTest.php
+++ b/tests/Query/Span/SpanNearQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query\Span;
+namespace ONGR\ElasticsearchDSL\Tests\Query\Span;
 
 use ONGR\ElasticsearchDSL\Query\Span\SpanNearQuery;
 use ONGR\ElasticsearchDSL\Query\Span\SpanQueryInterface;
diff --git a/tests/Query/Span/SpanNotQueryTest.php b/tests/Query/Span/SpanNotQueryTest.php
index e51f854c9a6d945b845bfeb09b32c8a36e4966e5..d1a227ac3aef46a506d711baa7569319a67c8010 100644
--- a/tests/Query/Span/SpanNotQueryTest.php
+++ b/tests/Query/Span/SpanNotQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query\Span;
+namespace ONGR\ElasticsearchDSL\Tests\Query\Span;
 
 use ONGR\ElasticsearchDSL\Query\Span\SpanNotQuery;
 use ONGR\ElasticsearchDSL\Query\Span\SpanQueryInterface;
diff --git a/tests/Query/Span/SpanOrQueryTest.php b/tests/Query/Span/SpanOrQueryTest.php
index 856f47c0a2cd201c9963e93414a791f2fe2af70b..d41c8915bde5f058ab41c53166af8f92b28ea9e1 100644
--- a/tests/Query/Span/SpanOrQueryTest.php
+++ b/tests/Query/Span/SpanOrQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query\Span;
+namespace ONGR\ElasticsearchDSL\Tests\Query\Span;
 
 use ONGR\ElasticsearchDSL\Query\Span\SpanOrQuery;
 use ONGR\ElasticsearchDSL\Query\Span\SpanQueryInterface;
diff --git a/tests/Query/Span/SpanTermQueryTest.php b/tests/Query/Span/SpanTermQueryTest.php
index 537f8621b8bdf40b8b21b3ccfab87b8e886bb5da..3220c169a94dee3a9e9fd7d0967429e6a1ce35d3 100644
--- a/tests/Query/Span/SpanTermQueryTest.php
+++ b/tests/Query/Span/SpanTermQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query\Span;
+namespace ONGR\ElasticsearchDSL\Tests\Query\Span;
 
 use ONGR\ElasticsearchDSL\Query\Span\SpanTermQuery;
 
diff --git a/tests/Query/TypeQueryTest.php b/tests/Query/TypeQueryTest.php
index 98ca51641b23ead2ccf9f80fdbcc9ac9325b9d80..f0284cbff0db6f04e33d646ef84bdc23783225fb 100644
--- a/tests/Query/TypeQueryTest.php
+++ b/tests/Query/TypeQueryTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace ONGR\ElasticsearchDSL\Tests\Unit\DSL\Query;
+namespace ONGR\ElasticsearchDSL\Tests\Query;
 
 use ONGR\ElasticsearchDSL\Query\TypeQuery;