diff --git a/Tests/Unit/Controller/TestimonialControllerTest.php b/Tests/Unit/Controller/TestimonialControllerTest.php
index 9f84ef2..5209ce0 100644
--- a/Tests/Unit/Controller/TestimonialControllerTest.php
+++ b/Tests/Unit/Controller/TestimonialControllerTest.php
@@ -54,7 +54,6 @@ class TestimonialControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function indexActionCanBeCalled() {
 		$this->subject->indexAction();
@@ -62,7 +61,6 @@ class TestimonialControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function indexActionPassesAllTestimonialsAsTestimonialsToView() {
 		$allTestimonials = new ObjectStorage();
diff --git a/Tests/Unit/Domain/Model/AdditionTest.php b/Tests/Unit/Domain/Model/AdditionTest.php
index 046cd16..8771089 100644
--- a/Tests/Unit/Domain/Model/AdditionTest.php
+++ b/Tests/Unit/Domain/Model/AdditionTest.php
@@ -31,7 +31,6 @@ class AdditionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function getTitleInitiallyReturnsEmptyString() {
 		self::assertSame(
@@ -42,7 +41,6 @@ class AdditionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function setTitleSetsTitle() {
 		$this->subject->setTitle('foo bar');
diff --git a/Tests/Unit/Domain/Model/TeaBeverageTest.php b/Tests/Unit/Domain/Model/TeaBeverageTest.php
index bae679e..fa9a2d0 100644
--- a/Tests/Unit/Domain/Model/TeaBeverageTest.php
+++ b/Tests/Unit/Domain/Model/TeaBeverageTest.php
@@ -31,7 +31,6 @@ class TeaBeverageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function getSizeInitiallyReturnsZero() {
 		self::assertSame(
@@ -42,7 +41,6 @@ class TeaBeverageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function setSizeSetsSize() {
 		$this->subject->setSize(1234.56);
@@ -55,7 +53,6 @@ class TeaBeverageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function getTypeInitiallyReturnsNull() {
 		self::assertNull(
@@ -65,7 +62,6 @@ class TeaBeverageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function setTypeSetsType() {
 		$type = new \OliverKlee\Tea\Domain\Model\TeaType();
@@ -79,7 +75,6 @@ class TeaBeverageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function getAdditionsInitiallyReturnsEmptyStorage() {
 		self::assertEquals(
@@ -90,7 +85,6 @@ class TeaBeverageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function setAdditionsSetsAdditions() {
 		$items = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
@@ -104,7 +98,6 @@ class TeaBeverageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function addAdditionAddsAddition() {
 		$items = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
@@ -120,7 +113,6 @@ class TeaBeverageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function removeAdditionRemovesAddition() {
 		$items = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
@@ -137,7 +129,6 @@ class TeaBeverageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function getTestimonialsInitiallyReturnsEmptyStorage() {
 		self::assertEquals(
@@ -148,7 +139,6 @@ class TeaBeverageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function setTestimonialsSetsTestimonials() {
 		$items = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
@@ -162,7 +152,6 @@ class TeaBeverageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function addTestimonialAddsTestimonial() {
 		$items = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
@@ -178,7 +167,6 @@ class TeaBeverageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function removeTestimonialRemovesTestimonial() {
 		$items = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
diff --git a/Tests/Unit/Domain/Model/TeaTypeTest.php b/Tests/Unit/Domain/Model/TeaTypeTest.php
index 7cd51e1..95b3af1 100644
--- a/Tests/Unit/Domain/Model/TeaTypeTest.php
+++ b/Tests/Unit/Domain/Model/TeaTypeTest.php
@@ -31,7 +31,6 @@ class TeaTypeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function getTitleInitiallyReturnsEmptyString() {
 		self::assertSame(
@@ -42,7 +41,6 @@ class TeaTypeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function setTitleSetsTitle() {
 		$this->subject->setTitle('foo bar');
@@ -55,7 +53,6 @@ class TeaTypeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function getCaffeinatedInitiallyReturnsFalse() {
 		self::assertSame(
@@ -66,7 +63,6 @@ class TeaTypeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function setCaffeinatedSetsCaffeinated() {
 		$this->subject->setCaffeinated(TRUE);
diff --git a/Tests/Unit/Domain/Model/TestimonialTest.php b/Tests/Unit/Domain/Model/TestimonialTest.php
index d9c52a3..35ec1ab 100644
--- a/Tests/Unit/Domain/Model/TestimonialTest.php
+++ b/Tests/Unit/Domain/Model/TestimonialTest.php
@@ -31,7 +31,6 @@ class TestimonialTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function getDateOfPostingInitiallyReturnsNull() {
 		self::assertNull(
@@ -41,7 +40,6 @@ class TestimonialTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function setDateOfPostingSetsDateOfPosting() {
 		$date = new \DateTime();
@@ -55,7 +53,6 @@ class TestimonialTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function getNumberOfConsumedCupsInitiallyReturnsZero() {
 		self::assertSame(
@@ -66,7 +63,6 @@ class TestimonialTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function setNumberOfConsumedCupsSetsNumberOfConsumedCups() {
 		$this->subject->setNumberOfConsumedCups(123456);
@@ -79,7 +75,6 @@ class TestimonialTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function getTextInitiallyReturnsEmptyString() {
 		self::assertSame(
@@ -90,7 +85,6 @@ class TestimonialTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function setTextSetsText() {
 		$this->subject->setText('foo bar');
diff --git a/Tests/Unit/Domain/Repository/TeaBeverageRepositoryTest.php b/Tests/Unit/Domain/Repository/TeaBeverageRepositoryTest.php
index 0358364..57f27df 100644
--- a/Tests/Unit/Domain/Repository/TeaBeverageRepositoryTest.php
+++ b/Tests/Unit/Domain/Repository/TeaBeverageRepositoryTest.php
@@ -38,7 +38,6 @@ class TeaBeverageRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function canBeInstantiated() {
 		self::assertNotNull(
diff --git a/Tests/Unit/Domain/Repository/TestimonialRepositoryTest.php b/Tests/Unit/Domain/Repository/TestimonialRepositoryTest.php
index 7af812c..f7c18ec 100644
--- a/Tests/Unit/Domain/Repository/TestimonialRepositoryTest.php
+++ b/Tests/Unit/Domain/Repository/TestimonialRepositoryTest.php
@@ -38,7 +38,6 @@ class TestimonialRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 
 	/**
 	 * @test
-	 * @return void
 	 */
 	public function canBeInstantiated() {
 		self::assertNotNull(