diff --git a/Classes/Controller/TestimonialController.php b/Classes/Controller/TestimonialController.php
index fe68358..fc73ddb 100644
--- a/Classes/Controller/TestimonialController.php
+++ b/Classes/Controller/TestimonialController.php
@@ -27,7 +27,7 @@ class TestimonialController extends ActionController {
 	/**
 	 * @var \OliverKlee\Tea\Domain\Repository\TestimonialRepository
 	 */
-	protected $testimonialRepository = NULL;
+	protected $testimonialRepository = null;
 
 	/**
 	 * Injects the TestimonialRepository.
diff --git a/Classes/Domain/Model/TeaBeverage.php b/Classes/Domain/Model/TeaBeverage.php
index dbfcb4b..ed8c384 100644
--- a/Classes/Domain/Model/TeaBeverage.php
+++ b/Classes/Domain/Model/TeaBeverage.php
@@ -29,19 +29,19 @@ class TeaBeverage extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	 * @var \OliverKlee\Tea\Domain\Model\TeaType
 	 * @lazy
 	 */
-	protected $type = NULL;
+	protected $type = null;
 
 	/**
 	 * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\OliverKlee\Tea\Domain\Model\Addition>
 	 * @lazy
 	 */
-	protected $additions = NULL;
+	protected $additions = null;
 
 	/**
 	 * @var \TYPO3\CMS\Extbase\Persistence\ObjectStorage<\OliverKlee\Tea\Domain\Model\Testimonial>
 	 * @lazy
 	 */
-	protected $testimonials = NULL;
+	protected $testimonials = null;
 
 	/**
 	 * The constructor.
diff --git a/Classes/Domain/Model/TeaType.php b/Classes/Domain/Model/TeaType.php
index 9613b67..745b559 100644
--- a/Classes/Domain/Model/TeaType.php
+++ b/Classes/Domain/Model/TeaType.php
@@ -29,7 +29,7 @@ class TeaType extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * @var bool
 	 */
-	protected $caffeinated = FALSE;
+	protected $caffeinated = false;
 
 	/**
 	 * @return string $title
diff --git a/Classes/Domain/Model/Testimonial.php b/Classes/Domain/Model/Testimonial.php
index 0937d06..a676655 100644
--- a/Classes/Domain/Model/Testimonial.php
+++ b/Classes/Domain/Model/Testimonial.php
@@ -23,7 +23,7 @@ class Testimonial extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity {
 	/**
 	 * @var \DateTime
 	 */
-	protected $dateOfPosting = NULL;
+	protected $dateOfPosting = null;
 
 	/**
 	 * @var int
diff --git a/Tests/Unit/Controller/TestimonialControllerTest.php b/Tests/Unit/Controller/TestimonialControllerTest.php
index 430ab9e..b30187b 100644
--- a/Tests/Unit/Controller/TestimonialControllerTest.php
+++ b/Tests/Unit/Controller/TestimonialControllerTest.php
@@ -28,17 +28,17 @@ class TestimonialControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	/**
 	 * @var TestimonialController
 	 */
-	protected $subject = NULL;
+	protected $subject = null;
 
 	/**
 	 * @var ViewInterface|\PHPUnit_Framework_MockObject_MockObject
 	 */
-	protected $view = NULL;
+	protected $view = null;
 
 	/**
 	 * @var TestimonialRepository|\PHPUnit_Framework_MockObject_MockObject
 	 */
-	protected $testimonialRepository = NULL;
+	protected $testimonialRepository = null;
 
 	protected function setUp() {
 		$this->subject = new TestimonialController();
@@ -47,7 +47,7 @@ class TestimonialControllerTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 		$this->subject->setView($this->view);
 
 		$this->testimonialRepository = $this->getMock(
-			'OliverKlee\\Tea\\Domain\\Repository\\TestimonialRepository', array(), array(), '', FALSE
+			'OliverKlee\\Tea\\Domain\\Repository\\TestimonialRepository', array(), array(), '', false
 		);
 		$this->subject->injectTestimonialRepository($this->testimonialRepository);
 	}
diff --git a/Tests/Unit/Domain/Model/AdditionTest.php b/Tests/Unit/Domain/Model/AdditionTest.php
index e4a31f7..f4f526f 100644
--- a/Tests/Unit/Domain/Model/AdditionTest.php
+++ b/Tests/Unit/Domain/Model/AdditionTest.php
@@ -23,7 +23,7 @@ class AdditionTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	/**
 	 * @var \OliverKlee\Tea\Domain\Model\Addition
 	 */
-	protected $subject = NULL;
+	protected $subject = null;
 
 	protected function setUp() {
 		$this->subject = new \OliverKlee\Tea\Domain\Model\Addition();
diff --git a/Tests/Unit/Domain/Model/TeaBeverageTest.php b/Tests/Unit/Domain/Model/TeaBeverageTest.php
index edf9b07..0f26746 100644
--- a/Tests/Unit/Domain/Model/TeaBeverageTest.php
+++ b/Tests/Unit/Domain/Model/TeaBeverageTest.php
@@ -25,7 +25,7 @@ class TeaBeverageTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	/**
 	 * @var \OliverKlee\Tea\Domain\Model\TeaBeverage
 	 */
-	protected $subject = NULL;
+	protected $subject = null;
 
 	protected function setUp() {
 		$this->subject = new \OliverKlee\Tea\Domain\Model\TeaBeverage();
diff --git a/Tests/Unit/Domain/Model/TeaTypeTest.php b/Tests/Unit/Domain/Model/TeaTypeTest.php
index fb03135..511d32c 100644
--- a/Tests/Unit/Domain/Model/TeaTypeTest.php
+++ b/Tests/Unit/Domain/Model/TeaTypeTest.php
@@ -23,7 +23,7 @@ class TeaTypeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	/**
 	 * @var \OliverKlee\Tea\Domain\Model\TeaType
 	 */
-	protected $subject = NULL;
+	protected $subject = null;
 
 	protected function setUp() {
 		$this->subject = new \OliverKlee\Tea\Domain\Model\TeaType();
@@ -56,7 +56,7 @@ class TeaTypeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	 */
 	public function getCaffeinatedInitiallyReturnsFalse() {
 		self::assertSame(
-			FALSE,
+			false,
 			$this->subject->getCaffeinated()
 		);
 	}
@@ -65,9 +65,9 @@ class TeaTypeTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	 * @test
 	 */
 	public function setCaffeinatedSetsCaffeinated() {
-		$this->subject->setCaffeinated(TRUE);
+		$this->subject->setCaffeinated(true);
 		self::assertSame(
-			TRUE,
+			true,
 			$this->subject->getCaffeinated()
 		);
 	}
diff --git a/Tests/Unit/Domain/Model/TestimonialTest.php b/Tests/Unit/Domain/Model/TestimonialTest.php
index 69941d7..2d13adf 100644
--- a/Tests/Unit/Domain/Model/TestimonialTest.php
+++ b/Tests/Unit/Domain/Model/TestimonialTest.php
@@ -23,7 +23,7 @@ class TestimonialTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	/**
 	 * @var \OliverKlee\Tea\Domain\Model\Testimonial
 	 */
-	protected $subject = NULL;
+	protected $subject = null;
 
 	protected function setUp() {
 		$this->subject = new \OliverKlee\Tea\Domain\Model\Testimonial();
diff --git a/Tests/Unit/Domain/Repository/TeaBeverageRepositoryTest.php b/Tests/Unit/Domain/Repository/TeaBeverageRepositoryTest.php
index 3df76e3..16bb8d3 100644
--- a/Tests/Unit/Domain/Repository/TeaBeverageRepositoryTest.php
+++ b/Tests/Unit/Domain/Repository/TeaBeverageRepositoryTest.php
@@ -28,7 +28,7 @@ class TeaBeverageRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	/**
 	 * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
 	 */
-	protected $objectManager = NULL;
+	protected $objectManager = null;
 
 	protected function setUp() {
 		$this->objectManager = $this->getMock('TYPO3\CMS\Extbase\Object\ObjectManagerInterface');
diff --git a/Tests/Unit/Domain/Repository/TestimonialRepositoryTest.php b/Tests/Unit/Domain/Repository/TestimonialRepositoryTest.php
index 4c4952e..8c13cce 100644
--- a/Tests/Unit/Domain/Repository/TestimonialRepositoryTest.php
+++ b/Tests/Unit/Domain/Repository/TestimonialRepositoryTest.php
@@ -28,7 +28,7 @@ class TestimonialRepositoryTest extends \TYPO3\CMS\Core\Tests\UnitTestCase {
 	/**
 	 * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface|\PHPUnit_Framework_MockObject_MockObject
 	 */
-	protected $objectManager = NULL;
+	protected $objectManager = null;
 
 	protected function setUp() {
 		$this->objectManager = $this->getMock('TYPO3\CMS\Extbase\Object\ObjectManagerInterface');