diff --git a/src/PhpWord/Element/AbstractContainer.php b/src/PhpWord/Element/AbstractContainer.php
index c24cdd63..d211ae07 100644
--- a/src/PhpWord/Element/AbstractContainer.php
+++ b/src/PhpWord/Element/AbstractContainer.php
@@ -158,6 +158,8 @@ abstract class AbstractContainer extends AbstractElement
      * Get all elements
      *
      * @return array
+     *
+     * @codeCoverageIgnore
      */
     public function getElements()
     {
diff --git a/src/PhpWord/Element/Section.php b/src/PhpWord/Element/Section.php
index 97130186..6bf58c6f 100644
--- a/src/PhpWord/Element/Section.php
+++ b/src/PhpWord/Element/Section.php
@@ -78,6 +78,8 @@ class Section extends AbstractContainer
      * Get section style
      *
      * @return \PhpOffice\PhpWord\Style\Section
+     *
+     * @codeCoverageIgnore
      */
     public function getStyle()
     {
@@ -92,8 +94,6 @@ class Section extends AbstractContainer
      * @param string $type
      *
      * @return Header
-     *
-     * @since 0.10.0
      */
     public function addHeader($type = Header::AUTO)
     {
@@ -108,8 +108,6 @@ class Section extends AbstractContainer
      * @param string $type
      *
      * @return Footer
-     *
-     * @since 0.10.0
      */
     public function addFooter($type = Header::AUTO)
     {
@@ -120,6 +118,8 @@ class Section extends AbstractContainer
      * Get header elements
      *
      * @return Header[]
+     *
+     * @codeCoverageIgnore
      */
     public function getHeaders()
     {
@@ -130,6 +130,8 @@ class Section extends AbstractContainer
      * Get footer elements
      *
      * @return Footer[]
+     *
+     * @codeCoverageIgnore
      */
     public function getFooters()
     {
diff --git a/tests/PhpWord/Element/SectionTest.php b/tests/PhpWord/Element/SectionTest.php
index dce6c1eb..b09c0b78 100644
--- a/tests/PhpWord/Element/SectionTest.php
+++ b/tests/PhpWord/Element/SectionTest.php
@@ -17,55 +17,18 @@
 
 namespace PhpOffice\PhpWord\Element;
 
-use PhpOffice\PhpWord\Exception\Exception;
 use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\Style;
 
 /**
- * Test class for PhpOffice\PhpWord\Element\Section
- *
+ * @covers \PhpOffice\PhpWord\Element\Section
+ * @coversDefaultClass \PhpOffice\PhpWord\Element\Section
  * @runTestsInSeparateProcesses
  */
 class SectionTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * Get style
-     */
-    public function testGetStyle()
-    {
-        $oSection = new Section(0);
-        $this->assertAttributeEquals($oSection->getStyle(), 'style', $oSection);
-    }
-
-    /**
-     * Get elements
-     */
-    public function testGetElements()
-    {
-        $oSection = new Section(0);
-        $this->assertAttributeEquals($oSection->getElements(), 'elements', $oSection);
-    }
-
-    /**
-     * Get footer
-     */
-    public function testGetFooters()
-    {
-        $oSection = new Section(0);
-        $this->assertAttributeEquals($oSection->getFooters(), 'footers', $oSection);
-    }
-
-    /**
-     * Get headers
-     */
-    public function testGetHeaders()
-    {
-        $oSection = new Section(0);
-        $this->assertAttributeEquals($oSection->getHeaders(), 'headers', $oSection);
-    }
-
-    /**
-     * Set settings
+     * @covers ::setStyle
      */
     public function testSetStyle()
     {
@@ -76,13 +39,12 @@ class SectionTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * Add elements
+     * @coversNothing
      */
     public function testAddElements()
     {
         $objectSource = __DIR__ . '/../_files/documents/reader.docx';
         $imageSource = __DIR__ . '/../_files/images/PhpWord.png';
-        // $imageUrl = 'http://php.net//images/logos/php-med-trans-light.gif';
 
         $section = new Section(0);
         $section->setPhpWord(new PhpWord());
@@ -124,8 +86,7 @@ class SectionTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * Test add object exception
-     *
+     * @coversNothing
      * @expectedException \PhpOffice\PhpWord\Exception\InvalidObjectException
      */
     public function testAddObjectException()
@@ -137,6 +98,8 @@ class SectionTest extends \PHPUnit_Framework_TestCase
 
     /**
      * Add title with predefined style
+     *
+     * @coversNothing
      */
     public function testAddTitleWithStyle()
     {
@@ -150,7 +113,9 @@ class SectionTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * Add header footer
+     * @covers ::addHeader
+     * @covers ::addFooter
+     * @covers ::hasDifferentFirstPage
      */
     public function testAddHeaderFooter()
     {
@@ -165,7 +130,8 @@ class SectionTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * Add header has different first page
+     * @covers ::addHeader
+     * @covers ::hasDifferentFirstPage
      */
     public function testHasDifferentFirstPage()
     {
@@ -176,9 +142,8 @@ class SectionTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * Add header exception
-     *
-     * @expectedException Exception
+     * @covers ::addHeader
+     * @expectedException \Exception
      * @expectedExceptionMessage Invalid header/footer type.
      */
     public function testAddHeaderException()
diff --git a/tests/PhpWord/TemplateProcessorTest.php b/tests/PhpWord/TemplateProcessorTest.php
index 61c9da8e..9a475017 100644
--- a/tests/PhpWord/TemplateProcessorTest.php
+++ b/tests/PhpWord/TemplateProcessorTest.php
@@ -142,7 +142,7 @@ final class TemplateProcessorTest extends \PHPUnit_Framework_TestCase
     }
 
     /**
-     * @civers ::setValue
+     * @covers ::setValue
      * @covers ::cloneRow
      * @covers ::saveAs
      * @test