diff --git a/.travis.yml b/.travis.yml
index 968ca2e..46471dd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,9 @@ matrix:
 
 sudo: false
 
+services:
+  - mysql
+
 addons:
   apt:
     packages:
diff --git a/README.md b/README.md
index bd93c44..0e389df 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ You can download and install this extension or use composer.
 
 ## Copyright / License
 
-Copyright: (c) 2015 - 2018, AOE GmbH
+Copyright: (c) 2015 - 2019, AOE GmbH
 License: GPLv3, <http://www.gnu.org/licenses/gpl-3.0.en.html>
 
 ## Contributing
diff --git a/Tests/Functional/System/Typo3/TCATest.php b/Tests/Functional/System/Typo3/TCATest.php
index d10a740..fdfa240 100644
--- a/Tests/Functional/System/Typo3/TCATest.php
+++ b/Tests/Functional/System/Typo3/TCATest.php
@@ -25,6 +25,9 @@
  ***************************************************************/
 
 use Nimut\TestingFramework\TestCase\FunctionalTestCase;
+use TYPO3\CMS\Core\DataHandling\DataHandler;
+use TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager;
+use TYPO3\CMS\Lang\LanguageService;
 
 /**
  * @package FeatureFlag
@@ -45,19 +48,23 @@ public function setUp()
     {
         parent::setUp();
 
-        $this->tca = $this->getMock(
-            'Tx_FeatureFlag_System_Typo3_TCA',
-            [
-                'getMappingRepository', 'getFeatureFlagRepository',
-                'getFeatureFlagByUid', 'getPersistenceManager', 'getLanguageService'
-            ]
-        );
-        $persistenceManager = $this->getMockBuilder(\TYPO3\CMS\Extbase\Persistence\Generic\PersistenceManager::class)
+        $this->tca = $this
+            ->getMockBuilder(Tx_FeatureFlag_System_Typo3_TCA::class)
+            ->setMethods([
+                'getMappingRepository',
+                'getFeatureFlagRepository',
+                'getFeatureFlagByUid',
+                'getPersistenceManager',
+                'getLanguageService'
+            ])
+            ->getMock();
+        $persistenceManager = $this
+            ->getMockBuilder(PersistenceManager::class)
             ->disableOriginalConstructor()
             ->setMethods(['persistAll'])
             ->getMock();
 
-        $languageService = $this->getMockBuilder(\TYPO3\CMS\Lang\LanguageService::class)
+        $languageService = $this->getMockBuilder(LanguageService::class)
             ->disableOriginalConstructor()
             ->setMethods(['sL'])
             ->getMock();
@@ -81,19 +88,38 @@ protected function tearDown()
      */
     public function selectRendersCorrectly()
     {
-        $featureFlag = $this->getMock('Tx_FeatureFlag_Domain_Model_FeatureFlag', ['getUid']);
+        $featureFlag = $this
+            ->getMockBuilder(Tx_FeatureFlag_Domain_Model_FeatureFlag::class)
+            ->setMethods(['getUid'])
+            ->getMock();
         $featureFlag->expects($this->any())->method('getUid')->willReturn(4711);
-        $mapping = $this->getMock('Tx_FeatureFlag_Domain_Model_Mapping', ['getFeatureFlag']);
+        $mapping = $this
+            ->getMockBuilder(Tx_FeatureFlag_Domain_Model_Mapping::class)
+            ->setMethods(['getFeatureFlag'])
+            ->getMock();
         $mapping->expects($this->any())->method('getFeatureFlag')->willReturn($featureFlag);
-        $mappingRepository = $this->getMock(
-            'Tx_FeatureFlag_Domain_Repository_Mapping',
-            ['findOneByForeignTableNameAndUid']
-        );
-        $mappingRepository->expects($this->once())->method('findOneByForeignTableNameAndUid')->willReturn($mapping);
-        $featureFlagRepository = $this->getMock('Tx_FeatureFlag_Domain_Repository_FeatureFlag', ['findAll']);
-        $featureFlagRepository->expects($this->once())->method('findAll')->willReturn($this->getListOfFeatureFlags());
-        $this->tca->expects($this->once())->method('getMappingRepository')->willReturn($mappingRepository);
-        $this->tca->expects($this->once())->method('getFeatureFlagRepository')->willReturn($featureFlagRepository);
+        $mappingRepository = $this
+            ->getMockBuilder(Tx_FeatureFlag_Domain_Repository_Mapping::class)
+            ->setMethods(['findOneByForeignTableNameAndUid'])
+            ->getMock();
+        $mappingRepository
+            ->expects($this->once())
+            ->method('findOneByForeignTableNameAndUid')
+            ->willReturn($mapping);
+        $featureFlagRepository = $this
+            ->getMockBuilder(Tx_FeatureFlag_Domain_Repository_FeatureFlag::class)
+            ->setMethods(['findAll'])
+            ->getMock();
+        $featureFlagRepository
+            ->expects($this->once())
+            ->method('findAll')
+            ->willReturn($this->getListOfFeatureFlags());
+        $this->tca->expects($this->once())
+            ->method('getMappingRepository')
+            ->willReturn($mappingRepository);
+        $this->tca->expects($this->once())
+            ->method('getFeatureFlagRepository')
+            ->willReturn($featureFlagRepository);
 
         $PA = [];
         $PA['row'] = [];
@@ -115,18 +141,21 @@ public function selectRendersCorrectly()
      */
     public function processDatamapDoNothingIfNothingSelected()
     {
-        $mappingRepository = $this->getMock(
-            'Tx_FeatureFlag_Domain_Repository_Mapping',
-            ['findOneByForeignTableNameAndUid', 'add', 'remove', 'update']
-        );
-        $mappingRepository->expects($this->once())->method('findOneByForeignTableNameAndUid')->willReturn(null);
+        $mappingRepository = $this
+            ->getMockBuilder(Tx_FeatureFlag_Domain_Repository_Mapping::class)
+            ->setMethods(['findOneByForeignTableNameAndUid', 'add', 'remove', 'update'])
+            ->getMock();
+        $mappingRepository
+            ->expects($this->once())
+            ->method('findOneByForeignTableNameAndUid')
+            ->willReturn(null);
         $mappingRepository->expects($this->never())->method('add');
         $mappingRepository->expects($this->never())->method('remove');
         $mappingRepository->expects($this->never())->method('update');
         $this->tca->expects($this->once())->method('getMappingRepository')->willReturn($mappingRepository);
         $this->tca->expects($this->never())->method('getFeatureFlagByUid');
 
-        $tceMainMock = $this->getMock(\TYPO3\CMS\Core\DataHandling\DataHandler::class);
+        $tceMainMock = $this->createMock(DataHandler::class);
         $incomingFieldArray = [
             'tx_featureflag_flag' => '0',
             'tx_featureflag_behavior' => '0',
@@ -139,18 +168,21 @@ public function processDatamapDoNothingIfNothingSelected()
      */
     public function processDatamapDoNothingIfNotInFeatureFlagContext()
     {
-        $mappingRepository = $this->getMock(
-            'Tx_FeatureFlag_Domain_Repository_Mapping',
-            ['findOneByForeignTableNameAndUid', 'add', 'remove', 'update']
-        );
-        $mappingRepository->expects($this->never())->method('findOneByForeignTableNameAndUid')->willReturn(null);
+        $mappingRepository = $this
+            ->getMockBuilder(Tx_FeatureFlag_Domain_Repository_Mapping::class)
+            ->setMethods(['findOneByForeignTableNameAndUid', 'add', 'remove', 'update'])
+            ->getMock();
+        $mappingRepository
+            ->expects($this->never())
+            ->method('findOneByForeignTableNameAndUid')
+            ->willReturn(null);
         $mappingRepository->expects($this->never())->method('add');
         $mappingRepository->expects($this->never())->method('remove');
         $mappingRepository->expects($this->never())->method('update');
         $this->tca->expects($this->never())->method('getMappingRepository')->willReturn($mappingRepository);
         $this->tca->expects($this->never())->method('getFeatureFlagByUid');
 
-        $tceMainMock = $this->getMock(\TYPO3\CMS\Core\DataHandling\DataHandler::class);
+        $tceMainMock = $this->getMockBuilder(DataHandler::class)->getMock();
         $incomingFieldArray = ['hidden' => '0'];
         $this->tca->processDatamap_preProcessFieldArray($incomingFieldArray, 'my_table', '4711', $tceMainMock);
     }
@@ -160,17 +192,20 @@ public function processDatamapDoNothingIfNotInFeatureFlagContext()
      */
     public function processDatamapRemoveMappingIfNothingSelectedAndMappingExists()
     {
-        $mapping = $this->getMock('Tx_FeatureFlag_Domain_Model_Mapping');
-        $mappingRepository = $this->getMock(
-            'Tx_FeatureFlag_Domain_Repository_Mapping',
-            ['findOneByForeignTableNameAndUid', 'remove', 'update']
-        );
-        $mappingRepository->expects($this->once())->method('findOneByForeignTableNameAndUid')->willReturn($mapping);
+        $mapping = $this->createMock(Tx_FeatureFlag_Domain_Model_Mapping::class);
+        $mappingRepository = $this
+            ->getMockBuilder(Tx_FeatureFlag_Domain_Repository_Mapping::class)
+            ->setMethods(['findOneByForeignTableNameAndUid', 'remove', 'update'])
+            ->getMock();
+        $mappingRepository
+            ->expects($this->once())
+            ->method('findOneByForeignTableNameAndUid')
+            ->willReturn($mapping);
         $mappingRepository->expects($this->once())->method('remove');
         $mappingRepository->expects($this->once())->method('update');
         $this->tca->expects($this->any())->method('getMappingRepository')->willReturn($mappingRepository);
 
-        $tceMainMock = $this->getMock(\TYPO3\CMS\Core\DataHandling\DataHandler::class);
+        $tceMainMock = $this->createMock(DataHandler::class);
         $incomingFieldArray = [
             'tx_featureflag_flag' => '0',
             'tx_featureflag_behavior' => '0',
@@ -183,20 +218,26 @@ public function processDatamapRemoveMappingIfNothingSelectedAndMappingExists()
      */
     public function processDatamapCreateNewMappingIfFeatureFlagGivenAndNoMappingPreviouslyCreated()
     {
-        $featureFlag = $this->getMock('Tx_FeatureFlag_Domain_Model_FeatureFlag', ['getUid']);
+        $featureFlag = $this
+            ->getMockBuilder(Tx_FeatureFlag_Domain_Model_FeatureFlag::class)
+            ->setMethods(['getUid'])
+            ->getMock();
         $featureFlag->expects($this->any())->method('getUid')->willReturn(4711);
 
-        $mappingRepository = $this->getMock(
-            'Tx_FeatureFlag_Domain_Repository_Mapping',
-            ['findOneByForeignTableNameAndUid', 'add']
-        );
-        $mappingRepository->expects($this->once())->method('findOneByForeignTableNameAndUid')->willReturn(null);
+        $mappingRepository = $this
+            ->getMockBuilder(Tx_FeatureFlag_Domain_Repository_Mapping::class)
+            ->setMethods(['findOneByForeignTableNameAndUid', 'add'])
+            ->getMock();
+        $mappingRepository
+            ->expects($this->once())
+            ->method('findOneByForeignTableNameAndUid')
+            ->willReturn(null);
         $mappingRepository->expects($this->once())->method('add');
 
         $this->tca->expects($this->any())->method('getMappingRepository')->willReturn($mappingRepository);
         $this->tca->expects($this->any())->method('getFeatureFlagByUid')->willReturn($featureFlag);
 
-        $tceMainMock = $this->getMock(\TYPO3\CMS\Core\DataHandling\DataHandler::class);
+        $tceMainMock = $this->createMock(DataHandler::class);
         $incomingFieldArray = [
             'tx_featureflag_flag' => '4711',
             'tx_featureflag_behavior' => '0',
@@ -218,11 +259,13 @@ public function processCmdmapCommandIsNotDelete()
      */
     public function processCmdmappostIsDelete()
     {
-        $mappingRepository = $this->getMock(
-            'Tx_FeatureFlag_Domain_Repository_Mapping',
-            ['findAllByForeignTableNameAndUid', 'remove']
-        );
-        $mappingRepository->expects($this->once())->method('findAllByForeignTableNameAndUid')->willReturn($this->getListOfMappings());
+        $mappingRepository = $this->getMockBuilder(Tx_FeatureFlag_Domain_Repository_Mapping::class)
+            ->setMethods(['findAllByForeignTableNameAndUid', 'remove'])
+            ->getMock();
+        $mappingRepository
+            ->expects($this->once())
+            ->method('findAllByForeignTableNameAndUid')
+            ->willReturn($this->getListOfMappings());
         $mappingRepository->expects($this->exactly(2))->method('remove');
         $this->tca->expects($this->any())->method('getMappingRepository')->willReturn($mappingRepository);
 
@@ -234,9 +277,9 @@ public function processCmdmappostIsDelete()
      */
     protected function getListOfMappings()
     {
-        $mapping1 = $this->getMock('Tx_FeatureFlag_Domain_Model_Mapping');
-        $mapping2 = $this->getMock('Tx_FeatureFlag_Domain_Model_Mapping');
-        $mapping3 = $this->getMock('stdClass');
+        $mapping1 = $this->createMock(Tx_FeatureFlag_Domain_Model_Mapping::class);
+        $mapping2 = $this->createMock(Tx_FeatureFlag_Domain_Model_Mapping::class);
+        $mapping3 = $this->createMock('stdClass');
 
         return array($mapping1, $mapping2, $mapping3);
     }
@@ -246,13 +289,22 @@ protected function getListOfMappings()
      */
     protected function getListOfFeatureFlags()
     {
-        $featureFlag1 = $this->getMock('Tx_FeatureFlag_Domain_Model_FeatureFlag', ['getUid', 'getDescription']);
+        $featureFlag1 = $this
+            ->getMockBuilder(Tx_FeatureFlag_Domain_Model_FeatureFlag::class)
+            ->setMethods(['getUid', 'getDescription'])
+            ->getMock();
         $featureFlag1->expects($this->any())->method('getUid')->willReturn(111);
         $featureFlag1->expects($this->any())->method('getDescription')->willReturn('flag 1');
-        $featureFlag2 = $this->getMock('Tx_FeatureFlag_Domain_Model_FeatureFlag', ['getUid', 'getDescription']);
+        $featureFlag2 = $this
+            ->getMockBuilder(Tx_FeatureFlag_Domain_Model_FeatureFlag::class)
+            ->setMethods(['getUid', 'getDescription'])
+            ->getMock();
         $featureFlag2->expects($this->any())->method('getUid')->willReturn(4711);
         $featureFlag2->expects($this->any())->method('getDescription')->willReturn('flag 2');
-        $featureFlag3 = $this->getMock('Tx_FeatureFlag_Domain_Model_FeatureFlag', ['getUid', 'getDescription']);
+        $featureFlag3 = $this
+            ->getMockBuilder(Tx_FeatureFlag_Domain_Model_FeatureFlag::class)
+            ->setMethods(['getUid', 'getDescription'])
+            ->getMock();
         $featureFlag3->expects($this->any())->method('getDescription')->willReturn('flag 3');
         $featureFlag3->expects($this->any())->method('getUid')->willReturn(222);
 
diff --git a/Tests/Unit/Domain/Model/MappingTest.php b/Tests/Unit/Domain/Model/MappingTest.php
index 54dc9b2..355e3ab 100644
--- a/Tests/Unit/Domain/Model/MappingTest.php
+++ b/Tests/Unit/Domain/Model/MappingTest.php
@@ -76,8 +76,8 @@ public function crdate()
      */
     public function featureFlag()
     {
-        $featureFlag = $this->getMock('Tx_FeatureFlag_Domain_Model_FeatureFlag', array('getFlag'));
-        $featureFlag->expects($this->any())->method('getFlag')->will($this->returnValue('my_awesome_feature_flag'));
+        $featureFlag = $this->getMockBuilder('Tx_FeatureFlag_Domain_Model_FeatureFlag')->setMethods(['getFlag'])->getMock();
+        $featureFlag->method('getFlag')->willReturn('my_awesome_feature_flag');
         $this->mapping->setFeatureFlag($featureFlag);
         $this->assertEquals($this->mapping->getFeatureFlag()->getFlag(), 'my_awesome_feature_flag');
     }
diff --git a/Tests/Unit/Service/EidProcessorTest.php b/Tests/Unit/Service/EidProcessorTest.php
index f8ddfbc..8f2be69 100644
--- a/Tests/Unit/Service/EidProcessorTest.php
+++ b/Tests/Unit/Service/EidProcessorTest.php
@@ -27,6 +27,9 @@
 
 use Aoe\FeatureFlag\Service\EidProcessor;
 use Nimut\TestingFramework\TestCase\UnitTestCase;
+use Tx_FeatureFlag_Service;
+use Tx_FeatureFlag_Service_Exception_ActionNotFound;
+use Tx_FeatureFlag_System_Typo3_CacheManager;
 
 /**
  * @package FeatureFlag
@@ -39,9 +42,11 @@ class EidProcessorTest extends UnitTestCase
      */
     private function getServiceMock()
     {
-        return $this->getMock(
-            'Tx_FeatureFlag_Service', ['updateFeatureFlag'], [], '', false
-        );
+        return $this
+            ->getMockBuilder(Tx_FeatureFlag_Service::class)
+            ->setMethods(['updateFeatureFlag'])
+            ->disableOriginalConstructor()
+            ->getMock();
     }
 
     /**
@@ -49,9 +54,11 @@ private function getServiceMock()
      */
     private function getCacheManagerMock()
     {
-        return $this->getMock(
-            'Tx_FeatureFlag_System_Typo3_CacheManager', ['clearPageCache'], [], '', false
-        );
+        return $this
+            ->getMockBuilder(Tx_FeatureFlag_System_Typo3_CacheManager::class)
+            ->setMethods(['clearPageCache'])
+            ->disableOriginalConstructor()
+            ->getMock();
     }
 
     /**
@@ -91,7 +98,7 @@ public function shouldThrowExceptionTest()
         $_GET = ['action' => '', 'feature' => 'testfeature'];
         $eidProcessor = new EidProcessor($this->getServiceMock(), $this->getCacheManagerMock());
 
-        $this->setExpectedException(\Tx_FeatureFlag_Service_Exception_ActionNotFound::class);
+        $this->expectException(Tx_FeatureFlag_Service_Exception_ActionNotFound::class);
         $eidProcessor->processRequest();
     }
 }
\ No newline at end of file
diff --git a/Tests/Unit/ServiceTest.php b/Tests/Unit/ServiceTest.php
index ad76ea2..17e7629 100644
--- a/Tests/Unit/ServiceTest.php
+++ b/Tests/Unit/ServiceTest.php
@@ -40,7 +40,7 @@ class Tx_FeatureFlag_Tests_Unit_ServiceTest extends Tx_FeatureFlag_Tests_Unit_Ba
      */
     protected function setService(Tx_FeatureFlag_Domain_Repository_FeatureFlag $mockRepository)
     {
-        $mockPersistenceManager = $this->getMock('\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface', array());
+        $mockPersistenceManager = $this->getMockBuilder('\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface')->getMock();
         $this->service = new Tx_FeatureFlag_Service($mockRepository, $mockPersistenceManager, $this->getMockConfiguration());
     }
 
@@ -76,7 +76,7 @@ private function getMockRepository($isEnabled)
      */
     private function getMockConfiguration()
     {
-        $mockConfiguration = $this->getMock('Tx_FeatureFlag_System_Typo3_Configuration', array('getTables'));
+        $mockConfiguration = $this->getMockBuilder('Tx_FeatureFlag_System_Typo3_Configuration')->setMethods(['getTables'])->getMock();
         $mockConfiguration->expects($this->any())->method('getTables')->willReturn('pages');
 
         return $mockConfiguration;
@@ -122,10 +122,10 @@ public function shouldThrowExceptionIfFlagDoesNotExist()
     {
         $GLOBALS['TCA']['tx_featureflag_domain_model_featureflag'] = 'mockedTca';
 
-        $mockRepository = $this->getMock('Tx_FeatureFlag_Domain_Repository_FeatureFlag', array('findByFlag'));
+        $mockRepository = $this->getMockBuilder('Tx_FeatureFlag_Domain_Repository_FeatureFlag')->setMethods(['findByFlag'])->getMock();
         $mockRepository->expects($this->once())->method('findByFlag')->will($this->returnValue(null));
         $this->setService($mockRepository);
-        $this->setExpectedException('Tx_FeatureFlag_Service_Exception_FeatureNotFound');
+        $this->expectException('Tx_FeatureFlag_Service_Exception_FeatureNotFound');
         $this->service->isFeatureEnabled('my_cool_feature');
     }
 
@@ -136,10 +136,10 @@ public function shouldThrowExceptionIfTcaIsNotLoaded()
     {
         $GLOBALS['TCA'] = null;
 
-        $mockRepository = $this->getMock('Tx_FeatureFlag_Domain_Repository_FeatureFlag', array('findByFlag'));
+        $mockRepository = $this->getMockBuilder('Tx_FeatureFlag_Domain_Repository_FeatureFlag')->setMethods(['findByFlag'])->getMock();
         $mockRepository->expects($this->never())->method('findByFlag');
         $this->setService($mockRepository);
-        $this->setExpectedException('RuntimeException');
+        $this->expectException('RuntimeException');
         $this->service->isFeatureEnabled('my_cool_feature');
     }
 
@@ -153,7 +153,7 @@ public function shouldUpdateFeatureFlag()
         $mockRepository = $this->getMockRepository(false);
         $mockRepository->expects($this->once())->method('update')->with($mockModel);
 
-        $mockPersistenceManager = $this->getMock('\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface', array());
+        $mockPersistenceManager = $this->getMockBuilder('\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface')->getMock();
         $mockPersistenceManager->expects($this->once())->method('persistAll');
 
         $serviceMock = $this->getMockBuilder('Tx_FeatureFlag_Service')->setConstructorArgs(array(
diff --git a/Tests/Unit/System/Typo3/ConfigurationTest.php b/Tests/Unit/System/Typo3/ConfigurationTest.php
index b4e231f..4b82315 100644
--- a/Tests/Unit/System/Typo3/ConfigurationTest.php
+++ b/Tests/Unit/System/Typo3/ConfigurationTest.php
@@ -45,11 +45,9 @@ protected function tearDown()
     public function methodGetShouldThrowException()
     {
         $configuration = new Tx_FeatureFlag_System_Typo3_Configuration();
-        $this->setExpectedException(
-            'InvalidArgumentException',
-            'Configuration key "InvalidConfigurationKey" does not exist.',
-            1384161387
-        );
+        $this->expectException('InvalidArgumentException');
+        $this->expectExceptionMessage('Configuration key "InvalidConfigurationKey" does not exist.');
+        $this->expectExceptionCode(1384161387);
         $configuration->get('InvalidConfigurationKey');
     }
 
diff --git a/Tests/Unit/System/Typo3/Task/FlagEntriesTest.php b/Tests/Unit/System/Typo3/Task/FlagEntriesTest.php
index c55767d..2cbde53 100644
--- a/Tests/Unit/System/Typo3/Task/FlagEntriesTest.php
+++ b/Tests/Unit/System/Typo3/Task/FlagEntriesTest.php
@@ -35,33 +35,33 @@ class Tx_FeatureFlag_Tests_Unit_System_Typo3_Task_FlagEntriesTest extends Tx_Fea
      */
     public function execute()
     {
-        $mockRepository = $this->getMock(
-            'Tx_FeatureFlag_Domain_Repository_FeatureFlag',
-            array('updateFeatureFlagStatusForTable')
-        );
+        $mockRepository = $this
+            ->getMockBuilder('Tx_FeatureFlag_Domain_Repository_FeatureFlag')
+            ->setMethods(['updateFeatureFlagStatusForTable'])
+            ->getMock();
         $mockRepository->expects($this->exactly(2))->method('updateFeatureFlagStatusForTable')->with(
             $this->stringStartsWith('table')
         );
 
-        $mockPersistenceManager = $this->getMock('\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface', array());
+        $mockPersistenceManager = $this
+            ->getMockBuilder('\TYPO3\CMS\Extbase\Persistence\PersistenceManagerInterface')->getMock();
 
-        $mockConfiguration = $this->getMock('Tx_FeatureFlag_System_Typo3_Configuration', array('getTables'));
-        $mockConfiguration->expects($this->once())->method('getTables')->will(
-            $this->returnValue(
-                array(
-                    'table_one',
-                    'table_two'
-                )
-            )
+        $mockConfiguration = $this
+            ->getMockBuilder('Tx_FeatureFlag_System_Typo3_Configuration')
+            ->setMethods(['getTables'])
+            ->getMock();
+        $mockConfiguration->expects($this->once())->method('getTables')->willReturn(
+            [
+                'table_one',
+                'table_two'
+            ]
         );
 
-        $flagEntries = $this->getMock(
-            'Tx_FeatureFlag_System_Typo3_Task_FlagEntries',
-            array('getFeatureFlagService'),
-            array(),
-            '',
-            false
-        );
+        $flagEntries = $this
+            ->getMockBuilder('Tx_FeatureFlag_System_Typo3_Task_FlagEntries')
+            ->setMethods(['getFeatureFlagService'])
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $serviceMock = $this->getMockBuilder('Tx_FeatureFlag_Service')->setConstructorArgs(array(
             $mockRepository,
diff --git a/composer.json b/composer.json
index bcac415..91f9767 100644
--- a/composer.json
+++ b/composer.json
@@ -18,21 +18,19 @@
     ],
     "require": {
         "php": "^7.0",
-        "typo3/cms-core": ">=7.6.0",
+        "ext-json": "*",
+        "typo3/cms-core": ">=7.6.0, <=8.7.99",
         "typo3/cms-extbase": "*",
         "typo3/cms-scheduler": "*"
     },
     "require-dev": {
         "typo3/cms": "^7.6",
-        "nimut/testing-framework": "2.0.*",
-        "phpunit/phpcov": "3.1.*",
-        "squizlabs/php_codesniffer": "3.3.*",
+        "nimut/testing-framework": "^4.1",
+        "phpunit/phpcov": "4.0.*",
+        "squizlabs/php_codesniffer": "3.4.*",
         "sebastian/phpcpd": "3.0.*",
         "phpmd/phpmd": "2.6.*"
     },
-    "replace": {
-        "feature_flag": "self.version"
-    },
     "autoload": {
         "classmap": [
             "Classes/"
@@ -57,11 +55,11 @@
         ],
         "test:unit": [
             "[ -e .Build/bin/phpunit ] || composer update",
-            "TYPO3_PATH_ROOT=$(pwd)/.Build/Web .Build/bin/phpunit -c .Build/vendor/nimut/testing-framework/res/Configuration/UnitTests.xml Tests/Unit/ --debug --verbose"
+            "TYPO3_PATH_ROOT=$(pwd)/.Build/Web .Build/bin/phpunit -c .Build/vendor/nimut/testing-framework/res/Configuration/UnitTests.xml Tests/Unit"
         ],
         "test:functional": [
             "[ -e .Build/bin/phpunit ] || composer update",
-            "TYPO3_PATH_ROOT=$(pwd)/.Build/Web .Build/bin/phpunit -c .Build/vendor/nimut/testing-framework/res/Configuration/FunctionalTests.xml Tests/Functional --debug --verbose"
+            "TYPO3_PATH_ROOT=$(pwd)/.Build/Web .Build/bin/phpunit -c .Build/vendor/nimut/testing-framework/res/Configuration/FunctionalTests.xml Tests/Functional"
         ]
     },
     "extra": {
diff --git a/ext_emconf.php b/ext_emconf.php
index 94262aa..4285f18 100644
--- a/ext_emconf.php
+++ b/ext_emconf.php
@@ -11,10 +11,10 @@
     'uploadfolder' => 0,
     'createDirs' => '',
     'clearCacheOnLoad' => 0,
-    'version' => '5.0.0',
+    'version' => '5.0.1',
     'constraints' => [
         'depends' => [
-            'typo3' => '7.6.0-7.6.99'
+            'typo3' => '7.6.0-8.7.99'
         ],
         'conflicts' => [],
         'suggests' => [],