diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/messages.twig b/addons/default/visiosoft/base-theme/resources/views/partials/messages.twig
index 411fe9650..6ea3181dd 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/messages.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/messages.twig
@@ -7,7 +7,7 @@
                 <span>&times;</span><span class="sr-only">Close</span>
             </button>
 
-            {% for message in message_get('success') %}
+            {% for message in message_pull('success') %}
                 {{ trans(message)|markdown }}
             {% endfor %}
         </div>
@@ -20,7 +20,7 @@
                 <span>&times;</span><span class="sr-only">Close</span>
             </button>
 
-            {% for message in message_get('info') %}
+            {% for message in message_pull('info') %}
                 {{ trans(message)|markdown }}
             {% endfor %}
         </div>
@@ -34,7 +34,7 @@
                 <span>&times;</span><span class="sr-only">Close</span>
             </button>
 
-            {% for message in message_get('warning') %}
+            {% for message in message_pull('warning') %}
                 {{ trans(message)|markdown }}
             {% endfor %}
         </div>
@@ -48,7 +48,7 @@
                 <span>&times;</span><span class="sr-only">Close</span>
             </button>
 
-            {% for message in message_get('error') %}
+            {% for message in message_pull('error') %}
                 {{ trans(message)|markdown }}
             {% endfor %}
         </div>
diff --git a/phpunit.xml b/phpunit.xml
deleted file mode 100644
index de3643f9f..000000000
--- a/phpunit.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit bootstrap="bootstrap/autoload.php"
-         convertWarningsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertErrorsToExceptions="true"
-         backupStaticAttributes="false"
-         processIsolation="false"
-         backupGlobals="false"
-         stopOnFailure="true"
-         colors="true">
-
-    <testsuites>
-        <testsuite name="Streams">
-            <directory suffix="Test.php">./vendor/anomaly/streams-platform/</directory>
-        </testsuite>
-        <testsuite name="Application">
-            <directory suffix="Test.php">./addons/*/*/*/tests</directory>
-        </testsuite>
-        <testsuite name="Core">
-            <directory suffix="Test.php">./core/*/*/tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./vendor/anomaly/streams-platform/src/</directory>
-            <exclude>
-                <directory suffix=".php">./app/</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-
-    <logging>
-        <log type="coverage-html" target="./coverage"/>
-    </logging>
-
-    <php>
-        <server name="HTTP_HOST" value="http://localhost"/>
-        <env name="APP_ENV" value="testing"/>
-        <env name="CACHE_DRIVER" value="array"/>
-        <env name="SESSION_DRIVER" value="array"/>
-        <env name="QUEUE_DRIVER" value="sync"/>
-        <env name="APP_THEME" value="pyrocms.theme.starter"/>
-        <env name="ADMIN_THEME" value="pyrocms.theme.accelerant"/>
-    </php>
-
-</phpunit>