diff --git a/src/Search.php b/src/Search.php
index b8d83d6ff86cbf8e93a03e76a4a9f4eb48e7a0c5..828d5f3e73a5aacb9974d40e0b6c3805259d06aa 100644
--- a/src/Search.php
+++ b/src/Search.php
@@ -307,7 +307,7 @@ class Search
      *
      * @param AbstractAggregation $aggregation
      *
-     * @return $this;
+     * @return $this
      */
     public function addAggregation(AbstractAggregation $aggregation)
     {
diff --git a/tests/Query/Span/SpanFirstQueryTest.php b/tests/Query/Span/SpanFirstQueryTest.php
index 7dbb30aa347aca2adf3ed130333f0f5d9718f0e8..9af18fb8fa08075fe16f8e1ddcb6d37328f4dff7 100644
--- a/tests/Query/Span/SpanFirstQueryTest.php
+++ b/tests/Query/Span/SpanFirstQueryTest.php
@@ -20,7 +20,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanQueryInterface;
 class SpanFirstQueryTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Object.
+     * @var SpanQueryInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $mock;
 
@@ -51,9 +51,7 @@ class SpanFirstQueryTest extends \PHPUnit_Framework_TestCase
      */
     public function testSpanFirstQueryToArray()
     {
-        /** @var SpanQueryInterface $mock */
-        $mock = $this->mock;
-        $query = new SpanFirstQuery($mock, 5);
+        $query = new SpanFirstQuery($this->mock, 5);
         $result = [
             'match' => [
                 'span_or' => [ 'key' => 'value'],
@@ -68,9 +66,7 @@ class SpanFirstQueryTest extends \PHPUnit_Framework_TestCase
      */
     public function testSpanFirstQueryGetType()
     {
-        /** @var SpanQueryInterface $mock */
-        $mock = $this->mock;
-        $query = new SpanFirstQuery($mock, 5);
+        $query = new SpanFirstQuery($this->mock, 5);
         $result = $query->getType();
         $this->assertEquals('span_first', $result);
     }
diff --git a/tests/Query/Span/SpanMultiTermQueryTest.php b/tests/Query/Span/SpanMultiTermQueryTest.php
index 38528612e6e7319ea2bb84ba4b2dc894318ac18c..59553c42988b5685396026da8901960fcb7ec227 100644
--- a/tests/Query/Span/SpanMultiTermQueryTest.php
+++ b/tests/Query/Span/SpanMultiTermQueryTest.php
@@ -20,7 +20,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanMultiTermQuery;
 class SpanMultiTermQueryTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var array.
+     * @var array
      */
     protected $mock;
 
diff --git a/tests/Query/Span/SpanNearQueryTest.php b/tests/Query/Span/SpanNearQueryTest.php
index 23b254cdfbb053fd46022620b2c4958e95486433..f01a38fd595e020fb2972b57a6eb4c37f4125030 100644
--- a/tests/Query/Span/SpanNearQueryTest.php
+++ b/tests/Query/Span/SpanNearQueryTest.php
@@ -20,7 +20,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanQueryInterface;
 class SpanNearQueryTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Object.
+     * @var SpanQueryInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $mock;
 
@@ -51,11 +51,9 @@ class SpanNearQueryTest extends \PHPUnit_Framework_TestCase
      */
     public function testSpanMultiTermQueryToArray()
     {
-        /** @var SpanQueryInterface $mock */
-        $mock = $this->mock;
         $query = new SpanNearQuery(['name']);
         $query->setSlop(5);
-        $query->addQuery($mock);
+        $query->addQuery($this->mock);
         $result = [
             'clauses' => [
                 0 => [
diff --git a/tests/Query/Span/SpanNotQueryTest.php b/tests/Query/Span/SpanNotQueryTest.php
index 4f0afdf31e6eb96c247d2a243461c5135ca63fae..e51f854c9a6d945b845bfeb09b32c8a36e4966e5 100644
--- a/tests/Query/Span/SpanNotQueryTest.php
+++ b/tests/Query/Span/SpanNotQueryTest.php
@@ -20,7 +20,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanQueryInterface;
 class SpanNotQueryTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Object.
+     * @var SpanQueryInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $mock;
 
@@ -51,9 +51,7 @@ class SpanNotQueryTest extends \PHPUnit_Framework_TestCase
      */
     public function testSpanNotQueryGetType()
     {
-        /** @var SpanQueryInterface $mock */
-        $mock = $this->mock;
-        $query = new SpanNotQuery($mock, $mock);
+        $query = new SpanNotQuery($this->mock, $this->mock);
         $result = $query->getType();
         $this->assertEquals('span_not', $result);
     }
@@ -63,9 +61,7 @@ class SpanNotQueryTest extends \PHPUnit_Framework_TestCase
      */
     public function testSpanNotQueryToArray()
     {
-        /** @var SpanQueryInterface $mock */
-        $mock = $this->mock;
-        $query = new SpanNotQuery($mock, $mock);
+        $query = new SpanNotQuery($this->mock, $this->mock);
         $result = [
             'include' => [
                 'span_or' => ['key' => 'value'],
diff --git a/tests/Query/Span/SpanOrQueryTest.php b/tests/Query/Span/SpanOrQueryTest.php
index b9eead593678b93ceae76e166113aecaf894a099..856f47c0a2cd201c9963e93414a791f2fe2af70b 100644
--- a/tests/Query/Span/SpanOrQueryTest.php
+++ b/tests/Query/Span/SpanOrQueryTest.php
@@ -20,7 +20,7 @@ use ONGR\ElasticsearchDSL\Query\Span\SpanQueryInterface;
 class SpanOrQueryTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var Object.
+     * @var SpanQueryInterface|\PHPUnit_Framework_MockObject_MockObject
      */
     protected $mock;
 
@@ -61,10 +61,8 @@ class SpanOrQueryTest extends \PHPUnit_Framework_TestCase
      */
     public function testSpanOrQueryToArray()
     {
-        /** @var SpanQueryInterface $mock */
-        $mock = $this->mock;
         $query = new SpanOrQuery();
-        $query->addQuery($mock);
+        $query->addQuery($this->mock);
         $result = [
             'clauses' => [
                 0 => [