diff --git a/.gitignore b/.gitignore
index 3c3629e..474b062 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 node_modules
+vendor
+silverstripe-cache
+composer.lock
diff --git a/.travis.yml b/.travis.yml
index 819b3d1..1cf8281 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
 language: php
 
+services:
+ - mysql
+
 env:
   global:
     - TRAVIS_NODE_VERSION="10"
@@ -7,22 +10,22 @@ env:
 matrix:
   include:
     - php: 7.2
-      env: DB=MYSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1
+      env: DB=MYSQL FRAMEWORK_VERSION=4.5.1 PHPUNIT_TEST=1
     - php: 7.3
-      env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1
+      env: DB=MYSQL FRAMEWORK_VERSION=4.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1
 
 before_script:
   - phpenv rehash
   - phpenv config-rm xdebug.ini
 
   - composer validate
-  - composer require --no-update silverstripe/recipe-testing:^1 silverstripe/recipe-cms:"$RECIPE_VERSION"
-  - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
+  - composer require --no-update silverstripe/framework:"$FRAMEWORK_VERSION"
+  - composer install --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
 
 script:
   - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit; fi
   - if [[ $PHPUNIT_COVERAGE_TEST ]]; then phpdbg -qrr vendor/bin/phpunit --coverage-clover=coverage.xml; fi
-  - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs src/ tests/ *.php; fi
+  - if [[ $PHPCS_TEST ]]; then vendor/bin/phpcs src/ tests/; fi
 
 after_success:
   - if [[ $PHPUNIT_COVERAGE_TEST ]]; then bash <(curl -s https://codecov.io/bash) -f coverage.xml -F php; fi
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index a5ec7a1..e801060 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,4 +1,4 @@
-<phpunit bootstrap="vendor/silverstripe/cms/tests/bootstrap.php" colors="true">
+<phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
     <testsuite name="silverstripe-module/skeleton">
         <directory>tests/</directory>
     </testsuite>
diff --git a/src/Dispatch/Dispatcher.php b/src/Dispatch/Dispatcher.php
index 6f6fa40..75b0372 100644
--- a/src/Dispatch/Dispatcher.php
+++ b/src/Dispatch/Dispatcher.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace SilverStripe\EventDispatcher\Dispatch;
 
 use InvalidArgumentException;
diff --git a/src/Dispatch/DispatcherLoaderInterface.php b/src/Dispatch/DispatcherLoaderInterface.php
index f74c991..d92626f 100644
--- a/src/Dispatch/DispatcherLoaderInterface.php
+++ b/src/Dispatch/DispatcherLoaderInterface.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace SilverStripe\EventDispatcher\Dispatch;
 
 interface DispatcherLoaderInterface
diff --git a/src/Dispatch/EventDispatcherInterface.php b/src/Dispatch/EventDispatcherInterface.php
index e68e86f..a9a962d 100644
--- a/src/Dispatch/EventDispatcherInterface.php
+++ b/src/Dispatch/EventDispatcherInterface.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace SilverStripe\EventDispatcher\Dispatch;
 
 use SilverStripe\EventDispatcher\Event\EventHandlerInterface;
diff --git a/src/Event/EventContextInterface.php b/src/Event/EventContextInterface.php
index 3367e90..c38417f 100644
--- a/src/Event/EventContextInterface.php
+++ b/src/Event/EventContextInterface.php
@@ -1,9 +1,7 @@
 <?php
 
-
 namespace SilverStripe\EventDispatcher\Event;
 
-
 interface EventContextInterface
 {
     /**
diff --git a/src/Event/EventHandlerInterface.php b/src/Event/EventHandlerInterface.php
index d3d530d..fd27fa5 100644
--- a/src/Event/EventHandlerInterface.php
+++ b/src/Event/EventHandlerInterface.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace SilverStripe\EventDispatcher\Event;
 
 interface EventHandlerInterface
diff --git a/src/Symfony/Backend.php b/src/Symfony/Backend.php
index eca735a..d84a285 100644
--- a/src/Symfony/Backend.php
+++ b/src/Symfony/Backend.php
@@ -1,6 +1,5 @@
 <?php
 
-
 namespace SilverStripe\EventDispatcher\Symfony;
 
 use SilverStripe\EventDispatcher\Dispatch\EventDispatcherInterface;
diff --git a/src/Symfony/Event.php b/src/Symfony/Event.php
index 92bfe12..5b9328a 100644
--- a/src/Symfony/Event.php
+++ b/src/Symfony/Event.php
@@ -1,9 +1,7 @@
 <?php
 
-
 namespace SilverStripe\EventDispatcher\Symfony;
 
-
 use SilverStripe\Core\Injector\Injectable;
 use SilverStripe\EventDispatcher\Event\EventContextInterface;
 use Symfony\Component\EventDispatcher\GenericEvent;
diff --git a/tests/Dispatch/MockBackend.php b/tests/Dispatch/MockBackend.php
index 55b5e88..b7d0d5a 100644
--- a/tests/Dispatch/MockBackend.php
+++ b/tests/Dispatch/MockBackend.php
@@ -1,9 +1,7 @@
 <?php
 
-
 namespace SilverStripe\EventDispatcher\Tests\Dispatch;
 
-
 use SilverStripe\EventDispatcher\Dispatch\EventDispatcherInterface;
 use SilverStripe\EventDispatcher\Event\EventHandlerInterface;
 
@@ -33,5 +31,6 @@ public function addListener(string $eventName, EventHandlerInterface $listener):
 
     public function removeListener(string $eventName, EventHandlerInterface $listener): EventDispatcherInterface
     {
+        return $this;
     }
 }
diff --git a/tests/Dispatch/MockEvent.php b/tests/Dispatch/MockEvent.php
index 65b71fe..d45e538 100644
--- a/tests/Dispatch/MockEvent.php
+++ b/tests/Dispatch/MockEvent.php
@@ -1,9 +1,7 @@
 <?php
 
-
 namespace SilverStripe\EventDispatcher\Tests\Dispatch;
 
-
 use SilverStripe\EventDispatcher\Event\EventContextInterface;
 
 class MockEvent implements EventContextInterface