diff --git a/.gitignore b/.gitignore
index d92bf70..75acad6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 /vendor/
 /.idea/
-
-composer.lock
-/var/
\ No newline at end of file
+/composer.lock
+/var/
+/.phpunit.result.cache
diff --git a/README.md b/README.md
index d35432a..27c7b9c 100644
--- a/README.md
+++ b/README.md
@@ -13,11 +13,11 @@ composer require botjaeger/nexmo-bundle
 ```
 
 Then add the following line to your app/AppKernel.php
-```php
+```
 public function registerBundles()
 {
     return [
-        ...
+        ...,
         new Botjaeger\NexmoBundle\BotjaegerNexmoBundle(),
     ];
 }
@@ -35,12 +35,12 @@ botjaeger_nexmo:
 ### Usage
 
 Then call 'botjaeger_nexmo.nexmo_client.client' in the container (some simplified methods)
-```php
+```
 $api = $this->get('botjaeger_nexmo.nexmo_client.client');
 ...
 ```
 Or use the default nexmo client
-```php
+```
 $api = $this->get('default_nexmo.client');
 ...
 ```
diff --git a/composer.json b/composer.json
index c9b7480..e901d42 100644
--- a/composer.json
+++ b/composer.json
@@ -21,20 +21,24 @@
             "Botjaeger\\NexmoBundle\\": "src/"
         }
     },
+    "autoload-dev": {
+        "psr-4": {
+            "Botjaeger\\NexmoBundle\\": "tests/"
+        }
+    },
     "require": {
         "php": ">=7.1",
-        "nexmo/client": "^1.6",
-        "symfony/config": "^3.4|^4.1",
-        "symfony/dependency-injection": "^3.4|^4.1",
-        "symfony/http-kernel": "^3.4|^4.1",
-        "symfony/yaml": "^3.4|^4.1"
+        "nexmo/client": "^2.0",
+        "symfony/config": "^3.4|^4.0",
+        "symfony/dependency-injection": "^3.4|^4.0",
+        "symfony/http-kernel": "^3.4|^4.0",
+        "symfony/yaml": "^3.4|^4.0"
     },
     "require-dev": {
-        "symfony/framework-bundle": "^3.4|^4.1",
-        "phpunit/phpunit": "^7.4",
         "symfony/browser-kit": "^4.3",
         "symfony/css-selector": "^4.3",
-        "symfony/phpunit-bridge": "^4.3"
+        "symfony/framework-bundle": "^3.4|^4.1",
+        "symfony/phpunit-bridge": "^5.1"
     },
     "config": {
         "sort-packages": true
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 7b7b93a..91412ef 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,29 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.7/phpunit.xsd"
-         bootstrap="tests/Fixtures/Botjaeger/autoload.php"
-         colors="true"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.3/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         executionOrder="depends,defects"
+         forceCoversAnnotation="true"
+         beStrictAboutCoversAnnotation="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTodoAnnotatedTests="true"
          verbose="true">
-
-    <php>
-        <server name="KERNEL_CLASS" value="AppKernel" />
-    </php>
-
     <testsuites>
         <testsuite name="BotjaegerNexmoBundle Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
-
+    <php>
+        <server name="KERNEL_CLASS" value="Botjaeger\NexmoBundle\Fixtures\Botjaeger\AppKernel"/>
+    </php>
     <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>fixtures</directory>
-                <directory>vendor</directory>
-                <directory>tests</directory>
-            </exclude>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">src</directory>
         </whitelist>
     </filter>
-
 </phpunit>
diff --git a/tests/DependencyInjection/BotjaegerNexmoExtensionTest.php b/tests/DependencyInjection/BotjaegerNexmoExtensionTest.php
index 0b37e0d..f7b9669 100644
--- a/tests/DependencyInjection/BotjaegerNexmoExtensionTest.php
+++ b/tests/DependencyInjection/BotjaegerNexmoExtensionTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Botjaeger\NexmoBundle\Tests\DependencyInjection;
+namespace Botjaeger\NexmoBundle\DependencyInjection;
 
 use Nexmo\Client;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
diff --git a/tests/Fixtures/Botjaeger/AppKernel.php b/tests/Fixtures/Botjaeger/AppKernel.php
index 55fd806..0a1c10d 100644
--- a/tests/Fixtures/Botjaeger/AppKernel.php
+++ b/tests/Fixtures/Botjaeger/AppKernel.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Botjaeger\NexmoBundle\Fixtures\Botjaeger;
+
 use Symfony\Component\Config\Loader\LoaderInterface;
 use Symfony\Component\HttpKernel\Kernel;
 
@@ -8,8 +10,8 @@ class AppKernel extends Kernel
     public function registerBundles()
     {
         return [
-            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-            new Botjaeger\NexmoBundle\BotjaegerNexmoBundle()
+            new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+            new \Botjaeger\NexmoBundle\BotjaegerNexmoBundle()
         ];
     }
     public function registerContainerConfiguration(LoaderInterface $loader)