diff --git a/tests/cases/AtomicOperations.test.php b/tests/cases/AtomicOperations.test.php
index cf9dcdc4..9771b7f9 100644
--- a/tests/cases/AtomicOperations.test.php
+++ b/tests/cases/AtomicOperations.test.php
@@ -19,7 +19,7 @@
 require_once __DIR__ . '/../../vendor/autoload.php';
 require_once __DIR__ . '/../mock/Autoload.php';
 $testHelper = new TestHelper('Atomic Operations');
-$pool = CacheManager::getInstance('Memstatic');
+$pool = CacheManager::getInstance('Memory');
 $testHelper->printInfoText('Testing APPEND/PREPEND methods...');
 
 {
diff --git a/tests/cases/CacheSlamsProtection.test.php b/tests/cases/CacheSlamsProtection.test.php
index 20521ebb..5cdb39db 100644
--- a/tests/cases/CacheSlamsProtection.test.php
+++ b/tests/cases/CacheSlamsProtection.test.php
@@ -14,10 +14,9 @@
 
 use Phpfastcache\CacheManager;
 use Phpfastcache\Config\IOConfigurationOption;
-use Phpfastcache\Core\Pool\ExtendedCacheItemPoolInterface;
-use Phpfastcache\Entities\ItemBatch;
 use Phpfastcache\EventManager;
 use Phpfastcache\Tests\Helper\TestHelper;
+use Phpfastcache\Event\Events;
 
 chdir(__DIR__);
 require_once __DIR__ . '/../../vendor/autoload.php';
@@ -29,8 +28,8 @@
 ]));
 
 if (!$testHelper->isHHVM()) {
-    EventManager::getInstance()->onCacheGetItemInSlamBatch(function (ExtendedCacheItemPoolInterface $itemPool, ItemBatch $driverData, $cacheSlamsSpendSeconds) use ($testHelper) {
-        $testHelper->printText("Looping in batch for {$cacheSlamsSpendSeconds} second(s) with a batch from " . $driverData->getItemDate()->format(\DateTime::W3C));
+    EventManager::getInstance()->addListener(Events::CACHE_GET_ITEM_IN_SLAM_BATCH, function (\Phpfastcache\Event\Event\CacheGetItemInSlamBatchItemPoolEvent $event) use ($testHelper) {
+        $testHelper->printText("Looping in batch for {$event->getCacheSlamsSpendSeconds()} second(s) with a batch from " . $event->getItemBatch()->getItemDate()->format(\DateTime::W3C));
     });
 
     $testHelper->runSubProcess('CacheSlamsProtection');
diff --git a/tests/cases/EventManagerScoped.test.php b/tests/cases/EventManagerScoped.test.php
index 93f499eb..e3d29058 100644
--- a/tests/cases/EventManagerScoped.test.php
+++ b/tests/cases/EventManagerScoped.test.php
@@ -15,10 +15,10 @@
 use Phpfastcache\CacheManager;
 use Phpfastcache\Core\Item\ExtendedCacheItemInterface;
 use Phpfastcache\Core\Pool\ExtendedCacheItemPoolInterface;
-use Phpfastcache\Event\EventReferenceParameter;
 use Phpfastcache\EventManager;
-use Phpfastcache\Exceptions\PhpfastcacheInvalidTypeException;
 use Phpfastcache\Tests\Helper\TestHelper;
+use Phpfastcache\Event\Event\EventInterface;
+use Phpfastcache\Event\Events;
 
 chdir(__DIR__);
 require_once __DIR__ . '/../../vendor/autoload.php';
@@ -36,36 +36,36 @@
 $filesGetItemEventManagerCount = 0;
 $redisGetItemEventManagerCount = 0;
 
-EventManager::getInstance()->addGlobalListener(static function (string $eventName) use ($testHelper, &$globalEveryEventsEvents) {
-    $testHelper->printInfoText(sprintf('<light_yellow>[Global]</light_yellow> <blue>Global "addGlobalListener" has been called for</blue> <magenta>"%s"</magenta>', $eventName));
-    $globalEveryEventsEvents[$eventName] = ($globalEveryEventsEvents[$eventName] ?? 0) + 1;
+EventManager::getInstance()->addGlobalListener(static function (EventInterface $event) use ($testHelper, &$globalEveryEventsEvents) {
+    $testHelper->printInfoText(sprintf('<light_yellow>[Global]</light_yellow> <blue>Global "addGlobalListener" has been called for</blue> <magenta>"%s"</magenta>', $event::getName()));
+    $globalEveryEventsEvents[$event::getName()] = ($globalEveryEventsEvents[$event::getName()] ?? 0) + 1;
 }, 'GlobalEveryEvent');
 
-EventManager::getInstance()->onCacheGetItem(static function (ExtendedCacheItemPoolInterface $itemPool, ExtendedCacheItemInterface $item, string $eventName) use ($testHelper, &$globalGetItemEventManagerCount) {
+EventManager::getInstance()->addListener(Events::CACHE_GET_ITEM, static function (\Phpfastcache\Event\Event\CacheGetItemEvent $event) use ($testHelper, &$globalGetItemEventManagerCount) {
     $testHelper->assertPass('<light_yellow>[Global]</light_yellow> Global event manager received events from multiple pool instances');
     $globalGetItemEventManagerCount++;
 });
 
-$filesCacheInstance->getEventManager()->addGlobalListener(static function (string $eventName) use ($testHelper, &$filesEveryEventsEventEvents) {
-    $testHelper->printInfoText(sprintf('<yellow>[Files]</yellow> <cyan>Scoped "addGlobalListener" has been called for</cyan> <magenta>"%s"</magenta>', $eventName));
-    $filesEveryEventsEventEvents[$eventName] = ($filesEveryEventsEventEvents[$eventName] ?? 0) + 1;
+$filesCacheInstance->getEventManager()->addGlobalListener(static function (EventInterface $event) use ($testHelper, &$filesEveryEventsEventEvents) {
+    $testHelper->printInfoText(sprintf('<yellow>[Files]</yellow> <cyan>Scoped "addGlobalListener" has been called for</cyan> <magenta>"%s"</magenta>', $event::getName()));
+    $filesEveryEventsEventEvents[$event::getName()] = ($filesEveryEventsEventEvents[$event::getName()] ?? 0) + 1;
 }, 'GlobalEveryEvent');
 
 
-$filesCacheInstance->getEventManager()->onCacheGetItem(static function (ExtendedCacheItemPoolInterface $itemPool, ExtendedCacheItemInterface $item, string $eventName) use ($testHelper, &$filesGetItemEventManagerCount)  {
-    if($itemPool->getDriverName() === 'Files') {
+$filesCacheInstance->getEventManager()->addListener(Events::CACHE_GET_ITEM, static function (\Phpfastcache\Event\Event\CacheGetItemEvent $event) use ($testHelper, &$filesGetItemEventManagerCount)  {
+    if($event->getItemPool()->getDriverName() === 'Files') {
         $testHelper->assertPass('<yellow>[Files]</yellow> Scoped event manager received only events of its own pool instance');
         $filesGetItemEventManagerCount++;
     }
 });
 
-$redisCacheInstance->getEventManager()->addGlobalListener(static function (string $eventName) use ($testHelper, &$redisEveryEventsEventEvents) {
-    $testHelper->printInfoText(sprintf('<yellow>[Redis]</yellow> <cyan>Scoped "addGlobalListener" has been called for</cyan> <magenta>"%s"</magenta>', $eventName));
-    $redisEveryEventsEventEvents[$eventName] = ($redisEveryEventsEventEvents[$eventName] ?? 0) + 1;
+$redisCacheInstance->getEventManager()->addGlobalListener(static function (\Phpfastcache\Event\Event\EventInterface $event) use ($testHelper, &$redisEveryEventsEventEvents) {
+    $testHelper->printInfoText(sprintf('<yellow>[Redis]</yellow> <cyan>Scoped "addGlobalListener" has been called for</cyan> <magenta>"%s"</magenta>', $event::getName()));
+    $redisEveryEventsEventEvents[$event::getName()] = ($redisEveryEventsEventEvents[$event::getName()] ?? 0) + 1;
 }, 'GlobalEveryEvent');
 
-$redisCacheInstance->getEventManager()->onCacheGetItem(static function (ExtendedCacheItemPoolInterface $itemPool, ExtendedCacheItemInterface $item, string $eventName) use ($testHelper, &$redisGetItemEventManagerCount)  {
-    if($itemPool->getDriverName() === 'Redis') {
+$redisCacheInstance->getEventManager()->addListener(Events::CACHE_GET_ITEM, static function (\Phpfastcache\Event\Event\CacheGetItemEvent $event) use ($testHelper, &$redisGetItemEventManagerCount)  {
+    if($event->getItemPool()->getDriverName() === 'Redis') {
         $testHelper->assertPass('<yellow>[Files]</yellow> Scoped event manager received only events of its own pool instance');
         $redisGetItemEventManagerCount++;
     }
diff --git a/tests/cases/GetAllItems.test.php b/tests/cases/GetAllItems.test.php
index 6f9ffc3c..9e08e98f 100644
--- a/tests/cases/GetAllItems.test.php
+++ b/tests/cases/GetAllItems.test.php
@@ -32,9 +32,9 @@
 /**
  * https://github.com/PHPSocialNetwork/phpfastcache/wiki/%5BV5%CB%96%5D-Fetching-all-keys
  */
-EventManager::getInstance()->addListener([Events::CACHE_GET_ALL_ITEMS], static function(ExtendedCacheItemPoolInterface $driver, EventReferenceParameter $referenceParameter) use ($testHelper, &$eventFlag){
-    $callback = $referenceParameter->getParameterValue();
-    $referenceParameter->setParameterValue(function(string $pattern) use ($callback, &$eventFlag, $testHelper) {
+EventManager::getInstance()->addListener([Events::CACHE_GET_ALL_ITEMS], static function(\Phpfastcache\Event\Event\CacheGetAllItemsEvent $event) use ($testHelper, &$eventFlag){
+    $callback = $event->getEventReferenceParameter()->getParameterValue();
+    $event->getEventReferenceParameter()->setParameterValue(function(string $pattern) use ($callback, &$eventFlag, $testHelper) {
         $eventFlag = true;
         $testHelper->printInfoText('The custom event Event::CACHE_GET_ALL_ITEMS has been called.');
         return $callback($pattern);
diff --git a/tests/cases/Memory.test.php b/tests/cases/Memory.test.php
index 7aebcdaa..7a4edd67 100644
--- a/tests/cases/Memory.test.php
+++ b/tests/cases/Memory.test.php
@@ -17,7 +17,7 @@
 
 chdir(__DIR__);
 require_once __DIR__ . '/../../vendor/autoload.php';
-$testHelper = new TestHelper('Memstatic driver');
+$testHelper = new TestHelper('Memory driver');
 $cacheInstance = CacheManager::getInstance('Memory');
 
 $testHelper->runCRUDTests($cacheInstance);
diff --git a/tests/cases/Wincache.test.php b/tests/cases/Wincache.test.php
deleted file mode 100644
index a43aea8d..00000000
--- a/tests/cases/Wincache.test.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- *
- * This file is part of Phpfastcache.
- *
- * @license MIT License (MIT)
- *
- * For full copyright and license information, please see the docs/CREDITS.txt and LICENCE files.
- *
- * @author Georges.L (Geolim4)  <contact@geolim4.com>
- * @author Contributors  https://github.com/PHPSocialNetwork/phpfastcache/graphs/contributors
- */
-
-use Phpfastcache\CacheManager;
-use Phpfastcache\Exceptions\PhpfastcacheDriverCheckException;
-use Phpfastcache\Tests\Helper\TestHelper;
-use Phpfastcache\Drivers\Wincache\Config as WincacheConfig;
-use Redis as RedisClient;
-
-chdir(__DIR__);
-require_once __DIR__ . '/../../vendor/autoload.php';
-$testHelper = new TestHelper('Wincache');
-
-$cacheInstance = CacheManager::getInstance('Wincache', new WincacheConfig());
-$testHelper->runCRUDTests($cacheInstance);
-
-$testHelper->terminateTest();