diff --git a/tests/unit/Application/Model/ActionBaseTest.php b/tests/unit/Application/Model/ActionBaseTest.php
index 35b00bf..67911a0 100644
--- a/tests/unit/Application/Model/ActionBaseTest.php
+++ b/tests/unit/Application/Model/ActionBaseTest.php
@@ -180,7 +180,7 @@ class ActionBaseTest extends d3ModCfgUnitTestCase
             ])
             ->getMock();
         $modelMock->expects($this->atLeastOnce())->method('hasFormElements')->willReturn(false);
-        $modelMock->expects($this->atLeastOnce())->method('executeAction')->willReturn(1);
+        $modelMock->expects($this->atLeastOnce())->method('executeAction');
         $modelMock->expects($this->atLeastOnce())->method('getQuery')->willReturn([]);
         $this->_oModel = $modelMock;
 
@@ -209,7 +209,7 @@ class ActionBaseTest extends d3ModCfgUnitTestCase
             ])
             ->getMock();
         $modelMock->expects($this->atLeastOnce())->method('hasFormElements')->willReturn(true);
-        $modelMock->expects($this->exactly((int) !$blThrowException))->method('executeAction')->willReturn(1);
+        $modelMock->expects($this->exactly((int) !$blThrowException))->method('executeAction');
         $modelMock->expects($this->exactly((int) !$blThrowException))->method('getQuery')->willReturn([]);
         $modelMock->expects($this->atLeastOnce())->method('getFormElements')->willReturn($elements);
         $this->_oModel = $modelMock;
@@ -282,9 +282,9 @@ class ActionBaseTest extends d3ModCfgUnitTestCase
             );
         } catch (TaskException $e) {
             if ($throwsException) {
-                $this->assertStringContainsString('ACTIONSELECT', $e->getMessage());
+                $this->assertStringContainsString('keine SELECTs exportieren', $e->getMessage());
             } else {
-                $this->assertStringContainsString('ACTIONRESULT', $e->getMessage());
+                $this->assertStringContainsString('1 Eintrag verändert', $e->getMessage());
             }
         }
     }
diff --git a/tests/unit/Application/Model/Exceptions/DebugExceptionTest.php b/tests/unit/Application/Model/Exceptions/DebugExceptionTest.php
index bc8c513..4712257 100644
--- a/tests/unit/Application/Model/Exceptions/DebugExceptionTest.php
+++ b/tests/unit/Application/Model/Exceptions/DebugExceptionTest.php
@@ -52,7 +52,7 @@ class DebugExceptionTest extends d3ModCfgUnitTestCase
         );
 
         $this->assertStringContainsString(
-            Registry::getLang()->translateString('D3_DATAWIZARD_DEBUG'),
+            'Debug: testMessage',
             $this->callMethod(
                 $this->_oModel,
                 'getMessage'
diff --git a/tests/unit/Application/Model/Exceptions/ExportFileExceptionTest.php b/tests/unit/Application/Model/Exceptions/ExportFileExceptionTest.php
index 511930e..026904b 100644
--- a/tests/unit/Application/Model/Exceptions/ExportFileExceptionTest.php
+++ b/tests/unit/Application/Model/Exceptions/ExportFileExceptionTest.php
@@ -52,7 +52,7 @@ class ExportFileExceptionTest extends d3ModCfgUnitTestCase
         );
 
         $this->assertStringContainsString(
-            Registry::getLang()->translateString('D3_DATAWIZARD_ERR_EXPORTFILEERROR'),
+            'kann nicht angelegt werden',
             $this->callMethod(
                 $this->_oModel,
                 'getMessage'
diff --git a/tests/unit/Application/Model/Exceptions/NoSuitableRendererExceptionTest.php b/tests/unit/Application/Model/Exceptions/NoSuitableRendererExceptionTest.php
index d5ad95d..42eaf40 100644
--- a/tests/unit/Application/Model/Exceptions/NoSuitableRendererExceptionTest.php
+++ b/tests/unit/Application/Model/Exceptions/NoSuitableRendererExceptionTest.php
@@ -52,7 +52,7 @@ class NoSuitableRendererExceptionTest extends d3ModCfgUnitTestCase
         );
 
         $this->assertStringContainsString(
-            Registry::getLang()->translateString('D3_DATAWIZARD_ERR_NOSUITABLERENDERER'),
+            'kein Renderer f',
             $this->callMethod(
                 $this->_oModel,
                 'getMessage'
diff --git a/tests/unit/Application/Model/ExportBaseTest.php b/tests/unit/Application/Model/ExportBaseTest.php
index 263fd5e..77677ce 100644
--- a/tests/unit/Application/Model/ExportBaseTest.php
+++ b/tests/unit/Application/Model/ExportBaseTest.php
@@ -592,7 +592,7 @@ class ExportBaseTest extends d3ModCfgUnitTestCase
             );
         } catch (TaskException $e) {
             if ($throwsException) {
-                $this->assertStringContainsString('NOEXPORTSELECT', $e->getMessage());
+                $this->assertStringContainsString('Export kann nicht ausgeführt werden', $e->getMessage());
             } elseif (!count($dbResult)) {
                 $this->assertStringContainsString('kein Inhalt', $e->getMessage());
             }