diff --git a/composer.json b/composer.json
index d2b0e93..7485f5d 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
     },
     "require": {
         "php": "~8.1.0 || ~8.2.0|| ~8.3.0",
-        "brick/varexporter": "^0.3.2",
+        "brick/varexporter": "^0.3.2 || ^0.4",
         "laminas/laminas-config": "^3.7",
         "laminas/laminas-eventmanager": "^3.4",
         "laminas/laminas-stdlib": "^3.6",
diff --git a/composer.lock b/composer.lock
index b5e6639..695eaac 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,30 +4,30 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3cc77079da49baa4a565ef8fccd45946",
+    "content-hash": "1db639ae04251b994d0668ea33c3a821",
     "packages": [
         {
             "name": "brick/varexporter",
-            "version": "0.3.8",
+            "version": "0.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/brick/varexporter.git",
-                "reference": "b5853edea6204ff8fa10633c3a4cccc4058410ed"
+                "reference": "2fd038f7c9d12d468130c6e1b3ce06e4160a7dbb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/brick/varexporter/zipball/b5853edea6204ff8fa10633c3a4cccc4058410ed",
-                "reference": "b5853edea6204ff8fa10633c3a4cccc4058410ed",
+                "url": "https://api.github.com/repos/brick/varexporter/zipball/2fd038f7c9d12d468130c6e1b3ce06e4160a7dbb",
+                "reference": "2fd038f7c9d12d468130c6e1b3ce06e4160a7dbb",
                 "shasum": ""
             },
             "require": {
                 "nikic/php-parser": "^4.0",
-                "php": "^7.2 || ^8.0"
+                "php": "^7.4 || ^8.0"
             },
             "require-dev": {
                 "php-coveralls/php-coveralls": "^2.2",
                 "phpunit/phpunit": "^8.5 || ^9.0",
-                "vimeo/psalm": "4.23.0"
+                "vimeo/psalm": "5.15.0"
             },
             "type": "library",
             "autoload": {
@@ -45,7 +45,7 @@
             ],
             "support": {
                 "issues": "https://github.com/brick/varexporter/issues",
-                "source": "https://github.com/brick/varexporter/tree/0.3.8"
+                "source": "https://github.com/brick/varexporter/tree/0.4.0"
             },
             "funding": [
                 {
@@ -53,7 +53,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2023-01-21T23:05:38+00:00"
+            "time": "2023-09-01T21:10:07+00:00"
         },
         {
             "name": "laminas/laminas-config",
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 43f893b..e6e1125 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -771,18 +771,6 @@
     </InvalidArgument>
     <MixedArgument>
       <code><![CDATA[$test->modules]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
     </MixedArgument>
     <MixedAssignment>
       <code>$config</code>
@@ -806,24 +794,6 @@
     <PossiblyNullReference>
       <code>getLoadedModules</code>
     </PossiblyNullReference>
-    <UndefinedThisPropertyAssignment>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->sharedEvents]]></code>
-    </UndefinedThisPropertyAssignment>
-    <UndefinedThisPropertyFetch>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-      <code><![CDATA[$this->events]]></code>
-    </UndefinedThisPropertyFetch>
   </file>
   <file src="test/ResetAutoloadFunctionsTrait.php">
     <RedundantCastGivenDocblockType>
diff --git a/test/ModuleManagerTest.php b/test/ModuleManagerTest.php
index a6de58b..acdce93 100644
--- a/test/ModuleManagerTest.php
+++ b/test/ModuleManagerTest.php
@@ -33,6 +33,10 @@ class ModuleManagerTest extends TestCase
 
     /** @var DefaultListenerAggregate */
     protected $defaultListeners;
+    /** @var SharedEventManager */
+    protected $sharedEvents;
+    /** @var EventManager */
+    protected $events;
 
     protected function setUp(): void
     {