diff --git a/Command/NodeJsServerCommand.php b/Command/NodeJsServerCommand.php
index fc11c18..552140c 100644
--- a/Command/NodeJsServerCommand.php
+++ b/Command/NodeJsServerCommand.php
@@ -65,5 +65,7 @@ public function execute(InputInterface $input, OutputInterface $output)
         $process->setIdleTimeout(false);
         $process->setTimeout(null);
         $process->run();
+
+        return 0;
     }
 }
diff --git a/DependencyInjection/SocketIoConfiguration.php b/DependencyInjection/SocketIoConfiguration.php
index 7165d0c..dc14473 100644
--- a/DependencyInjection/SocketIoConfiguration.php
+++ b/DependencyInjection/SocketIoConfiguration.php
@@ -5,7 +5,6 @@
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Config\Definition\Builder\TreeBuilder;
 use Symfony\Component\Config\Definition\ConfigurationInterface;
-use Symfony\Component\HttpKernel\Kernel;
 
 /**
  * Class SocketIoConfiguration.
@@ -23,13 +22,8 @@ class SocketIoConfiguration implements ConfigurationInterface
      */
     public function getConfigTreeBuilder()
     {
-        if (Kernel::VERSION_ID >= 40300) {
-            $treeBuilder = new TreeBuilder('sfcod_socketio');
-            $rootNode = $treeBuilder->getRootNode();
-        } else {
-            $treeBuilder = new TreeBuilder();
-            $rootNode = $treeBuilder->root('sfcod_socketio');
-        }
+        $treeBuilder = new TreeBuilder('sfcod_socketio');
+        $rootNode = $treeBuilder->getRootNode();
 
         $this->addNamespaces($rootNode);
 
diff --git a/Service/Process.php b/Service/Process.php
index fe1fbee..1580a70 100644
--- a/Service/Process.php
+++ b/Service/Process.php
@@ -85,7 +85,14 @@ private function inWork()
      */
     private function push(string $handle, array $data): \Symfony\Component\Process\Process
     {
-        $cmd = sprintf('php %s socket-io:process --handler=%s --data=%s --env=%s', $this->scriptName, escapeshellarg($handle), escapeshellarg(serialize($data)), getenv('APP_ENV'));
+        $cmd = [
+            'php',
+            $this->scriptName,
+            'socket-io:process',
+            '--handler=' . escapeshellarg($handle),
+            '--data=' . escapeshellarg(serialize($data)),
+            '--env=prod',
+        ];
 
         $process = new \Symfony\Component\Process\Process($cmd, $this->binPath);
         $process->setTimeout(10);
diff --git a/Tests/Data/LoadTrait.php b/Tests/Data/LoadTrait.php
index 09133fe..9e83654 100644
--- a/Tests/Data/LoadTrait.php
+++ b/Tests/Data/LoadTrait.php
@@ -6,8 +6,6 @@
 use Psr\Log\LoggerInterface;
 use SfCod\SocketIoBundle\DependencyInjection\SocketIoExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\Dotenv\Dotenv;
-use Symfony\Component\Dotenv\Exception\PathException;
 
 trait LoadTrait
 {
@@ -15,17 +13,11 @@ trait LoadTrait
 
     protected function configure()
     {
-        $dotenv = new Dotenv();
-        try {
-            $dotenv->load(__DIR__ . '/../../.env');
-        } catch (PathException $e) {
-            // Nothing
-        }
-
         $extension = new SocketIoExtension();
         $container = new ContainerBuilder();
-        $container->setParameter('kernel.project_dir', getenv('KERNEL_PROJECT_DIR'));
+        $container->setParameter('kernel.project_dir', '');
         $container->setParameter('kernel.root_dir', realpath(__DIR__ . '/../../../../SfCod/'));
+        $container->setParameter('kernel.bundles', []);
         $container->set(LoggerInterface::class, new Logger('test'));
 
         $extension->load([
diff --git a/Tests/Service/BroadcastTest.php b/Tests/Service/BroadcastTest.php
index f14e6e4..b20082f 100644
--- a/Tests/Service/BroadcastTest.php
+++ b/Tests/Service/BroadcastTest.php
@@ -1,12 +1,15 @@
 <?php
 
-namespace SfCod\SocketIoBundle\Tests;
+namespace SfCod\SocketIoBundle\Tests\Service;
 
 use PHPUnit\Framework\TestCase;
+use Psr\Log\LoggerInterface;
 use SfCod\SocketIoBundle\Events\EventInterface;
 use SfCod\SocketIoBundle\Events\EventPublisherInterface;
 use SfCod\SocketIoBundle\Events\EventSubscriberInterface;
 use SfCod\SocketIoBundle\Service\Broadcast;
+use SfCod\SocketIoBundle\Service\EventManager;
+use SfCod\SocketIoBundle\Service\RedisDriver;
 use SfCod\SocketIoBundle\Tests\Data\LoadTrait;
 use SfCod\SocketIoBundle\Tests\Data\MarkAsReadSubscriber;
 use Symfony\Component\Process\Process;
@@ -26,6 +29,8 @@ class BroadcastTest extends TestCase
      * @var Broadcast
      */
     private $broadcast;
+    private $eventManagerMock;
+    private $processMock;
 
     /**
      * Set up test.
@@ -33,8 +38,14 @@ class BroadcastTest extends TestCase
     protected function setUp()
     {
         $this->configure();
+        $redisDriverMock = $this->createMock(RedisDriver::class);
+        $eventManagerMock = $this->createMock(EventManager::class);
+        $this->eventManagerMock = $eventManagerMock;
+        $loggerMock = $this->createMock(LoggerInterface::class);
+        $processMock = $this->createMock(\SfCod\SocketIoBundle\Service\Process::class);
+        $this->processMock = $processMock;
 
-        $this->broadcast = $this->container->get(Broadcast::class);
+        $this->broadcast = new Broadcast($redisDriverMock, $eventManagerMock, $loggerMock, $processMock);
     }
 
     /**
@@ -44,9 +55,10 @@ protected function setUp()
      */
     public function testOn()
     {
+        $this->processMock->method('run')->willReturn(new Process([]));
         $result = $this->broadcast->on(MarkAsReadSubscriber::name(), []);
 
-        $this->assertInstanceOf(Process::class, $result);
+        self::assertInstanceOf(Process::class, $result);
     }
 
     /**
@@ -58,35 +70,34 @@ public function testProcess()
 
         $handler = $this->getMockBuilder([EventInterface::class, EventSubscriberInterface::class])->getMock();
         $handler
-            ->expects($this->once())
+            ->expects(self::once())
             ->method('setPayload')
             ->with($data);
         $handler
-            ->expects($this->once())
+            ->expects(self::once())
             ->method('handle');
 
-        $this->container->set(sprintf('socketio.%s', get_class($handler)), $handler);
+        $this->eventManagerMock->method('resolve')->willReturn($handler);
         $this->broadcast->process(get_class($handler), $data);
     }
 
-//    /**
-//     */
-//    public function testEmit()
-//    {
-//        $data = range(1, 10);
-//
-//        $handler = $this->getMockBuilder([EventInterface::class, EventPublisherInterface::class])->getMock();
-//        $handler
-//            ->expects($this->once())
-//            ->method('setPayload')
-//            ->with($data);
-//        $handler
-//            ->expects($this->once())
-//            ->method('fire');
-//
-//        $this->container->set(sprintf('socketio.%s', get_class($handler)), $handler);
-//        $this->broadcast->emit(get_class($handler), $data);
-//    }
+    /**
+     */
+    public function testEmit()
+    {
+        $data = range(1, 10);
+
+        $handler = $this->getMockBuilder([EventInterface::class, EventPublisherInterface::class])->getMock();
+        $handler
+            ->expects(self::once())
+            ->method('setPayload')
+            ->with($data);
+        $handler
+            ->expects(self::once())
+            ->method('fire');
+        $this->eventManagerMock->method('resolve')->willReturn($handler);
+        $this->broadcast->emit(get_class($handler), $data);
+    }
 
 //    /**
 //     */
diff --git a/Tests/Service/RedisDriverTest.php b/Tests/Service/RedisDriverTest.php
index c32bc47..353840f 100644
--- a/Tests/Service/RedisDriverTest.php
+++ b/Tests/Service/RedisDriverTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace SfCod\SocketIoBundle\Tests;
+namespace SfCod\SocketIoBundle\Tests\Service;
 
 use PHPUnit\Framework\TestCase;
 use Predis\Client;
diff --git a/composer.json b/composer.json
index d1750c8..5e94653 100644
--- a/composer.json
+++ b/composer.json
@@ -15,21 +15,30 @@
         }
     ],
     "require": {
-        "php": "^7.0",
-        "symfony/framework-bundle": "^4.0|^5.0",
+        "php": "^7.1",
+        "symfony/framework-bundle": "^4.4 || ^5.0",
         "predis/predis": "^1.1",
         "symfony/monolog-bundle": "^3.1",
         "ezyang/htmlpurifier": "^4.0",
-        "symfony/dotenv": "^4.0|^5.0",
-        "symfony/process": "^4.0|^5.0"
+        "symfony/dotenv": "^4.4 || ^5.0",
+        "symfony/process": "^4.4 || ^5.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^4.0|^5.0",
-        "friendsofphp/php-cs-fixer": "^2.8"
+        "symfony/phpunit-bridge": "^4.4 || ^5.0",
+        "friendsofphp/php-cs-fixer": "^2.8",
+        "phpunit/phpunit": "^7.5"
     },
     "autoload": {
         "psr-4": {
             "SfCod\\SocketIoBundle\\": ""
+        },
+        "exclude-from-classmap": [
+            "/Tests/"
+        ]
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "SfCod\\QueueBundle\\Tests\\": "/Tests/"
         }
     }
 }
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 43989c1..c5d8580 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
          bootstrap="vendor/autoload.php"
 >
   <testsuites>
@@ -17,6 +16,16 @@
     </testsuite>
   </testsuites>
 
+  <filter>
+    <whitelist>
+      <directory>./</directory>
+      <exclude>
+        <directory>./Tests</directory>
+        <directory>./vendor</directory>
+      </exclude>
+    </whitelist>
+  </filter>
+
   <php>
     <ini name="error_reporting" value="-1" />
   </php>