diff --git a/mailpoet/tests/_support/AcceptanceTester.php b/mailpoet/tests/_support/AcceptanceTester.php
index 2098edcbac..1e781d8c4f 100644
--- a/mailpoet/tests/_support/AcceptanceTester.php
+++ b/mailpoet/tests/_support/AcceptanceTester.php
@@ -270,7 +270,7 @@ class AcceptanceTester extends \Codeception\Actor {
     $attributeValue = $i->executeInSelenium(function (\Facebook\WebDriver\WebDriver $webdriver) use ($cssSelector, $cssProperty){
       return $webdriver->findElement(\Facebook\WebDriver\WebDriverBy::cssSelector($cssSelector))->getCSSValue($cssProperty);
     });
-    expect($attributeValue)->equals($value);
+    verify($attributeValue)->equals($value);
   }
 
   public function assertAttributeNotContains($selector, $attribute, $notContains) {
diff --git a/mailpoet/tests/_support/IntegrationTester.php b/mailpoet/tests/_support/IntegrationTester.php
index 4eac3f7b78..c56849793b 100644
--- a/mailpoet/tests/_support/IntegrationTester.php
+++ b/mailpoet/tests/_support/IntegrationTester.php
@@ -295,7 +295,7 @@ class IntegrationTester extends \Codeception\Actor {
     if (!$date2 instanceof DateTimeInterface) {
       throw new \Exception('$date2 is not DateTimeInterface');
     }
-    expect($date1->getTimestamp())->equals($date2->getTimestamp(), $delta);
+    verify($date1->getTimestamp())->equals($date2->getTimestamp(), $delta);
   }
 
   public function createAutomation(string $name, Step ...$steps): ?Automation {
diff --git a/mailpoet/tests/acceptance/EmailEditor/CreateAndSendEmailUsingGutenbergCest.php b/mailpoet/tests/acceptance/EmailEditor/CreateAndSendEmailUsingGutenbergCest.php
index 212f265bc4..be77311c93 100644
--- a/mailpoet/tests/acceptance/EmailEditor/CreateAndSendEmailUsingGutenbergCest.php
+++ b/mailpoet/tests/acceptance/EmailEditor/CreateAndSendEmailUsingGutenbergCest.php
@@ -47,7 +47,7 @@ class CreateAndSendEmailUsingGutenbergCest {
     $i->click('Send');
     $i->waitForElement('[name="subject"]');
     $subject = $i->grabValueFrom('[name="subject"]');
-    expect($subject)->equals('My New Subject');
+    verify($subject)->equals('My New Subject');
     $i->waitForText('My New Preview Text');
     $i->fillField('sender_name', 'John Doe');
     $i->fillField('sender_address', 'john.doe@example.com');
diff --git a/mailpoet/tests/acceptance/Newsletters/EditorLineHeightCest.php b/mailpoet/tests/acceptance/Newsletters/EditorLineHeightCest.php
index 2a1a3a1634..d260842635 100644
--- a/mailpoet/tests/acceptance/Newsletters/EditorLineHeightCest.php
+++ b/mailpoet/tests/acceptance/Newsletters/EditorLineHeightCest.php
@@ -67,7 +67,7 @@ class EditorLineHeightCest {
         ->findElement(WebDriverBy::cssSelector('.mailpoet_newsletter_wrapper .mailpoet_text_block ' . $selector))
         ->getCSSValue('line-height');
     });
-    expect($elementLineHeight)->equals((int)$fontSize * (float)$lineHeight);
+    verify($elementLineHeight)->equals((int)$fontSize * (float)$lineHeight);
   }
 
   private function checkLineHeightInPreview(\AcceptanceTester $i, $fontSize, $lineHeight, $selector) {
diff --git a/mailpoet/tests/integration/API/APITest.php b/mailpoet/tests/integration/API/APITest.php
index ae67379c23..e55bca5b44 100644
--- a/mailpoet/tests/integration/API/APITest.php
+++ b/mailpoet/tests/integration/API/APITest.php
@@ -14,7 +14,7 @@ class APITest extends \MailPoetTest {
       API::MP('invalid_version');
       $this->fail('Incorrect API version exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('Invalid API version.');
+      verify($e->getMessage())->equals('Invalid API version.');
     }
   }
 }
diff --git a/mailpoet/tests/integration/API/JSON/APITest.php b/mailpoet/tests/integration/API/JSON/APITest.php
index 8690e51a13..ae3f2b8d6c 100644
--- a/mailpoet/tests/integration/API/JSON/APITest.php
+++ b/mailpoet/tests/integration/API/JSON/APITest.php
@@ -109,7 +109,7 @@ class APITest extends \MailPoetTest {
     $namespaces = $this->api->getEndpointNamespaces();
 
     expect($namespaces)->count(2);
-    expect($namespaces[$namespace['version']][0])->equals($namespace['name']);
+    verify($namespaces[$namespace['version']][0])->equals($namespace['name']);
   }
 
   public function testItReturns400ErrorWhenAPIVersionIsNotSpecified() {
@@ -119,7 +119,7 @@ class APITest extends \MailPoetTest {
     ];
 
     $response = $this->api->setRequestData($data, Endpoint::TYPE_POST);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
   }
 
   public function testItAcceptsAndProcessesAPIVersion() {
@@ -136,8 +136,8 @@ class APITest extends \MailPoetTest {
     ];
     $this->api->setRequestData($data, Endpoint::TYPE_POST);
 
-    expect($this->api->getRequestedAPIVersion())->equals('v2');
-    expect($this->api->getRequestedEndpointClass())->equals(
+    verify($this->api->getRequestedAPIVersion())->equals('v2');
+    verify($this->api->getRequestedEndpointClass())->equals(
       'MailPoet\API\JSON\v2\APITestNamespacedEndpointStubV2'
     );
   }
@@ -158,7 +158,7 @@ class APITest extends \MailPoetTest {
     $this->api->setRequestData($data, Endpoint::TYPE_POST);
     $response = $this->api->processRoute();
 
-    expect($response->getData()['data'])->equals($data['data']);
+    verify($response->getData()['data'])->equals($data['data']);
   }
 
   public function testItConvertsExceptionToErrorResponse() {
@@ -177,7 +177,7 @@ class APITest extends \MailPoetTest {
     $this->api->setRequestData($data, Endpoint::TYPE_POST);
     $response = $this->api->processRoute();
 
-    expect($response->errors)->equals([['error' => 'key', 'message' => 'value']]);
+    verify($response->errors)->equals([['error' => 'key', 'message' => 'value']]);
   }
 
   public function testItCallsAddedEndpointsForSpecificAPIVersion() {
@@ -194,7 +194,7 @@ class APITest extends \MailPoetTest {
     ];
     $this->api->setRequestData($data, Endpoint::TYPE_POST);
     $response = $this->api->processRoute();
-    expect($response->getData()['data'])->equals($data['api_version']);
+    verify($response->getData()['data'])->equals($data['api_version']);
   }
 
   public function testItValidatesPermissionBeforeProcessingEndpointMethod() {
@@ -213,8 +213,8 @@ class APITest extends \MailPoetTest {
       [
         'container' => $this->container,
         'validatePermissions' => function($method, $permissions) use ($data) {
-          expect($method)->equals($data['method']);
-          expect($permissions)->equals(
+          verify($method)->equals($data['method']);
+          verify($permissions)->equals(
             [
               'global' => AccessControl::NO_ACCESS_RESTRICTION,
               'methods' => [
@@ -230,7 +230,7 @@ class APITest extends \MailPoetTest {
     $api->addEndpointNamespace($namespace['name'], $namespace['version']);
     $api->setRequestData($data, Endpoint::TYPE_POST);
     $response = $api->processRoute();
-    expect($response->getData()['data'])->equals($data['data']);
+    verify($response->getData()['data'])->equals($data['data']);
   }
 
   public function testItReturnsForbiddenResponseWhenPermissionFailsValidation() {
@@ -253,7 +253,7 @@ class APITest extends \MailPoetTest {
     $api->addEndpointNamespace($namespace['name'], $namespace['version']);
     $api->setRequestData($data, Endpoint::TYPE_POST);
     $response = $api->processRoute();
-    expect($response->status)->equals(Response::STATUS_FORBIDDEN);
+    verify($response->status)->equals(Response::STATUS_FORBIDDEN);
   }
 
   public function testItValidatesGlobalPermission() {
@@ -265,7 +265,7 @@ class APITest extends \MailPoetTest {
       new AccessControl(),
       [
         'validatePermission' => Expected::once(function($cap) {
-          expect($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
+          verify($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
           return false;
         }),
       ]
@@ -278,7 +278,7 @@ class APITest extends \MailPoetTest {
       new AccessControl(),
       [
         'validatePermission' => Expected::once(function($cap) {
-          expect($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
+          verify($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
           return true;
         }),
       ]
@@ -299,7 +299,7 @@ class APITest extends \MailPoetTest {
       new AccessControl(),
       [
         'validatePermission' => Expected::once(function($cap) {
-          expect($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
+          verify($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
           return false;
         }),
       ]
@@ -312,7 +312,7 @@ class APITest extends \MailPoetTest {
       new AccessControl(),
       [
         'validatePermission' => Expected::once(function($cap) {
-          expect($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
+          verify($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
           return true;
         }),
       ]
@@ -337,8 +337,8 @@ class APITest extends \MailPoetTest {
     $this->api->setRequestData($data, Endpoint::TYPE_POST);
     $response = $this->api->processRoute();
 
-    expect($response->status)->equals(Response::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals('Invalid API endpoint method.');
+    verify($response->status)->equals(Response::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals('Invalid API endpoint method.');
   }
 
   public function testItLogsExceptionToLogTable() {
@@ -365,8 +365,8 @@ class APITest extends \MailPoetTest {
     $log = reset($logs);
     $this->assertInstanceOf(LogEntity::class, $log);
     expect($log->getMessage())->stringContainsString('Some Error');
-    expect($log->getName())->equals(LoggerFactory::TOPIC_API);
-    expect($response->errors)->equals([['error' => 'bad_request', 'message' => 'Some Error']]);
+    verify($log->getName())->equals(LoggerFactory::TOPIC_API);
+    verify($response->errors)->equals([['error' => 'bad_request', 'message' => 'Some Error']]);
     $this->diContainer->get(SettingsController::class)->set('logging', 'errors');
   }
 
diff --git a/mailpoet/tests/integration/API/JSON/ResponseBuilders/DynamicSegmentsResponseBuilderTest.php b/mailpoet/tests/integration/API/JSON/ResponseBuilders/DynamicSegmentsResponseBuilderTest.php
index 3ec1991280..9a8417a4e8 100644
--- a/mailpoet/tests/integration/API/JSON/ResponseBuilders/DynamicSegmentsResponseBuilderTest.php
+++ b/mailpoet/tests/integration/API/JSON/ResponseBuilders/DynamicSegmentsResponseBuilderTest.php
@@ -20,19 +20,19 @@ class DynamicSegmentsResponseBuilderTest extends \MailPoetTest {
     $responseBuilder = $this->diContainer->get(DynamicSegmentsResponseBuilder::class);
     $response = $responseBuilder->build($segment);
     expect($response)->array();
-    expect($response['id'])->equals($segment->getId());
-    expect($response['name'])->equals($name);
-    expect($response['description'])->equals($description);
-    expect($response['type'])->equals(SegmentEntity::TYPE_DYNAMIC);
+    verify($response['id'])->equals($segment->getId());
+    verify($response['name'])->equals($name);
+    verify($response['description'])->equals($description);
+    verify($response['type'])->equals(SegmentEntity::TYPE_DYNAMIC);
     expect($response)->hasKey('created_at');
     expect($response)->hasKey('updated_at');
     expect($response)->hasKey('deleted_at');
-    expect($response['filters_connect'])->equals(DynamicSegmentFilterData::CONNECT_TYPE_AND);
+    verify($response['filters_connect'])->equals(DynamicSegmentFilterData::CONNECT_TYPE_AND);
     expect($response['filters'])->array();
     expect($response['filters'])->count(1);
-    expect($response['filters'][0]['segmentType'])->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
-    expect($response['filters'][0]['wordpressRole'])->equals(['editor']);
-    expect($response['filters'][0]['action'])->equals(UserRole::TYPE);
+    verify($response['filters'][0]['segmentType'])->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
+    verify($response['filters'][0]['wordpressRole'])->equals(['editor']);
+    verify($response['filters'][0]['action'])->equals(UserRole::TYPE);
   }
 
   public function testItBuildsGetResponseWithTwoFilters() {
@@ -47,24 +47,24 @@ class DynamicSegmentsResponseBuilderTest extends \MailPoetTest {
     $responseBuilder = $this->diContainer->get(DynamicSegmentsResponseBuilder::class);
     $response = $responseBuilder->build($segment);
     expect($response)->array();
-    expect($response['id'])->equals($segment->getId());
-    expect($response['name'])->equals($name);
-    expect($response['description'])->equals($description);
-    expect($response['type'])->equals(SegmentEntity::TYPE_DYNAMIC);
+    verify($response['id'])->equals($segment->getId());
+    verify($response['name'])->equals($name);
+    verify($response['description'])->equals($description);
+    verify($response['type'])->equals(SegmentEntity::TYPE_DYNAMIC);
     expect($response)->hasKey('created_at');
     expect($response)->hasKey('updated_at');
     expect($response)->hasKey('deleted_at');
-    expect($response['filters_connect'])->equals(DynamicSegmentFilterData::CONNECT_TYPE_AND);
+    verify($response['filters_connect'])->equals(DynamicSegmentFilterData::CONNECT_TYPE_AND);
     expect($response['filters'])->array();
     expect($response['filters'])->count(2);
-    expect($response['filters'][0]['segmentType'])->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
-    expect($response['filters'][0]['wordpressRole'])->equals(['editor']);
-    expect($response['filters'][0]['action'])->equals(UserRole::TYPE);
-    expect($response['filters'][0]['connect'])->equals(DynamicSegmentFilterData::CONNECT_TYPE_AND);
-    expect($response['filters'][1]['segmentType'])->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
-    expect($response['filters'][1]['wordpressRole'])->equals(['administrator']);
-    expect($response['filters'][1]['action'])->equals(UserRole::TYPE);
-    expect($response['filters'][1]['connect'])->equals(DynamicSegmentFilterData::CONNECT_TYPE_AND);
+    verify($response['filters'][0]['segmentType'])->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
+    verify($response['filters'][0]['wordpressRole'])->equals(['editor']);
+    verify($response['filters'][0]['action'])->equals(UserRole::TYPE);
+    verify($response['filters'][0]['connect'])->equals(DynamicSegmentFilterData::CONNECT_TYPE_AND);
+    verify($response['filters'][1]['segmentType'])->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
+    verify($response['filters'][1]['wordpressRole'])->equals(['administrator']);
+    verify($response['filters'][1]['action'])->equals(UserRole::TYPE);
+    verify($response['filters'][1]['connect'])->equals(DynamicSegmentFilterData::CONNECT_TYPE_AND);
   }
 
   public function testItBuildsListingsResponse() {
@@ -87,12 +87,12 @@ class DynamicSegmentsResponseBuilderTest extends \MailPoetTest {
     $responseBuilder = $this->diContainer->get(DynamicSegmentsResponseBuilder::class);
     $response = $responseBuilder->buildForListing([$segment]);
     expect($response)->array();
-    expect($response[0]['name'])->equals($name);
-    expect($response[0]['description'])->equals($description);
-    expect($response[0]['type'])->equals(SegmentEntity::TYPE_DYNAMIC);
+    verify($response[0]['name'])->equals($name);
+    verify($response[0]['description'])->equals($description);
+    verify($response[0]['type'])->equals(SegmentEntity::TYPE_DYNAMIC);
     expect($response[0]['subscribers_url'])->startsWith('http');
-    expect($response[0]['count_all'])->equals(1);
-    expect($response[0]['count_subscribed'])->equals(1);
+    verify($response[0]['count_all'])->equals(1);
+    verify($response[0]['count_subscribed'])->equals(1);
 
     $this->tester->deleteWordPressUser($wpUserEmail);
   }
diff --git a/mailpoet/tests/integration/API/JSON/ResponseBuilders/FormsResponseBuilderTest.php b/mailpoet/tests/integration/API/JSON/ResponseBuilders/FormsResponseBuilderTest.php
index 7c255e46ac..e842303529 100644
--- a/mailpoet/tests/integration/API/JSON/ResponseBuilders/FormsResponseBuilderTest.php
+++ b/mailpoet/tests/integration/API/JSON/ResponseBuilders/FormsResponseBuilderTest.php
@@ -35,11 +35,11 @@ class FormsResponseBuilderTest extends \MailPoetTest {
 
     $response = $this->responseBuilder->build($form);
 
-    expect($response['name'])->equals($this->formName);
-    expect($response['status'])->equals(FormEntity::STATUS_ENABLED);
-    expect($response['body']['name'])->equals($this->formBody['name']);
-    expect($response['body']['params']['label'])->equals($this->formBody['params']['label']);
-    expect($response['settings']['success_message'])->equals($this->formSettings['success_message']);
+    verify($response['name'])->equals($this->formName);
+    verify($response['status'])->equals(FormEntity::STATUS_ENABLED);
+    verify($response['body']['name'])->equals($this->formBody['name']);
+    verify($response['body']['params']['label'])->equals($this->formBody['params']['label']);
+    verify($response['settings']['success_message'])->equals($this->formSettings['success_message']);
   }
 
   public function testItBuildsFormsForListing() {
@@ -49,8 +49,8 @@ class FormsResponseBuilderTest extends \MailPoetTest {
     $response = $this->responseBuilder->buildForListing([$form1, $form2]);
 
     expect($response)->count(2);
-    expect($response[0]['signups'])->equals(0);
-    expect($response[0]['segments'])->equals($this->formSettings['segments']);
+    verify($response[0]['signups'])->equals(0);
+    verify($response[0]['segments'])->equals($this->formSettings['segments']);
   }
 
   private function createForm($name) {
diff --git a/mailpoet/tests/integration/API/JSON/ResponseBuilders/NewslettersResponseBuilderTest.php b/mailpoet/tests/integration/API/JSON/ResponseBuilders/NewslettersResponseBuilderTest.php
index 1590d97b7c..2e507f39b2 100644
--- a/mailpoet/tests/integration/API/JSON/ResponseBuilders/NewslettersResponseBuilderTest.php
+++ b/mailpoet/tests/integration/API/JSON/ResponseBuilders/NewslettersResponseBuilderTest.php
@@ -51,9 +51,9 @@ class NewslettersResponseBuilderTest extends \MailPoetTest {
       NewslettersResponseBuilder::RELATION_TOTAL_SENT,
       NewslettersResponseBuilder::RELATION_STATISTICS,
     ]);
-    expect($response['total_sent'])->equals($stats['total_sent']);
-    expect($response['children_count'])->equals($stats['children_count']);
-    expect($response['statistics'])->equals($stats['statistics']);
+    verify($response['total_sent'])->equals($stats['total_sent']);
+    verify($response['children_count'])->equals($stats['children_count']);
+    verify($response['statistics'])->equals($stats['statistics']);
     $em->remove($newsletter);
     $em->flush();
   }
diff --git a/mailpoet/tests/integration/API/JSON/ResponseBuilders/SegmentsResponseBuilderTest.php b/mailpoet/tests/integration/API/JSON/ResponseBuilders/SegmentsResponseBuilderTest.php
index 0da78873be..ddd3966333 100644
--- a/mailpoet/tests/integration/API/JSON/ResponseBuilders/SegmentsResponseBuilderTest.php
+++ b/mailpoet/tests/integration/API/JSON/ResponseBuilders/SegmentsResponseBuilderTest.php
@@ -21,9 +21,9 @@ class SegmentsResponseBuilderTest extends \MailPoetTest {
     $responseBuilder = $di->get(SegmentsResponseBuilder::class);
     $response = $responseBuilder->build($segment);
 
-    expect($response['name'])->equals($name);
-    expect($response['type'])->equals(SegmentEntity::TYPE_DEFAULT);
-    expect($response['description'])->equals($description);
+    verify($response['name'])->equals($name);
+    verify($response['type'])->equals(SegmentEntity::TYPE_DEFAULT);
+    verify($response['description'])->equals($description);
     expect($response)->hasKey('id');
     expect($response)->hasKey('created_at');
     expect($response)->hasKey('updated_at');
@@ -52,9 +52,9 @@ class SegmentsResponseBuilderTest extends \MailPoetTest {
     $responseBuilder = $di->get(SegmentsResponseBuilder::class);
     $response = $responseBuilder->buildForListing([$segment]);
     expect($response)->array();
-    expect($response[0]['name'])->equals($name);
-    expect($response[0]['type'])->equals(SegmentEntity::TYPE_DEFAULT);
+    verify($response[0]['name'])->equals($name);
+    verify($response[0]['type'])->equals(SegmentEntity::TYPE_DEFAULT);
     expect($response[0]['subscribers_url'])->startsWith('http');
-    expect($response[0]['subscribers_count']['subscribed'])->equals('1');
+    verify($response[0]['subscribers_count']['subscribed'])->equals('1');
   }
 }
diff --git a/mailpoet/tests/integration/API/JSON/v1/AutomaticEmailsTest.php b/mailpoet/tests/integration/API/JSON/v1/AutomaticEmailsTest.php
index 3fb1b0bcb2..8e68b7947a 100644
--- a/mailpoet/tests/integration/API/JSON/v1/AutomaticEmailsTest.php
+++ b/mailpoet/tests/integration/API/JSON/v1/AutomaticEmailsTest.php
@@ -36,7 +36,7 @@ class AutomaticEmailsTest extends \MailPoetTest {
       'event_slug' => 'event_slug',
     ];
     $result = $this->api->getEventOptions($data);
-    expect($result->errors[0]['message'])->equals($expectedErrorMessage);
+    verify($result->errors[0]['message'])->equals($expectedErrorMessage);
 
     // filter is invalid
     $data = [
@@ -46,7 +46,7 @@ class AutomaticEmailsTest extends \MailPoetTest {
       'event_slug' => 'event_slug',
     ];
     $result = $this->api->getEventOptions($data);
-    expect($result->errors[0]['message'])->equals($expectedErrorMessage);
+    verify($result->errors[0]['message'])->equals($expectedErrorMessage);
 
     // email slug is invalid
     $data = [
@@ -56,7 +56,7 @@ class AutomaticEmailsTest extends \MailPoetTest {
       'event_slug' => 'event_slug',
     ];
     $result = $this->api->getEventOptions($data);
-    expect($result->errors[0]['message'])->equals($expectedErrorMessage);
+    verify($result->errors[0]['message'])->equals($expectedErrorMessage);
 
     // event slug is invalid
     $data = [
@@ -66,7 +66,7 @@ class AutomaticEmailsTest extends \MailPoetTest {
       'event_slug' => null,
     ];
     $result = $this->api->getEventOptions($data);
-    expect($result->errors[0]['message'])->equals($expectedErrorMessage);
+    verify($result->errors[0]['message'])->equals($expectedErrorMessage);
   }
 
   public function testItRequiresValidEventFilterWhenGettingEventOptions() {
@@ -91,7 +91,7 @@ class AutomaticEmailsTest extends \MailPoetTest {
       ];
     });
     $this->wp->addFilter('test_filter', function($query) {
-      expect($query)->equals('test');
+      verify($query)->equals('test');
       return 'pass';
     });
 
@@ -103,7 +103,7 @@ class AutomaticEmailsTest extends \MailPoetTest {
       'event_slug' => 'event_slug',
     ];
     $result = $this->api->getEventOptions($data);
-    expect($result->errors[0]['message'])->equals($expectedErrorMessage);
+    verify($result->errors[0]['message'])->equals($expectedErrorMessage);
 
     $this->wp->removeAllFilters('mailpoet_automatic_email_test');
     $this->wp->removeAllFilters('test_filter');
@@ -129,7 +129,7 @@ class AutomaticEmailsTest extends \MailPoetTest {
       ];
     });
     $this->wp->addFilter('test_filter', function($query) {
-      expect($query)->equals('test');
+      verify($query)->equals('test');
       return 'pass';
     });
 
@@ -140,7 +140,7 @@ class AutomaticEmailsTest extends \MailPoetTest {
       'event_slug' => 'event_slug',
     ];
     $result = $this->api->getEventOptions($data);
-    expect($result->data)->equals('pass');
+    verify($result->data)->equals('pass');
 
     $this->wp->removeAllFilters('mailpoet_automatic_email_test');
     $this->wp->removeAllFilters('test_filter');
@@ -155,7 +155,7 @@ class AutomaticEmailsTest extends \MailPoetTest {
       'event_slug' => 'event_slug',
     ];
     $result = $this->api->getEventOptions($data);
-    expect($result->errors[0]['message'])->equals($expectedErrorMessage);
+    verify($result->errors[0]['message'])->equals($expectedErrorMessage);
 
     // event slug is invalid
     $data = [
@@ -163,7 +163,7 @@ class AutomaticEmailsTest extends \MailPoetTest {
       'event_slug' => null,
     ];
     $result = $this->api->getEventOptions($data);
-    expect($result->errors[0]['message'])->equals($expectedErrorMessage);
+    verify($result->errors[0]['message'])->equals($expectedErrorMessage);
   }
 
   public function testItRequiresValidEventWhenGettingEventShortcodes() {
@@ -191,7 +191,7 @@ class AutomaticEmailsTest extends \MailPoetTest {
       // should be 'event_slug'
     ];
     $result = $this->api->getEventShortcodes($data);
-    expect($result->errors[0]['message'])->equals($expectedErrorMessage);
+    verify($result->errors[0]['message'])->equals($expectedErrorMessage);
 
     $this->wp->removeAllFilters('mailpoet_automatic_email_test');
   }
@@ -225,7 +225,7 @@ class AutomaticEmailsTest extends \MailPoetTest {
       'event_slug' => 'event_slug',
     ];
     $result = $this->api->getEventShortcodes($data);
-    expect($result->data['email_title'])->equals($shortcodes);
+    verify($result->data['email_title'])->equals($shortcodes);
 
     $this->wp->removeAllFilters('mailpoet_automatic_email_test');
   }
diff --git a/mailpoet/tests/integration/API/JSON/v1/CouponsTest.php b/mailpoet/tests/integration/API/JSON/v1/CouponsTest.php
index f8d746af22..69cd8f9e84 100644
--- a/mailpoet/tests/integration/API/JSON/v1/CouponsTest.php
+++ b/mailpoet/tests/integration/API/JSON/v1/CouponsTest.php
@@ -146,13 +146,13 @@ class CouponsTest extends \MailPoetTest {
 
   private function validateResponse($response, $expectedCoupons): void {
     $returnedCoupons = $response->data;
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     expect($returnedCoupons)->count(count($expectedCoupons));
 
     foreach ($expectedCoupons as $key => $coupon) {
-      expect($coupon->get_id())->equals($returnedCoupons[$key]['id']);
-      expect($coupon->get_code())->equals($returnedCoupons[$key]['text']);
-      expect($coupon->get_discount_type())->equals($returnedCoupons[$key]['discountType']);
+      verify($coupon->get_id())->equals($returnedCoupons[$key]['id']);
+      verify($coupon->get_code())->equals($returnedCoupons[$key]['text']);
+      verify($coupon->get_discount_type())->equals($returnedCoupons[$key]['discountType']);
     }
   }
 
diff --git a/mailpoet/tests/integration/API/JSON/v1/CustomFieldsTest.php b/mailpoet/tests/integration/API/JSON/v1/CustomFieldsTest.php
index 0a94c59af9..2883bc998c 100644
--- a/mailpoet/tests/integration/API/JSON/v1/CustomFieldsTest.php
+++ b/mailpoet/tests/integration/API/JSON/v1/CustomFieldsTest.php
@@ -71,7 +71,7 @@ class CustomFieldsTest extends \MailPoetTest {
 
   public function testItCanGetAllCustomFields() {
     $response = $this->endpoint->getAll();
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     expect($response->data)->count(count($this->customFields));
 
     foreach ($response->data as $customField) {
@@ -87,13 +87,13 @@ class CustomFieldsTest extends \MailPoetTest {
     $customFieldId = $customField->getId();
 
     $response = $this->endpoint->delete(['id' => $customFieldId]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
 
     $customField = $this->repository->findOneBy(['type' => 'date']);
     expect($customField)->null();
 
     $response = $this->endpoint->delete(['id' => $customFieldId]);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
   }
 
   public function testItCanSaveACustomField() {
@@ -104,19 +104,19 @@ class CustomFieldsTest extends \MailPoetTest {
     ];
 
     $response = $this->endpoint->save($newCustomField);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
 
     // missing type
     $response = $this->endpoint->save(['name' => 'New custom field1']);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
 
     // missing name
     $response = $this->endpoint->save(['type' => 'text']);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
 
     // missing data
     $response = $this->endpoint->save();
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
   }
 
   public function testItSanitizesCheckboxValueButKeepsAllowedHTML() {
@@ -134,8 +134,8 @@ class CustomFieldsTest extends \MailPoetTest {
     ];
 
     $response = $this->endpoint->save($newCustomField);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data['params']['values'][0]['value'])
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data['params']['values'][0]['value'])
       ->equals('"&gt;&lt;img src=e onerror=alert(1) <strong>hello</strong><a href="https://example.com">link</a>');
   }
 
@@ -146,11 +146,11 @@ class CustomFieldsTest extends \MailPoetTest {
 
     $response = $this->endpoint->get(['id' => $customField->getId()]);
 
-    expect($response->data['name'])->equals('CF: text');
-    expect($response->data['type'])->equals('text');
+    verify($response->data['name'])->equals('CF: text');
+    verify($response->data['type'])->equals('text');
     expect($response->data['params'])->notEmpty();
 
     $response = $this->endpoint->get(['id' => 'not_an_id']);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
   }
 }
diff --git a/mailpoet/tests/integration/API/JSON/v1/DynamicSegmentsTest.php b/mailpoet/tests/integration/API/JSON/v1/DynamicSegmentsTest.php
index 5c082e27bc..7f306a94b2 100644
--- a/mailpoet/tests/integration/API/JSON/v1/DynamicSegmentsTest.php
+++ b/mailpoet/tests/integration/API/JSON/v1/DynamicSegmentsTest.php
@@ -29,14 +29,14 @@ class DynamicSegmentsTest extends \MailPoetTest {
     $segment = $this->createDynamicSegmentEntity('s1', '');
     $response = $this->endpoint->get(['id' => $segment->getId()]);
     expect($response)->isInstanceOf('\MailPoet\API\JSON\SuccessResponse');
-    expect($response->status)->equals(self::SUCCESS_RESPONSE_CODE);
-    expect($response->data['id'])->equals($segment->getId());
+    verify($response->status)->equals(self::SUCCESS_RESPONSE_CODE);
+    verify($response->data['id'])->equals($segment->getId());
   }
 
   public function testGetReturnsError() {
     $response = $this->endpoint->get(['id' => 5]);
     expect($response)->isInstanceOf('\MailPoet\API\JSON\ErrorResponse');
-    expect($response->status)->equals(self::SEGMENT_NOT_FOUND_RESPONSE_CODE);
+    verify($response->status)->equals(self::SEGMENT_NOT_FOUND_RESPONSE_CODE);
   }
 
   public function testSaverSavesData() {
@@ -50,8 +50,8 @@ class DynamicSegmentsTest extends \MailPoetTest {
       ]],
     ]);
     expect($response)->isInstanceOf('\MailPoet\API\JSON\SuccessResponse');
-    expect($response->status)->equals(self::SUCCESS_RESPONSE_CODE);
-    expect($response->data['name'])->equals('Test dynamic');
+    verify($response->status)->equals(self::SUCCESS_RESPONSE_CODE);
+    verify($response->data['name'])->equals('Test dynamic');
   }
 
   public function testSaverReturnsErrorOnInvalidFilterData() {
@@ -59,8 +59,8 @@ class DynamicSegmentsTest extends \MailPoetTest {
       'name' => 'Test dynamic',
     ]);
     expect($response)->isInstanceOf('\MailPoet\API\JSON\ErrorResponse');
-    expect($response->status)->equals(self::INVALID_DATA_RESPONSE_CODE);
-    expect($response->errors[0]['message'])->equals('Please add at least one condition for filtering.');
+    verify($response->status)->equals(self::INVALID_DATA_RESPONSE_CODE);
+    verify($response->errors[0]['message'])->equals('Please add at least one condition for filtering.');
   }
 
   public function testSaverReturnsErrorOnDuplicateRecord() {
@@ -75,8 +75,8 @@ class DynamicSegmentsTest extends \MailPoetTest {
     $this->endpoint->save($data);
     $response = $this->endpoint->save($data);
     expect($response)->isInstanceOf('\MailPoet\API\JSON\ErrorResponse');
-    expect($response->status)->equals(self::INVALID_DATA_RESPONSE_CODE);
-    expect($response->errors[0]['message'])->equals('Another record already exists. Please specify a different "name".');
+    verify($response->status)->equals(self::INVALID_DATA_RESPONSE_CODE);
+    verify($response->errors[0]['message'])->equals('Another record already exists. Please specify a different "name".');
   }
 
   public function testSaverReturnsErrorOnEmptyName() {
@@ -90,8 +90,8 @@ class DynamicSegmentsTest extends \MailPoetTest {
     $this->endpoint->save($data);
     $response = $this->endpoint->save($data);
     expect($response)->isInstanceOf('\MailPoet\API\JSON\ErrorResponse');
-    expect($response->status)->equals(self::INVALID_DATA_RESPONSE_CODE);
-    expect($response->errors[0]['message'])->equals('Please specify a name.');
+    verify($response->status)->equals(self::INVALID_DATA_RESPONSE_CODE);
+    verify($response->errors[0]['message'])->equals('Please specify a name.');
   }
 
   public function testItCanTrashASegment() {
@@ -99,9 +99,9 @@ class DynamicSegmentsTest extends \MailPoetTest {
 
     $response = $this->endpoint->trash(['id' => $dynamicSegment->getId()]);
 
-    expect($response->status)->equals(self::SUCCESS_RESPONSE_CODE);
-    expect($response->data['name'])->equals($dynamicSegment->getName());
-    expect($response->meta['count'])->equals(1);
+    verify($response->status)->equals(self::SUCCESS_RESPONSE_CODE);
+    verify($response->data['name'])->equals($dynamicSegment->getName());
+    verify($response->meta['count'])->equals(1);
 
     $this->entityManager->refresh($dynamicSegment);
     $this->assertInstanceOf(SegmentEntity::class, $dynamicSegment);
@@ -120,8 +120,8 @@ class DynamicSegmentsTest extends \MailPoetTest {
 
     $response = $this->endpoint->trash(['id' => $dynamicSegment->getId()]);
     $this->entityManager->refresh($dynamicSegment);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals("Segment cannot be deleted because it’s used for 'Subject' email");
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals("Segment cannot be deleted because it’s used for 'Subject' email");
   }
 
   public function testItCanRestoreASegment() {
@@ -129,9 +129,9 @@ class DynamicSegmentsTest extends \MailPoetTest {
 
     $response = $this->endpoint->restore(['id' => $dynamicSegment->getId()]);
 
-    expect($response->status)->equals(self::SUCCESS_RESPONSE_CODE);
-    expect($response->data['name'])->equals($dynamicSegment->getName());
-    expect($response->meta['count'])->equals(1);
+    verify($response->status)->equals(self::SUCCESS_RESPONSE_CODE);
+    verify($response->data['name'])->equals($dynamicSegment->getName());
+    verify($response->meta['count'])->equals(1);
 
     $this->entityManager->refresh($dynamicSegment);
     $this->assertInstanceOf(SegmentEntity::class, $dynamicSegment);
@@ -145,9 +145,9 @@ class DynamicSegmentsTest extends \MailPoetTest {
 
     $response = $this->endpoint->delete(['id' => $dynamicSegment->getId()]);
 
-    expect($response->status)->equals(self::SUCCESS_RESPONSE_CODE);
-    expect($response->data)->equals(null);
-    expect($response->meta['count'])->equals(1);
+    verify($response->status)->equals(self::SUCCESS_RESPONSE_CODE);
+    verify($response->data)->equals(null);
+    verify($response->meta['count'])->equals(1);
 
     // Clear entity manager to forget all entities
     $this->entityManager->clear();
@@ -164,8 +164,8 @@ class DynamicSegmentsTest extends \MailPoetTest {
       'action' => 'trash',
       'listing' => ['group' => 'all'],
     ]);
-    expect($response->status)->equals(self::SUCCESS_RESPONSE_CODE);
-    expect($response->meta['count'])->equals(2);
+    verify($response->status)->equals(self::SUCCESS_RESPONSE_CODE);
+    verify($response->meta['count'])->equals(2);
 
     $this->entityManager->refresh($dynamicSegment1);
     $this->entityManager->refresh($dynamicSegment2);
@@ -177,8 +177,8 @@ class DynamicSegmentsTest extends \MailPoetTest {
       'listing' => ['group' => 'trash'],
     ]);
 
-    expect($response->status)->equals(self::SUCCESS_RESPONSE_CODE);
-    expect($response->meta['count'])->equals(2);
+    verify($response->status)->equals(self::SUCCESS_RESPONSE_CODE);
+    verify($response->meta['count'])->equals(2);
 
     $this->entityManager->refresh($dynamicSegment1);
     $this->entityManager->refresh($dynamicSegment2);
@@ -194,16 +194,16 @@ class DynamicSegmentsTest extends \MailPoetTest {
       'action' => 'delete',
       'listing' => ['group' => 'trash'],
     ]);
-    expect($response->status)->equals(self::SUCCESS_RESPONSE_CODE);
-    expect($response->meta['count'])->equals(2);
+    verify($response->status)->equals(self::SUCCESS_RESPONSE_CODE);
+    verify($response->meta['count'])->equals(2);
 
     // Second delete doesn't delete anything
     $response = $this->endpoint->bulkAction([
       'action' => 'delete',
       'listing' => ['group' => 'trash'],
     ]);
-    expect($response->status)->equals(self::SUCCESS_RESPONSE_CODE);
-    expect($response->meta['count'])->equals(0);
+    verify($response->status)->equals(self::SUCCESS_RESPONSE_CODE);
+    verify($response->meta['count'])->equals(0);
 
     $this->entityManager->clear();
 
diff --git a/mailpoet/tests/integration/API/JSON/v1/FeatureFlagsTest.php b/mailpoet/tests/integration/API/JSON/v1/FeatureFlagsTest.php
index cbefbb058a..9187fda34d 100644
--- a/mailpoet/tests/integration/API/JSON/v1/FeatureFlagsTest.php
+++ b/mailpoet/tests/integration/API/JSON/v1/FeatureFlagsTest.php
@@ -26,7 +26,7 @@ class FeatureFlagsTest extends \MailPoetTest {
       'feature-b' => false,
     ]);
 
-    expect($endpoint->getAll()->data)->equals([
+    verify($endpoint->getAll()->data)->equals([
       [
         'name' => 'feature-a',
         'value' => true,
@@ -50,7 +50,7 @@ class FeatureFlagsTest extends \MailPoetTest {
       'feature-a' => true,
     ]);
 
-    expect($endpoint->getAll()->data)->equals([
+    verify($endpoint->getAll()->data)->equals([
       [
         'name' => 'feature-a',
         'value' => false,
@@ -71,8 +71,8 @@ class FeatureFlagsTest extends \MailPoetTest {
     $this->entityManager->clear();
     $features = $this->repository->findBy(['name' => 'feature-a']);
     expect($features)->count(1);
-    expect($features[0]->getName())->equals('feature-a');
-    expect($features[0]->getValue())->equals(false);
+    verify($features[0]->getName())->equals('feature-a');
+    verify($features[0]->getValue())->equals(false);
   }
 
   public function testItUpdatesDatabaseValue() {
@@ -91,9 +91,9 @@ class FeatureFlagsTest extends \MailPoetTest {
 
     $this->entityManager->clear();
     $features = $this->repository->findBy(['name' => 'feature-a']);
-    expect(count($features))->equals(1);
-    expect($features[0]->getName())->equals('feature-a');
-    expect($features[0]->getValue())->equals(true);
+    verify(count($features))->equals(1);
+    verify($features[0]->getName())->equals('feature-a');
+    verify($features[0]->getValue())->equals(true);
   }
 
   public function testItDoesNotReturnUnknownFlag() {
@@ -112,11 +112,11 @@ class FeatureFlagsTest extends \MailPoetTest {
       'feature-unknown' => false,
     ]);
 
-    expect($response->errors[0]['error'])->equals(APIError::BAD_REQUEST);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['error'])->equals(APIError::BAD_REQUEST);
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
 
     $features = $this->repository->findAll();
-    expect(count($features))->equals(0);
+    verify(count($features))->equals(0);
   }
 
   /** @return FeatureFlags */
diff --git a/mailpoet/tests/integration/API/JSON/v1/FormsTest.php b/mailpoet/tests/integration/API/JSON/v1/FormsTest.php
index b73d9bd4d8..18662e515e 100644
--- a/mailpoet/tests/integration/API/JSON/v1/FormsTest.php
+++ b/mailpoet/tests/integration/API/JSON/v1/FormsTest.php
@@ -47,16 +47,16 @@ class FormsTest extends \MailPoetTest {
 
   public function testItCanGetAForm() {
     $response = $this->endpoint->get(/* missing id */);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
-    expect($response->errors[0]['message'])->equals('This form does not exist.');
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->errors[0]['message'])->equals('This form does not exist.');
 
     $response = $this->endpoint->get(['id' => 'not_an_id']);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
-    expect($response->errors[0]['message'])->equals('This form does not exist.');
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->errors[0]['message'])->equals('This form does not exist.');
 
     $response = $this->endpoint->get(['id' => $this->form1->getId()]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals(
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data)->equals(
       $this->reloadForm((int)$this->form1->getId())->toArray()
     );
   }
@@ -64,38 +64,38 @@ class FormsTest extends \MailPoetTest {
   public function testItCanGetListingData() {
     $response = $this->endpoint->listing();
 
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
 
     expect($response->meta)->hasKey('filters');
     expect($response->meta)->hasKey('groups');
-    expect($response->meta['count'])->equals(3);
+    verify($response->meta['count'])->equals(3);
 
     expect($response->data)->count(3);
-    expect($response->data[0]['name'])->equals('Form 1');
-    expect($response->data[1]['name'])->equals('Form 2');
-    expect($response->data[2]['name'])->equals('Form 3');
+    verify($response->data[0]['name'])->equals('Form 1');
+    verify($response->data[1]['name'])->equals('Form 2');
+    verify($response->data[2]['name'])->equals('Form 3');
   }
 
   public function testItCanCreateANewForm() {
     $response = $this->endpoint->saveEditor();
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals(
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data)->equals(
       $this->reloadForm((int)$response->data['id'])->toArray()
     );
-    expect($response->data['name'])->equals('New form');
+    verify($response->data['name'])->equals('New form');
   }
 
   public function testItCanStoreDataForPreview() {
     $response = $this->endpoint->saveEditor();
     $formId = $response->data['id'];
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals(
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data)->equals(
       $this->reloadForm((int)$formId)->toArray()
     );
     $response->data['styles'] = '/* Custom Styles */';
 
     $response = $this->endpoint->previewEditor($response->data);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $storedData = $this->wp->getTransient(PreviewPage::PREVIEW_DATA_TRANSIENT_PREFIX . $formId);
     expect($storedData['body'])->notEmpty();
     expect($storedData['styles'])->notEmpty();
@@ -104,23 +104,23 @@ class FormsTest extends \MailPoetTest {
 
   public function testItCanSaveFormEditor() {
     $response = $this->endpoint->saveEditor();
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
 
     $form = $this->reloadForm((int)$response->data['id'])->toArray();
     $form['name'] = 'Updated form';
 
     $response = $this->endpoint->saveEditor($form);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     expect($response->meta['is_widget'])->false();
-    expect($response->data['name'])->equals('Updated form');
-    expect($response->data['settings']['segments_selected_by'])->equals('admin');
+    verify($response->data['name'])->equals('Updated form');
+    verify($response->data['settings']['segments_selected_by'])->equals('admin');
   }
 
   public function testItOnlyAdminCanSaveCustomHtml() {
     // Administrator
     wp_set_current_user(1);
     $response = $this->endpoint->saveEditor();
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
 
     $form = $this->reloadForm((int)$response->data['id'])->toArray();
     $form['body'][] = [
@@ -130,17 +130,17 @@ class FormsTest extends \MailPoetTest {
       ],
     ] ;
     $response = $this->endpoint->saveEditor($form);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     // Non Admin
     wp_set_current_user(0);
     $response = $this->endpoint->saveEditor($form);
-    expect($response->status)->equals(APIResponse::STATUS_FORBIDDEN);
+    verify($response->status)->equals(APIResponse::STATUS_FORBIDDEN);
     expect($response->errors[0]['message'])->startsWith('Only administrator can');
   }
 
   public function testItCanExtractListsFromListSelectionBlock() {
     $response = $this->endpoint->saveEditor();
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
 
     $form = $this->reloadForm((int)$response->data['id'])->toArray();
     $form['body'][] = [
@@ -151,14 +151,14 @@ class FormsTest extends \MailPoetTest {
     ];
 
     $response = $this->endpoint->saveEditor($form);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data['settings']['segments_selected_by'])->equals('user');
-    expect($response->data['settings']['segments'])->equals([1, 3]);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data['settings']['segments_selected_by'])->equals('user');
+    verify($response->data['settings']['segments'])->equals([1, 3]);
   }
 
   public function testItCanExtractListsFromNestedListSelectionBlock() {
     $response = $this->endpoint->saveEditor();
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
 
     $form = $this->reloadForm((int)$response->data['id'])->toArray();
     $form['body'][] = [
@@ -181,9 +181,9 @@ class FormsTest extends \MailPoetTest {
     ];
 
     $response = $this->endpoint->saveEditor($form);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data['settings']['segments_selected_by'])->equals('user');
-    expect($response->data['settings']['segments'])->equals([2, 4]);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data['settings']['segments_selected_by'])->equals('user');
+    verify($response->data['settings']['segments'])->equals([2, 4]);
   }
 
   public function testItCreatesTagsDuringSavingFormEditor(): void {
@@ -199,7 +199,7 @@ class FormsTest extends \MailPoetTest {
         ],
       ],
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
 
     $tag1 = $this->tagRepository->findOneBy(['name' => $tag->getName()]);
     $this->assertEquals($tag1, $tag);
@@ -217,61 +217,61 @@ class FormsTest extends \MailPoetTest {
     expect($this->form1)->notNull();
 
     $response = $this->endpoint->restore(['id' => $this->form1->getId()]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals(
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data)->equals(
       $this->form1->toArray()
     );
     expect($response->data['deleted_at'])->null();
-    expect($response->meta['count'])->equals(1);
+    verify($response->meta['count'])->equals(1);
   }
 
   public function testErrorWhenRestoringNonExistentForm() {
     $response = $this->endpoint->restore(['id' => 'Invalid ID']);
-    expect($response->errors[0]['error'])->equals('not_found');
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->errors[0]['error'])->equals('not_found');
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
     expect($response->meta)->isEmpty();
   }
 
   public function testItCanTrashAForm() {
     $response = $this->endpoint->trash(['id' => $this->form2->getId()]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals(
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data)->equals(
       $this->form2->toArray()
     );
     expect($response->data['deleted_at'])->notNull();
-    expect($response->meta['count'])->equals(1);
+    verify($response->meta['count'])->equals(1);
   }
 
   public function testErrorWhenTrashingNonExistentForm() {
     $response = $this->endpoint->trash(['id' => 'Invalid ID']);
-    expect($response->errors[0]['error'])->equals('not_found');
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->errors[0]['error'])->equals('not_found');
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
     expect($response->meta)->isEmpty();
   }
 
   public function testItCanDeleteAForm() {
     $response = $this->endpoint->delete(['id' => $this->form3->getId()]);
     expect($response->data)->isEmpty();
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(1);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(1);
   }
 
   public function testErrorWhenDeletingNonExistentForm() {
     $response = $this->endpoint->delete(['id' => 'Invalid ID']);
-    expect($response->errors[0]['error'])->equals('not_found');
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->errors[0]['error'])->equals('not_found');
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
     expect($response->meta)->isEmpty();
   }
 
   public function testItCanDuplicateAForm() {
     $response = $this->endpoint->duplicate(['id' => $this->form1->getId()]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $form = $this->formsRepository->findOneBy(['name' => 'Copy of Form 1']);
     $this->assertInstanceOf(FormEntity::class, $form);
-    expect($response->data)->equals(
+    verify($response->data)->equals(
       $form->toArray()
     );
-    expect($response->meta['count'])->equals(1);
+    verify($response->meta['count'])->equals(1);
   }
 
   public function testItCanBulkDeleteForms() {
@@ -279,22 +279,22 @@ class FormsTest extends \MailPoetTest {
       'action' => 'trash',
       'listing' => ['group' => 'all'],
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(3);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(3);
 
     $response = $this->endpoint->bulkAction([
       'action' => 'delete',
       'listing' => ['group' => 'trash'],
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(3);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(3);
 
     $response = $this->endpoint->bulkAction([
       'action' => 'delete',
       'listing' => ['group' => 'trash'],
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(0);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(0);
   }
 
   public function testItCanUpdateFormStatus() {
@@ -302,34 +302,34 @@ class FormsTest extends \MailPoetTest {
       'status' => FormEntity::STATUS_ENABLED,
       'id' => $this->form1->getId(),
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $form = $this->reloadForm((int)$this->form1->getId());
-    expect($form->getStatus())->equals(FormEntity::STATUS_ENABLED);
+    verify($form->getStatus())->equals(FormEntity::STATUS_ENABLED);
 
     $response = $this->endpoint->setStatus([
       'status' => FormEntity::STATUS_DISABLED,
       'id' => $this->form1->getId(),
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $form = $this->reloadForm((int)$this->form1->getId());
-    expect($form->getStatus())->equals(FormEntity::STATUS_DISABLED);
+    verify($form->getStatus())->equals(FormEntity::STATUS_DISABLED);
 
     $response = $this->endpoint->setStatus([
       'status' => FormEntity::STATUS_DISABLED,
       'id' => 'invalid id',
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
 
     $response = $this->endpoint->setStatus([
       'id' => $this->form1->getId(),
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
 
     $response = $this->endpoint->setStatus([
       'status' => 'invalid status',
       'id' => $this->form1->getId(),
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
   }
 
   private function createForm(string $name): FormEntity {
diff --git a/mailpoet/tests/integration/API/JSON/v1/ImportExportTest.php b/mailpoet/tests/integration/API/JSON/v1/ImportExportTest.php
index 28aef21bd1..9538c645e2 100644
--- a/mailpoet/tests/integration/API/JSON/v1/ImportExportTest.php
+++ b/mailpoet/tests/integration/API/JSON/v1/ImportExportTest.php
@@ -32,10 +32,10 @@ class ImportExportTest extends \MailPoetTest {
 
   public function testItSchedulesTaskWhenNoneExists() {
     $response = $this->endpoint->setupWooCommerceInitialImport();
-    expect($response->status)->equals(200);
+    verify($response->status)->equals(200);
     $task = $this->scheduledTasksRepository->findOneBy(['type' => WooCommerceSync::TASK_TYPE]);
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
-    expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
+    verify($task->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
     $now = time();
     $scheduledAt = new Carbon($task->getScheduledAt());
     expect($scheduledAt->timestamp)->greaterOrEquals($now - 1);
@@ -49,13 +49,13 @@ class ImportExportTest extends \MailPoetTest {
     $this->endpoint->setupWooCommerceInitialImport();
     $task = $this->scheduledTasksRepository->findOneBy(['type' => WooCommerceSync::TASK_TYPE]);
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
-    expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
+    verify($task->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
     $now = time();
     $scheduledAt = new Carbon($task->getScheduledAt());
     expect($scheduledAt->timestamp)->greaterOrEquals($now - 1);
     expect($scheduledAt->timestamp)->lessOrEquals($now + 1);
     $taskCount = $this->scheduledTasksRepository->countBy(['type' => WooCommerceSync::TASK_TYPE]);
-    expect($taskCount)->equals(1);
+    verify($taskCount)->equals(1);
   }
 
   public function testItDoesNothingForRunningTask() {
@@ -63,9 +63,9 @@ class ImportExportTest extends \MailPoetTest {
     $this->endpoint->setupWooCommerceInitialImport();
     $task = $this->scheduledTasksRepository->findOneBy(['type' => WooCommerceSync::TASK_TYPE]);
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
-    expect($task->getStatus())->equals(null);
+    verify($task->getStatus())->equals(null);
     $taskCount = $this->scheduledTasksRepository->countBy(['type' => WooCommerceSync::TASK_TYPE]);
-    expect($taskCount)->equals(1);
+    verify($taskCount)->equals(1);
   }
 
   public function testItIgnoresCompletedAndPausedTasks() {
@@ -73,7 +73,7 @@ class ImportExportTest extends \MailPoetTest {
     $this->createTask(WooCommerceSync::TASK_TYPE, ScheduledTaskEntity::STATUS_COMPLETED);
     $this->endpoint->setupWooCommerceInitialImport();
     $taskCount = $this->scheduledTasksRepository->countBy(['type' => WooCommerceSync::TASK_TYPE]);
-    expect($taskCount)->equals(3);
+    verify($taskCount)->equals(3);
   }
 
   private function createTask($type, $status = null, $scheduledAt = null) {
diff --git a/mailpoet/tests/integration/API/JSON/v1/MailerTest.php b/mailpoet/tests/integration/API/JSON/v1/MailerTest.php
index 9fa2e47e61..ab231767d1 100644
--- a/mailpoet/tests/integration/API/JSON/v1/MailerTest.php
+++ b/mailpoet/tests/integration/API/JSON/v1/MailerTest.php
@@ -20,7 +20,7 @@ class MailerTest extends \MailPoetTest {
     $mailerLog['status'] = MailerLog::STATUS_PAUSED;
     MailerLog::updateMailerLog($mailerLog);
     $mailerLog = MailerLog::getMailerLog();
-    expect($mailerLog['status'])->equals(MailerLog::STATUS_PAUSED);
+    verify($mailerLog['status'])->equals(MailerLog::STATUS_PAUSED);
     $settings = SettingsController::getInstance();
     $authorizedEmailsController = $this->makeEmpty(AuthorizedEmailsController::class, ['checkAuthorizedEmailAddresses' => Expected::never()]);
     $senderDomainController = $this->diContainer->get(AuthorizedSenderDomainController::class);
@@ -28,7 +28,7 @@ class MailerTest extends \MailPoetTest {
     $bridge = new Bridge($settings);
     $mailerEndpoint = new Mailer($authorizedEmailsController, $settings, $bridge, $this->diContainer->get(MailerFactory::class), new MetaInfo, $senderDomainController);
     $response = $mailerEndpoint->resumeSending();
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $mailerLog = MailerLog::getMailerLog();
     expect($mailerLog['status'])->null();
   }
diff --git a/mailpoet/tests/integration/API/JSON/v1/NewsletterTemplatesTest.php b/mailpoet/tests/integration/API/JSON/v1/NewsletterTemplatesTest.php
index 4011744715..1146265210 100644
--- a/mailpoet/tests/integration/API/JSON/v1/NewsletterTemplatesTest.php
+++ b/mailpoet/tests/integration/API/JSON/v1/NewsletterTemplatesTest.php
@@ -34,17 +34,17 @@ class NewsletterTemplatesTest extends \MailPoetTest {
 
     $endpoint = $this->diContainer->get(NewsletterTemplates::class);
     $response = $endpoint->get(/* missing id */);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
-    expect($response->errors[0]['message'])
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->errors[0]['message'])
       ->equals('This template does not exist.');
 
     $response = $endpoint->get(['id' => 'not_an_id']);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
-    expect($response->errors[0]['message'])
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->errors[0]['message'])
       ->equals('This template does not exist.');
 
     $response = $endpoint->get(['id' => $template->getId()]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     expect($response->data['name'])->same('Template #1');
     expect($response->data['body'])->same(['key1' => 'value1']);
   }
@@ -54,7 +54,7 @@ class NewsletterTemplatesTest extends \MailPoetTest {
 
     $endpoint = $this->diContainer->get(NewsletterTemplates::class);
     $response = $endpoint->getAll();
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     expect($response->data)->count(count($templates));
   }
 
@@ -66,7 +66,7 @@ class NewsletterTemplatesTest extends \MailPoetTest {
 
     $endpoint = $this->diContainer->get(NewsletterTemplates::class);
     $response = $endpoint->save($templateData);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     expect($response->data['name'])->same('Template #3');
     expect($response->data['body'])->same(['key3' => 'value3']);
   }
@@ -86,7 +86,7 @@ class NewsletterTemplatesTest extends \MailPoetTest {
 
     $endpoint = $this->diContainer->get(NewsletterTemplates::class);
     $response = $endpoint->save($templateData);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     expect($response->data['name'])->same('Template #3');
     expect($response->data['body'])->same(['key3' => 'value3']);
     expect($response->data['newsletter_id'])->same($newsletter->getId());
@@ -107,7 +107,7 @@ class NewsletterTemplatesTest extends \MailPoetTest {
 
     $endpoint = $this->diContainer->get(NewsletterTemplates::class);
     $response = $endpoint->save($templateData);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
 
     $templateData['body'] = json_decode($templateData['body'], true);
 
@@ -119,15 +119,15 @@ class NewsletterTemplatesTest extends \MailPoetTest {
   public function testItCanDeleteANewsletterTemplate() {
     $endpoint = $this->diContainer->get(NewsletterTemplates::class);
     $response = $endpoint->delete(/* missing id */);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
-    expect($response->errors[0]['message'])
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->errors[0]['message'])
       ->equals('This template does not exist.');
 
     $template = $this->newsletterTemplatesRepository->findOneBy(['name' => 'Template #1']);
     $this->assertInstanceOf(NewsletterTemplateEntity::class, $template);
     $templateId = $template->getId();
     $response = $endpoint->delete(['id' => $template->getId()]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
 
     $deletedTemplate = $this->newsletterTemplatesRepository->findOneById($templateId);
     expect($deletedTemplate)->null();
diff --git a/mailpoet/tests/integration/API/JSON/v1/NewslettersTest.php b/mailpoet/tests/integration/API/JSON/v1/NewslettersTest.php
index bf01b890da..5a5cd421db 100644
--- a/mailpoet/tests/integration/API/JSON/v1/NewslettersTest.php
+++ b/mailpoet/tests/integration/API/JSON/v1/NewslettersTest.php
@@ -126,11 +126,11 @@ class NewslettersTest extends \MailPoetTest {
         'sort_order' => 'asc',
       ]
     );
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data[0]['id'])->equals($this->newsletter->getId());
-    expect($response->data[1]['id'])->equals($sentNewsletters[1]->getId());
-    expect($response->data[2]['id'])->equals($sentNewsletters[2]->getId());
-    expect($response->data[3]['id'])->equals($sentNewsletters[3]->getId());
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data[0]['id'])->equals($this->newsletter->getId());
+    verify($response->data[1]['id'])->equals($sentNewsletters[1]->getId());
+    verify($response->data[2]['id'])->equals($sentNewsletters[2]->getId());
+    verify($response->data[3]['id'])->equals($sentNewsletters[3]->getId());
 
     // sorting by DESC order retains unsent newsletters at the top
     $response = $this->endpoint->listing(
@@ -142,22 +142,22 @@ class NewslettersTest extends \MailPoetTest {
         'sort_order' => 'desc',
       ]
     );
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data[0]['id'])->equals($this->newsletter->getId());
-    expect($response->data[1]['id'])->equals($sentNewsletters[3]->getId());
-    expect($response->data[2]['id'])->equals($sentNewsletters[2]->getId());
-    expect($response->data[3]['id'])->equals($sentNewsletters[1]->getId());
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data[0]['id'])->equals($this->newsletter->getId());
+    verify($response->data[1]['id'])->equals($sentNewsletters[3]->getId());
+    verify($response->data[2]['id'])->equals($sentNewsletters[2]->getId());
+    verify($response->data[3]['id'])->equals($sentNewsletters[1]->getId());
   }
 
   public function testItCanGetANewsletter() {
     $response = $this->endpoint->get(); // missing id
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
-    expect($response->errors[0]['message'])
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->errors[0]['message'])
       ->equals('This email does not exist.');
 
     $response = $this->endpoint->get(['id' => 'not_an_id']);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
-    expect($response->errors[0]['message'])
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->errors[0]['message'])
       ->equals('This email does not exist.');
 
     $wp = Stub::make(new WPFunctions, [
@@ -169,10 +169,10 @@ class NewslettersTest extends \MailPoetTest {
     ]);
     $response = $this->endpoint->get(['id' => $this->newsletter->getId()]);
 
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $newsletter = $this->newsletterRepository->findOneById($this->newsletter->getId());
     $this->assertInstanceOf(NewsletterEntity::class, $newsletter);
-    expect($response->data)->equals($this->newslettersResponseBuilder->build($newsletter, [
+    verify($response->data)->equals($this->newslettersResponseBuilder->build($newsletter, [
       NewslettersResponseBuilder::RELATION_SEGMENTS,
       NewslettersResponseBuilder::RELATION_OPTIONS,
       NewslettersResponseBuilder::RELATION_QUEUE,
@@ -197,19 +197,19 @@ class NewslettersTest extends \MailPoetTest {
     ];
 
     $response = $this->endpoint->save($newsletterData);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $updatedNewsletter = $this->newsletterRepository->findOneById($this->newsletter->getId());
     $this->assertInstanceOf(NewsletterEntity::class, $updatedNewsletter); // PHPStan
-    expect($response->data)->equals($this->newslettersResponseBuilder->build($updatedNewsletter, [NewslettersResponseBuilder::RELATION_SEGMENTS]));
-    expect($updatedNewsletter->getType())->equals('Updated type');
-    expect($updatedNewsletter->getSubject())->equals('Updated subject');
-    expect($updatedNewsletter->getPreheader())->equals('Updated preheader');
-    expect($updatedNewsletter->getBody())->equals(['value' => 'Updated body']);
-    expect($updatedNewsletter->getSenderName())->equals('Updated sender name');
-    expect($updatedNewsletter->getSenderAddress())->equals('Updated sender address');
-    expect($updatedNewsletter->getReplyToName())->equals('Updated reply-to name');
-    expect($updatedNewsletter->getReplyToAddress())->equals('Updated reply-to address');
-    expect($updatedNewsletter->getGaCampaign())->equals('Updated GA campaign');
+    verify($response->data)->equals($this->newslettersResponseBuilder->build($updatedNewsletter, [NewslettersResponseBuilder::RELATION_SEGMENTS]));
+    verify($updatedNewsletter->getType())->equals('Updated type');
+    verify($updatedNewsletter->getSubject())->equals('Updated subject');
+    verify($updatedNewsletter->getPreheader())->equals('Updated preheader');
+    verify($updatedNewsletter->getBody())->equals(['value' => 'Updated body']);
+    verify($updatedNewsletter->getSenderName())->equals('Updated sender name');
+    verify($updatedNewsletter->getSenderAddress())->equals('Updated sender address');
+    verify($updatedNewsletter->getReplyToName())->equals('Updated reply-to name');
+    verify($updatedNewsletter->getReplyToAddress())->equals('Updated reply-to address');
+    verify($updatedNewsletter->getGaCampaign())->equals('Updated GA campaign');
   }
 
   public function testItReturnsErrorIfSubscribersLimitReached() {
@@ -221,7 +221,7 @@ class NewslettersTest extends \MailPoetTest {
       'id' => $this->newsletter->getId(),
       'status' => NewsletterEntity::STATUS_ACTIVE,
     ]);
-    expect($res->status)->equals(APIResponse::STATUS_FORBIDDEN);
+    verify($res->status)->equals(APIResponse::STATUS_FORBIDDEN);
   }
 
   public function testItCanSetANewsletterStatus() {
@@ -232,8 +232,8 @@ class NewslettersTest extends \MailPoetTest {
        'status' => NewsletterEntity::STATUS_SENDING,
      ]
     );
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data['status'])->equals(NewsletterEntity::STATUS_SENDING);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data['status'])->equals(NewsletterEntity::STATUS_SENDING);
 
     // set status to draft
     $response = $this->endpoint->setStatus(
@@ -242,8 +242,8 @@ class NewslettersTest extends \MailPoetTest {
         'status' => NewsletterEntity::STATUS_DRAFT,
       ]
     );
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data['status'])->equals(NewsletterEntity::STATUS_DRAFT);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data['status'])->equals(NewsletterEntity::STATUS_DRAFT);
 
     // no status specified throws an error
     $response = $this->endpoint->setStatus(
@@ -251,8 +251,8 @@ class NewslettersTest extends \MailPoetTest {
         'id' => $this->newsletter->getId(),
       ]
     );
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])
       ->equals('You need to specify a status.');
 
     // invalid newsletter id throws an error
@@ -261,8 +261,8 @@ class NewslettersTest extends \MailPoetTest {
         'status' => NewsletterEntity::STATUS_DRAFT,
       ]
     );
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
-    expect($response->errors[0]['message'])
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->errors[0]['message'])
       ->equals('This email does not exist.');
   }
 
@@ -296,13 +296,13 @@ class NewslettersTest extends \MailPoetTest {
     $tasks = $this->scheduledTasksRepository->findAll();
     // previously scheduled notification is rescheduled for future date
     $this->assertInstanceOf(\DateTimeInterface::class, $tasks[0]->getScheduledAt());
-    expect($tasks[0]->getScheduledAt()->format('Y-m-d H:i:s'))->equals($this->scheduler->getNextRunDate($schedule));
+    verify($tasks[0]->getScheduledAt()->format('Y-m-d H:i:s'))->equals($this->scheduler->getNextRunDate($schedule));
     // future scheduled notifications are left intact
     $this->assertInstanceOf(\DateTimeInterface::class, $tasks[1]->getScheduledAt());
-    expect($tasks[1]->getScheduledAt()->format('Y-m-d H:i:s'))->equals($randomFutureDate);
+    verify($tasks[1]->getScheduledAt()->format('Y-m-d H:i:s'))->equals($randomFutureDate);
     // previously unscheduled (e.g., sent/sending) notifications are left intact
     $this->assertInstanceOf(\DateTimeInterface::class, $tasks[2]->getScheduledAt());
-    expect($tasks[2]->getScheduledAt()->format('Y-m-d H:i:s'))->equals($this->scheduler->getPreviousRunDate($schedule));
+    verify($tasks[2]->getScheduledAt()->format('Y-m-d H:i:s'))->equals($this->scheduler->getPreviousRunDate($schedule));
   }
 
   public function testItSchedulesPostNotificationsWhenStatusIsSetBackToActive() {
@@ -328,29 +328,29 @@ class NewslettersTest extends \MailPoetTest {
     expect($trashedNewsletter->getDeletedAt())->notNull();
 
     $response = $this->endpoint->restore(['id' => $this->newsletter->getId()]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $newsletter = $this->newsletterRepository->findOneById($this->newsletter->getId());
     $this->assertInstanceOf(NewsletterEntity::class, $newsletter);
-    expect($response->data)->equals($this->newslettersResponseBuilder->build($newsletter));
+    verify($response->data)->equals($this->newslettersResponseBuilder->build($newsletter));
     expect($response->data['deleted_at'])->null();
-    expect($response->meta['count'])->equals(1);
+    verify($response->meta['count'])->equals(1);
   }
 
   public function testItCanTrashANewsletter() {
     $response = $this->endpoint->trash(['id' => $this->newsletter->getId()]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $newsletter = $this->newsletterRepository->findOneById($this->newsletter->getId());
     $this->assertInstanceOf(NewsletterEntity::class, $newsletter);
-    expect($response->data)->equals($this->newslettersResponseBuilder->build($newsletter));
+    verify($response->data)->equals($this->newslettersResponseBuilder->build($newsletter));
     expect($response->data['deleted_at'])->notNull();
-    expect($response->meta['count'])->equals(1);
+    verify($response->meta['count'])->equals(1);
   }
 
   public function testItCanDeleteANewsletter() {
     $response = $this->endpoint->delete(['id' => $this->newsletter->getId()]);
     expect($response->data)->isEmpty();
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(1);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(1);
   }
 
   public function testItCanDuplicateANewsletter() {
@@ -363,22 +363,22 @@ class NewslettersTest extends \MailPoetTest {
     ]);
 
     $response = $this->endpoint->duplicate(['id' => $this->newsletter->getId()]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $newsletterCopy = $this->newsletterRepository->findOneBy(['subject' => 'Copy of My Standard Newsletter']);
     $this->assertInstanceOf(NewsletterEntity::class, $newsletterCopy);
-    expect($response->data)->equals($this->newslettersResponseBuilder->build($newsletterCopy));
-    expect($response->meta['count'])->equals(1);
+    verify($response->data)->equals($this->newslettersResponseBuilder->build($newsletterCopy));
+    verify($response->meta['count'])->equals(1);
 
     $hookName = 'mailpoet_api_newsletters_duplicate_after';
     expect(WPHooksHelper::isActionDone($hookName))->true();
     expect(WPHooksHelper::getActionDone($hookName)[0] instanceof NewsletterEntity)->true();
 
     $response = $this->endpoint->duplicate(['id' => $this->postNotification->getId()]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $newsletterCopy = $this->newsletterRepository->findOneBy(['subject' => 'Copy of My Post Notification']);
     $this->assertInstanceOf(NewsletterEntity::class, $newsletterCopy);
-    expect($response->data)->equals($this->newslettersResponseBuilder->build($newsletterCopy));
-    expect($response->meta['count'])->equals(1);
+    verify($response->data)->equals($this->newslettersResponseBuilder->build($newsletterCopy));
+    verify($response->meta['count'])->equals(1);
   }
 
   public function testItCanCreateANewsletter() {
@@ -387,14 +387,14 @@ class NewslettersTest extends \MailPoetTest {
       'type' => NewsletterEntity::TYPE_STANDARD,
     ];
     $response = $this->endpoint->create($data);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $newsletter = $this->newsletterRepository->findOneBy(['subject' => 'My New Newsletter']);
     $this->assertInstanceOf(NewsletterEntity::class, $newsletter);
-    expect($response->data)->equals($this->newslettersResponseBuilder->build($newsletter));
+    verify($response->data)->equals($this->newslettersResponseBuilder->build($newsletter));
 
     $response = $this->endpoint->create();
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals('Please specify a type.');
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals('Please specify a type.');
   }
 
   public function testItCanCreateAnAutomationNewsletter() {
@@ -403,10 +403,10 @@ class NewslettersTest extends \MailPoetTest {
       'type' => NewsletterEntity::TYPE_AUTOMATION,
     ];
     $response = $this->endpoint->create($data);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $newsletter = $this->newsletterRepository->findOneBy(['subject' => 'My Automation newsletter']);
     $this->assertInstanceOf(NewsletterEntity::class, $newsletter);
-    expect($response->data)->equals($this->newslettersResponseBuilder->build($newsletter));
+    verify($response->data)->equals($this->newslettersResponseBuilder->build($newsletter));
   }
 
   public function testItHasDefaultSenderAfterCreate() {
@@ -420,13 +420,13 @@ class NewslettersTest extends \MailPoetTest {
     $settingsController->set('reply_to', ['name' => 'Reply', 'address' => 'reply@test.com']);
 
     $response = $this->endpoint->create($data);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data['subject'])->equals('My First Newsletter');
-    expect($response->data['type'])->equals(NewsletterEntity::TYPE_STANDARD);
-    expect($response->data['sender_address'])->equals('sender@test.com');
-    expect($response->data['sender_name'])->equals('Sender');
-    expect($response->data['reply_to_address'])->equals('reply@test.com');
-    expect($response->data['reply_to_name'])->equals('Reply');
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data['subject'])->equals('My First Newsletter');
+    verify($response->data['type'])->equals(NewsletterEntity::TYPE_STANDARD);
+    verify($response->data['sender_address'])->equals('sender@test.com');
+    verify($response->data['sender_name'])->equals('Sender');
+    verify($response->data['reply_to_address'])->equals('reply@test.com');
+    verify($response->data['reply_to_name'])->equals('Reply');
   }
 
   public function testItCanGetListingData() {
@@ -440,26 +440,26 @@ class NewslettersTest extends \MailPoetTest {
 
     $response = $this->endpoint->listing();
 
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
 
     expect($response->meta)->hasKey('filters');
     expect($response->meta)->hasKey('groups');
-    expect($response->meta['count'])->equals(2);
+    verify($response->meta['count'])->equals(2);
 
     expect($response->data)->count(2);
-    expect($response->data[0]['subject'])->equals('My Standard Newsletter');
-    expect($response->data[1]['subject'])->equals('My Post Notification');
+    verify($response->data[0]['subject'])->equals('My Standard Newsletter');
+    verify($response->data[1]['subject'])->equals('My Post Notification');
 
     // 1st subscriber has 2 segments
     expect($response->data[0]['segments'])->count(2);
-    expect($response->data[0]['segments'][0]['id'])
+    verify($response->data[0]['segments'][0]['id'])
       ->equals($segment1->getId());
-    expect($response->data[0]['segments'][1]['id'])
+    verify($response->data[0]['segments'][1]['id'])
       ->equals($segment2->getId());
 
     // 2nd subscriber has 1 segment
     expect($response->data[1]['segments'])->count(1);
-    expect($response->data[1]['segments'][0]['id'])
+    verify($response->data[1]['segments'][0]['id'])
       ->equals($segment2->getId());
   }
 
@@ -484,11 +484,11 @@ class NewslettersTest extends \MailPoetTest {
       ]
     );
 
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
 
     // we should only get the standard newsletter
-    expect($response->meta['count'])->equals(1);
-    expect($response->data[0]['subject'])->equals($this->newsletter->getSubject());
+    verify($response->meta['count'])->equals(1);
+    verify($response->data[0]['subject'])->equals($this->newsletter->getSubject());
 
     // filter by 2nd segment
     $response = $this->endpoint->listing(
@@ -499,10 +499,10 @@ class NewslettersTest extends \MailPoetTest {
       ]
     );
 
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
 
     // we should have the 2 newsletters
-    expect($response->meta['count'])->equals(2);
+    verify($response->meta['count'])->equals(2);
   }
 
   public function testItCanLimitListing() {
@@ -515,11 +515,11 @@ class NewslettersTest extends \MailPoetTest {
       ]
     );
 
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
 
-    expect($response->meta['count'])->equals(2);
+    verify($response->meta['count'])->equals(2);
     expect($response->data)->count(1);
-    expect($response->data[0]['subject'])->equals(
+    verify($response->data[0]['subject'])->equals(
       $this->postNotification->getSubject()
     );
 
@@ -533,9 +533,9 @@ class NewslettersTest extends \MailPoetTest {
       ]
     );
 
-    expect($response->meta['count'])->equals(2);
+    verify($response->meta['count'])->equals(2);
     expect($response->data)->count(1);
-    expect($response->data[0]['subject'])->equals(
+    verify($response->data[0]['subject'])->equals(
       $this->newsletter->getSubject()
     );
   }
@@ -555,8 +555,8 @@ class NewslettersTest extends \MailPoetTest {
       ]
     );
 
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(count($selectionIds));
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(count($selectionIds));
   }
 
   public function testItCanBulkDeleteNewsletters() {
@@ -566,8 +566,8 @@ class NewslettersTest extends \MailPoetTest {
         'listing' => ['group' => 'all'],
       ]
     );
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(2);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(2);
 
     $response = $this->endpoint->bulkAction(
       [
@@ -575,8 +575,8 @@ class NewslettersTest extends \MailPoetTest {
         'listing' => ['group' => 'trash'],
       ]
     );
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(2);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(2);
 
     $response = $this->endpoint->bulkAction(
       [
@@ -584,8 +584,8 @@ class NewslettersTest extends \MailPoetTest {
         'listing' => ['group' => 'trash'],
       ]
     );
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(0);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(0);
   }
 
   public function testItCanSendAPreview() {
@@ -601,7 +601,7 @@ class NewslettersTest extends \MailPoetTest {
       'id' => $this->newsletter->getId(),
     ];
     $response = $endpoint->sendPreview($data);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
   }
 
   public function testItReturnsMailerErrorWhenSendingFailed() {
@@ -619,7 +619,7 @@ class NewslettersTest extends \MailPoetTest {
       'id' => $this->newsletter->getId(),
     ];
     $response = $endpoint->sendPreview($data);
-    expect($response->errors[0]['message'])->equals('The email could not be sent: failed');
+    verify($response->errors[0]['message'])->equals('The email could not be sent: failed');
   }
 
   public function testItReturnsBrowserPreviewUrlWithoutProtocol() {
diff --git a/mailpoet/tests/integration/API/JSON/v1/SegmentsTest.php b/mailpoet/tests/integration/API/JSON/v1/SegmentsTest.php
index ea0778af8b..9295eb6ec2 100644
--- a/mailpoet/tests/integration/API/JSON/v1/SegmentsTest.php
+++ b/mailpoet/tests/integration/API/JSON/v1/SegmentsTest.php
@@ -55,16 +55,16 @@ class SegmentsTest extends \MailPoetTest {
 
   public function testItCanGetASegment(): void {
     $response = $this->endpoint->get(/* missing id */);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
-    expect($response->errors[0]['message'])->equals('This list does not exist.');
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->errors[0]['message'])->equals('This list does not exist.');
 
     $response = $this->endpoint->get(['id' => 'not_an_id']);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
-    expect($response->errors[0]['message'])->equals('This list does not exist.');
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->errors[0]['message'])->equals('This list does not exist.');
 
     $response = $this->endpoint->get(['id' => $this->segment1->getId()]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals(
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data)->equals(
       $this->responseBuilder->build($this->segment1)
     );
   }
@@ -72,16 +72,16 @@ class SegmentsTest extends \MailPoetTest {
   public function testItCanGetListingData(): void {
     $response = $this->endpoint->listing();
 
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
 
     expect($response->meta)->hasKey('filters');
     expect($response->meta)->hasKey('groups');
-    expect($response->meta['count'])->equals(3);
+    verify($response->meta['count'])->equals(3);
 
     expect($response->data)->count(3);
-    expect($response->data[0]['name'])->equals($this->segment1->getName());
-    expect($response->data[1]['name'])->equals($this->segment2->getName());
-    expect($response->data[2]['name'])->equals($this->segment3->getName());
+    verify($response->data[0]['name'])->equals($this->segment1->getName());
+    verify($response->data[1]['name'])->equals($this->segment2->getName());
+    verify($response->data[2]['name'])->equals($this->segment3->getName());
   }
 
   public function testItCanSaveASegment(): void {
@@ -91,15 +91,15 @@ class SegmentsTest extends \MailPoetTest {
     ];
 
     $response = $this->endpoint->save(/* missing data */);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals('Please specify a name.');
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals('Please specify a name.');
     $this->entityManager->clear();
 
     $response = $this->endpoint->save($segmentData);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $segment = $this->segmentRepository->findOneBy(['name' => $name]);
     $this->assertInstanceOf(SegmentEntity::class, $segment);
-    expect($response->data)->equals(
+    verify($response->data)->equals(
       $this->responseBuilder->build($segment)
     );
   }
@@ -110,8 +110,8 @@ class SegmentsTest extends \MailPoetTest {
     ];
 
     $response = $this->endpoint->save($duplicateEntry);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals('Another record already exists. Please specify a different "name".');
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals('Another record already exists. Please specify a different "name".');
   }
 
   public function testItCanRestoreASegment(): void {
@@ -124,14 +124,14 @@ class SegmentsTest extends \MailPoetTest {
     $this->entityManager->clear();
 
     $response = $this->endpoint->restore(['id' => $this->segment1->getId()]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $segment = $this->segmentRepository->findOneById($trashedSegment->getId());
     $this->assertInstanceOf(SegmentEntity::class, $segment);
-    expect($response->data)->equals(
+    verify($response->data)->equals(
       $this->responseBuilder->build($segment)
     );
     expect($response->data['deleted_at'])->null();
-    expect($response->meta['count'])->equals(1);
+    verify($response->meta['count'])->equals(1);
   }
 
   public function testItCanTrashASegment() {
@@ -140,12 +140,12 @@ class SegmentsTest extends \MailPoetTest {
     $segment = $this->segmentRepository->findOneById($this->segment2->getId());
     $this->assertInstanceOf(SegmentEntity::class, $segment);
 
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals(
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data)->equals(
       $this->responseBuilder->build($segment)
     );
     expect($response->data['deleted_at'])->notNull();
-    expect($response->meta['count'])->equals(1);
+    verify($response->meta['count'])->equals(1);
   }
 
   public function testItReturnsErrorWhenTrashingSegmentWithActiveNewsletter() {
@@ -159,8 +159,8 @@ class SegmentsTest extends \MailPoetTest {
 
     $response = $this->endpoint->trash(['id' => $this->segment2->getId()]);
     $this->entityManager->refresh($this->segment2);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals("List cannot be deleted because it’s used for 'Subject' email");
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals("List cannot be deleted because it’s used for 'Subject' email");
   }
 
   public function testItReturnsErrorWhenTrashingSegmentWithActiveForm() {
@@ -169,8 +169,8 @@ class SegmentsTest extends \MailPoetTest {
 
     $response = $this->endpoint->trash(['id' => $this->segment3->getId()]);
     $this->entityManager->refresh($this->segment3);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals("List cannot be deleted because it’s used for 'My Form' form");
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals("List cannot be deleted because it’s used for 'My Form' form");
   }
 
   public function testItReturnsPluralErrorWhenTrashingSegmentWithActiveForms() {
@@ -180,8 +180,8 @@ class SegmentsTest extends \MailPoetTest {
 
     $response = $this->endpoint->trash(['id' => $this->segment3->getId()]);
     $this->entityManager->refresh($this->segment3);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals("List cannot be deleted because it’s used for 'My Form', 'My other Form' forms");
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals("List cannot be deleted because it’s used for 'My Form', 'My other Form' forms");
   }
 
   public function testItCanTrashSegmentWithoutActiveForm() {
@@ -193,19 +193,19 @@ class SegmentsTest extends \MailPoetTest {
     $segment = $this->segmentRepository->findOneById($this->segment2->getId());
     $this->assertInstanceOf(SegmentEntity::class, $segment);
 
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals(
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data)->equals(
       $this->responseBuilder->build($segment)
     );
     expect($response->data['deleted_at'])->notNull();
-    expect($response->meta['count'])->equals(1);
+    verify($response->meta['count'])->equals(1);
   }
 
   public function testItCanDeleteASegment() {
     $response = $this->endpoint->delete(['id' => $this->segment3->getId()]);
     expect($response->data)->isEmpty();
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(1);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(1);
   }
 
   public function testItCanDuplicateASegment() {
@@ -213,11 +213,11 @@ class SegmentsTest extends \MailPoetTest {
     $segment = $this->segmentRepository->findOneBy(['name' => 'Copy of Segment 1']);
     $this->assertInstanceOf(SegmentEntity::class, $segment);
 
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals(
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data)->equals(
       $this->responseBuilder->build($segment)
     );
-    expect($response->meta['count'])->equals(1);
+    verify($response->meta['count'])->equals(1);
   }
 
   public function testItCanBulkDeleteSegments() {
@@ -228,23 +228,23 @@ class SegmentsTest extends \MailPoetTest {
       'action' => 'trash',
       'listing' => ['group' => 'all'],
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(3);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(3);
 
     $response = $this->endpoint->bulkAction([
       'action' => 'delete',
       'listing' => ['group' => 'trash'],
     ]);
 
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(3);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(3);
 
     $response = $this->endpoint->bulkAction([
       'action' => 'delete',
       'listing' => ['group' => 'trash'],
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(0);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(0);
 
     $subsribers = $this->subscriberSegmentRepository->findBy(['segment' => $this->segment1]);
     expect($subsribers)->count(0);
diff --git a/mailpoet/tests/integration/API/JSON/v1/SendingQueueTest.php b/mailpoet/tests/integration/API/JSON/v1/SendingQueueTest.php
index 9850882ceb..237129b79d 100644
--- a/mailpoet/tests/integration/API/JSON/v1/SendingQueueTest.php
+++ b/mailpoet/tests/integration/API/JSON/v1/SendingQueueTest.php
@@ -53,11 +53,11 @@ class SendingQueueTest extends \MailPoetTest {
     $repo = $this->diContainer->get(ScheduledTasksRepository::class);
     $scheduledTask = $repo->findOneById($result->data['task_id']);
     $this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask);
-    expect($scheduledTask->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
+    verify($scheduledTask->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
     $scheduled = $scheduledTask->getScheduledAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $scheduled);
-    expect($scheduled->format('Y-m-d H:i:s'))->equals($newsletterOptions['scheduledAt']);
-    expect($scheduledTask->getType())->equals(Sending::TASK_TYPE);
+    verify($scheduled->format('Y-m-d H:i:s'))->equals($newsletterOptions['scheduledAt']);
+    verify($scheduledTask->getType())->equals(Sending::TASK_TYPE);
   }
 
   public function testItReturnsErrorIfSubscribersLimitReached() {
@@ -67,9 +67,9 @@ class SendingQueueTest extends \MailPoetTest {
       ]),
     ]);
     $res = $sendingQueue->add(['newsletter_id' => $this->newsletter->getId()]);
-    expect($res->status)->equals(APIResponse::STATUS_FORBIDDEN);
+    verify($res->status)->equals(APIResponse::STATUS_FORBIDDEN);
     $res = $sendingQueue->resume(['newsletter_id' => $this->newsletter->getId()]);
-    expect($res->status)->equals(APIResponse::STATUS_FORBIDDEN);
+    verify($res->status)->equals(APIResponse::STATUS_FORBIDDEN);
   }
 
   public function testItReschedulesScheduledSendingQueueTask() {
@@ -90,7 +90,7 @@ class SendingQueueTest extends \MailPoetTest {
     $this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask);
     $scheduled = $scheduledTask->getScheduledAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $scheduled);
-    expect($scheduled->format('Y-m-d H:i:s'))->equals('2018-10-10 10:00:00');
+    verify($scheduled->format('Y-m-d H:i:s'))->equals('2018-10-10 10:00:00');
 
     // update scheduled time
     $newsletterOptions = [
@@ -103,11 +103,11 @@ class SendingQueueTest extends \MailPoetTest {
     $rescheduledTask = $repo->findOneById($result->data['task_id']);
     $this->assertInstanceOf(ScheduledTaskEntity::class, $rescheduledTask);
     // new task was not created
-    expect($rescheduledTask->getId())->equals($scheduledTask->getId());
+    verify($rescheduledTask->getId())->equals($scheduledTask->getId());
     // scheduled time was updated
     $scheduled = $rescheduledTask->getScheduledAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $scheduled);
-    expect($scheduled->format('Y-m-d H:i:s'))->equals('2018-11-11 11:00:00');
+    verify($scheduled->format('Y-m-d H:i:s'))->equals('2018-11-11 11:00:00');
   }
 
   public function testItRejectsInvalidNewsletters() {
diff --git a/mailpoet/tests/integration/API/JSON/v1/SendingTaskSubscribersTest.php b/mailpoet/tests/integration/API/JSON/v1/SendingTaskSubscribersTest.php
index 3f97e32997..5d4674fd97 100644
--- a/mailpoet/tests/integration/API/JSON/v1/SendingTaskSubscribersTest.php
+++ b/mailpoet/tests/integration/API/JSON/v1/SendingTaskSubscribersTest.php
@@ -84,8 +84,8 @@ class SendingTaskSubscribersTest extends \MailPoetTest {
       'sort_by' => 'created_at',
       'params' => ['id' => $this->newsletter->getId() + 1],
     ]);
-    expect($res->status)->equals(APIResponse::STATUS_NOT_FOUND);
-    expect($res->errors[0]['message'])
+    verify($res->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($res->errors[0]['message'])
       ->equals('This email has not been sent yet.');
   }
 
@@ -95,8 +95,8 @@ class SendingTaskSubscribersTest extends \MailPoetTest {
       'sort_by' => 'created_at',
       'params' => ['id' => $newsletterWithoutTask->getId()],
     ]);
-    expect($res->status)->equals(APIResponse::STATUS_NOT_FOUND);
-    expect($res->errors[0]['message'])
+    verify($res->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($res->errors[0]['message'])
       ->equals('This email has not been sent yet.');
   }
 
@@ -136,8 +136,8 @@ class SendingTaskSubscribersTest extends \MailPoetTest {
       'sort_by' => 'subscriber',
       'params' => ['id' => $this->newsletter->getId()],
     ]);
-    expect($res->status)->equals(APIResponse::STATUS_OK);
-    expect($res->data)->equals([
+    verify($res->status)->equals(APIResponse::STATUS_OK);
+    verify($res->data)->equals([
       $sentSubscriberStatus,
       $failedSubscriberStatus,
       $unprocessedSubscriberStatus,
@@ -148,8 +148,8 @@ class SendingTaskSubscribersTest extends \MailPoetTest {
       'sort_by' => 'created_at',
       'params' => ['id' => $this->newsletter->getId()],
     ]);
-    expect($res->status)->equals(APIResponse::STATUS_OK);
-    expect($res->data)->equals([
+    verify($res->status)->equals(APIResponse::STATUS_OK);
+    verify($res->data)->equals([
       $sentSubscriberStatus,
     ]);
 
@@ -158,8 +158,8 @@ class SendingTaskSubscribersTest extends \MailPoetTest {
       'sort_by' => 'created_at',
       'params' => ['id' => $this->newsletter->getId()],
     ]);
-    expect($res->status)->equals(APIResponse::STATUS_OK);
-    expect($res->data)->equals([
+    verify($res->status)->equals(APIResponse::STATUS_OK);
+    verify($res->data)->equals([
       $failedSubscriberStatus,
     ]);
 
@@ -168,8 +168,8 @@ class SendingTaskSubscribersTest extends \MailPoetTest {
       'sort_by' => 'created_at',
       'params' => ['id' => $this->newsletter->getId()],
     ]);
-    expect($res->status)->equals(APIResponse::STATUS_OK);
-    expect($res->data)->equals([
+    verify($res->status)->equals(APIResponse::STATUS_OK);
+    verify($res->data)->equals([
       $unprocessedSubscriberStatus,
     ]);
   }
@@ -179,16 +179,16 @@ class SendingTaskSubscribersTest extends \MailPoetTest {
       'taskId' => $this->task->getId() + 1,
       'subscriberId' => $this->sentSubscriber->getId(),
     ]);
-    expect($res->status)->equals(APIResponse::STATUS_NOT_FOUND);
-    expect($res->errors[0]['message'])
+    verify($res->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($res->errors[0]['message'])
       ->equals('Failed sending task not found!');
 
     $res = $this->endpoint->resend([
       'taskId' => $this->task->getId(),
       'subscriberId' => $this->sentSubscriber->getId(),
     ]);
-    expect($res->status)->equals(APIResponse::STATUS_NOT_FOUND);
-    expect($res->errors[0]['message'])
+    verify($res->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($res->errors[0]['message'])
       ->equals('Failed sending task not found!');
   }
 
@@ -197,17 +197,17 @@ class SendingTaskSubscribersTest extends \MailPoetTest {
       'taskId' => $this->task->getId(),
       'subscriberId' => $this->failedSubscriber->getId(),
     ]);
-    expect($res->status)->equals(APIResponse::STATUS_OK);
+    verify($res->status)->equals(APIResponse::STATUS_OK);
 
     $this->entityManager->refresh($this->failedSubscriberTask);
-    expect($this->failedSubscriberTask->getError())->equals(null);
-    expect($this->failedSubscriberTask->getFailed())->equals(0);
-    expect($this->failedSubscriberTask->getProcessed())->equals(0);
+    verify($this->failedSubscriberTask->getError())->equals(null);
+    verify($this->failedSubscriberTask->getFailed())->equals(0);
+    verify($this->failedSubscriberTask->getProcessed())->equals(0);
 
     $this->entityManager->refresh($this->task);
-    expect($this->task->getStatus())->equals(null);
+    verify($this->task->getStatus())->equals(null);
 
     $this->entityManager->refresh($this->newsletter);
-    expect($this->newsletter->getStatus())->equals(NewsletterEntity::STATUS_SENDING);
+    verify($this->newsletter->getStatus())->equals(NewsletterEntity::STATUS_SENDING);
   }
 }
diff --git a/mailpoet/tests/integration/API/JSON/v1/ServicesTest.php b/mailpoet/tests/integration/API/JSON/v1/ServicesTest.php
index c185e3c25d..af834bc0aa 100644
--- a/mailpoet/tests/integration/API/JSON/v1/ServicesTest.php
+++ b/mailpoet/tests/integration/API/JSON/v1/ServicesTest.php
@@ -34,8 +34,8 @@ class ServicesTest extends \MailPoetTest {
 
   public function testItRespondsWithErrorIfNoMSSKeyIsGiven() {
     $response = $this->diContainer->get(Services::class)->checkMSSKey(['key' => '']);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals('Please specify a key.');
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals('Please specify a key.');
   }
 
   public function testItRespondsWithSuccessIfMSSKeyIsValid() {
@@ -49,7 +49,7 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->checkMSSKey($this->data);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
   }
 
   public function testItRespondsWithErrorIfMSSKeyIsInvalid() {
@@ -62,7 +62,7 @@ class ServicesTest extends \MailPoetTest {
     );
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->checkMSSKey($this->data);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
   }
 
   public function testItRespondsWithErrorIfMSSKeyIsExpiring() {
@@ -80,7 +80,7 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->checkMSSKey($this->data);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     expect($response->data['message'])
       ->stringContainsString($date->format($servicesEndpoint->dateTime->getDateFormat()));
   }
@@ -96,7 +96,7 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->checkMSSKey($this->data);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
     $errorMessage = $this->invokeMethod(
       $servicesEndpoint, 'getErrorDescriptionByCode', [Bridge::CHECK_ERROR_UNAVAILABLE]
     );
@@ -115,7 +115,7 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->checkMSSKey($this->data);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
     $errorMessage = $this->invokeMethod(
       $servicesEndpoint, 'getErrorDescriptionByCode', [Bridge::CHECK_ERROR_UNKNOWN]
     );
@@ -134,7 +134,7 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->checkMSSKey($this->data);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
     expect($response->errors[0]['message'])->stringContainsString('404');
   }
 
@@ -151,8 +151,8 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->checkMSSKey($this->data);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
-    expect($response->errors[0]['message'])->equals('test');
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->errors[0]['message'])->equals('test');
   }
 
   public function testItDoesNotPauseSendingWhenMSSKeyValidAndApproved() {
@@ -172,7 +172,7 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->checkMSSKey($this->data);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     expect(MailerLog::isSendingPaused())->false();
   }
 
@@ -193,7 +193,7 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->checkMSSKey($this->data);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     expect(MailerLog::isSendingPaused())->true();
   }
 
@@ -220,14 +220,14 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->checkMSSKey($this->data);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     expect(MailerLog::isSendingPaused())->false();
   }
 
   public function testItRespondsWithErrorIfNoPremiumKeyIsGiven() {
     $response = $response = $this->diContainer->get(Services::class)->checkPremiumKey(['key' => '']);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals('Please specify a key.');
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals('Please specify a key.');
   }
 
   public function testItRespondsWithSuccessIfPremiumKeyIsValid() {
@@ -241,7 +241,7 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->checkPremiumKey($this->data);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     foreach (array_keys(Installer::getPremiumStatus()) as $key) {
       expect(isset($response->meta[$key]))->true();
     }
@@ -258,7 +258,7 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->checkPremiumKey($this->data);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
   }
 
   public function testItRespondsWithErrorIfPremiumKeyIsUsed() {
@@ -272,7 +272,7 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->checkPremiumKey($this->data);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
   }
 
   public function testItRespondsWithErrorIfPremiumKeyIsExpiring() {
@@ -290,7 +290,7 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->checkPremiumKey($this->data);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     expect($response->data['message'])
       ->stringContainsString($date->format($servicesEndpoint->dateTime->getDateFormat()));
   }
@@ -306,7 +306,7 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->checkPremiumKey($this->data);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
     $errorMessage = $this->invokeMethod(
       $servicesEndpoint, 'getErrorDescriptionByCode', [Bridge::CHECK_ERROR_UNAVAILABLE]
     );
@@ -325,7 +325,7 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->checkPremiumKey($this->data);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
     $errorMessage = $this->invokeMethod(
       $servicesEndpoint, 'getErrorDescriptionByCode', [Bridge::CHECK_ERROR_UNKNOWN]
     );
@@ -344,7 +344,7 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->checkPremiumKey($this->data);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
     expect($response->errors[0]['message'])->stringContainsString('404');
   }
 
@@ -361,8 +361,8 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->checkPremiumKey($this->data);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
-    expect($response->errors[0]['message'])->equals('test');
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->errors[0]['message'])->equals('test');
   }
 
   public function testItRespondsWithPublicIdForMSS() {
@@ -384,8 +384,8 @@ class ServicesTest extends \MailPoetTest {
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $servicesEndpoint->checkMSSKey($this->data);
 
-    expect($this->settings->get('public_id'))->equals($fakePublicId);
-    expect($this->settings->get('new_public_id'))->equals('true');
+    verify($this->settings->get('public_id'))->equals($fakePublicId);
+    verify($this->settings->get('new_public_id'))->equals('true');
   }
 
   public function testItRespondsWithoutPublicIdForMSS() {
@@ -426,8 +426,8 @@ class ServicesTest extends \MailPoetTest {
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->checkPremiumKey($this->data);
 
-    expect($this->settings->get('public_id'))->equals($fakePublicId);
-    expect($this->settings->get('new_public_id'))->equals('true');
+    verify($this->settings->get('public_id'))->equals($fakePublicId);
+    verify($this->settings->get('new_public_id'))->equals('true');
   }
 
   public function testItRespondsWithoutPublicIdForPremium() {
@@ -465,16 +465,16 @@ class ServicesTest extends \MailPoetTest {
       'congratulatoryEmailController' => $congratulatoryEmailController,
     ]);
     $response = $servicesEndpoint->sendCongratulatoryMssEmail();
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals(['email_address' => 'authorized@email.com']);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data)->equals(['email_address' => 'authorized@email.com']);
   }
 
   public function testCongratulatoryEmailRespondsWithErrorWhenMssNotActive() {
     $this->settings->set(Mailer::MAILER_CONFIG_SETTING_NAME, ['method' => Mailer::METHOD_PHPMAIL]);
     $servicesEndpoint = $this->diContainer->get(Services::class);
     $response = $servicesEndpoint->sendCongratulatoryMssEmail();
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals('MailPoet Sending Service is not active.');
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals('MailPoet Sending Service is not active.');
   }
 
   public function testCongratulatoryEmailRespondsWithErrorWhenNoEmailAuthorized() {
@@ -486,8 +486,8 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->sendCongratulatoryMssEmail();
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals('No FROM email addresses are authorized.');
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals('No FROM email addresses are authorized.');
   }
 
   public function testCongratulatoryEmailRespondsWithDifferentErrorWhenNoEmailAuthorizedButDomainIsVerified() {
@@ -506,10 +506,10 @@ class ServicesTest extends \MailPoetTest {
       'senderDomain' => $senderDomainMock,
     ]);
     $response = $servicesEndpoint->sendCongratulatoryMssEmail();
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
     // when the sender domain is verified, we don't insist the FROM email be authorized
     // we instead get a different error when the sender email is not avaliable
-    expect($response->errors[0]['message'])->equals('Sender email address is not set.');
+    verify($response->errors[0]['message'])->equals('Sender email address is not set.');
   }
 
   public function testCongratulatoryEmailRespondsWithErrorWhenNoSenderSet() {
@@ -521,8 +521,8 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->sendCongratulatoryMssEmail();
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals('Sender email address is not set.');
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals('Sender email address is not set.');
   }
 
   public function testCongratulatoryEmailRespondsWithErrorWhenSenderNotAuthorized() {
@@ -534,8 +534,8 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->sendCongratulatoryMssEmail();
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals("Sender email address 'unauthorized@email.com' is not authorized.");
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals("Sender email address 'unauthorized@email.com' is not authorized.");
   }
 
   public function testCongratulatoryEmailRespondsWithSuccessWhenSenderNotAuthorizedButDomainIsVerified() {
@@ -561,8 +561,8 @@ class ServicesTest extends \MailPoetTest {
     ]);
     $response = $servicesEndpoint->sendCongratulatoryMssEmail();
 
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals(['email_address' => 'unauthorized@email.com']);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data)->equals(['email_address' => 'unauthorized@email.com']);
   }
 
   public function testCongratulatoryEmailRespondsWithErrorWhenSendingFails() {
@@ -583,8 +583,8 @@ class ServicesTest extends \MailPoetTest {
       'congratulatoryEmailController' => $congratulatoryEmailController,
     ]);
     $response = $servicesEndpoint->sendCongratulatoryMssEmail();
-    expect($response->status)->equals(APIResponse::STATUS_UNKNOWN);
-    expect($response->errors[0]['message'])->equals('Sending of congratulatory email failed.');
+    verify($response->status)->equals(APIResponse::STATUS_UNKNOWN);
+    verify($response->errors[0]['message'])->equals('Sending of congratulatory email failed.');
   }
 
   public function testItRespondsWithCorrectMessageIfKeyDoesntSupportMSS() {
@@ -601,7 +601,7 @@ class ServicesTest extends \MailPoetTest {
 
     $servicesEndpoint = $this->createServicesEndpointWithMocks(['bridge' => $bridge]);
     $response = $servicesEndpoint->checkMSSKey($this->data);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     expect($response->data['message'])->stringContainsString(
       'Your Premium key has been successfully validated, but is not valid for MailPoet Sending Service'
     );
diff --git a/mailpoet/tests/integration/API/JSON/v1/SettingsTest.php b/mailpoet/tests/integration/API/JSON/v1/SettingsTest.php
index 1c16f5c18f..af58e7d1bc 100644
--- a/mailpoet/tests/integration/API/JSON/v1/SettingsTest.php
+++ b/mailpoet/tests/integration/API/JSON/v1/SettingsTest.php
@@ -77,7 +77,7 @@ class SettingsTest extends \MailPoetTest {
 
   public function testItCanGetSettings() {
     $response = $this->endpoint->get();
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
 
     expect($response->data)->notEmpty();
     expect($response->data['some']['setting']['key'])->true();
@@ -85,8 +85,8 @@ class SettingsTest extends \MailPoetTest {
     $this->diContainer->get(SettingsRepository::class)->truncate();
     $this->settings->resetCache();
     $response = $this->endpoint->get();
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals($this->settings->getAllDefaults());
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data)->equals($this->settings->getAllDefaults());
   }
 
   public function testItCanSetSettings() {
@@ -120,14 +120,14 @@ class SettingsTest extends \MailPoetTest {
     );
 
     $response = $this->endpoint->set(/* missing data */);
-    expect($response->errors[0]['error'])->equals(APIError::BAD_REQUEST);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['error'])->equals(APIError::BAD_REQUEST);
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
 
     $response = $this->endpoint->set($newSettings);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
 
     $response = $this->endpoint->get();
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     expect($response->data['some']['setting'])->hasNotKey('key');
     expect($response->data['some']['setting']['new_key'])->true();
     expect($response->data['some']['new_setting'])->true();
@@ -193,7 +193,7 @@ class SettingsTest extends \MailPoetTest {
     ]);
     expect($response->status)->same(200);
     expect($this->settings->get('sender.address'))->same('invalid@email.com');
-    expect($response->meta)->equals([
+    verify($response->meta)->equals([
       'invalid_sender_address' => 'invalid@email.com',
       'showNotice' => false,
     ]);
@@ -268,7 +268,7 @@ class SettingsTest extends \MailPoetTest {
     $this->endpoint->set($newSettings);
 
     $this->settings->resetCache();
-    expect($this->settings->get('sender')['address'])->equals('johndoeexampletestnonexistinghopefullyfreemail@gmail.com');
+    verify($this->settings->get('sender')['address'])->equals('johndoeexampletestnonexistinghopefullyfreemail@gmail.com');
     expect($this->settings->get('reply_to'))->isEmpty();
   }
 
@@ -276,26 +276,26 @@ class SettingsTest extends \MailPoetTest {
     $this->createNewsletter(NewsletterEntity::TYPE_RE_ENGAGEMENT, NewsletterEntity::STATUS_ACTIVE);
     $this->settings->set('tracking', ['level' => TrackingConfig::LEVEL_PARTIAL]);
     $response = $this->endpoint->set(['tracking' => ['level' => TrackingConfig::LEVEL_BASIC]]);
-    expect($response->meta['showNotice'])->equals(true);
-    expect($response->meta['action'])->equals('deactivate');
-    expect($this->newsletterRepository->findActiveByTypes([NewsletterEntity::TYPE_RE_ENGAGEMENT]))->equals([]);
+    verify($response->meta['showNotice'])->equals(true);
+    verify($response->meta['action'])->equals('deactivate');
+    verify($this->newsletterRepository->findActiveByTypes([NewsletterEntity::TYPE_RE_ENGAGEMENT]))->equals([]);
   }
 
   public function testItFlagsNoticeToReactivateReEngagementEmailsIfTrackingEnabled(): void {
     $this->createNewsletter(NewsletterEntity::TYPE_RE_ENGAGEMENT);
     $this->settings->set('tracking', ['level' => TrackingConfig::LEVEL_BASIC]);
     $response = $this->endpoint->set(['tracking' => ['level' => TrackingConfig::LEVEL_PARTIAL]]);
-    expect($response->meta['showNotice'])->equals(true);
-    expect($response->meta['action'])->equals('reactivate');
+    verify($response->meta['showNotice'])->equals(true);
+    verify($response->meta['action'])->equals('reactivate');
   }
 
   public function testNoNoticeWhenTrackingChangesIfNoReEngagementEmails(): void {
     $this->createNewsletter(NewsletterEntity::TYPE_STANDARD, NewsletterEntity::STATUS_ACTIVE);
     $this->settings->set('tracking', ['level' => TrackingConfig::LEVEL_BASIC]);
     $response = $this->endpoint->set(['tracking' => ['level' => TrackingConfig::LEVEL_PARTIAL]]);
-    expect($response->meta['showNotice'])->equals(false);
+    verify($response->meta['showNotice'])->equals(false);
     $response = $this->endpoint->set(['tracking' => ['level' => TrackingConfig::LEVEL_BASIC]]);
-    expect($response->meta['showNotice'])->equals(false);
+    verify($response->meta['showNotice'])->equals(false);
   }
 
   public function testItCanDeleteSetting() {
@@ -336,11 +336,11 @@ class SettingsTest extends \MailPoetTest {
     );
 
     expect($this->endpoint->setKeyAndSetupMss($newKey))->isInstanceOf(SuccessResponse::class);
-    expect($this->settings->get('mta.mailpoet_api_key'))->equals($newKey);
-    expect($this->settings->get('mta_group'))->equals('mailpoet');
-    expect($this->settings->get('mta.method'))->equals('MailPoet');
-    expect($this->settings->get('signup_confirmation.enabled'))->equals(1);
-    expect($this->settings->get('premium.premium_key'))->equals($newKey);
+    verify($this->settings->get('mta.mailpoet_api_key'))->equals($newKey);
+    verify($this->settings->get('mta_group'))->equals('mailpoet');
+    verify($this->settings->get('mta.method'))->equals('MailPoet');
+    verify($this->settings->get('signup_confirmation.enabled'))->equals(1);
+    verify($this->settings->get('premium.premium_key'))->equals($newKey);
   }
 
   private function createNewsletter(string $type, string $status = NewsletterEntity::STATUS_DRAFT, $parent = null): NewsletterEntity {
diff --git a/mailpoet/tests/integration/API/JSON/v1/SetupTest.php b/mailpoet/tests/integration/API/JSON/v1/SetupTest.php
index 5c764dcd82..1011728dc1 100644
--- a/mailpoet/tests/integration/API/JSON/v1/SetupTest.php
+++ b/mailpoet/tests/integration/API/JSON/v1/SetupTest.php
@@ -36,7 +36,7 @@ class SetupTest extends \MailPoetTest {
     $cronActionScheduler = $this->diContainer->get(ActionScheduler::class);
     $router = new Setup($wpStub, new Activator($this->connection, $settings, $populator, $wpStub, $migrator, $cronActionScheduler));
     $response = $router->reset();
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
 
     $settings = SettingsController::getInstance();
     $signupConfirmation = $settings->fetch('signup_confirmation.enabled');
@@ -44,9 +44,9 @@ class SetupTest extends \MailPoetTest {
 
     $captcha = $settings->fetch('captcha');
     $captchaType = $captchaRenderer->isSupported() ? CaptchaConstants::TYPE_BUILTIN : CaptchaConstants::TYPE_DISABLED;
-    expect($captcha['type'])->equals($captchaType);
-    expect($captcha['recaptcha_site_token'])->equals('');
-    expect($captcha['recaptcha_secret_token'])->equals('');
+    verify($captcha['type'])->equals($captchaType);
+    verify($captcha['recaptcha_site_token'])->equals('');
+    verify($captcha['recaptcha_secret_token'])->equals('');
 
     $woocommerceOptinOnCheckout = $settings->fetch('woocommerce.optin_on_checkout');
     expect($woocommerceOptinOnCheckout['enabled'])->true();
diff --git a/mailpoet/tests/integration/API/JSON/v1/SubscribersTest.php b/mailpoet/tests/integration/API/JSON/v1/SubscribersTest.php
index 5d3553dbe3..539f648208 100644
--- a/mailpoet/tests/integration/API/JSON/v1/SubscribersTest.php
+++ b/mailpoet/tests/integration/API/JSON/v1/SubscribersTest.php
@@ -161,24 +161,24 @@ class SubscribersTest extends \MailPoetTest {
 
   public function testItCanGetASubscriber() {
     $response = $this->endpoint->get(['id' => 'not_an_id']);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
-    expect($response->errors[0]['message'])->equals(
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->errors[0]['message'])->equals(
       'This subscriber does not exist.'
     );
 
     $response = $this->endpoint->get(/* missing argument */);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
-    expect($response->errors[0]['message'])->equals(
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->errors[0]['message'])->equals(
       'This subscriber does not exist.'
     );
 
     $response = $this->endpoint->get(['id' => $this->subscriber1->getId()]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data['id'])->equals($this->subscriber1->getId());
-    expect($response->data['first_name'])->equals($this->subscriber1->getFirstName());
-    expect($response->data['email'])->equals($this->subscriber1->getEmail());
-    expect($response->data['unsubscribes'])->equals([]);
-    expect($response->data['subscriptions'])->equals([]);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data['id'])->equals($this->subscriber1->getId());
+    verify($response->data['first_name'])->equals($this->subscriber1->getFirstName());
+    verify($response->data['email'])->equals($this->subscriber1->getEmail());
+    verify($response->data['unsubscribes'])->equals([]);
+    verify($response->data['subscriptions'])->equals([]);
   }
 
   public function testItCanSaveANewSubscriber() {
@@ -193,27 +193,27 @@ class SubscribersTest extends \MailPoetTest {
     ];
 
     $response = $this->endpoint->save($validData);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $this->assertInstanceOf(SuccessResponse::class, $response);
     $this->entityManager->clear();
     $subscriberRepository = $this->diContainer->get(SubscribersRepository::class);
     $subscriber = $subscriberRepository->findOneBy(['email' => 'raul.doe@mailpoet.com']);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($response->data['email'])->equals('raul.doe@mailpoet.com');
-    expect($response->data['id'])->equals($subscriber->getId());
-    expect($response->data['status'])->equals($subscriber->getStatus());
+    verify($response->data['email'])->equals('raul.doe@mailpoet.com');
+    verify($response->data['id'])->equals($subscriber->getId());
+    verify($response->data['status'])->equals($subscriber->getStatus());
 
     $subscriberSegments = $subscriber->getSegments();
-    expect($subscriberSegments->count())->equals(2);
-    expect($subscriberSegments->get(0)->getName())->equals($this->segment1->getName());
-    expect($subscriberSegments->get(1)->getName())->equals($this->segment2->getName());
+    verify($subscriberSegments->count())->equals(2);
+    verify($subscriberSegments->get(0)->getName())->equals($this->segment1->getName());
+    verify($subscriberSegments->get(1)->getName())->equals($this->segment2->getName());
 
     $this->entityManager->clear();
     $response = $this->endpoint->save(/* missing data */);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
     $this->assertInstanceOf(ErrorResponse::class, $response);
 
-    expect($response->errors[0]['message'])
+    verify($response->errors[0]['message'])
       ->equals('Please enter your email address');
 
     $invalidData = [
@@ -222,11 +222,11 @@ class SubscribersTest extends \MailPoetTest {
 
     $this->entityManager->clear();
     $response = $this->endpoint->save($invalidData);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
     $this->assertInstanceOf(ErrorResponse::class, $response);
-    expect($response->errors[0]['message'])
+    verify($response->errors[0]['message'])
       ->equals('Your email address is invalid!');
-    expect($subscriber->getSource())->equals('administrator');
+    verify($subscriber->getSource())->equals('administrator');
   }
 
   public function testItCanSaveANewSubscriberWithCustomField() {
@@ -245,15 +245,15 @@ class SubscribersTest extends \MailPoetTest {
 
     $response = $this->endpoint->save($validData);
     $this->assertInstanceOf(SuccessResponse::class, $response);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $this->entityManager->clear();
     $subscriberRepository = $this->diContainer->get(SubscribersRepository::class);
     $subscriber = $subscriberRepository->findOneBy(['email' => 'raul.doe@mailpoet.com']);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($response->data['email'])->equals('raul.doe@mailpoet.com');
-    expect($response->data['id'])->equals($subscriber->getId());
-    expect($response->data['status'])->equals($subscriber->getStatus());
-    expect($response->data["cf_{$customField->getId()}"])->equals('testing');
+    verify($response->data['email'])->equals('raul.doe@mailpoet.com');
+    verify($response->data['id'])->equals($subscriber->getId());
+    verify($response->data['status'])->equals($subscriber->getStatus());
+    verify($response->data["cf_{$customField->getId()}"])->equals('testing');
   }
 
   public function testItCanSaveAnExistingSubscriber() {
@@ -268,12 +268,12 @@ class SubscribersTest extends \MailPoetTest {
 
     $response = $this->endpoint->save($subscriberData);
     $this->assertInstanceOf(SuccessResponse::class, $response);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals(
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data)->equals(
       $this->responseBuilder->build($this->subscriber2)
     );
-    expect($response->data['first_name'])->equals('Super Jane');
-    expect($response->data['source'])->equals('api');
+    verify($response->data['first_name'])->equals('Super Jane');
+    verify($response->data['source'])->equals('api');
   }
 
   public function testItCanUpdateEmailOfAnExistingSubscriber() {
@@ -281,12 +281,12 @@ class SubscribersTest extends \MailPoetTest {
     $subscriberData['email'] = 'newjane@mailpoet.com';
     $response = $this->endpoint->save($subscriberData);
     $this->assertInstanceOf(SuccessResponse::class, $response);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals(
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data)->equals(
       $this->responseBuilder->build($this->subscriber2)
     );
-    expect($response->data['email'])->equals('newjane@mailpoet.com');
-    expect($response->data['first_name'])->equals($subscriberData['first_name']);
+    verify($response->data['email'])->equals('newjane@mailpoet.com');
+    verify($response->data['first_name'])->equals($subscriberData['first_name']);
   }
 
   public function testItCannotUpdateEmailOfAnExistingSubscriberIfEmailIsNotUnique() {
@@ -294,8 +294,8 @@ class SubscribersTest extends \MailPoetTest {
     $subscriberData['email'] = $this->subscriber1->getEmail();
     $response = $this->endpoint->save($subscriberData);
     $this->assertInstanceOf(ErrorResponse::class, $response);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals('A subscriber with E-mail "' . $this->subscriber1->getEmail() . '" already exists.');
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals('A subscriber with E-mail "' . $this->subscriber1->getEmail() . '" already exists.');
   }
 
   public function testItCanRemoveListsFromAnExistingSubscriber() {
@@ -309,11 +309,11 @@ class SubscribersTest extends \MailPoetTest {
 
     $response = $this->endpoint->save($subscriberData);
     $this->assertInstanceOf(SuccessResponse::class, $response);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->data)->equals(
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->data)->equals(
       $this->responseBuilder->build($this->subscriber2)
     );
-    expect($this->subscriber2->getSubscriberSegments()->filter(function (SubscriberSegmentEntity $subscriberSegment) {
+    verify($this->subscriber2->getSubscriberSegments()->filter(function (SubscriberSegmentEntity $subscriberSegment) {
       return $subscriberSegment->getStatus() === SubscriberEntity::STATUS_SUBSCRIBED;
     })->count())->equals(0);
   }
@@ -324,35 +324,35 @@ class SubscribersTest extends \MailPoetTest {
 
     $response = $this->endpoint->restore(['id' => $this->subscriber1->getId()]);
 
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $subscriberRepository = $this->diContainer->get(SubscribersRepository::class);
     $subscriber = $subscriberRepository->findOneById($this->subscriber1->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($response->data['id'])->equals($subscriber->getId());
-    expect($response->data['email'])->equals($subscriber->getEmail());
-    expect($response->data['status'])->equals($subscriber->getStatus());
+    verify($response->data['id'])->equals($subscriber->getId());
+    verify($response->data['email'])->equals($subscriber->getEmail());
+    verify($response->data['status'])->equals($subscriber->getStatus());
     expect($response->data['deleted_at'])->null();
-    expect($response->meta['count'])->equals(1);
+    verify($response->meta['count'])->equals(1);
   }
 
   public function testItCanTrashASubscriber() {
     $response = $this->endpoint->trash(['id' => $this->subscriber2->getId()]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $subscriberRepository = $this->diContainer->get(SubscribersRepository::class);
     $subscriber = $subscriberRepository->findOneById($this->subscriber2->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($response->data['id'])->equals($subscriber->getId());
-    expect($response->data['email'])->equals($subscriber->getEmail());
-    expect($response->data['status'])->equals($subscriber->getStatus());
+    verify($response->data['id'])->equals($subscriber->getId());
+    verify($response->data['email'])->equals($subscriber->getEmail());
+    verify($response->data['status'])->equals($subscriber->getStatus());
     expect($response->data['deleted_at'])->notNull();
-    expect($response->meta['count'])->equals(1);
+    verify($response->meta['count'])->equals(1);
   }
 
   public function testItCanDeleteASubscriber() {
     $response = $this->endpoint->delete(['id' => $this->subscriber1->getId()]);
     expect($response->data)->isEmpty();
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(1);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(1);
   }
 
   public function testItCanFilterListing() {
@@ -364,7 +364,7 @@ class SubscribersTest extends \MailPoetTest {
     ]);
 
     // it should return all subscribers
-    expect($response->meta['count'])->equals(2);
+    verify($response->meta['count'])->equals(2);
 
     // filter by 1st segment
     $response = $this->endpoint->listing([
@@ -373,8 +373,8 @@ class SubscribersTest extends \MailPoetTest {
       ],
     ]);
 
-    expect($response->meta['count'])->equals(1);
-    expect($response->data[0]['email'])->equals($this->subscriber2->getEmail());
+    verify($response->meta['count'])->equals(1);
+    verify($response->data[0]['email'])->equals($this->subscriber2->getEmail());
 
     // filter by 2nd segment
     $response = $this->endpoint->listing([
@@ -383,8 +383,8 @@ class SubscribersTest extends \MailPoetTest {
       ],
     ]);
 
-    expect($response->meta['count'])->equals(1);
-    expect($response->data[0]['email'])->equals($this->subscriber2->getEmail());
+    verify($response->meta['count'])->equals(1);
+    verify($response->data[0]['email'])->equals($this->subscriber2->getEmail());
   }
 
   public function testItCanLoadDynamicSegments() {
@@ -419,57 +419,57 @@ class SubscribersTest extends \MailPoetTest {
     $response = $this->endpoint->listing([
       'search' => '',
     ]);
-    expect($response->meta['count'])->equals(3);
+    verify($response->meta['count'])->equals(3);
 
     // search by email
     $response = $this->endpoint->listing([
       'search' => '.me',
     ]);
-    expect($response->meta['count'])->equals(1);
-    expect($response->data[0]['email'])->equals($newSubscriber->getEmail());
+    verify($response->meta['count'])->equals(1);
+    verify($response->data[0]['email'])->equals($newSubscriber->getEmail());
 
     // search by last name
     $response = $this->endpoint->listing([
       'search' => 'doe',
     ]);
-    expect($response->meta['count'])->equals(2);
-    expect($response->data[0]['email'])->equals($this->subscriber1->getEmail());
-    expect($response->data[1]['email'])->equals($this->subscriber2->getEmail());
+    verify($response->meta['count'])->equals(2);
+    verify($response->data[0]['email'])->equals($this->subscriber1->getEmail());
+    verify($response->data[1]['email'])->equals($this->subscriber2->getEmail());
 
     // search by first name
     $response = $this->endpoint->listing([
       'search' => 'billy',
     ]);
-    expect($response->meta['count'])->equals(1);
-    expect($response->data[0]['email'])->equals($newSubscriber->getEmail());
+    verify($response->meta['count'])->equals(1);
+    verify($response->data[0]['email'])->equals($newSubscriber->getEmail());
   }
 
   public function testItCanGroupListing() {
     $subscribedGroup = $this->endpoint->listing([
       'group' => SubscriberEntity::STATUS_SUBSCRIBED,
     ]);
-    expect($subscribedGroup->meta['count'])->equals(1);
-    expect($subscribedGroup->data[0]['email'])->equals(
+    verify($subscribedGroup->meta['count'])->equals(1);
+    verify($subscribedGroup->data[0]['email'])->equals(
       $this->subscriber2->getEmail()
     );
 
     $unsubscribedGroup = $this->endpoint->listing([
       'group' => SubscriberEntity::STATUS_UNSUBSCRIBED,
     ]);
-    expect($unsubscribedGroup->meta['count'])->equals(0);
+    verify($unsubscribedGroup->meta['count'])->equals(0);
 
     $unconfirmedGroup = $this->endpoint->listing([
       'group' => SubscriberEntity::STATUS_UNCONFIRMED,
     ]);
-    expect($unconfirmedGroup->meta['count'])->equals(1);
-    expect($unconfirmedGroup->data[0]['email'])->equals(
+    verify($unconfirmedGroup->meta['count'])->equals(1);
+    verify($unconfirmedGroup->data[0]['email'])->equals(
       $this->subscriber1->getEmail()
     );
 
     $trashedGroup = $this->endpoint->listing([
       'group' => 'trash',
     ]);
-    expect($trashedGroup->meta['count'])->equals(0);
+    verify($trashedGroup->meta['count'])->equals(0);
 
     // trash 1st subscriber
     $this->subscriber1->setDeletedAt(new \DateTime());
@@ -478,8 +478,8 @@ class SubscribersTest extends \MailPoetTest {
     $trashedGroup = $this->endpoint->listing([
       'group' => 'trash',
     ]);
-    expect($trashedGroup->meta['count'])->equals(1);
-    expect($trashedGroup->data[0]['email'])->equals(
+    verify($trashedGroup->meta['count'])->equals(1);
+    verify($trashedGroup->data[0]['email'])->equals(
       $this->subscriber1->getEmail()
     );
   }
@@ -504,7 +504,7 @@ class SubscribersTest extends \MailPoetTest {
       ],
     ]);
 
-    expect($response->data[0]['status'])->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
+    verify($response->data[0]['status'])->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
   }
 
   public function testItCanSortAndLimitListing() {
@@ -515,9 +515,9 @@ class SubscribersTest extends \MailPoetTest {
       'sort_order' => 'asc',
     ]);
 
-    expect($response->meta['count'])->equals(2);
+    verify($response->meta['count'])->equals(2);
     expect($response->data)->count(1);
-    expect($response->data[0]['email'])->equals(
+    verify($response->data[0]['email'])->equals(
       $this->subscriber2->getEmail()
     );
 
@@ -529,9 +529,9 @@ class SubscribersTest extends \MailPoetTest {
       'sort_order' => 'asc',
     ]);
 
-    expect($response->meta['count'])->equals(2);
+    verify($response->meta['count'])->equals(2);
     expect($response->data)->count(1);
-    expect($response->data[0]['email'])->equals(
+    verify($response->data[0]['email'])->equals(
       $this->subscriber1->getEmail()
     );
   }
@@ -603,9 +603,9 @@ class SubscribersTest extends \MailPoetTest {
       ],
       'action' => 'delete',
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     expect($response->data)->isEmpty();
-    expect($response->meta['count'])->equals(count($selectionIds));
+    verify($response->meta['count'])->equals(count($selectionIds));
 
     $this->entityManager->clear();
 
@@ -625,22 +625,22 @@ class SubscribersTest extends \MailPoetTest {
       'action' => 'trash',
       'listing' => ['group' => 'all'],
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(2);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(2);
 
     $response = $this->endpoint->bulkAction([
       'action' => 'delete',
       'listing' => ['group' => 'trash'],
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(2);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(2);
 
     $response = $this->endpoint->bulkAction([
       'action' => 'delete',
       'listing' => ['group' => 'trash'],
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(0);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(0);
   }
 
   public function testItCannotRunAnInvalidBulkAction() {
@@ -650,7 +650,7 @@ class SubscribersTest extends \MailPoetTest {
         'listing' => [],
       ]);
     } catch (UnexpectedValueException $exception) {
-      expect($exception->getHttpStatusCode())->equals(APIResponse::STATUS_BAD_REQUEST);
+      verify($exception->getHttpStatusCode())->equals(APIResponse::STATUS_BAD_REQUEST);
       expect($exception->getErrors()[Error::BAD_REQUEST])->stringContainsString('Invalid bulk action');
     }
   }
@@ -662,8 +662,8 @@ class SubscribersTest extends \MailPoetTest {
       // no form ID specified
     ]);
 
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals('Please leave the first field empty.');
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals('Please leave the first field empty.');
   }
 
   public function testItCannotSubscribeWithoutFormID() {
@@ -672,8 +672,8 @@ class SubscribersTest extends \MailPoetTest {
       // no form ID specified
     ]);
 
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals('Please specify a valid form ID.');
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals('Please specify a valid form ID.');
   }
 
   public function testItCannotSubscribeWithoutSegmentsIfTheyAreSelectedByUser() {
@@ -683,8 +683,8 @@ class SubscribersTest extends \MailPoetTest {
       // no segments specified
     ]);
 
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals('Please select a list.');
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals('Please select a list.');
   }
 
   public function testItCanSubscribe() {
@@ -694,7 +694,7 @@ class SubscribersTest extends \MailPoetTest {
       $this->obfuscatedSegments => [$this->segment1->getId(), $this->segment2->getId()],
     ]);
 
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
   }
 
   public function testItCanSubscribeToSelectedSegment() {
@@ -704,13 +704,13 @@ class SubscribersTest extends \MailPoetTest {
       $this->obfuscatedSegments => [$this->segment2->getId()],
     ]);
 
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $subscriberRepository = $this->diContainer->get(SubscribersRepository::class);
     $subscriber = $subscriberRepository->findOneBy(['email' => 'toto@mailpoet.com']);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
     $segments = $subscriber->getSegments();
-    expect($segments->count())->equals(1);
-    expect($segments->get(0)->getId())->equals($this->segment2->getId());
+    verify($segments->count())->equals(1);
+    verify($segments->get(0)->getId())->equals($this->segment2->getId());
   }
 
   public function testItCannotSubscribeWithoutReCaptchaWhenEnabled() {
@@ -720,8 +720,8 @@ class SubscribersTest extends \MailPoetTest {
       'form_id' => $this->form->getId(),
       $this->obfuscatedSegments => [$this->segment1->getId(), $this->segment2->getId()],
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals('Please check the CAPTCHA.');
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals('Please check the CAPTCHA.');
     $this->settings->set('captcha', []);
   }
 
@@ -732,8 +732,8 @@ class SubscribersTest extends \MailPoetTest {
       'form_id' => $this->form->getId(),
       $this->obfuscatedSegments => [$this->segment1->getId(), $this->segment2->getId()],
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals('Please check the CAPTCHA.');
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals('Please check the CAPTCHA.');
     $this->settings->set('captcha', []);
   }
 
@@ -749,8 +749,8 @@ class SubscribersTest extends \MailPoetTest {
       'form_id' => $this->form->getId(),
       $this->obfuscatedSegments => [$this->segment1->getId(), $this->segment2->getId()],
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals('Please fill in the CAPTCHA.');
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals('Please fill in the CAPTCHA.');
     $this->settings->set('captcha', []);
   }
 
@@ -772,7 +772,7 @@ class SubscribersTest extends \MailPoetTest {
       $this->obfuscatedSegments => [$this->segment1->getId(), $this->segment2->getId()],
       'captcha' => $captchaValue['phrase'],
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $this->settings->set('captcha', []);
   }
 
@@ -796,7 +796,7 @@ class SubscribersTest extends \MailPoetTest {
       'form_id' => $form->getId(),
       $this->obfuscatedSegments => [$this->segment1->getId(), $this->segment2->getId()],
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
   }
 
   public function testItCanSubscribeWithoutSegmentsIfTheyAreSelectedByAdmin() {
@@ -812,14 +812,14 @@ class SubscribersTest extends \MailPoetTest {
       // no segments specified
     ]);
 
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
     $subscriberRepository = $this->diContainer->get(SubscribersRepository::class);
     $subscriber = $subscriberRepository->findOneBy(['email' => 'toto@mailpoet.com']);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
     $segments = $subscriber->getSegments();
-    expect($segments->count())->equals(2);
-    expect($segments->get(0)->getId())->equals($settings['segments'][0]);
-    expect($segments->get(1)->getId())->equals($settings['segments'][1]);
+    verify($segments->count())->equals(2);
+    verify($segments->get(0)->getId())->equals($settings['segments'][0]);
+    verify($segments->get(1)->getId())->equals($settings['segments'][1]);
   }
 
   public function testItCannotSubscribeIfFormHasNoSegmentsDefined() {
@@ -836,8 +836,8 @@ class SubscribersTest extends \MailPoetTest {
       $this->obfuscatedSegments => [$this->segment1->getId(), $this->segment2->getId()],
     ]);
 
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals('Please select a list.');
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals('Please select a list.');
   }
 
   public function testItCannotMassSubscribe() {
@@ -855,8 +855,8 @@ class SubscribersTest extends \MailPoetTest {
       $this->obfuscatedSegments => [$this->segment1->getId(), $this->segment2->getId()],
     ]);
 
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals('You need to wait 1 minutes before subscribing again.');
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals('You need to wait 1 minutes before subscribing again.');
   }
 
   public function testItCannotMassResubscribe() {
@@ -882,8 +882,8 @@ class SubscribersTest extends \MailPoetTest {
       $this->obfuscatedSegments => [$this->segment1->getId(), $this->segment2->getId()],
     ]);
 
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals('You need to wait 1 minutes before subscribing again.');
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals('You need to wait 1 minutes before subscribing again.');
   }
 
   public function testThirdPartiesCanInterruptSubscriptionProcess() {
@@ -906,8 +906,8 @@ class SubscribersTest extends \MailPoetTest {
     $didSubscribe = $this->subscribersRepository->findOneBy(['email' => 'toto@mailpoet.com']);
     expect($didSubscribe)->null();
     expect($response)->isInstanceOf(ErrorResponse::class);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals($expectedErrorMessage);
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals($expectedErrorMessage);
   }
 
   public function testItSchedulesWelcomeEmailNotificationWhenSubscriberIsAdded() {
@@ -972,23 +972,23 @@ class SubscribersTest extends \MailPoetTest {
 
   public function testItSendsConfirmationEmail() {
     $response = $this->endpoint->sendConfirmationEmail(['id' => 'non_existent']);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
 
     $response = $this->endpoint->sendConfirmationEmail(['id' => $this->subscriber1->getId()]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
 
     wp_set_current_user(0);
     $this->subscriber1->setConfirmationsCount(ConfirmationEmailMailer::MAX_CONFIRMATION_EMAILS);
     $this->entityManager->flush();
     $response = $this->endpoint->sendConfirmationEmail(['id' => $this->subscriber1->getId()]);
-    expect($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
+    verify($response->status)->equals(APIResponse::STATUS_NOT_FOUND);
   }
 
   public function testItDisplaysProperErrorMessageWhenConfirmationEmailsAreDisabled() {
     $this->settings->set('signup_confirmation.enabled', false);
     $response = $this->endpoint->sendConfirmationEmail(['id' => $this->subscriber1->getId()]);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
-    expect($response->errors[0]['message'])->equals('Sign-up confirmation is disabled in your <a href="admin.php?page=mailpoet-settings#/signup">MailPoet settings</a>. Please enable it to resend confirmation emails or update your subscriber’s status manually.');
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['message'])->equals('Sign-up confirmation is disabled in your <a href="admin.php?page=mailpoet-settings#/signup">MailPoet settings</a>. Please enable it to resend confirmation emails or update your subscriber’s status manually.');
   }
 
   public function testItKeepsSpecialSegmentsUnchangedAfterSaving() {
@@ -1015,8 +1015,8 @@ class SubscribersTest extends \MailPoetTest {
     $this->endpoint->save($subscriberData);
 
     $segments = $subscriber->getSegments();
-    expect($segments->get(0)->getId())->equals($this->segment1->getId());
-    expect($segments->get(1)->getId())->equals($wcSegment->getId());
+    verify($segments->get(0)->getId())->equals($this->segment1->getId());
+    verify($segments->get(1)->getId())->equals($wcSegment->getId());
   }
 
   public function testItCanBulkAddTagToSubscribers(): void {
@@ -1041,15 +1041,15 @@ class SubscribersTest extends \MailPoetTest {
     $subscriberTag1 = $subscriberTagRepository->findOneBy(['subscriber' => $this->subscriber1, 'tag' => $tag]);
     $subscriberTag2 = $subscriberTagRepository->findOneBy(['subscriber' => $this->subscriber2, 'tag' => $tag]);
 
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(2);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(2);
     expect($subscriberTag1)->isInstanceOf(SubscriberTagEntity::class);
     expect($subscriberTag2)->isInstanceOf(SubscriberTagEntity::class);
 
     // Testing that adding the same tag again does not return an error
     $response = $this->endpoint->bulkAction($bulkActionData);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(0);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(0);
   }
 
   public function testItCanBulkRemoveTagFromSubscribers(): void {
@@ -1081,15 +1081,15 @@ class SubscribersTest extends \MailPoetTest {
     $subscriberTag1 = $subscriberTagRepository->findOneBy(['subscriber' => $subscriber1, 'tag' => $tag]);
     $subscriberTag2 = $subscriberTagRepository->findOneBy(['subscriber' => $subscriber2, 'tag' => $tag]);
 
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(2);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(2);
     expect($subscriberTag1)->null();
     expect($subscriberTag2)->null();
 
     // Testing that removing the same tag again does not return an error
     $response = $this->endpoint->bulkAction($bulkActionData);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($response->meta['count'])->equals(0);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->meta['count'])->equals(0);
   }
 
   private function _createWelcomeNewsletter(): void {
diff --git a/mailpoet/tests/integration/API/JSON/v1/UserFlagsTest.php b/mailpoet/tests/integration/API/JSON/v1/UserFlagsTest.php
index e96f65dc2a..37b2399e7f 100644
--- a/mailpoet/tests/integration/API/JSON/v1/UserFlagsTest.php
+++ b/mailpoet/tests/integration/API/JSON/v1/UserFlagsTest.php
@@ -36,18 +36,18 @@ class UserFlagsTest extends \MailPoetTest {
     ];
 
     $response = $this->endpoint->set(/* missing data */);
-    expect($response->errors[0]['error'])->equals(APIError::BAD_REQUEST);
-    expect($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
+    verify($response->errors[0]['error'])->equals(APIError::BAD_REQUEST);
+    verify($response->status)->equals(APIResponse::STATUS_BAD_REQUEST);
 
-    expect($this->userFlags->getAll())->equals([
+    verify($this->userFlags->getAll())->equals([
       'flag_1' => 'value_1',
       'flag_2' => 'default_value_2',
     ]);
 
     $response = $this->endpoint->set($newFlags);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
 
-    expect($this->userFlags->getAll())->equals([
+    verify($this->userFlags->getAll())->equals([
       'flag_1' => 'new_value_1',
       'flag_2' => 'default_value_2',
       'flag_3' => 'new_value_3',
diff --git a/mailpoet/tests/integration/API/JSON/v1/WoocommerceSettingsTest.php b/mailpoet/tests/integration/API/JSON/v1/WoocommerceSettingsTest.php
index 47e76c3e00..896032f734 100644
--- a/mailpoet/tests/integration/API/JSON/v1/WoocommerceSettingsTest.php
+++ b/mailpoet/tests/integration/API/JSON/v1/WoocommerceSettingsTest.php
@@ -24,15 +24,15 @@ class WoocommerceSettingsTest extends \MailPoetTest {
     $response = $this->endpoint->set([
       'woocommerce_email_base_color' => '#aaaaaa',
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($this->wp->getOption('woocommerce_email_base_color'))->equals('#aaaaaa');
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($this->wp->getOption('woocommerce_email_base_color'))->equals('#aaaaaa');
   }
 
   public function testItDoesNotSetUnallowedSettings() {
     $response = $this->endpoint->set([
       'mailpoet_some_none_exting_option' => 'some value',
     ]);
-    expect($response->status)->equals(APIResponse::STATUS_OK);
-    expect($this->wp->getOption('mailpoet_some_none_exting_option', null))->equals(null);
+    verify($response->status)->equals(APIResponse::STATUS_OK);
+    verify($this->wp->getOption('mailpoet_some_none_exting_option', null))->equals(null);
   }
 }
diff --git a/mailpoet/tests/integration/API/MP/APITest.php b/mailpoet/tests/integration/API/MP/APITest.php
index 1251729b6d..40bc02e98c 100644
--- a/mailpoet/tests/integration/API/MP/APITest.php
+++ b/mailpoet/tests/integration/API/MP/APITest.php
@@ -28,7 +28,7 @@ class APITest extends \MailPoetTest {
         return func_get_args();
       },
     ]);
-    expect($API->subscribeToList(1, 2))->equals(
+    verify($API->subscribeToList(1, 2))->equals(
       [
         1,
         [
@@ -47,7 +47,7 @@ class APITest extends \MailPoetTest {
         return func_get_args();
       },
     ]);
-    expect($API->unsubscribeFromList(1, 2))
+    verify($API->unsubscribeFromList(1, 2))
       ->equals([
         1,
         [
diff --git a/mailpoet/tests/integration/API/MP/SegmentsTest.php b/mailpoet/tests/integration/API/MP/SegmentsTest.php
index 07a216743b..8e6f328f4e 100644
--- a/mailpoet/tests/integration/API/MP/SegmentsTest.php
+++ b/mailpoet/tests/integration/API/MP/SegmentsTest.php
@@ -64,7 +64,7 @@ class SegmentsTest extends \MailPoetTest {
       $this->getApi()->addList([]);
       $this->fail('List name required exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('List name is required.');
+      verify($e->getMessage())->equals('List name is required.');
     }
   }
 
@@ -75,9 +75,9 @@ class SegmentsTest extends \MailPoetTest {
       'type' => 'ignore this field',
     ]);
     expect($result['id'])->greaterThan(0);
-    expect($result['name'])->equals('Test segment123');
-    expect($result['description'])->equals('Description');
-    expect($result['type'])->equals('default');
+    verify($result['name'])->equals('Test segment123');
+    verify($result['description'])->equals('Description');
+    verify($result['type'])->equals('default');
   }
 
   public function testItDoesNotAddExistingList() {
@@ -87,7 +87,7 @@ class SegmentsTest extends \MailPoetTest {
       $this->getApi()->addList(['name' => $segment->getName()]);
       $this->fail('List exists exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('This list already exists.');
+      verify($e->getMessage())->equals('This list already exists.');
     }
   }
 
@@ -98,7 +98,7 @@ class SegmentsTest extends \MailPoetTest {
 
     $result = $this->getApi()->addList($segment);
     expect($result['id'])->greaterThan(0);
-    expect($result['name'])->equals($segment['name']);
+    verify($result['name'])->equals($segment['name']);
   }
 
   public function testItRequiresIdToUpdateList(): void {
@@ -106,8 +106,8 @@ class SegmentsTest extends \MailPoetTest {
       $this->getApi()->updateList([]);
       $this->fail('List id required exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('List id is required.');
-      expect($e->getCode())->equals(APIException::LIST_ID_REQUIRED);
+      verify($e->getMessage())->equals('List id is required.');
+      verify($e->getCode())->equals(APIException::LIST_ID_REQUIRED);
     }
   }
 
@@ -116,8 +116,8 @@ class SegmentsTest extends \MailPoetTest {
       $this->getApi()->updateList(['id' => 2]);
       $this->fail('List id must be valid exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('The list does not exist.');
-      expect($e->getCode())->equals(APIException::LIST_NOT_EXISTS);
+      verify($e->getMessage())->equals('The list does not exist.');
+      verify($e->getCode())->equals(APIException::LIST_NOT_EXISTS);
     }
   }
 
@@ -127,7 +127,7 @@ class SegmentsTest extends \MailPoetTest {
       $this->getApi()->updateList(['id' => $segment->getId()]);
       $this->fail('List name required exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('List name is required.');
+      verify($e->getMessage())->equals('List name is required.');
     }
   }
 
@@ -142,7 +142,7 @@ class SegmentsTest extends \MailPoetTest {
       ]);
       $this->fail('List name is already used exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('This list already exists.');
+      verify($e->getMessage())->equals('This list already exists.');
     }
   }
 
@@ -159,9 +159,9 @@ class SegmentsTest extends \MailPoetTest {
       'description' => 'updated description',
     ];
     $result = $this->getApi()->updateList($data);
-    expect($result['id'])->equals($data['id']);
-    expect($result['name'])->equals($data['name']);
-    expect($result['description'])->equals($data['description']);
+    verify($result['id'])->equals($data['id']);
+    verify($result['name'])->equals($data['name']);
+    verify($result['description'])->equals($data['description']);
   }
 
   public function testItDoesNotAllowUpdateWPSegment(): void {
@@ -171,8 +171,8 @@ class SegmentsTest extends \MailPoetTest {
       $this->getApi()->updateList(['id' => $wpSegment->getId(), 'name' => 'Test']);
       $this->fail('WP list cannot be updated.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('List of the type \'' . $wpSegment->getType() . '\' is not supported for this action.');
-      expect($e->getCode())->equals(APIException::LIST_TYPE_IS_NOT_SUPPORTED);
+      verify($e->getMessage())->equals('List of the type \'' . $wpSegment->getType() . '\' is not supported for this action.');
+      verify($e->getCode())->equals(APIException::LIST_TYPE_IS_NOT_SUPPORTED);
     }
   }
 
@@ -181,8 +181,8 @@ class SegmentsTest extends \MailPoetTest {
       $this->getApi()->deleteList('');
       $this->fail('List id required exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('List id is required.');
-      expect($e->getCode())->equals(APIException::LIST_ID_REQUIRED);
+      verify($e->getMessage())->equals('List id is required.');
+      verify($e->getCode())->equals(APIException::LIST_ID_REQUIRED);
     }
   }
 
@@ -191,8 +191,8 @@ class SegmentsTest extends \MailPoetTest {
       $this->getApi()->updateList(['id' => 2]);
       $this->fail('List id must be valid exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('The list does not exist.');
-      expect($e->getCode())->equals(APIException::LIST_NOT_EXISTS);
+      verify($e->getMessage())->equals('The list does not exist.');
+      verify($e->getCode())->equals(APIException::LIST_NOT_EXISTS);
     }
   }
 
@@ -205,8 +205,8 @@ class SegmentsTest extends \MailPoetTest {
       $this->getApi()->deleteList((string)$segment->getId());
       $this->fail('List id cannot not have relation on a form exception should be thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals("List cannot be deleted because it’s used for '" . $form->getName() . "' form");
-      expect($e->getCode())->equals(APIException::LIST_USED_IN_FORM);
+      verify($e->getMessage())->equals("List cannot be deleted because it’s used for '" . $form->getName() . "' form");
+      verify($e->getCode())->equals(APIException::LIST_USED_IN_FORM);
     }
   }
 
@@ -220,8 +220,8 @@ class SegmentsTest extends \MailPoetTest {
       $this->getApi()->deleteList((string)$segment->getId());
       $this->fail('List id cannot not have relation on an email exception should be thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals("List cannot be deleted because it’s used for '" . $newsletter->getSubject() . "' email");
-      expect($e->getCode())->equals(APIException::LIST_USED_IN_EMAIL);
+      verify($e->getMessage())->equals("List cannot be deleted because it’s used for '" . $newsletter->getSubject() . "' email");
+      verify($e->getCode())->equals(APIException::LIST_USED_IN_EMAIL);
     }
   }
 
@@ -232,8 +232,8 @@ class SegmentsTest extends \MailPoetTest {
       $this->getApi()->deleteList((string)$wpSegment->getId());
       $this->fail('WP list cannot be updated.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('List of the type \'' . $wpSegment->getType() . '\' is not supported for this action.');
-      expect($e->getCode())->equals(APIException::LIST_TYPE_IS_NOT_SUPPORTED);
+      verify($e->getMessage())->equals('List of the type \'' . $wpSegment->getType() . '\' is not supported for this action.');
+      verify($e->getCode())->equals(APIException::LIST_TYPE_IS_NOT_SUPPORTED);
     }
   }
 
@@ -245,7 +245,7 @@ class SegmentsTest extends \MailPoetTest {
     $segmentId = (string)$segment->getId();
 
     $result = $this->getApi()->deleteList($segmentId);
-    expect($result)->equals(true);
+    verify($result)->equals(true);
     $this->entityManager->clear();
     expect($this->segmentsRepository->findOneById($segmentId))->null();
     expect($this->subscriberSegmentsRepository->findBy(['segment' => $segmentId]))->count(0);
diff --git a/mailpoet/tests/integration/API/MP/SubscribersTest.php b/mailpoet/tests/integration/API/MP/SubscribersTest.php
index da873e9f17..311c3a1c1d 100644
--- a/mailpoet/tests/integration/API/MP/SubscribersTest.php
+++ b/mailpoet/tests/integration/API/MP/SubscribersTest.php
@@ -87,7 +87,7 @@ class SubscribersTest extends \MailPoetTest {
       $this->getApi()->subscribeToLists(false, [1,2,3]);
       $this->fail('Subscriber does not exist exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('A subscriber is required.');
+      verify($e->getMessage())->equals('A subscriber is required.');
     }
   }
 
@@ -98,14 +98,14 @@ class SubscribersTest extends \MailPoetTest {
       $this->getApi()->subscribeToLists($subscriber->getId(), [1,2,3]);
       $this->fail('Missing segments exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('These lists do not exist.');
+      verify($e->getMessage())->equals('These lists do not exist.');
     }
     // single list error message
     try {
       $this->getApi()->subscribeToLists($subscriber->getId(), [1]);
       $this->fail('Missing segments exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('This list does not exist.');
+      verify($e->getMessage())->equals('This list does not exist.');
     }
   }
 
@@ -117,7 +117,7 @@ class SubscribersTest extends \MailPoetTest {
       $this->getApi()->subscribeToLists($subscriber->getId(), [$segment->getId()]);
       $this->fail('WP Users segment exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals("Can't subscribe to a WordPress Users list with ID {$segment->getId()}.");
+      verify($e->getMessage())->equals("Can't subscribe to a WordPress Users list with ID {$segment->getId()}.");
     }
   }
 
@@ -129,7 +129,7 @@ class SubscribersTest extends \MailPoetTest {
       $this->getApi()->subscribeToLists($subscriber->getId(), [$segment->getId()]);
       $this->fail('WooCommerce Customers segment exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals("Can't subscribe to a WooCommerce Customers list with ID {$segment->getId()}.");
+      verify($e->getMessage())->equals("Can't subscribe to a WooCommerce Customers list with ID {$segment->getId()}.");
     }
   }
 
@@ -142,14 +142,14 @@ class SubscribersTest extends \MailPoetTest {
       $this->getApi()->subscribeToLists($subscriber->getId(), [$segment->getId(), 90, 100]);
       $this->fail('Missing segments with IDs exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('Lists with IDs 90, 100 do not exist.');
+      verify($e->getMessage())->equals('Lists with IDs 90, 100 do not exist.');
     }
     // single list error message
     try {
       $this->getApi()->subscribeToLists($subscriber->getId(), [$segment->getId(), 90]);
       $this->fail('Missing segments with IDs exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('List with ID 90 does not exist.');
+      verify($e->getMessage())->equals('List with ID 90 does not exist.');
     }
   }
 
@@ -162,12 +162,12 @@ class SubscribersTest extends \MailPoetTest {
       $this->getApi()->subscribeToLists($subscriber->getId(), []);
       $this->fail('Segments are required exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('At least one segment ID is required.');
+      verify($e->getMessage())->equals('At least one segment ID is required.');
     }
 
     $result = $this->getApi()->subscribeToLists($subscriber->getId(), [$segment->getId()]);
-    expect($result['id'])->equals($subscriber->getId());
-    expect($result['subscriptions'][0]['segment_id'])->equals($segment->getId());
+    verify($result['id'])->equals($subscriber->getId());
+    verify($result['subscriptions'][0]['segment_id'])->equals($segment->getId());
   }
 
   public function testItSendsConfirmationEmailToASubscriberWhenBeingAddedToList() {
@@ -196,10 +196,10 @@ class SubscribersTest extends \MailPoetTest {
     $API = $this->getApi($subscribers);
 
     $API->subscribeToLists($subscriber->getEmail(), $segments, ['send_confirmation_email' => false, 'skip_subscriber_notification' => true]);
-    expect($sent)->equals(false);
+    verify($sent)->equals(false);
     // should send
     $API->subscribeToLists($subscriber->getEmail(), $segments, ['skip_subscriber_notification' => true]);
-    expect($sent)->equals(true);
+    verify($sent)->equals(true);
   }
 
   public function testItSendsNotificationEmailWhenBeingAddedToList() {
@@ -230,9 +230,9 @@ class SubscribersTest extends \MailPoetTest {
     $segment = $this->getSegment();
 
     $result = $this->getApi()->subscribeToList($subscriber->getEmail(), $segment->getId());
-    expect($result['id'])->equals($subscriber->getId());
+    verify($result['id'])->equals($subscriber->getId());
     expect($result['subscriptions'])->notEmpty();
-    expect($result['subscriptions'][0]['segment_id'])->equals($segment->getId());
+    verify($result['subscriptions'][0]['segment_id'])->equals($segment->getId());
   }
 
   public function testItSchedulesWelcomeNotificationByDefaultAfterSubscriberSubscriberToLists() {
@@ -288,7 +288,7 @@ class SubscribersTest extends \MailPoetTest {
       $this->getApi()->unsubscribe(false);
       $this->fail('Subscriber does not exist exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('A subscriber is required.');
+      verify($e->getMessage())->equals('A subscriber is required.');
     }
   }
 
@@ -297,7 +297,7 @@ class SubscribersTest extends \MailPoetTest {
       $this->getApi()->unsubscribe('asdf');
       $this->fail('Subscriber does not exist exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('This subscriber does not exist.');
+      verify($e->getMessage())->equals('This subscriber does not exist.');
     }
   }
 
@@ -310,7 +310,7 @@ class SubscribersTest extends \MailPoetTest {
       $this->getApi()->unsubscribe($subscriber->getId());
       $this->fail('Subscriber already unsubscribed exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('This subscriber is already unsubscribed.');
+      verify($e->getMessage())->equals('This subscriber is already unsubscribed.');
     }
   }
 
@@ -357,7 +357,7 @@ class SubscribersTest extends \MailPoetTest {
       $this->getApi()->unsubscribeFromLists(false, [1,2,3]);
       $this->fail('Subscriber does not exist exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('A subscriber is required.');
+      verify($e->getMessage())->equals('A subscriber is required.');
     }
   }
 
@@ -366,7 +366,7 @@ class SubscribersTest extends \MailPoetTest {
       $this->getApi()->unsubscribeFromLists('asdf', [1,2,3]);
       $this->fail('Subscriber does not exist exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('This subscriber does not exist.');
+      verify($e->getMessage())->equals('This subscriber does not exist.');
     }
   }
 
@@ -377,14 +377,14 @@ class SubscribersTest extends \MailPoetTest {
       $this->getApi()->unsubscribeFromLists($subscriber->getId(), [1,2,3]);
       $this->fail('Missing segments exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('These lists do not exist.');
+      verify($e->getMessage())->equals('These lists do not exist.');
     }
     // single list error message
     try {
       $this->getApi()->unsubscribeFromLists($subscriber->getId(), [1]);
       $this->fail('Missing segments exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('This list does not exist.');
+      verify($e->getMessage())->equals('This list does not exist.');
     }
   }
 
@@ -396,14 +396,14 @@ class SubscribersTest extends \MailPoetTest {
       $this->getApi()->unsubscribeFromLists($subscriber->getId(), [$segment->getId(), 90, 100]);
       $this->fail('Missing segments with IDs exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('Lists with IDs 90, 100 do not exist.');
+      verify($e->getMessage())->equals('Lists with IDs 90, 100 do not exist.');
     }
     // single list error message
     try {
       $this->getApi()->unsubscribeFromLists($subscriber->getId(), [$segment->getId(), 90]);
       $this->fail('Missing segments with IDs exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('List with ID 90 does not exist.');
+      verify($e->getMessage())->equals('List with ID 90 does not exist.');
     }
   }
 
@@ -414,7 +414,7 @@ class SubscribersTest extends \MailPoetTest {
       $this->getApi()->unsubscribeFromLists($subscriber->getId(), [$segment->getId()]);
       $this->fail('WP Users segment exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals("Can't unsubscribe from a WordPress Users list with ID {$segment->getId()}.");
+      verify($e->getMessage())->equals("Can't unsubscribe from a WordPress Users list with ID {$segment->getId()}.");
     }
   }
 
@@ -426,7 +426,7 @@ class SubscribersTest extends \MailPoetTest {
       $this->getApi()->unsubscribeFromLists($subscriber->getId(), [$segment->getId()]);
       $this->fail('WooCommerce Customers segment exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals("Can't unsubscribe from a WooCommerce Customers list with ID {$segment->getId()}.");
+      verify($e->getMessage())->equals("Can't unsubscribe from a WooCommerce Customers list with ID {$segment->getId()}.");
     }
   }
 
@@ -439,13 +439,13 @@ class SubscribersTest extends \MailPoetTest {
       $this->getApi()->unsubscribeFromLists($subscriber->getId(), []);
       $this->fail('Segments are required exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('At least one segment ID is required.');
+      verify($e->getMessage())->equals('At least one segment ID is required.');
     }
 
     $result = $this->getApi()->subscribeToLists($subscriber->getId(), [$segment->getId()]);
-    expect($result['subscriptions'][0]['status'])->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($result['subscriptions'][0]['status'])->equals(SubscriberEntity::STATUS_SUBSCRIBED);
     $result = $this->getApi()->unsubscribeFromLists($subscriber->getId(), [$segment->getId()]);
-    expect($result['subscriptions'][0]['status'])->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
+    verify($result['subscriptions'][0]['status'])->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
   }
 
   public function testItChecksEmptyParamsInCorrectOrder() {
@@ -454,7 +454,7 @@ class SubscribersTest extends \MailPoetTest {
       $this->getApi()->unsubscribeFromLists(null, []);
       $this->fail('Segments are required exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('At least one segment ID is required.');
+      verify($e->getMessage())->equals('At least one segment ID is required.');
     }
 
     // test if segments are specified
@@ -462,7 +462,7 @@ class SubscribersTest extends \MailPoetTest {
       $this->getApi()->unsubscribeFromLists(null, [1]);
       $this->fail('Subscriber is required exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('A subscriber is required.');
+      verify($e->getMessage())->equals('A subscriber is required.');
     }
   }
 
@@ -471,7 +471,7 @@ class SubscribersTest extends \MailPoetTest {
       $this->getApi()->addSubscriber([]);
       $this->fail('Subscriber email address required exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('Subscriber email address is required.');
+      verify($e->getMessage())->equals('Subscriber email address is required.');
     }
   }
 
@@ -484,7 +484,7 @@ class SubscribersTest extends \MailPoetTest {
     ];
 
     $result = $this->getApi()->addSubscriber($subscriber);
-    expect($result['status'])->equals('unconfirmed');
+    verify($result['status'])->equals('unconfirmed');
   }
 
   public function testItDoesNotAddExistingSubscriber() {
@@ -493,7 +493,7 @@ class SubscribersTest extends \MailPoetTest {
       $this->getApi()->addSubscriber(['email' => $subscriber->getEmail()]);
       $this->fail('Subscriber exists exception should have been thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('This subscriber already exists.');
+      verify($e->getMessage())->equals('This subscriber already exists.');
     }
   }
 
@@ -526,11 +526,11 @@ class SubscribersTest extends \MailPoetTest {
     $_SERVER['REMOTE_ADDR'] = $expectedRemoteAddr;
     $result = $this->getApi()->addSubscriber($subscriber);
     expect($result['id'])->greaterThan(0);
-    expect($result['email'])->equals($subscriber['email']);
-    expect($result['cf_' . $customField->getId()])->equals('test');
-    expect($result['source'])->equals('api');
-    expect($result['subscribed_ip'])->equals($expectedRemoteAddr);
-    expect(strlen($result['unsubscribe_token']))->equals(15);
+    verify($result['email'])->equals($subscriber['email']);
+    verify($result['cf_' . $customField->getId()])->equals('test');
+    verify($result['source'])->equals('api');
+    verify($result['subscribed_ip'])->equals($expectedRemoteAddr);
+    verify(strlen($result['unsubscribe_token']))->equals(15);
   }
 
   public function testItAllowsToOverrideSubscriberIPAddress() {
@@ -540,7 +540,7 @@ class SubscribersTest extends \MailPoetTest {
     ];
 
     $result = $this->getApi()->addSubscriber($subscriber);
-    expect($result['subscribed_ip'])->equals($subscriber['subscribed_ip']);
+    verify($result['subscribed_ip'])->equals($subscriber['subscribed_ip']);
   }
 
   public function testItChecksForMandatoryCustomFields() {
@@ -567,8 +567,8 @@ class SubscribersTest extends \MailPoetTest {
 
     $result = $this->getApi()->addSubscriber($subscriber, [$segment->getId()]);
     expect($result['id'])->greaterThan(0);
-    expect($result['email'])->equals($subscriber['email']);
-    expect($result['subscriptions'][0]['segment_id'])->equals($segment->getId());
+    verify($result['email'])->equals($subscriber['email']);
+    verify($result['subscriptions'][0]['segment_id'])->equals($segment->getId());
   }
 
   public function testItSchedulesWelcomeNotificationByDefaultAfterAddingSubscriber() {
@@ -699,7 +699,7 @@ class SubscribersTest extends \MailPoetTest {
         'requiredCustomFieldsValidator' => Stub::makeEmpty(RequiredCustomFieldValidator::class, ['validate']),
         'subscribeToLists' => Expected::once(function ($subscriberId, $segmentsIds, $options) {
           expect($options)->hasKey('send_confirmation_email');
-          expect($options['send_confirmation_email'])->equals(1);
+          verify($options['send_confirmation_email'])->equals(1);
           return [];
         }),
       ],
@@ -774,8 +774,8 @@ class SubscribersTest extends \MailPoetTest {
     $this->getApi()->subscribeToList($subscriber->getId(), $segment->getId());
 
     $result = $this->getApi()->getSubscriber($subscriber->getEmail());
-    expect($result['email'])->equals($subscriber->getEmail());
-    expect($result['subscriptions'][0]['segment_id'])->equals($segment->getId());
+    verify($result['email'])->equals($subscriber->getEmail());
+    verify($result['subscriptions'][0]['segment_id'])->equals($segment->getId());
   }
 
   public function testGetSubscriberThrowsWhenSubscriberDoesntExist() {
diff --git a/mailpoet/tests/integration/AdminPages/HelpTest.php b/mailpoet/tests/integration/AdminPages/HelpTest.php
index b3a016b4bf..67822e0b79 100644
--- a/mailpoet/tests/integration/AdminPages/HelpTest.php
+++ b/mailpoet/tests/integration/AdminPages/HelpTest.php
@@ -58,9 +58,9 @@ class HelpTest extends \MailPoetTest {
       ->create();
     $queue = $this->createNewSendingQueue($task, $newsletter);
     $data = $this->helpPage->buildTaskData($task);
-    expect($data['newsletter']['newsletter_id'])->equals($newsletter->getId());
-    expect($data['newsletter']['queue_id'])->equals($queue->getId());
-    expect($data['newsletter']['subject'])->equals('Rendered Subject');
+    verify($data['newsletter']['newsletter_id'])->equals($newsletter->getId());
+    verify($data['newsletter']['queue_id'])->equals($queue->getId());
+    verify($data['newsletter']['subject'])->equals('Rendered Subject');
     expect($data['newsletter']['preview_url'])->notEmpty();
   }
 
@@ -71,10 +71,10 @@ class HelpTest extends \MailPoetTest {
       Carbon::now()->addDay()
     );
     $data = $this->helpPage->buildTaskData($task);
-    expect($data['newsletter']['newsletter_id'])->equals(null);
-    expect($data['newsletter']['queue_id'])->equals(null);
-    expect($data['newsletter']['subject'])->equals(null);
-    expect($data['newsletter']['preview_url'])->equals(null);
+    verify($data['newsletter']['newsletter_id'])->equals(null);
+    verify($data['newsletter']['queue_id'])->equals(null);
+    verify($data['newsletter']['subject'])->equals(null);
+    verify($data['newsletter']['preview_url'])->equals(null);
   }
 
   private function createNewSendingQueue(?ScheduledTaskEntity $task, ?NewsletterEntity $newsletter, $renderedSubject = null): SendingQueueEntity {
diff --git a/mailpoet/tests/integration/Analytics/AnalyticsTest.php b/mailpoet/tests/integration/Analytics/AnalyticsTest.php
index 977a3552e7..b00f4b6faf 100644
--- a/mailpoet/tests/integration/Analytics/AnalyticsTest.php
+++ b/mailpoet/tests/integration/Analytics/AnalyticsTest.php
@@ -84,7 +84,7 @@ class AnalyticsTest extends \MailPoetTest {
     $this->settings->set('analytics_last_sent', null);
 
     $analytics = new Analytics($reporter, SettingsController::getInstance());
-    expect($analytics->generateAnalytics())->equals(apply_filters(Analytics::ANALYTICS_FILTER, $data));
+    verify($analytics->generateAnalytics())->equals(apply_filters(Analytics::ANALYTICS_FILTER, $data));
   }
 
   public function testGetDataIfEnabledAndSentLongTimeAgo() {
@@ -103,7 +103,7 @@ class AnalyticsTest extends \MailPoetTest {
 
     $analytics = new Analytics($reporter, SettingsController::getInstance());
 
-    expect($analytics->generateAnalytics())->equals(apply_filters(Analytics::ANALYTICS_FILTER, $data));
+    verify($analytics->generateAnalytics())->equals(apply_filters(Analytics::ANALYTICS_FILTER, $data));
   }
 
   public function testSetPublicId() {
@@ -114,8 +114,8 @@ class AnalyticsTest extends \MailPoetTest {
 
     $this->analytics->setPublicId($fakePublicId);
 
-    expect($this->settings->get('public_id'))->equals($fakePublicId);
-    expect($this->settings->get('new_public_id'))->equals('true');
+    verify($this->settings->get('public_id'))->equals($fakePublicId);
+    verify($this->settings->get('new_public_id'))->equals('true');
     expect($this->settings->get(Analytics::SETTINGS_LAST_SENT_KEY, null))->null();
   }
 
@@ -127,21 +127,21 @@ class AnalyticsTest extends \MailPoetTest {
 
     $this->analytics->setPublicId($fakePublicId);
     // When we update public_id it's marked as new
-    expect($this->settings->get('new_public_id'))->equals('true');
+    verify($this->settings->get('new_public_id'))->equals('true');
     expect($this->analytics->isPublicIdNew())->true();
-    expect($this->settings->get('new_public_id'))->equals('false');
+    verify($this->settings->get('new_public_id'))->equals('false');
 
     $this->analytics->setPublicId($fakePublicId);
     // We tried to update public_id with the same value, so it's not marked as new
-    expect($this->settings->get('new_public_id'))->equals('false');
+    verify($this->settings->get('new_public_id'))->equals('false');
     expect($this->analytics->isPublicIdNew())->false();
-    expect($this->settings->get('new_public_id'))->equals('false');
+    verify($this->settings->get('new_public_id'))->equals('false');
   }
 
   public function testGetNextSendDateIsWeekFromLastSend(): void {
     $this->settings->set('analytics_last_sent', Carbon::now());
     $weekFromNow = Carbon::now()->addDays(7);
     $nextSendDate = $this->analytics->getNextSendDate();
-    expect($nextSendDate->getTimestamp())->equals($weekFromNow->getTimestamp());
+    verify($nextSendDate->getTimestamp())->equals($weekFromNow->getTimestamp());
   }
 }
diff --git a/mailpoet/tests/integration/Analytics/UnsubscribeAnalyticsTest.php b/mailpoet/tests/integration/Analytics/UnsubscribeAnalyticsTest.php
index 1bb1444596..54bf5622ec 100644
--- a/mailpoet/tests/integration/Analytics/UnsubscribeAnalyticsTest.php
+++ b/mailpoet/tests/integration/Analytics/UnsubscribeAnalyticsTest.php
@@ -39,9 +39,9 @@ class UnsubscribeAnalyticsTest extends \MailPoetTest {
     $this->createStatisticsUnsubscribe($createdAt, StatisticsUnsubscribeEntity::METHOD_LINK);
 
     $properties = $this->unsubscribeReporter->getProperties();
-    expect($properties[UnsubscribeReporter::TOTAL])->equals(4);
-    expect($properties[sprintf(UnsubscribeReporter::COUNT_PER_METHOD_PATTERN, '1 Click')])->equals(3);
-    expect($properties[sprintf(UnsubscribeReporter::COUNT_PER_METHOD_PATTERN, 'Link')])->equals(1);
+    verify($properties[UnsubscribeReporter::TOTAL])->equals(4);
+    verify($properties[sprintf(UnsubscribeReporter::COUNT_PER_METHOD_PATTERN, '1 Click')])->equals(3);
+    verify($properties[sprintf(UnsubscribeReporter::COUNT_PER_METHOD_PATTERN, 'Link')])->equals(1);
   }
 
   private function createStatisticsUnsubscribe(\DateTimeInterface $createdAt, $method): StatisticsUnsubscribeEntity {
diff --git a/mailpoet/tests/integration/AutomaticEmails/AutomaticEmailsTest.php b/mailpoet/tests/integration/AutomaticEmails/AutomaticEmailsTest.php
index 47c22c2a79..ebb95d80fc 100644
--- a/mailpoet/tests/integration/AutomaticEmails/AutomaticEmailsTest.php
+++ b/mailpoet/tests/integration/AutomaticEmails/AutomaticEmailsTest.php
@@ -153,7 +153,7 @@ class AutomaticEmailsTest extends \MailPoetTest {
     });
 
     $result = $this->AM->getAutomaticEmailBySlug('email1');
-    expect($result['slug'])->equals('email1');
+    verify($result['slug'])->equals('email1');
 
     $this->wp->removeAllFilters('mailpoet_automatic_email_test');
   }
@@ -208,7 +208,7 @@ class AutomaticEmailsTest extends \MailPoetTest {
     });
 
     $result = $this->AM->getAutomaticEmailEventBySlug('email', 'event2_slug');
-    expect($result['slug'])->equals('event2_slug');
+    verify($result['slug'])->equals('event2_slug');
 
     $this->wp->removeAllFilters('mailpoet_automatic_email_test');
   }
diff --git a/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/FirstPurchaseTest.php b/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/FirstPurchaseTest.php
index 371d1ddd52..54f9a9c57d 100644
--- a/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/FirstPurchaseTest.php
+++ b/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/FirstPurchaseTest.php
@@ -61,7 +61,7 @@ class FirstPurchaseTest extends \MailPoetTest {
 
     $result = $event->getEventDetails();
     expect($result)->notEmpty();
-    expect($result['slug'])->equals(FirstPurchase::SLUG);
+    verify($result['slug'])->equals(FirstPurchase::SLUG);
   }
 
   public function testDateShortcodeHandlerReturnsShortcodeWhenItCannotDetectProperShortcode() {
@@ -69,7 +69,7 @@ class FirstPurchaseTest extends \MailPoetTest {
     $shortcode = 'wrong shortcode';
 
     $result = $event->handleOrderDateShortcode($shortcode, true, true, true);
-    expect($result)->equals($shortcode);
+    verify($result)->equals($shortcode);
   }
 
   public function testDateShortcodeHandlerReturnsShortcodeWhenQueueIsMissing() {
@@ -79,7 +79,7 @@ class FirstPurchaseTest extends \MailPoetTest {
       'dateI18n' => 'success',
     ]));
     $result = $event->handleOrderDateShortcode($shortcode, true, true, false);
-    expect($result)->equals('success');
+    verify($result)->equals('success');
   }
 
   public function testDateShortcodeHandlerReturnsCurrentDateWhenDateIsMissingInQueueMeta() {
@@ -91,7 +91,7 @@ class FirstPurchaseTest extends \MailPoetTest {
       'dateI18n' => 'success',
     ]));
     $result = $event->handleOrderDateShortcode($shortcode, true, true, $queue);
-    expect($result)->equals('success');
+    verify($result)->equals('success');
   }
 
   public function testDateShortcodeHandlerReturnsSystemFormattedDate() {
@@ -102,7 +102,7 @@ class FirstPurchaseTest extends \MailPoetTest {
       'dateI18n' => 'success',
     ]));
     $result = $event->handleOrderDateShortcode($shortcode, true, true, $queue);
-    expect($result)->equals('success');
+    verify($result)->equals('success');
   }
 
   public function testOrderAmountShortcodeHandlerReturnsShortcodeWhenItCannotDetectProperShortcode() {
@@ -110,7 +110,7 @@ class FirstPurchaseTest extends \MailPoetTest {
     $shortcode = 'wrong shortcode';
 
     $result = $event->handleOrderTotalShortcode($shortcode, true, true, true);
-    expect($result)->equals($shortcode);
+    verify($result)->equals($shortcode);
   }
 
   public function testOrderAmountShortcodeHandlerReturnsFormattedZeroValueWhenQueueIsMissing() {
@@ -122,7 +122,7 @@ class FirstPurchaseTest extends \MailPoetTest {
     $event = new FirstPurchase($helper);
     $shortcode = FirstPurchase::ORDER_TOTAL_SHORTCODE;
     $result = $event->handleOrderTotalShortcode($shortcode, true, true, false);
-    expect($result)->equals(0);
+    verify($result)->equals(0);
   }
 
   public function testOrderAmountShortcodeHandlerReturnsFormattedZeroValueWhenOrderAmountIsMissingInQueueMeta() {
@@ -135,7 +135,7 @@ class FirstPurchaseTest extends \MailPoetTest {
     $shortcode = FirstPurchase::ORDER_TOTAL_SHORTCODE;
     $queue = $this->createSendingQueue($this->newsletterFactory->create());
     $result = $event->handleOrderTotalShortcode($shortcode, true, true, $queue);
-    expect($result)->equals(0);
+    verify($result)->equals(0);
   }
 
   public function testOrderAmountShortcodeHandlerReturnsFormattedPrice() {
@@ -148,7 +148,7 @@ class FirstPurchaseTest extends \MailPoetTest {
     $shortcode = FirstPurchase::ORDER_TOTAL_SHORTCODE;
     $queue = $this->createSendingQueue($this->newsletterFactory->create(), ['order_amount' => 15]);
     $result = $event->handleOrderTotalShortcode($shortcode, true, true, $queue);
-    expect($result)->equals(15);
+    verify($result)->equals(15);
   }
 
   public function testItDoesNotScheduleEmailWhenOrderDetailsAreNotAvailable() {
@@ -245,7 +245,7 @@ class FirstPurchaseTest extends \MailPoetTest {
     $sendingQueue = $this->sendingQueueRepository->findOneBy(['newsletter' => $newsletter]);
     $this->assertInstanceOf(SendingQueueEntity::class, $sendingQueue);
     $meta = $sendingQueue->getMeta();
-    expect($meta)->equals([
+    verify($meta)->equals([
       'order_amount' => $order->get_total(),
       'order_date' => $orderDate->getTimestamp(),
       'order_id' => $order->get_id(),
@@ -269,7 +269,7 @@ class FirstPurchaseTest extends \MailPoetTest {
     $tasksCountBeforeStatusChange = count($this->scheduledTasksRepository->findBy(['type' => Sending::TASK_TYPE]));
     WPFunctions::get()->doAction('woocommerce_order_status_completed', $orderId);
     $tasksCountAfterStatusChange = count($this->scheduledTasksRepository->findBy(['type' => Sending::TASK_TYPE]));
-    expect($tasksCountAfterStatusChange)->equals($tasksCountBeforeStatusChange);
+    verify($tasksCountAfterStatusChange)->equals($tasksCountBeforeStatusChange);
   }
 
   public function _runTestItSchedulesEmailForState($orderState) {
@@ -321,7 +321,7 @@ class FirstPurchaseTest extends \MailPoetTest {
     $sendingQueue = $this->sendingQueueRepository->findOneBy(['newsletter' => $newsletter]);
     $this->assertInstanceOf(SendingQueueEntity::class, $sendingQueue);
     $meta = $sendingQueue->getMeta();
-    expect($meta)->equals([
+    verify($meta)->equals([
       'order_amount' => 'order_total',
       'order_date' => $dateCreated->getTimestamp(),
       'order_id' => $orderId,
diff --git a/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedInCategoryTest.php b/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedInCategoryTest.php
index e10eba7e87..56034403f1 100644
--- a/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedInCategoryTest.php
+++ b/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedInCategoryTest.php
@@ -46,7 +46,7 @@ class PurchasedInCategoryTest extends \MailPoetTest {
   public function testItGetsEventDetails() {
     $result = $this->event->getEventDetails();
     expect($result)->notEmpty();
-    expect($result['slug'])->equals(PurchasedInCategory::SLUG);
+    verify($result['slug'])->equals(PurchasedInCategory::SLUG);
   }
 
   public function testItDoesNotScheduleEmailWhenOrderDetailsAreNotAvailable() {
@@ -90,7 +90,7 @@ class PurchasedInCategoryTest extends \MailPoetTest {
     $queue = $this->sendingQueuesRepository->findOneBy(['newsletter' => $newsletter]);
     // We only want to record the ID for the category that triggered the newsletter
     $this->assertInstanceOf(SendingQueueEntity::class, $queue);
-    expect($queue->getMeta())->equals(['orderedProductCategories' => ['15']]);
+    verify($queue->getMeta())->equals(['orderedProductCategories' => ['15']]);
     expect($queue->getTask())->notEmpty();
   }
 
diff --git a/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedProductTest.php b/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedProductTest.php
index 46cad225cf..44dd145308 100644
--- a/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedProductTest.php
+++ b/mailpoet/tests/integration/AutomaticEmails/WooCommerce/Events/PurchasedProductTest.php
@@ -44,7 +44,7 @@ class PurchasedProductTest extends \MailPoetTest {
     $event = new PurchasedProduct();
     $result = $event->getEventDetails();
     expect($result)->notEmpty();
-    expect($result['slug'])->equals(PurchasedProduct::SLUG);
+    verify($result['slug'])->equals(PurchasedProduct::SLUG);
   }
 
   public function testItDoesNotScheduleEmailWhenOrderDetailsAreNotAvailable() {
@@ -150,7 +150,7 @@ class PurchasedProductTest extends \MailPoetTest {
     $sendingQueue = $this->triggerEmailForState('processing', $email, $event);
     expect($sendingQueue)->notEmpty();
     $this->assertInstanceOf(SendingQueueEntity::class, $sendingQueue);
-    expect($sendingQueue->getMeta())->equals(['orderedProducts' => [1000]]);
+    verify($sendingQueue->getMeta())->equals(['orderedProducts' => [1000]]);
   }
 
   public function testItSchedulesEmailForCompletedOrder() {
@@ -161,7 +161,7 @@ class PurchasedProductTest extends \MailPoetTest {
     $sendingQueue = $this->triggerEmailForState('completed', $email, $event);
     expect($sendingQueue)->notEmpty();
     $this->assertInstanceOf(SendingQueueEntity::class, $sendingQueue);
-    expect($sendingQueue->getMeta())->equals(['orderedProducts' => [1000]]);
+    verify($sendingQueue->getMeta())->equals(['orderedProducts' => [1000]]);
   }
 
   public function testItOnlySavesMetaDataForProductIdsMatchingTriggerIds() {
@@ -172,7 +172,7 @@ class PurchasedProductTest extends \MailPoetTest {
     $sendingQueue = $this->triggerEmailForState('completed', $email, $event);
     expect($sendingQueue)->notEmpty();
     $this->assertInstanceOf(SendingQueueEntity::class, $sendingQueue);
-    expect($sendingQueue->getMeta())->equals(['orderedProducts' => [1000]]);
+    verify($sendingQueue->getMeta())->equals(['orderedProducts' => [1000]]);
   }
 
   public function testItDoesNotSaveOtherTriggerIds() {
@@ -183,7 +183,7 @@ class PurchasedProductTest extends \MailPoetTest {
     $sendingQueue = $this->triggerEmailForState('completed', $email, $event);
     expect($sendingQueue)->notEmpty();
     $this->assertInstanceOf(SendingQueueEntity::class, $sendingQueue);
-    expect($sendingQueue->getMeta())->equals(['orderedProducts' => [1000]]);
+    verify($sendingQueue->getMeta())->equals(['orderedProducts' => [1000]]);
   }
 
   private function createEmailTriggeredByProductIds(array $triggerProductIds): NewsletterEntity {
diff --git a/mailpoet/tests/integration/AutomaticEmails/WooCommerce/WooCommerceTest.php b/mailpoet/tests/integration/AutomaticEmails/WooCommerce/WooCommerceTest.php
index 3f956f035a..7bb7a24c9a 100644
--- a/mailpoet/tests/integration/AutomaticEmails/WooCommerce/WooCommerceTest.php
+++ b/mailpoet/tests/integration/AutomaticEmails/WooCommerce/WooCommerceTest.php
@@ -86,8 +86,8 @@ class WooCommerceTest extends \MailPoetTest {
     $AM = new AutomaticEmails(new WPFunctions(), $this->automaticEmailFactory);
     $result = $AM->getAutomaticEmailBySlug('woocommerce');
     foreach ($result['events'] as $event) {
-      expect($event['actionButtonTitle'])->equals('WooCommerce is required');
-      expect($event['actionButtonLink'])->equals('https://wordpress.org/plugins/woocommerce/');
+      verify($event['actionButtonTitle'])->equals('WooCommerce is required');
+      verify($event['actionButtonLink'])->equals('https://wordpress.org/plugins/woocommerce/');
     }
 
     $WC = $this->createWooCommerceEmailMock();
diff --git a/mailpoet/tests/integration/Automation/Engine/Data/AutomationRunLogTest.php b/mailpoet/tests/integration/Automation/Engine/Data/AutomationRunLogTest.php
index 2d01a322fb..e55eb75620 100644
--- a/mailpoet/tests/integration/Automation/Engine/Data/AutomationRunLogTest.php
+++ b/mailpoet/tests/integration/Automation/Engine/Data/AutomationRunLogTest.php
@@ -36,7 +36,7 @@ class AutomationRunLogTest extends \MailPoetTest {
     $log->setData('data', $data);
     $this->automationRunLogStorage->createAutomationRunLog($log);
     $retrieved = $this->automationRunLogStorage->getLogsForAutomationRun(1)[0];
-    expect($retrieved->getData()['data'])->equals($data);
+    verify($retrieved->getData()['data'])->equals($data);
   }
 
   public function testItAllowsSettingMultidimensionalArraysOfScalarValues(): void {
@@ -53,7 +53,7 @@ class AutomationRunLogTest extends \MailPoetTest {
     $log->setData('data', $data);
     $this->automationRunLogStorage->createAutomationRunLog($log);
     $retrieved = $this->automationRunLogStorage->getLogsForAutomationRun(1)[0];
-    expect($retrieved->getData()['data'])->equals($data);
+    verify($retrieved->getData()['data'])->equals($data);
   }
 
   public function testItDoesNotAllowSettingDataThatIncludesClosures(): void {
diff --git a/mailpoet/tests/integration/Automation/Engine/Storage/AutomationRunLogStorageTest.php b/mailpoet/tests/integration/Automation/Engine/Storage/AutomationRunLogStorageTest.php
index 4f6efc6867..2071ddcf58 100644
--- a/mailpoet/tests/integration/Automation/Engine/Storage/AutomationRunLogStorageTest.php
+++ b/mailpoet/tests/integration/Automation/Engine/Storage/AutomationRunLogStorageTest.php
@@ -27,7 +27,7 @@ class AutomationRunLogStorageTest extends \MailPoetTest {
     $id = $this->storage->createAutomationRunLog($log);
     $fromDatabase = $this->storage->getAutomationRunLog($id);
     $this->assertInstanceOf(AutomationRunLog::class, $fromDatabase);
-    expect(['id' => $fromDatabase->getId()] + $preSave)->equals($fromDatabase->toArray());
+    verify(['id' => $fromDatabase->getId()] + $preSave)->equals($fromDatabase->toArray());
   }
 
   public function testItCanStoreAnError() {
@@ -38,7 +38,7 @@ class AutomationRunLogStorageTest extends \MailPoetTest {
     $this->assertInstanceOf(AutomationRunLog::class, $log);
     $errors = $log->getError();
     $this->assertIsArray($errors);
-    expect(array_keys($errors))->equals([
+    verify(array_keys($errors))->equals([
       'message',
       'errorClass',
       'code',
diff --git a/mailpoet/tests/integration/Automation/Engine/Storage/AutomationStorageTest.php b/mailpoet/tests/integration/Automation/Engine/Storage/AutomationStorageTest.php
index 4b2629d15f..7bcd5ee006 100644
--- a/mailpoet/tests/integration/Automation/Engine/Storage/AutomationStorageTest.php
+++ b/mailpoet/tests/integration/Automation/Engine/Storage/AutomationStorageTest.php
@@ -203,7 +203,7 @@ class AutomationStorageTest extends \MailPoetTest {
 
   public function testItCanGetCountOfActiveAutomationsByTriggersAndActionKeys(): void {
     $automation = $this->createEmptyAutomation();
-    expect($this->testee->getCountOfActiveByTriggerKeysAndAction([SomeoneSubscribesTrigger::KEY], SendEmailAction::KEY))
+    verify($this->testee->getCountOfActiveByTriggerKeysAndAction([SomeoneSubscribesTrigger::KEY], SendEmailAction::KEY))
       ->equals(0);
     $triggerStep = new Step('id', Step::TYPE_TRIGGER, SomeoneSubscribesTrigger::KEY, [], []);
     $emailActionStep = new Step('id-2', Step::TYPE_ACTION, SendEmailAction::KEY, [], []);
@@ -211,24 +211,24 @@ class AutomationStorageTest extends \MailPoetTest {
     $automation->setStatus(Automation::STATUS_ACTIVE);
     $this->testee->updateAutomation($automation);
     // Correct trigger and action
-    expect($this->testee->getCountOfActiveByTriggerKeysAndAction([SomeoneSubscribesTrigger::KEY], SendEmailAction::KEY))
+    verify($this->testee->getCountOfActiveByTriggerKeysAndAction([SomeoneSubscribesTrigger::KEY], SendEmailAction::KEY))
       ->equals(1);
     // Incorrect trigger
-    expect($this->testee->getCountOfActiveByTriggerKeysAndAction([UserRegistrationTrigger::KEY], SendEmailAction::KEY))
+    verify($this->testee->getCountOfActiveByTriggerKeysAndAction([UserRegistrationTrigger::KEY], SendEmailAction::KEY))
       ->equals(0);
     // Incorrect action
-    expect($this->testee->getCountOfActiveByTriggerKeysAndAction([SomeoneSubscribesTrigger::KEY], 'mailpoet:send-emai'))
+    verify($this->testee->getCountOfActiveByTriggerKeysAndAction([SomeoneSubscribesTrigger::KEY], 'mailpoet:send-emai'))
       ->equals(0);
     // New version without any send email step
     $automation->setSteps(['id' => $triggerStep]);
     $this->testee->updateAutomation($automation);
-    expect($this->testee->getCountOfActiveByTriggerKeysAndAction([SomeoneSubscribesTrigger::KEY], SendEmailAction::KEY))
+    verify($this->testee->getCountOfActiveByTriggerKeysAndAction([SomeoneSubscribesTrigger::KEY], SendEmailAction::KEY))
       ->equals(0);
     // Draft automation
     $automation->setSteps(['id' => $triggerStep, 'id-2' => $emailActionStep]);
     $automation->setStatus(Automation::STATUS_DRAFT);
     $this->testee->updateAutomation($automation);
-    expect($this->testee->getCountOfActiveByTriggerKeysAndAction([SomeoneSubscribesTrigger::KEY], SendEmailAction::KEY))
+    verify($this->testee->getCountOfActiveByTriggerKeysAndAction([SomeoneSubscribesTrigger::KEY], SendEmailAction::KEY))
       ->equals(0);
   }
 
diff --git a/mailpoet/tests/integration/Config/AccessControlTest.php b/mailpoet/tests/integration/Config/AccessControlTest.php
index 699bbc465c..903c56b972 100644
--- a/mailpoet/tests/integration/Config/AccessControlTest.php
+++ b/mailpoet/tests/integration/Config/AccessControlTest.php
@@ -67,7 +67,7 @@ class AccessControlTest extends \MailPoetTest {
       }
     );
 
-    expect($this->accessControl->getDefaultPermissions())->equals(
+    verify($this->accessControl->getDefaultPermissions())->equals(
       [
         AccessControl::PERMISSION_ACCESS_PLUGIN_ADMIN => [
           'custom_access_plugin_admin_role',
@@ -100,7 +100,7 @@ class AccessControlTest extends \MailPoetTest {
   public function testItGetsPermissionLabels() {
     $permissions = $this->accessControl->getDefaultPermissions();
     $labels = $this->accessControl->getPermissionLabels();
-    expect(count($permissions))->equals(count($labels));
+    verify(count($permissions))->equals(count($labels));
   }
 
   public function testItValidatesIfUserHasCapability() {
diff --git a/mailpoet/tests/integration/Config/DatabaseTest.php b/mailpoet/tests/integration/Config/DatabaseTest.php
index 84c9338629..1a5bbbaacb 100644
--- a/mailpoet/tests/integration/Config/DatabaseTest.php
+++ b/mailpoet/tests/integration/Config/DatabaseTest.php
@@ -25,7 +25,7 @@ class DatabaseTest extends \MailPoetTest {
   }
 
   public function testItConfiguresLogging() {
-    expect(ORM::get_config('logging'))->equals(WP_DEBUG);
+    verify(ORM::get_config('logging'))->equals(WP_DEBUG);
   }
 
   public function testItSetsDBDriverOptions() {
@@ -39,6 +39,6 @@ class DatabaseTest extends \MailPoetTest {
       )
       ->findOne();
     // time zone should be set based on WP's time zone
-    expect($result->timeZone)->equals(Env::$dbTimezoneOffset);
+    verify($result->timeZone)->equals(Env::$dbTimezoneOffset);
   }
 }
diff --git a/mailpoet/tests/integration/Config/EnvTest.php b/mailpoet/tests/integration/Config/EnvTest.php
index f76aa53db5..fdb8071d52 100644
--- a/mailpoet/tests/integration/Config/EnvTest.php
+++ b/mailpoet/tests/integration/Config/EnvTest.php
@@ -17,75 +17,75 @@ class EnvTest extends \MailPoetTest {
   }
 
   public function testItCanReturnPluginPrefix() {
-    expect(Env::$pluginPrefix)->equals('mailpoet_');
+    verify(Env::$pluginPrefix)->equals('mailpoet_');
   }
 
   public function testItCanReturnDbPrefix() {
     global $wpdb;
     $dbPrefix = $wpdb->prefix . 'mailpoet_';
-    expect(Env::$dbPrefix)->equals($dbPrefix);
+    verify(Env::$dbPrefix)->equals($dbPrefix);
   }
 
   public function testItProcessDBHost() {
     Env::init('file', '1.0.0', 'localhost', 'db_user', 'pass123', 'db_name');
-    expect(Env::$dbHost)->equals('localhost');
+    verify(Env::$dbHost)->equals('localhost');
     expect(Env::$dbPort)->null();
 
     Env::init('file', '1.0.0', 'localhost:3307', 'db_user', 'pass123', 'db_name');
-    expect(Env::$dbHost)->equals('localhost');
-    expect(Env::$dbPort)->equals('3307');
+    verify(Env::$dbHost)->equals('localhost');
+    verify(Env::$dbPort)->equals('3307');
   }
 
   public function testItProcessDBHostWithSocket() {
     Env::init('file', '1.0.0', 'localhost:/var/lib/mysql/mysql55.sock', 'db_user', 'pass123', 'db_name');
-    expect(Env::$dbHost)->equals('localhost');
-    expect(Env::$dbSocket)->equals('/var/lib/mysql/mysql55.sock');
+    verify(Env::$dbHost)->equals('localhost');
+    verify(Env::$dbSocket)->equals('/var/lib/mysql/mysql55.sock');
   }
 
   public function testItProcessDBHostWithIpV6Address() {
     Env::init('file', '1.0.0', '::1', 'db_user', 'pass123', 'db_name');
-    expect(Env::$dbHost)->equals('::1');
-    expect(Env::$dbSocket)->equals(null);
+    verify(Env::$dbHost)->equals('::1');
+    verify(Env::$dbSocket)->equals(null);
 
     Env::init('file', '1.0.0', 'b57e:9b70:ab96:6a0b:5ba2:49e3:ebba:a036', 'db_user', 'pass123', 'db_name');
-    expect(Env::$dbHost)->equals('b57e:9b70:ab96:6a0b:5ba2:49e3:ebba:a036');
-    expect(Env::$dbSocket)->equals(null);
+    verify(Env::$dbHost)->equals('b57e:9b70:ab96:6a0b:5ba2:49e3:ebba:a036');
+    verify(Env::$dbSocket)->equals(null);
   }
 
   public function testItCanReturnDbName() {
-    expect(Env::$dbName)->equals(DB_NAME);
+    verify(Env::$dbName)->equals(DB_NAME);
   }
 
   public function testItCanReturnDbUser() {
-    expect(Env::$dbUsername)->equals(DB_USER);
+    verify(Env::$dbUsername)->equals(DB_USER);
   }
 
   public function testItCanReturnDbPassword() {
-    expect(Env::$dbPassword)->equals(DB_PASSWORD);
+    verify(Env::$dbPassword)->equals(DB_PASSWORD);
   }
 
   public function testItCanReturnDbCharset() {
     global $wpdb;
     $charset = $wpdb->charset;
-    expect(Env::$dbCharset)->equals($charset);
+    verify(Env::$dbCharset)->equals($charset);
   }
 
   public function testItCanReturnDbCollation() {
     global $wpdb;
     $collation = $wpdb->collate;
-    expect(Env::$dbCollation)->equals($collation);
+    verify(Env::$dbCollation)->equals($collation);
   }
 
   public function testItCanReturnDbCharsetCollate() {
     global $wpdb;
     $charsetCollate = $wpdb->get_charset_collate();
-    expect(Env::$dbCharsetCollate)->equals($charsetCollate);
+    verify(Env::$dbCharsetCollate)->equals($charsetCollate);
   }
 
   public function testItCanGetDbTimezoneOffset() {
-    expect(Env::getDbTimezoneOffset('+1.5'))->equals("+01:30");
-    expect(Env::getDbTimezoneOffset('+11'))->equals("+11:00");
-    expect(Env::getDbTimezoneOffset('-5.5'))->equals("-05:30");
+    verify(Env::getDbTimezoneOffset('+1.5'))->equals("+01:30");
+    verify(Env::getDbTimezoneOffset('+11'))->equals("+11:00");
+    verify(Env::getDbTimezoneOffset('-5.5'))->equals("-05:30");
   }
 
   public function _after() {
diff --git a/mailpoet/tests/integration/Config/InstallerTest.php b/mailpoet/tests/integration/Config/InstallerTest.php
index 16857697c6..9d089022c0 100644
--- a/mailpoet/tests/integration/Config/InstallerTest.php
+++ b/mailpoet/tests/integration/Config/InstallerTest.php
@@ -75,7 +75,7 @@ class InstallerTest extends \MailPoetTest {
       $this
     );
     $result = $installer->getPluginInformation(false, 'plugin_information', $args);
-    expect($result->slug)->equals($this->slug);
+    verify($result->slug)->equals($this->slug);
     expect($result->new_version)->notEmpty(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
     expect($result->download_link)->notEmpty(); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
     expect($result->package)->notEmpty();
@@ -85,11 +85,11 @@ class InstallerTest extends \MailPoetTest {
     $data = new \stdClass;
     $data->someProperty = '123';
     $result = $this->installer->getPluginInformation($data, 'some_action', null);
-    expect($result)->equals($data);
+    verify($result)->equals($data);
     $args = new \stdClass;
     $args->slug = 'different-slug';
     $result = $this->installer->getPluginInformation($data, 'plugin_information', $args);
-    expect($result)->equals($data);
+    verify($result)->equals($data);
   }
 
   public function testItGetsPremiumStatus() {
diff --git a/mailpoet/tests/integration/Config/RendererTest.php b/mailpoet/tests/integration/Config/RendererTest.php
index 7953bb1d81..7a21b0d96e 100644
--- a/mailpoet/tests/integration/Config/RendererTest.php
+++ b/mailpoet/tests/integration/Config/RendererTest.php
@@ -37,8 +37,8 @@ class RendererTest extends \MailPoetTest {
       Env::$cachePath,
       new TwigFileSystem(Env::$viewsPath)
     );
-    expect($renderer->assetsManifestJs)->equals(Env::$assetsPath . '/dist/js/manifest.json');
-    expect($renderer->assetsManifestCss)->equals(Env::$assetsPath . '/dist/css/manifest.json');
+    verify($renderer->assetsManifestJs)->equals(Env::$assetsPath . '/dist/js/manifest.json');
+    verify($renderer->assetsManifestCss)->equals(Env::$assetsPath . '/dist/css/manifest.json');
   }
 
   public function testItGetsAssetManifest() {
@@ -53,8 +53,8 @@ class RendererTest extends \MailPoetTest {
     file_put_contents(Env::$tempPath . '/js.json', json_encode($assetsManifestJs));
     file_put_contents(Env::$tempPath . '/css.json', json_encode($assetsManifestCss));
 
-    expect($this->renderer->getAssetManifest(Env::$tempPath . '/js.json'))->equals($assetsManifestJs);
-    expect($this->renderer->getAssetManifest(Env::$tempPath . '/css.json'))->equals($assetsManifestCss);
+    verify($this->renderer->getAssetManifest(Env::$tempPath . '/js.json'))->equals($assetsManifestJs);
+    verify($this->renderer->getAssetManifest(Env::$tempPath . '/css.json'))->equals($assetsManifestCss);
   }
 
   public function testItReturnsFalseAssetManifestDoesNotExist() {
@@ -68,8 +68,8 @@ class RendererTest extends \MailPoetTest {
     ];
     $renderer = $this->renderer;
     $renderer->assetsManifestCss = $assetsManifestCss;
-    expect($renderer->getCssAsset('style1.css'))->equals('style1.hash.css');
-    expect($renderer->getCssAsset('style2.css'))->equals('style2.hash.css');
+    verify($renderer->getCssAsset('style1.css'))->equals('style1.hash.css');
+    verify($renderer->getCssAsset('style2.css'))->equals('style2.hash.css');
   }
 
   public function testItCanGetJsAsset() {
@@ -79,8 +79,8 @@ class RendererTest extends \MailPoetTest {
     ];
     $renderer = $this->renderer;
     $renderer->assetsManifestJs = $assetsManifestJs;
-    expect($renderer->getJsAsset('script1.js'))->equals('script1.hash.js');
-    expect($renderer->getJsAsset('script2.js'))->equals('script2.hash.js');
+    verify($renderer->getJsAsset('script1.js'))->equals('script1.hash.js');
+    verify($renderer->getJsAsset('script2.js'))->equals('script2.hash.js');
   }
 
   public function testItDelegatesRenderingToTwig() {
@@ -128,7 +128,7 @@ class RendererTest extends \MailPoetTest {
       ]
     );
 
-    expect($renderer->render(['somekey' => 'someval']))->equals('test render');
+    verify($renderer->render(['somekey' => 'someval']))->equals('test render');
   }
 
   public function _after() {
diff --git a/mailpoet/tests/integration/Config/ServicesCheckerTest.php b/mailpoet/tests/integration/Config/ServicesCheckerTest.php
index e76497109d..39fff4e961 100644
--- a/mailpoet/tests/integration/Config/ServicesCheckerTest.php
+++ b/mailpoet/tests/integration/Config/ServicesCheckerTest.php
@@ -178,7 +178,7 @@ class ServicesCheckerTest extends \MailPoetTest {
         'state' => Bridge::KEY_VALID,
       ]
     );
-    expect($this->servicesChecker->getValidAccountKey())->equals($mssKey);
+    verify($this->servicesChecker->getValidAccountKey())->equals($mssKey);
 
     // Only Premium is Valid
     $this->settings->set(
@@ -193,7 +193,7 @@ class ServicesCheckerTest extends \MailPoetTest {
         'state' => '',
       ]
     );
-    expect($this->servicesChecker->getValidAccountKey())->equals($premiumKey);
+    verify($this->servicesChecker->getValidAccountKey())->equals($premiumKey);
 
     // Both Valid (lets use MSS in that case)
     $this->settings->set(
@@ -202,7 +202,7 @@ class ServicesCheckerTest extends \MailPoetTest {
         'state' => Bridge::KEY_VALID,
       ]
     );
-    expect($this->servicesChecker->getValidAccountKey())->equals($mssKey);
+    verify($this->servicesChecker->getValidAccountKey())->equals($mssKey);
 
     // MSS is valid but underprivileged premium invalid
     $this->settings->set(
@@ -217,7 +217,7 @@ class ServicesCheckerTest extends \MailPoetTest {
         'state' => Bridge::KEY_INVALID,
       ]
     );
-    expect($this->servicesChecker->getValidAccountKey())->equals($mssKey);
+    verify($this->servicesChecker->getValidAccountKey())->equals($mssKey);
 
     // MSS is invalid, premium valid but underprivileged
     $this->settings->set(
@@ -232,7 +232,7 @@ class ServicesCheckerTest extends \MailPoetTest {
         'state' => Bridge::KEY_VALID_UNDERPRIVILEGED,
       ]
     );
-    expect($this->servicesChecker->getValidAccountKey())->equals($premiumKey);
+    verify($this->servicesChecker->getValidAccountKey())->equals($premiumKey);
 
     // None valid
     // Only MSS is Valid
diff --git a/mailpoet/tests/integration/Config/ShortcodesTest.php b/mailpoet/tests/integration/Config/ShortcodesTest.php
index a24ef48a21..4d16923be5 100644
--- a/mailpoet/tests/integration/Config/ShortcodesTest.php
+++ b/mailpoet/tests/integration/Config/ShortcodesTest.php
@@ -75,7 +75,7 @@ class ShortcodesTest extends \MailPoetTest {
     $requestData = $this->newsletterUrl->transformUrlDataObject(
       Router::decodeRequestData($data['data'])
     );
-    expect($requestData['newsletter_hash'])->equals($this->newsletter->getHash());
+    verify($requestData['newsletter_hash'])->equals($this->newsletter->getHash());
   }
 
   public function testArchiveAcceptsStartDate() {
diff --git a/mailpoet/tests/integration/Config/TranslationUpdaterTest.php b/mailpoet/tests/integration/Config/TranslationUpdaterTest.php
index f9656eaef6..674a632ace 100644
--- a/mailpoet/tests/integration/Config/TranslationUpdaterTest.php
+++ b/mailpoet/tests/integration/Config/TranslationUpdaterTest.php
@@ -102,19 +102,19 @@ class TranslationUpdaterTest extends \MailPoetTest {
 
     expect($result->translations)->notEmpty();
     $freeTranslation = $result->translations[0];
-    expect($freeTranslation['type'])->equals('plugin');
-    expect($freeTranslation['slug'])->equals($this->freeSlug);
-    expect($freeTranslation['language'])->equals('fr_FR');
-    expect($freeTranslation['version'])->equals($this->freeVersion);
-    expect($freeTranslation['updated'])->equals('2021-08-12 14:28:35');
-    expect($freeTranslation['package'])->equals('https:\/\/translate.files.wordpress.com\/2021\/08\/mailpoet-free-0_1-fr_fr.zip');
+    verify($freeTranslation['type'])->equals('plugin');
+    verify($freeTranslation['slug'])->equals($this->freeSlug);
+    verify($freeTranslation['language'])->equals('fr_FR');
+    verify($freeTranslation['version'])->equals($this->freeVersion);
+    verify($freeTranslation['updated'])->equals('2021-08-12 14:28:35');
+    verify($freeTranslation['package'])->equals('https:\/\/translate.files.wordpress.com\/2021\/08\/mailpoet-free-0_1-fr_fr.zip');
     $premiumTranslation = $result->translations[1];
-    expect($premiumTranslation['type'])->equals('plugin');
-    expect($premiumTranslation['slug'])->equals($this->premiumSlug);
-    expect($premiumTranslation['language'])->equals('fr_FR');
-    expect($premiumTranslation['version'])->equals($this->premiumVersion);
-    expect($premiumTranslation['updated'])->equals('2021-08-12 14:28:35');
-    expect($premiumTranslation['package'])->equals('https:\/\/translate.files.wordpress.com\/2021\/08\/mailpoet-premium-0_1-fr_fr.zip');
+    verify($premiumTranslation['type'])->equals('plugin');
+    verify($premiumTranslation['slug'])->equals($this->premiumSlug);
+    verify($premiumTranslation['language'])->equals('fr_FR');
+    verify($premiumTranslation['version'])->equals($this->premiumVersion);
+    verify($premiumTranslation['updated'])->equals('2021-08-12 14:28:35');
+    verify($premiumTranslation['package'])->equals('https:\/\/translate.files.wordpress.com\/2021\/08\/mailpoet-premium-0_1-fr_fr.zip');
   }
 
   public function testItDoesNotOverrideNewerVersion(): void {
@@ -224,13 +224,13 @@ class TranslationUpdaterTest extends \MailPoetTest {
     $result = $updater->checkForTranslations($updateTransient);
     expect($result->translations)->notEmpty();
     $freeTranslation = $result->translations[0];
-    expect($freeTranslation['type'])->equals('plugin');
-    expect($freeTranslation['slug'])->equals($this->freeSlug);
-    expect($freeTranslation['language'])->equals('fr_FR');
-    expect($freeTranslation['version'])->equals($this->freeVersion);
+    verify($freeTranslation['type'])->equals('plugin');
+    verify($freeTranslation['slug'])->equals($this->freeSlug);
+    verify($freeTranslation['language'])->equals('fr_FR');
+    verify($freeTranslation['version'])->equals($this->freeVersion);
     // We add 1 second to .org so that .com translation are saved as newer.
-    expect($freeTranslation['updated'])->equals('2021-10-15 05:18:36');
-    expect($freeTranslation['package'])->equals('https:\/\/translate.files.wordpress.com\/2021\/08\/mailpoet-free-0_1-fr_fr.zip');
+    verify($freeTranslation['updated'])->equals('2021-10-15 05:18:36');
+    verify($freeTranslation['package'])->equals('https:\/\/translate.files.wordpress.com\/2021\/08\/mailpoet-free-0_1-fr_fr.zip');
   }
 
   public function testItDoesNotInstallDotOrgTranslationsInCaseThereIsLanguagePackFromDotCom(): void {
@@ -294,21 +294,21 @@ class TranslationUpdaterTest extends \MailPoetTest {
     expect($result->translations)->count(4); // askimet + mailpoet cs_CZ and two packs from .com
 
     $mailPoetCs = $result->translations[0];
-    expect($mailPoetCs['slug'])->equals('mailpoet');
-    expect($mailPoetCs['language'])->equals('cs_CZ');
+    verify($mailPoetCs['slug'])->equals('mailpoet');
+    verify($mailPoetCs['language'])->equals('cs_CZ');
 
     $askimetFr = $result->translations[1];
-    expect($askimetFr['slug'])->equals('askimet');
-    expect($askimetFr['language'])->equals('fr_FR');
+    verify($askimetFr['slug'])->equals('askimet');
+    verify($askimetFr['language'])->equals('fr_FR');
 
     $mailpoetFr = $result->translations[2];
-    expect($mailpoetFr['slug'])->equals('mailpoet');
-    expect($mailpoetFr['language'])->equals('fr_FR');
+    verify($mailpoetFr['slug'])->equals('mailpoet');
+    verify($mailpoetFr['language'])->equals('fr_FR');
     expect($mailpoetFr['package'])->stringContainsString('translate.files.wordpress.com');
 
     $mailpoetPremiumFr = $result->translations[3];
-    expect($mailpoetPremiumFr['slug'])->equals('mailpoet-premium');
-    expect($mailpoetPremiumFr['language'])->equals('fr_FR');
+    verify($mailpoetPremiumFr['slug'])->equals('mailpoet-premium');
+    verify($mailpoetPremiumFr['language'])->equals('fr_FR');
     expect($mailpoetPremiumFr['package'])->stringContainsString('translate.files.wordpress.com');
   }
 
@@ -407,12 +407,12 @@ class TranslationUpdaterTest extends \MailPoetTest {
 
     expect($result->translations)->notEmpty();
     $freeTranslation = $result->translations[0];
-    expect($freeTranslation['type'])->equals('plugin');
-    expect($freeTranslation['slug'])->equals($this->freeSlug);
-    expect($freeTranslation['language'])->equals('fr_FR');
-    expect($freeTranslation['version'])->equals($this->freeVersion);
-    expect($freeTranslation['updated'])->equals('2021-08-12 14:28:35');
-    expect($freeTranslation['package'])->equals('https:\/\/translate.files.wordpress.com\/2021\/08\/mailpoet-free-0_1-fr_fr.zip');
+    verify($freeTranslation['type'])->equals('plugin');
+    verify($freeTranslation['slug'])->equals($this->freeSlug);
+    verify($freeTranslation['language'])->equals('fr_FR');
+    verify($freeTranslation['version'])->equals($this->freeVersion);
+    verify($freeTranslation['updated'])->equals('2021-08-12 14:28:35');
+    verify($freeTranslation['package'])->equals('https:\/\/translate.files.wordpress.com\/2021\/08\/mailpoet-free-0_1-fr_fr.zip');
   }
 
   private function getResponseData(): array {
diff --git a/mailpoet/tests/integration/Config/UpdaterTest.php b/mailpoet/tests/integration/Config/UpdaterTest.php
index a9506e64a4..1b85e46657 100644
--- a/mailpoet/tests/integration/Config/UpdaterTest.php
+++ b/mailpoet/tests/integration/Config/UpdaterTest.php
@@ -67,9 +67,9 @@ class UpdaterTest extends \MailPoetTest {
     );
     $result = $updater->checkForUpdate($updateTransient);
     expect($result->last_checked)->greaterOrEquals($updateTransient->last_checked); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($result->checked[$this->pluginName])->equals($this->version);
-    expect($result->response[$this->pluginName]->slug)->equals($this->slug);
-    expect($result->response[$this->pluginName]->plugin)->equals($this->pluginName);
+    verify($result->checked[$this->pluginName])->equals($this->version);
+    verify($result->response[$this->pluginName]->slug)->equals($this->slug);
+    verify($result->response[$this->pluginName]->plugin)->equals($this->pluginName);
     expect(version_compare(
       $this->version,
       $result->response[$this->pluginName]->new_version,
@@ -104,9 +104,9 @@ class UpdaterTest extends \MailPoetTest {
     );
     $result = $updater->checkForUpdate($updateTransient);
     expect($result->last_checked)->greaterOrEquals($updateTransient->last_checked); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($result->checked[$this->pluginName])->equals($this->version);
-    expect($result->no_update[$this->pluginName]->slug)->equals($this->slug); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($result->no_update[$this->pluginName]->plugin)->equals($this->pluginName); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($result->checked[$this->pluginName])->equals($this->version);
+    verify($result->no_update[$this->pluginName]->slug)->equals($this->slug); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($result->no_update[$this->pluginName]->plugin)->equals($this->pluginName); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
     expect(version_compare(
       $this->version,
       $result->no_update[$this->pluginName]->new_version, // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
diff --git a/mailpoet/tests/integration/Cron/ActionScheduler/Actions/DaemonRunTest.php b/mailpoet/tests/integration/Cron/ActionScheduler/Actions/DaemonRunTest.php
index 2cda00a96d..ce4f38b74e 100644
--- a/mailpoet/tests/integration/Cron/ActionScheduler/Actions/DaemonRunTest.php
+++ b/mailpoet/tests/integration/Cron/ActionScheduler/Actions/DaemonRunTest.php
@@ -46,7 +46,7 @@ class DaemonRunTest extends \MailPoetTest {
       'address' => 'john@example.com',
     ]);
     $this->daemonRun->init();
-    expect($this->daemonRun->getDaemonExecutionLimit())->equals(20); // Verify initial execution limit
+    verify($this->daemonRun->getDaemonExecutionLimit())->equals(20); // Verify initial execution limit
 
     $this->actionScheduler->scheduleImmediateSingleAction(DaemonRun::NAME);
     $actions = $this->actionSchedulerHelper->getMailPoetScheduledActions();
diff --git a/mailpoet/tests/integration/Cron/ActionScheduler/Actions/DaemonTriggerTest.php b/mailpoet/tests/integration/Cron/ActionScheduler/Actions/DaemonTriggerTest.php
index b8054dfe79..5b48fe9146 100644
--- a/mailpoet/tests/integration/Cron/ActionScheduler/Actions/DaemonTriggerTest.php
+++ b/mailpoet/tests/integration/Cron/ActionScheduler/Actions/DaemonTriggerTest.php
@@ -41,7 +41,7 @@ class DaemonTriggerTest extends \MailPoetTest {
     expect($actions)->count(1);
     $action = reset($actions);
     $this->assertInstanceOf(\ActionScheduler_Action::class, $action);
-    expect($action->get_hook())->equals(DaemonTrigger::NAME);
+    verify($action->get_hook())->equals(DaemonTrigger::NAME);
   }
 
   public function testTriggerDoesNotTriggerAnythingIfThereAreNoJobs(): void {
@@ -78,7 +78,7 @@ class DaemonTriggerTest extends \MailPoetTest {
     expect($actions)->count(1);
     $action = reset($actions);
     $this->assertInstanceOf(\ActionScheduler_Action::class, $action);
-    expect($action->get_hook())->equals(DaemonRun::NAME);
+    verify($action->get_hook())->equals(DaemonRun::NAME);
     $this->cleanup();
   }
 
diff --git a/mailpoet/tests/integration/Cron/CronHelperTest.php b/mailpoet/tests/integration/Cron/CronHelperTest.php
index ac75d22d3c..a0e9351603 100644
--- a/mailpoet/tests/integration/Cron/CronHelperTest.php
+++ b/mailpoet/tests/integration/Cron/CronHelperTest.php
@@ -32,9 +32,9 @@ class CronHelperTest extends \MailPoetTest {
   }
 
   public function testItDefinesConstants() {
-    expect(CronHelper::DAEMON_EXECUTION_LIMIT)->equals(20);
-    expect(CronHelper::DAEMON_REQUEST_TIMEOUT)->equals(5);
-    expect(CronHelper::DAEMON_SETTING)->equals('cron_daemon');
+    verify(CronHelper::DAEMON_EXECUTION_LIMIT)->equals(20);
+    verify(CronHelper::DAEMON_REQUEST_TIMEOUT)->equals(5);
+    verify(CronHelper::DAEMON_SETTING)->equals('cron_daemon');
   }
 
   public function testItCreatesDaemon() {
@@ -42,7 +42,7 @@ class CronHelperTest extends \MailPoetTest {
     $time = time();
     $this->cronHelper->createDaemon($token);
     $daemon = $this->settings->get(CronHelper::DAEMON_SETTING);
-    expect($daemon)->equals(
+    verify($daemon)->equals(
       [
         'token' => $token,
         'status' => CronHelper::DAEMON_STATUS_ACTIVE,
@@ -61,7 +61,7 @@ class CronHelperTest extends \MailPoetTest {
     $time = time();
     $this->cronHelper->restartDaemon($token);
     $daemon = $this->settings->get(CronHelper::DAEMON_SETTING);
-    expect($daemon)->equals(
+    verify($daemon)->equals(
       [
         'token' => $token,
         'status' => CronHelper::DAEMON_STATUS_ACTIVE,
@@ -81,7 +81,7 @@ class CronHelperTest extends \MailPoetTest {
       CronHelper::DAEMON_SETTING,
       $daemon
     );
-    expect($this->cronHelper->getDaemon())->equals($daemon);
+    verify($this->cronHelper->getDaemon())->equals($daemon);
   }
 
   public function testItSavesDaemon() {
@@ -94,7 +94,7 @@ class CronHelperTest extends \MailPoetTest {
     $time = time();
     $this->cronHelper->saveDaemon($daemon);
     $daemon['updated_at'] = $time;
-    expect($this->cronHelper->getDaemon())->equals($daemon);
+    verify($this->cronHelper->getDaemon())->equals($daemon);
   }
 
   public function testItUpdatesDaemonAccessedAt() {
@@ -119,7 +119,7 @@ class CronHelperTest extends \MailPoetTest {
       $this->cronHelper->accessDaemon('some_token');
       $this->fail('An exception should have been thrown.');
     } catch (\LogicException $e) {
-      expect($e->getMessage())->equals('Daemon does not exist.');
+      verify($e->getMessage())->equals('Daemon does not exist.');
     }
   }
 
@@ -187,7 +187,7 @@ class CronHelperTest extends \MailPoetTest {
 
     $this->cronHelper->deactivateDaemon($daemon);
     $daemon = $this->cronHelper->getDaemon();
-    expect($daemon['status'])->equals(CronHelper::DAEMON_STATUS_INACTIVE);
+    verify($daemon['status'])->equals(CronHelper::DAEMON_STATUS_INACTIVE);
   }
 
   public function testItSavesLastError() {
@@ -200,7 +200,7 @@ class CronHelperTest extends \MailPoetTest {
     $time = time();
     $this->cronHelper->saveDaemonLastError('error');
     $daemon = $this->cronHelper->getDaemon();
-    expect($daemon['last_error'])->equals('error');
+    verify($daemon['last_error'])->equals('error');
     expect($daemon['last_error_date'])->greaterOrEquals($time);
   }
 
@@ -213,7 +213,7 @@ class CronHelperTest extends \MailPoetTest {
 
     $this->cronHelper->saveDaemonRunCompleted(123);
     $daemon = $this->cronHelper->getDaemon();
-    expect($daemon['run_completed_at'])->equals(123);
+    verify($daemon['run_completed_at'])->equals(123);
   }
 
   public function testItCreatesRandomToken() {
@@ -222,24 +222,24 @@ class CronHelperTest extends \MailPoetTest {
     $token2 = $this->cronHelper->createToken();
     expect($token1)->notEquals($token2);
     expect(is_string($token1))->true();
-    expect(strlen($token1))->equals(5);
+    verify(strlen($token1))->equals(5);
   }
 
   public function testItGetsSiteUrl() {
     // 1. do nothing when the url does not contain port
     $siteUrl = 'http://example.com';
-    expect($this->cronHelper->getSiteUrl($siteUrl))->equals($siteUrl);
+    verify($this->cronHelper->getSiteUrl($siteUrl))->equals($siteUrl);
 
     if (getenv('WP_TEST_ENABLE_NETWORK_TESTS') !== 'true') $this->markTestSkipped();
 
     // 2. when url contains valid port, try connecting to it
     $siteUrl = 'http://example.com:80';
-    expect($this->cronHelper->getSiteUrl($siteUrl))->equals($siteUrl);
+    verify($this->cronHelper->getSiteUrl($siteUrl))->equals($siteUrl);
 
     // 3. when url contains invalid port, try connecting to it. when connection fails,
     // another attempt will be made to connect to the standard port derived from URL schema
     $siteUrl = 'http://example.com:8080';
-    expect($this->cronHelper->getSiteUrl($siteUrl))->equals('http://example.com');
+    verify($this->cronHelper->getSiteUrl($siteUrl))->equals('http://example.com');
 
     // 4. when connection can't be established, exception should be thrown
     $siteUrl = 'https://invalid:80';
@@ -247,7 +247,7 @@ class CronHelperTest extends \MailPoetTest {
       $this->cronHelper->getSiteUrl($siteUrl);
       self::fail('Site URL is unreachable exception not thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('Site URL is unreachable.');
+      verify($e->getMessage())->equals('Site URL is unreachable.');
     }
   }
 
@@ -274,7 +274,7 @@ class CronHelperTest extends \MailPoetTest {
       return 'http://custom_cron_url';
     };
     add_filter('mailpoet_cron_request_url', $filter);
-    expect($this->cronHelper->getCronUrl('sample_action'))->equals('http://custom_cron_url');
+    verify($this->cronHelper->getCronUrl('sample_action'))->equals('http://custom_cron_url');
     remove_filter('mailpoet_cron_request_url', $filter);
   }
 
@@ -298,7 +298,7 @@ class CronHelperTest extends \MailPoetTest {
     $wp->addFilter('mailpoet_cron_request_args', $filter);
     $cronHelper = new CronHelper($this->settings, $wp);
     $cronHelper->queryCronUrl('test');
-    expect($wpRemoteGetArgs[1])->equals($requestArgs);
+    verify($wpRemoteGetArgs[1])->equals($requestArgs);
 
     $wp->removeFilter('mailpoet_cron_request_args', $filter);
   }
@@ -311,7 +311,7 @@ class CronHelperTest extends \MailPoetTest {
       },
     ]);
     $cronHelper = new CronHelper($this->settings, $wp);
-    expect($cronHelper->pingDaemon())->equals('A valid URL was not provided.');
+    verify($cronHelper->pingDaemon())->equals('A valid URL was not provided.');
   }
 
   public function testItPingsDaemon() {
@@ -326,7 +326,7 @@ class CronHelperTest extends \MailPoetTest {
       }
     }
     // raw response is returned
-    expect($pingResponse)->equals(DaemonHttpRunner::PING_SUCCESS_RESPONSE);
+    verify($pingResponse)->equals(DaemonHttpRunner::PING_SUCCESS_RESPONSE);
   }
 
   public function testItValidatesPingResponse() {
diff --git a/mailpoet/tests/integration/Cron/CronWorkerRunnerTest.php b/mailpoet/tests/integration/Cron/CronWorkerRunnerTest.php
index c4f68d6a0b..f56d936375 100644
--- a/mailpoet/tests/integration/Cron/CronWorkerRunnerTest.php
+++ b/mailpoet/tests/integration/Cron/CronWorkerRunnerTest.php
@@ -165,12 +165,12 @@ class CronWorkerRunnerTest extends \MailPoetTest {
       $this->cronWorkerRunner->run($worker);
       $this->fail('An exception should be thrown');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('test error');
+      verify($e->getMessage())->equals('test error');
       $task = $this->scheduledTasksRepository->findOneById($task->getId());
       $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
       expect($task->getScheduledAt())->greaterThan($scheduledAt);
       expect($task->getStatus())->same(ScheduledTaskEntity::STATUS_SCHEDULED);
-      expect($task->getRescheduleCount())->equals(1);
+      verify($task->getRescheduleCount())->equals(1);
       expect($task->getInProgress())->isEmpty();
     }
   }
@@ -191,9 +191,9 @@ class CronWorkerRunnerTest extends \MailPoetTest {
       expect($e->getCode())->same(CronHelper::DAEMON_EXECUTION_LIMIT_REACHED);
       $task = $this->scheduledTasksRepository->findOneById($task->getId());
       $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
-      expect($scheduledAt)->equals($task->getScheduledAt());
+      verify($scheduledAt)->equals($task->getScheduledAt());
       expect($task->getStatus())->null();
-      expect($task->getRescheduleCount())->equals(0);
+      verify($task->getRescheduleCount())->equals(0);
     }
   }
 
diff --git a/mailpoet/tests/integration/Cron/CronWorkerSchedulerTest.php b/mailpoet/tests/integration/Cron/CronWorkerSchedulerTest.php
index ab69525154..97394e892d 100644
--- a/mailpoet/tests/integration/Cron/CronWorkerSchedulerTest.php
+++ b/mailpoet/tests/integration/Cron/CronWorkerSchedulerTest.php
@@ -37,7 +37,7 @@ class CronWorkerSchedulerTest extends \MailPoetTest {
     expect($this->entityManager->getRepository(ScheduledTaskEntity::class)->findAll())->count(1);
 
     $result = $this->cronWorkerScheduler->schedule('test', $nextRunDate);
-    expect($result->getId())->equals($task->getId());
+    verify($result->getId())->equals($task->getId());
     expect($this->entityManager->getRepository(ScheduledTaskEntity::class)->findAll())->count(1);
   }
 
@@ -48,7 +48,7 @@ class CronWorkerSchedulerTest extends \MailPoetTest {
     $this->entityManager->flush();
     $immediateTask = $this->cronWorkerScheduler->scheduleImmediatelyIfNotRunning('test');
     $tasks = $this->entityManager->getRepository(ScheduledTaskEntity::class)->findAll();
-    expect($immediateTask->getId())->equals($task->getId());
+    verify($immediateTask->getId())->equals($task->getId());
     expect($tasks)->count(1);
     expect($tasks[0]->getType())->same('test');
     expect($tasks[0]->getStatus())->null();
@@ -60,7 +60,7 @@ class CronWorkerSchedulerTest extends \MailPoetTest {
     $task = $this->cronWorkerScheduler->schedule('test', $nextRunDate);
     $immediateTask = $this->cronWorkerScheduler->scheduleImmediatelyIfNotRunning('test');
     $tasks = $this->entityManager->getRepository(ScheduledTaskEntity::class)->findAll();
-    expect($immediateTask->getId())->equals($task->getId());
+    verify($immediateTask->getId())->equals($task->getId());
     expect($tasks)->count(1);
     expect($tasks[0]->getType())->same('test');
     expect($tasks[0]->getStatus())->same(ScheduledTaskEntity::STATUS_SCHEDULED);
@@ -71,8 +71,8 @@ class CronWorkerSchedulerTest extends \MailPoetTest {
     $this->cronWorkerScheduler->scheduleImmediatelyIfNotRunning('test');
     $tasks = $this->entityManager->getRepository(ScheduledTaskEntity::class)->findAll();
     expect($tasks)->count(1);
-    expect($tasks[0]->getType())->equals('test');
-    expect($tasks[0]->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
+    verify($tasks[0]->getType())->equals('test');
+    verify($tasks[0]->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
     $this->tester->assertEqualDateTimes($tasks[0]->getScheduledAt(), Carbon::now(), 1);
   }
 
@@ -94,15 +94,15 @@ class CronWorkerSchedulerTest extends \MailPoetTest {
     $scheduledAt = $task->getScheduledAt();
 
     $timeout = $this->cronWorkerScheduler->rescheduleProgressively($task);
-    expect($timeout)->equals(ScheduledTaskEntity::BASIC_RESCHEDULE_TIMEOUT);
+    verify($timeout)->equals(ScheduledTaskEntity::BASIC_RESCHEDULE_TIMEOUT);
     expect($scheduledAt < $task->getScheduledAt())->true();
-    expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
+    verify($task->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
 
     $timeout = $this->cronWorkerScheduler->rescheduleProgressively($task);
-    expect($timeout)->equals(ScheduledTaskEntity::BASIC_RESCHEDULE_TIMEOUT * 2);
+    verify($timeout)->equals(ScheduledTaskEntity::BASIC_RESCHEDULE_TIMEOUT * 2);
 
     $task->setRescheduleCount(123456); // too many
     $timeout = $this->cronWorkerScheduler->rescheduleProgressively($task);
-    expect($timeout)->equals(ScheduledTaskEntity::MAX_RESCHEDULE_TIMEOUT);
+    verify($timeout)->equals(ScheduledTaskEntity::MAX_RESCHEDULE_TIMEOUT);
   }
 }
diff --git a/mailpoet/tests/integration/Cron/DaemonActionSchedulerRunnerTest.php b/mailpoet/tests/integration/Cron/DaemonActionSchedulerRunnerTest.php
index c062c5e0f6..7557896b71 100644
--- a/mailpoet/tests/integration/Cron/DaemonActionSchedulerRunnerTest.php
+++ b/mailpoet/tests/integration/Cron/DaemonActionSchedulerRunnerTest.php
@@ -35,7 +35,7 @@ class DaemonActionSchedulerRunnerTest extends \MailPoetTest {
     expect($actions)->count(1);
     $action = reset($actions);
     $this->assertInstanceOf(\ActionScheduler_Action::class, $action);
-    expect($action->get_hook())->equals(DaemonTrigger::NAME);
+    verify($action->get_hook())->equals(DaemonTrigger::NAME);
   }
 
   public function testItDeactivateAllTasks(): void {
diff --git a/mailpoet/tests/integration/Cron/DaemonHttpRunnerTest.php b/mailpoet/tests/integration/Cron/DaemonHttpRunnerTest.php
index b3595651c6..0694a41a4e 100644
--- a/mailpoet/tests/integration/Cron/DaemonHttpRunnerTest.php
+++ b/mailpoet/tests/integration/Cron/DaemonHttpRunnerTest.php
@@ -46,7 +46,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest {
         },
       ]
     );
-    expect($daemon->run(false))->equals('Invalid or missing request data.');
+    verify($daemon->run(false))->equals('Invalid or missing request data.');
   }
 
   public function testItDoesNotRunWhenThereIsInvalidOrMissingToken() {
@@ -61,7 +61,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest {
     $daemon->settingsDaemonData = [
       'token' => 123,
     ];
-    expect($daemon->run(['token' => 456]))->equals('Invalid or missing token.');
+    verify($daemon->run(['token' => 456]))->equals('Invalid or missing token.');
   }
 
   public function testItStoresErrorMessageAndContinuesExecutionWhenWorkersThrowException() {
@@ -91,8 +91,8 @@ class DaemonHttpRunnerTest extends \MailPoetTest {
     $daemonHttpRunner->__construct($daemon, $this->cronHelper, SettingsController::getInstance(), $this->diContainer->get(WordPress::class));
     $daemonHttpRunner->run($data);
     $updatedDaemon = $this->settings->get(CronHelper::DAEMON_SETTING);
-    expect($updatedDaemon['last_error'][0]['message'])->equals('Message');
-    expect($updatedDaemon['last_error'][1]['message'])->equals('');
+    verify($updatedDaemon['last_error'][0]['message'])->equals('Message');
+    verify($updatedDaemon['last_error'][1]['message'])->equals('');
   }
 
   public function testItCanPauseExecution() {
@@ -156,7 +156,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest {
     $daemonHttpRunner->__construct($daemon, $this->cronHelper, SettingsController::getInstance(), $this->diContainer->get(WordPress::class));
     $daemonHttpRunner->run($data);
     $dataAfterRun = $this->settings->get(CronHelper::DAEMON_SETTING);
-    expect($dataAfterRun['token'])->equals(567);
+    verify($dataAfterRun['token'])->equals(567);
   }
 
   public function testItTerminatesExecutionWhenDaemonIsDeactivated() {
@@ -212,7 +212,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest {
     $daemonHttpRunner->__construct($daemon, $this->cronHelper, SettingsController::getInstance(), $this->diContainer->get(WordPress::class));
     $daemonHttpRunner->run($data);
     $updatedDaemon = $this->settings->get(CronHelper::DAEMON_SETTING);
-    expect($updatedDaemon['token'])->equals($daemonHttpRunner->token);
+    verify($updatedDaemon['token'])->equals($daemonHttpRunner->token);
   }
 
   public function testItUpdatesTimestampsDuringExecution() {
@@ -249,7 +249,7 @@ class DaemonHttpRunnerTest extends \MailPoetTest {
 
   public function testItCanRun() {
     ignore_user_abort(false);
-    expect(ignore_user_abort())->equals(false);
+    verify(ignore_user_abort())->equals(false);
     $daemonHttpRunner = $this->make(DaemonHttpRunner::class, [
       'pauseExecution' => null,
       // daemon should call itself
@@ -267,13 +267,13 @@ class DaemonHttpRunnerTest extends \MailPoetTest {
     $daemon = new Daemon($this->cronHelper, $cronWorkerRunnerMock, $this->createWorkersFactoryMock(), $this->diContainer->get(LoggerFactory::class));
     $daemonHttpRunner->__construct($daemon, $this->cronHelper, SettingsController::getInstance(), $this->diContainer->get(WordPress::class));
     $daemonHttpRunner->run($data);
-    expect(ignore_user_abort())->equals(true);
+    verify(ignore_user_abort())->equals(true);
   }
 
   public function testItRespondsToPingRequest() {
     $daemon = $this->make(DaemonHttpRunner::class, [
       'terminateRequest' => Expected::exactly(1, function($message) {
-        expect($message)->equals('pong');
+        verify($message)->equals('pong');
       }),
     ]);
     $daemon->ping();
diff --git a/mailpoet/tests/integration/Cron/SupervisorTest.php b/mailpoet/tests/integration/Cron/SupervisorTest.php
index c1246fbecc..8fbc837655 100644
--- a/mailpoet/tests/integration/Cron/SupervisorTest.php
+++ b/mailpoet/tests/integration/Cron/SupervisorTest.php
@@ -44,13 +44,13 @@ class SupervisorTest extends \MailPoetTest {
   public function testItReturnsDaemonWhenOneExists() {
     if (getenv('WP_TEST_ENABLE_NETWORK_TESTS') !== 'true') $this->markTestSkipped();
     $this->supervisor->init();
-    expect($this->supervisor->getDaemon())->equals($this->supervisor->daemon);
+    verify($this->supervisor->getDaemon())->equals($this->supervisor->daemon);
   }
 
   public function testItDoesNothingWhenDaemonExecutionDurationIsBelowLimit() {
     if (getenv('WP_TEST_ENABLE_NETWORK_TESTS') !== 'true') $this->markTestSkipped();
     $this->supervisor->init();
-    expect($this->supervisor->checkDaemon())
+    verify($this->supervisor->checkDaemon())
       ->equals($this->supervisor->daemon);
   }
 
@@ -61,7 +61,7 @@ class SupervisorTest extends \MailPoetTest {
     $daemon = $this->supervisor->checkDaemon();
     expect(is_int($daemon['updated_at']))->true();
     expect($daemon['updated_at'])->notEquals($this->supervisor->daemon['updated_at']);
-    expect($daemon['status'])->equals(CronHelper::DAEMON_STATUS_ACTIVE);
+    verify($daemon['status'])->equals(CronHelper::DAEMON_STATUS_ACTIVE);
   }
 
   public function testRestartsDaemonWhenItIsInactive() {
@@ -70,6 +70,6 @@ class SupervisorTest extends \MailPoetTest {
     $this->supervisor->daemon['updated_at'] = time();
     $this->supervisor->daemon['status'] = CronHelper::DAEMON_STATUS_INACTIVE;
     $daemon = $this->supervisor->checkDaemon();
-    expect($daemon['status'])->equals(CronHelper::DAEMON_STATUS_ACTIVE);
+    verify($daemon['status'])->equals(CronHelper::DAEMON_STATUS_ACTIVE);
   }
 }
diff --git a/mailpoet/tests/integration/Cron/Triggers/WordPressTest.php b/mailpoet/tests/integration/Cron/Triggers/WordPressTest.php
index 6f436df2a2..21139172eb 100644
--- a/mailpoet/tests/integration/Cron/Triggers/WordPressTest.php
+++ b/mailpoet/tests/integration/Cron/Triggers/WordPressTest.php
@@ -66,8 +66,8 @@ class WordPressTest extends \MailPoetTest {
     $currentTime = time();
     $this->settings->set(WordPress::LAST_RUN_AT_SETTING, $currentTime);
     $this->addQueue(SendingQueueEntity::STATUS_SCHEDULED);
-    expect($this->wordpressTrigger->run())->equals(false);
-    expect($this->settings->get(WordPress::LAST_RUN_AT_SETTING))->equals($currentTime);
+    verify($this->wordpressTrigger->run())->equals(false);
+    verify($this->settings->get(WordPress::LAST_RUN_AT_SETTING))->equals($currentTime);
     WPFunctions::get()->removeAllFilters('mailpoet_cron_trigger_wordpress_run_interval');
   }
 
@@ -162,9 +162,9 @@ class WordPressTest extends \MailPoetTest {
 
   public function testItCanDeactivateRunningDaemon() {
     $this->settings->set(CronHelper::DAEMON_SETTING, ['status' => CronHelper::DAEMON_STATUS_ACTIVE]);
-    expect($this->settings->get(CronHelper::DAEMON_SETTING)['status'])->equals(CronHelper::DAEMON_STATUS_ACTIVE);
+    verify($this->settings->get(CronHelper::DAEMON_SETTING)['status'])->equals(CronHelper::DAEMON_STATUS_ACTIVE);
     $this->wordpressTrigger->stop();
-    expect($this->settings->get(CronHelper::DAEMON_SETTING)['status'])->equals(CronHelper::DAEMON_STATUS_INACTIVE);
+    verify($this->settings->get(CronHelper::DAEMON_SETTING)['status'])->equals(CronHelper::DAEMON_STATUS_INACTIVE);
   }
 
   public function testItRunsWhenExecutionRequirementsAreMet() {
@@ -178,9 +178,9 @@ class WordPressTest extends \MailPoetTest {
 
   public function testItDeactivatesCronDaemonWhenExecutionRequirementsAreNotMet() {
     $this->settings->set(CronHelper::DAEMON_SETTING, ['status' => CronHelper::DAEMON_STATUS_ACTIVE]);
-    expect($this->settings->get(CronHelper::DAEMON_SETTING)['status'])->equals(CronHelper::DAEMON_STATUS_ACTIVE);
+    verify($this->settings->get(CronHelper::DAEMON_SETTING)['status'])->equals(CronHelper::DAEMON_STATUS_ACTIVE);
     $this->wordpressTrigger->run();
-    expect($this->settings->get(CronHelper::DAEMON_SETTING)['status'])->equals(CronHelper::DAEMON_STATUS_INACTIVE);
+    verify($this->settings->get(CronHelper::DAEMON_SETTING)['status'])->equals(CronHelper::DAEMON_STATUS_INACTIVE);
   }
 
   public function testItDoesNotTriggerCronWhenFutureStatsReportIsScheduled() {
diff --git a/mailpoet/tests/integration/Cron/Workers/BeamerTest.php b/mailpoet/tests/integration/Cron/Workers/BeamerTest.php
index 7b083d710a..1df67ee63f 100644
--- a/mailpoet/tests/integration/Cron/Workers/BeamerTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/BeamerTest.php
@@ -22,8 +22,8 @@ class BeamerTest extends \MailPoetTest {
     ]);
     $beamer = new Beamer($settings, $wp);
     $done = $beamer->setLastAnnouncementDate();
-    expect($done)->equals(true);
-    expect($settings->get('last_announcement_date'))->equals(Carbon::createFromTimeString($newDate)->getTimestamp());
+    verify($done)->equals(true);
+    verify($settings->get('last_announcement_date'))->equals(Carbon::createFromTimeString($newDate)->getTimestamp());
   }
 
   public function testItDoesNothingIfNoResponse() {
@@ -36,8 +36,8 @@ class BeamerTest extends \MailPoetTest {
     ]);
     $beamer = new Beamer($settings, $wp);
     $done = $beamer->setLastAnnouncementDate();
-    expect($done)->equals(false);
-    expect($settings->get('last_announcement_date'))->equals(Carbon::createFromTimeString($oldDate)->getTimestamp());
+    verify($done)->equals(false);
+    verify($settings->get('last_announcement_date'))->equals(Carbon::createFromTimeString($oldDate)->getTimestamp());
   }
 
   public function testItDoesNothingIfWrongResponse() {
@@ -50,8 +50,8 @@ class BeamerTest extends \MailPoetTest {
     ]);
     $beamer = new Beamer($settings, $wp);
     $done = $beamer->setLastAnnouncementDate();
-    expect($done)->equals(false);
-    expect($settings->get('last_announcement_date'))->equals(Carbon::createFromTimeString($oldDate)->getTimestamp());
+    verify($done)->equals(false);
+    verify($settings->get('last_announcement_date'))->equals(Carbon::createFromTimeString($oldDate)->getTimestamp());
   }
 
   public function testItDoesNothingIfEmptyList() {
@@ -64,7 +64,7 @@ class BeamerTest extends \MailPoetTest {
     ]);
     $beamer = new Beamer($settings, $wp);
     $done = $beamer->setLastAnnouncementDate();
-    expect($done)->equals(false);
-    expect($settings->get('last_announcement_date'))->equals(Carbon::createFromTimeString($oldDate)->getTimestamp());
+    verify($done)->equals(false);
+    verify($settings->get('last_announcement_date'))->equals(Carbon::createFromTimeString($oldDate)->getTimestamp());
   }
 }
diff --git a/mailpoet/tests/integration/Cron/Workers/BounceTest.php b/mailpoet/tests/integration/Cron/Workers/BounceTest.php
index 9eb83f9c8c..3f395c1e50 100644
--- a/mailpoet/tests/integration/Cron/Workers/BounceTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/BounceTest.php
@@ -74,7 +74,7 @@ class BounceTest extends \MailPoetTest {
   }
 
   public function testItDefinesConstants() {
-    expect(Bounce::BATCH_SIZE)->equals(100);
+    verify(Bounce::BATCH_SIZE)->equals(100);
   }
 
   public function testItCanInitializeBridgeAPI() {
@@ -112,14 +112,14 @@ class BounceTest extends \MailPoetTest {
 
   public function testItPreparesTask() {
     $task = $this->createScheduledTask();
-    expect($this->scheduledTaskSubscribersRepository->countBy([
+    verify($this->scheduledTaskSubscribersRepository->countBy([
       'task' => $task,
       'processed' => ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED,
     ]))->equals(0);
     $result = $this->worker->prepareTaskStrategy($task, microtime(true));
     expect($this->emails)->count($this->scheduledTaskSubscribersRepository->countBy([]));
     expect($result)->true();
-    expect($this->scheduledTaskSubscribersRepository->countBy([
+    verify($this->scheduledTaskSubscribersRepository->countBy([
       'task' => $task,
       'processed' => ScheduledTaskSubscriberEntity::STATUS_UNPROCESSED,
     ]))->equals(count($this->emails));
@@ -158,10 +158,10 @@ class BounceTest extends \MailPoetTest {
 
     $subscribers = $this->subscribersRepository->findAll();
 
-    expect($subscribers[0]->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
-    expect($subscribers[1]->getStatus())->equals(SubscriberEntity::STATUS_BOUNCED);
-    expect($subscribers[2]->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
-    expect($subscribers[3]->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED);
+    verify($subscribers[0]->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscribers[1]->getStatus())->equals(SubscriberEntity::STATUS_BOUNCED);
+    verify($subscribers[2]->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscribers[3]->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED);
   }
 
   public function testItCreatesStatistics() {
diff --git a/mailpoet/tests/integration/Cron/Workers/InactiveSubscribersTest.php b/mailpoet/tests/integration/Cron/Workers/InactiveSubscribersTest.php
index 66ab205d74..b512113cc5 100644
--- a/mailpoet/tests/integration/Cron/Workers/InactiveSubscribersTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/InactiveSubscribersTest.php
@@ -106,8 +106,8 @@ class InactiveSubscribersTest extends \MailPoetTest {
     $this->entityManager->flush();
     $worker->processTaskStrategy($task, microtime(true));
 
-    expect($controllerMock->markInactiveSubscribers(5, 1000))->equals(0);
-    expect($controllerMock->markActiveSubscribers(5, 1000))->equals(0);
+    verify($controllerMock->markInactiveSubscribers(5, 1000))->equals(0);
+    verify($controllerMock->markActiveSubscribers(5, 1000))->equals(0);
   }
 
   public function testItCanStopDeactivationIfMarkInactiveSubscribersReturnsFalse() {
@@ -126,7 +126,7 @@ class InactiveSubscribersTest extends \MailPoetTest {
     $worker->processTaskStrategy($task, microtime(true));
 
     $meta = $task->getMeta();
-    expect(isset($meta['last_subscriber_id']))->equals(false);
+    verify(isset($meta['last_subscriber_id']))->equals(false);
   }
 
   public function testThrowsAnExceptionWhenTimeIsOut() {
diff --git a/mailpoet/tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php b/mailpoet/tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php
index 29bb364ab8..a664560921 100644
--- a/mailpoet/tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php
@@ -52,7 +52,7 @@ class PremiumKeyCheckTest extends \MailPoetTest {
         $this->equalTo($response)
       );
     $this->fillPremiumKey();
-    expect($this->worker->checkKey())->equals($response);
+    verify($this->worker->checkKey())->equals($response);
   }
 
   private function fillPremiumKey() {
diff --git a/mailpoet/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php b/mailpoet/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php
index 2cb14a7ea5..c34a856832 100644
--- a/mailpoet/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php
@@ -37,7 +37,7 @@ class SendingServiceKeyCheckTest extends \MailPoetTest {
     // normally next run is scheduled at the next day in first six hours
     $nextRun = $this->worker->getNextRunDate();
     $nextDay = Carbon::now()->startOfDay()->addDay()->addHours(6);
-    expect($nextRun->format('Y-m-d'))->equals($nextDay->format('Y-m-d'));
+    verify($nextRun->format('Y-m-d'))->equals($nextDay->format('Y-m-d'));
     expect($nextRun)->lessThan($nextDay);
 
     // when pending key approval, next run is scheduled in an hour
@@ -101,7 +101,7 @@ class SendingServiceKeyCheckTest extends \MailPoetTest {
         $this->equalTo($response)
       );
     $this->setMailPoetSendingMethod();
-    expect($this->worker->checkKey())->equals($response);
+    verify($this->worker->checkKey())->equals($response);
   }
 
   private function setMailPoetSendingMethod() {
diff --git a/mailpoet/tests/integration/Cron/Workers/SchedulerTest.php b/mailpoet/tests/integration/Cron/Workers/SchedulerTest.php
index 8d4c994918..a054806d0b 100644
--- a/mailpoet/tests/integration/Cron/Workers/SchedulerTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/SchedulerTest.php
@@ -158,12 +158,12 @@ class SchedulerTest extends \MailPoetTest {
     $this->assertInstanceOf(NewsletterEntity::class, $notificationHistory);
     // check the hash of the post notification history
     expect($notificationHistory->getHash())->notEquals($newsletter->getHash());
-    expect(strlen((string)$notificationHistory->getHash()))->equals(Security::HASH_LENGTH);
+    verify(strlen((string)$notificationHistory->getHash()))->equals(Security::HASH_LENGTH);
     // check the unsubscribe token of the post notification history
     expect($notificationHistory->getUnsubscribeToken())->notEquals($newsletter->getUnsubscribeToken());
-    expect(strlen((string)$notificationHistory->getUnsubscribeToken()))->equals(Security::UNSUBSCRIBE_TOKEN_LENGTH);
+    verify(strlen((string)$notificationHistory->getUnsubscribeToken()))->equals(Security::UNSUBSCRIBE_TOKEN_LENGTH);
 
-    expect($notificationHistory->getParent())->equals($newsletter);
+    verify($notificationHistory->getParent())->equals($newsletter);
     expect($notificationHistory->getNewsletterSegments())->count(count($segments));
   }
 
@@ -486,13 +486,13 @@ class SchedulerTest extends \MailPoetTest {
     $updatedSubscribersIds = array_map(function(SubscriberEntity $subscriber): int {
       return (int)$subscriber->getId();
     }, $updatedSubscribers);
-    expect($updatedSubscribersIds)->equals([$subscriber->getId()]);
+    verify($updatedSubscribersIds)->equals([$subscriber->getId()]);
     // set queue's status to null
     expect($scheduledTask->getStatus())->null();
     // set newsletter's status to sending
     $updatedNewsletter = $this->newslettersRepository->findOneById($newsletter->getId());
     $this->assertInstanceOf(NewsletterEntity::class, $updatedNewsletter);
-    expect($updatedNewsletter->getStatus())->equals(NewsletterEntity::STATUS_SENDING);
+    verify($updatedNewsletter->getStatus())->equals(NewsletterEntity::STATUS_SENDING);
   }
 
   public function testItFailsToProcessPostNotificationNewsletterWhenSegmentsDontExist() {
@@ -570,16 +570,16 @@ class SchedulerTest extends \MailPoetTest {
     $updatedSubscribersIds = array_map(function(SubscriberEntity $subscriber): int {
       return (int)$subscriber->getId();
     }, $updatedSubscribers);
-    expect($updatedSubscribersIds)->equals([$subscriber->getId()]);
+    verify($updatedSubscribersIds)->equals([$subscriber->getId()]);
     $scheduledNewsletter = $sendingQueue->getNewsletter();
     $this->assertInstanceOf(NewsletterEntity::class, $scheduledNewsletter);
-    expect($scheduledNewsletter->getId())->equals($notificationHistory->getId());
-    expect($sendingQueue->getCountProcessed())->equals(0);
-    expect($sendingQueue->getCountToProcess())->equals(1);
+    verify($scheduledNewsletter->getId())->equals($notificationHistory->getId());
+    verify($sendingQueue->getCountProcessed())->equals(0);
+    verify($sendingQueue->getCountToProcess())->equals(1);
     // set notification history's status to sending
     $updatedNotificationHistory = $this->newslettersRepository->findOneBy(['parent' => $newsletter->getId()]);
     $this->assertInstanceOf(NewsletterEntity::class, $updatedNotificationHistory);
-    expect($updatedNotificationHistory->getStatus())->equals(NewsletterEntity::STATUS_SENDING);
+    verify($updatedNotificationHistory->getStatus())->equals(NewsletterEntity::STATUS_SENDING);
   }
 
   public function testItFailsToProcessWhenScheduledQueuesNotFound() {
@@ -777,9 +777,9 @@ class SchedulerTest extends \MailPoetTest {
 
     // scheduled task should exist
     $task = SendingTask::getByNewsletterId($newsletter->getId());
-    expect($task->status)->equals(SendingQueueEntity::STATUS_SCHEDULED);
-    expect($task->newsletterId)->equals($newsletter->getId());
-    expect($task->getSubscribers())->equals([$subscriber->getId()]);
+    verify($task->status)->equals(SendingQueueEntity::STATUS_SCHEDULED);
+    verify($task->newsletterId)->equals($newsletter->getId());
+    verify($task->getSubscribers())->equals([$subscriber->getId()]);
 
     // task should have its status set to null (i.e., sending)
     $scheduler = $this->getScheduler();
@@ -802,9 +802,9 @@ class SchedulerTest extends \MailPoetTest {
 
     // scheduled task should exist
     $task = SendingTask::getByNewsletterId($newsletter->getId());
-    expect($task->status)->equals(SendingQueueEntity::STATUS_SCHEDULED);
-    expect($task->newsletterId)->equals($newsletter->getId());
-    expect($task->getSubscribers())->equals([$subscriber->getId()]);
+    verify($task->status)->equals(SendingQueueEntity::STATUS_SCHEDULED);
+    verify($task->newsletterId)->equals($newsletter->getId());
+    verify($task->getSubscribers())->equals([$subscriber->getId()]);
 
     // task should be deleted
     $scheduler = $this->getScheduler();
@@ -837,8 +837,8 @@ class SchedulerTest extends \MailPoetTest {
 
     // scheduled task should exist
     $task = SendingTask::getByNewsletterId($newsletter->getId());
-    expect($task->status)->equals(SendingQueueEntity::STATUS_SCHEDULED);
-    expect($task->newsletterId)->equals($newsletter->getId());
+    verify($task->status)->equals(SendingQueueEntity::STATUS_SCHEDULED);
+    verify($task->newsletterId)->equals($newsletter->getId());
 
     // task should have its status set to null (i.e., sending)
     $scheduler = $this->getScheduler($this->subscribersFinder);
@@ -848,7 +848,7 @@ class SchedulerTest extends \MailPoetTest {
     // task should have 1 subscriber added from segment
     $subscribers = $task->subscribers()->findMany();
     expect($subscribers)->count(1);
-    expect($subscribers[0]->id)->equals($subscriber->getId());
+    verify($subscribers[0]->id)->equals($subscriber->getId());
   }
 
   public function testItProcessesScheduledAutomationEmail() {
@@ -863,9 +863,9 @@ class SchedulerTest extends \MailPoetTest {
 
     // scheduled task should exist
     $task = SendingTask::getByNewsletterId($newsletter->getId());
-    expect($task->status)->equals(SendingQueueEntity::STATUS_SCHEDULED);
-    expect($task->newsletterId)->equals($newsletter->getId());
-    expect($task->getSubscribers())->equals([$subscriber->getId()]);
+    verify($task->status)->equals(SendingQueueEntity::STATUS_SCHEDULED);
+    verify($task->newsletterId)->equals($newsletter->getId());
+    verify($task->getSubscribers())->equals([$subscriber->getId()]);
 
     // task should have its status set to null (i.e., sending)
     $scheduler = $this->getScheduler();
@@ -888,9 +888,9 @@ class SchedulerTest extends \MailPoetTest {
 
     // scheduled task should exist
     $task = SendingTask::getByNewsletterId($newsletter->getId());
-    expect($task->status)->equals(SendingQueueEntity::STATUS_SCHEDULED);
-    expect($task->newsletterId)->equals($newsletter->getId());
-    expect($task->getSubscribers())->equals([$subscriber->getId()]);
+    verify($task->status)->equals(SendingQueueEntity::STATUS_SCHEDULED);
+    verify($task->newsletterId)->equals($newsletter->getId());
+    verify($task->getSubscribers())->equals([$subscriber->getId()]);
 
     // task should be deleted
     $scheduler = $this->getScheduler();
diff --git a/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingErrorHandlerTest.php b/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingErrorHandlerTest.php
index 874d86facd..5dd9cb3844 100644
--- a/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingErrorHandlerTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingErrorHandlerTest.php
@@ -43,9 +43,9 @@ class SendingErrorHandlerTest extends \MailPoetTest {
           2,
           function($id, $message) {
             if ($id === 2) {
-              expect($message)->equals('Error Message');
+              verify($message)->equals('Error Message');
             } else {
-              expect($message)->equals('Subscriber Message');
+              verify($message)->equals('Subscriber Message');
             }
           }
         ),
diff --git a/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php b/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php
index b3a98cdc21..69874ee9b4 100644
--- a/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php
@@ -186,7 +186,7 @@ class SendingQueueTest extends \MailPoetTest {
   }
 
   public function testItReturnsCorrectBatchSize(): void {
-    expect($this->sendingQueueWorker->getBatchSize())->equals(SendingThrottlingHandler::BATCH_SIZE);
+    verify($this->sendingQueueWorker->getBatchSize())->equals(SendingThrottlingHandler::BATCH_SIZE);
   }
 
   public function testItEnforcesExecutionLimitsBeforeQueueProcessing() {
@@ -366,11 +366,11 @@ class SendingQueueTest extends \MailPoetTest {
         [
           'send' => Expected::exactly(1, function($newsletter, $subscriber, $extraParams) use ($directUnsubscribeURL) {
             expect(isset($extraParams['unsubscribe_url']))->true();
-            expect($extraParams['unsubscribe_url'])->equals($directUnsubscribeURL);
+            verify($extraParams['unsubscribe_url'])->equals($directUnsubscribeURL);
             expect(isset($extraParams['meta']))->true();
-            expect($extraParams['meta']['email_type'])->equals('newsletter');
-            expect($extraParams['meta']['subscriber_status'])->equals('subscribed');
-            expect($extraParams['meta']['subscriber_source'])->equals('administrator');
+            verify($extraParams['meta']['email_type'])->equals('newsletter');
+            verify($extraParams['meta']['subscriber_status'])->equals('subscribed');
+            verify($extraParams['meta']['subscriber_source'])->equals('administrator');
             return $this->mailerTaskDummyResponse;
           }),
         ]
@@ -389,11 +389,11 @@ class SendingQueueTest extends \MailPoetTest {
         [
           'send' => Expected::exactly(1, function($newsletter, $subscriber, $extraParams) use ($trackedUnsubscribeURL) {
             expect(isset($extraParams['unsubscribe_url']))->true();
-            expect($extraParams['unsubscribe_url'])->equals($trackedUnsubscribeURL);
+            verify($extraParams['unsubscribe_url'])->equals($trackedUnsubscribeURL);
             expect(isset($extraParams['meta']))->true();
-            expect($extraParams['meta']['email_type'])->equals('newsletter');
-            expect($extraParams['meta']['subscriber_status'])->equals('subscribed');
-            expect($extraParams['meta']['subscriber_source'])->equals('administrator');
+            verify($extraParams['meta']['email_type'])->equals('newsletter');
+            verify($extraParams['meta']['subscriber_status'])->equals('subscribed');
+            verify($extraParams['meta']['subscriber_source'])->equals('administrator');
             return $this->mailerTaskDummyResponse;
           }),
         ]
@@ -430,7 +430,7 @@ class SendingQueueTest extends \MailPoetTest {
     // newsletter status is set to sent
     $updatedNewsletter = Newsletter::findOne($this->newsletter->id);
     $this->assertInstanceOf(Newsletter::class, $updatedNewsletter);
-    expect($updatedNewsletter->status)->equals(Newsletter::STATUS_SENT);
+    verify($updatedNewsletter->status)->equals(Newsletter::STATUS_SENT);
 
     // queue status is set to completed
     $sendingQueue = $this->sendingQueuesRepository->findOneById($this->queue->id);
@@ -439,16 +439,16 @@ class SendingQueueTest extends \MailPoetTest {
     $this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask);
     $this->sendingQueuesRepository->refresh($sendingQueue);
     $this->scheduledTasksRepository->refresh($scheduledTask);
-    expect($scheduledTask->getStatus())->equals(SendingQueue::STATUS_COMPLETED);
+    verify($scheduledTask->getStatus())->equals(SendingQueue::STATUS_COMPLETED);
 
     // queue subscriber processed/to process count is updated
     expect($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED))
       ->count(0);
     $processedSubscribers = $scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED);
-    expect($processedSubscribers)->equals([$this->subscriber]);
-    expect($sendingQueue->getCountTotal())->equals(1);
-    expect($sendingQueue->getCountProcessed())->equals(1);
-    expect($sendingQueue->getCountToProcess())->equals(0);
+    verify($processedSubscribers)->equals([$this->subscriber]);
+    verify($sendingQueue->getCountTotal())->equals(1);
+    verify($sendingQueue->getCountProcessed())->equals(1);
+    verify($sendingQueue->getCountToProcess())->equals(0);
 
     // statistics entry should be created
     $statistics = StatisticsNewsletters::where('newsletter_id', $this->newsletter->id)
@@ -510,13 +510,13 @@ class SendingQueueTest extends \MailPoetTest {
             $subscriber = $subscribersRepository->findOneBy(['email' => $subscriberEmail]);
             $subscriptionUrlFactory = SubscriptionUrlFactory::getInstance();
             $unsubscribeUrl = $subscriptionUrlFactory->getUnsubscribeUrl($subscriber, (int)$queue->id);
-            expect($newsletter['subject'])->equals('News for ' . $subscriberEmail);
-            expect($newsletter['body']['html'])->equals('<p>Hello ' . $subscriberEmail . '</p>');
-            expect($newsletter['body']['text'])->equals('Hello ' . $subscriberEmail);
-            expect($extraParams['meta']['email_type'])->equals('newsletter');
-            expect($extraParams['meta']['subscriber_status'])->equals(SubscriberEntity::STATUS_SUBSCRIBED);
-            expect($extraParams['meta']['subscriber_source'])->equals('form');
-            expect($extraParams['unsubscribe_url'])->equals($unsubscribeUrl);
+            verify($newsletter['subject'])->equals('News for ' . $subscriberEmail);
+            verify($newsletter['body']['html'])->equals('<p>Hello ' . $subscriberEmail . '</p>');
+            verify($newsletter['body']['text'])->equals('Hello ' . $subscriberEmail);
+            verify($extraParams['meta']['email_type'])->equals('newsletter');
+            verify($extraParams['meta']['subscriber_status'])->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+            verify($extraParams['meta']['subscriber_source'])->equals('form');
+            verify($extraParams['unsubscribe_url'])->equals($unsubscribeUrl);
 
             return $this->mailerTaskDummyResponse;
           }),
@@ -558,7 +558,7 @@ class SendingQueueTest extends \MailPoetTest {
     // newsletter status is set to sent
     $updatedNewsletter = Newsletter::findOne($this->newsletter->id);
     $this->assertInstanceOf(Newsletter::class, $updatedNewsletter);
-    expect($updatedNewsletter->status)->equals(Newsletter::STATUS_SENT);
+    verify($updatedNewsletter->status)->equals(Newsletter::STATUS_SENT);
 
     // queue status is set to completed
     $sendingQueue = $this->sendingQueuesRepository->findOneById($this->queue->id);
@@ -567,16 +567,16 @@ class SendingQueueTest extends \MailPoetTest {
     $this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask);
     $this->sendingQueuesRepository->refresh($sendingQueue);
     $this->scheduledTasksRepository->refresh($scheduledTask);
-    expect($scheduledTask->getStatus())->equals(SendingQueue::STATUS_COMPLETED);
+    verify($scheduledTask->getStatus())->equals(SendingQueue::STATUS_COMPLETED);
 
     // queue subscriber processed/to process count is updated
     expect($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED))
       ->count(0);
     $processedSubscribers = $scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED);
-    expect($processedSubscribers)->equals([$this->subscriber]);
-    expect($sendingQueue->getCountTotal())->equals(1);
-    expect($sendingQueue->getCountProcessed())->equals(1);
-    expect($sendingQueue->getCountToProcess())->equals(0);
+    verify($processedSubscribers)->equals([$this->subscriber]);
+    verify($sendingQueue->getCountTotal())->equals(1);
+    verify($sendingQueue->getCountProcessed())->equals(1);
+    verify($sendingQueue->getCountToProcess())->equals(0);
 
     // statistics entry should be created
     $statistics = StatisticsNewsletters::where('newsletter_id', $this->newsletter->id)
@@ -610,22 +610,22 @@ class SendingQueueTest extends \MailPoetTest {
     $this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask);
     $this->sendingQueuesRepository->refresh($sendingQueue);
     $this->scheduledTasksRepository->refresh($scheduledTask);
-    expect($scheduledTask->getStatus())->equals(SendingQueue::STATUS_COMPLETED);
+    verify($scheduledTask->getStatus())->equals(SendingQueue::STATUS_COMPLETED);
 
     // newsletter status is set to sent and sent_at date is populated
     $updatedNewsletter = $this->newslettersRepository->findOneById($this->newsletter->id);
     $this->assertInstanceOf(NewsletterEntity::class, $updatedNewsletter);
-    expect($updatedNewsletter->getStatus())->equals(Newsletter::STATUS_SENT);
-    expect($updatedNewsletter->getSentAt())->equals($scheduledTask->getProcessedAt());
+    verify($updatedNewsletter->getStatus())->equals(Newsletter::STATUS_SENT);
+    verify($updatedNewsletter->getSentAt())->equals($scheduledTask->getProcessedAt());
 
     // queue subscriber processed/to process count is updated
     expect($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED))
       ->count(0);
     $processedSubscribers = $scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED);
-    expect($processedSubscribers)->equals([$this->subscriber]);
-    expect($sendingQueue->getCountTotal())->equals(1);
-    expect($sendingQueue->getCountProcessed())->equals(1);
-    expect($sendingQueue->getCountToProcess())->equals(0);
+    verify($processedSubscribers)->equals([$this->subscriber]);
+    verify($sendingQueue->getCountTotal())->equals(1);
+    verify($sendingQueue->getCountProcessed())->equals(1);
+    verify($sendingQueue->getCountToProcess())->equals(0);
 
     // statistics entry should be created
     $statistics = StatisticsNewsletters::where('newsletter_id', $this->newsletter->id)
@@ -695,11 +695,11 @@ class SendingQueueTest extends \MailPoetTest {
     $this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask);
     $this->sendingQueuesRepository->refresh($sendingQueue);
     $this->scheduledTasksRepository->refresh($scheduledTask);
-    expect($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED))->equals([$this->subscriber]);
-    expect($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED))->equals([$wrongSubscriber]);
-    expect($sendingQueue->getCountTotal())->equals(2);
-    expect($sendingQueue->getCountProcessed())->equals(1);
-    expect($sendingQueue->getCountToProcess())->equals(1);
+    verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED))->equals([$this->subscriber]);
+    verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED))->equals([$wrongSubscriber]);
+    verify($sendingQueue->getCountTotal())->equals(2);
+    verify($sendingQueue->getCountProcessed())->equals(1);
+    verify($sendingQueue->getCountToProcess())->equals(1);
 
     $sendingQueueWorker->sendNewsletters(
       $queue,
@@ -713,11 +713,11 @@ class SendingQueueTest extends \MailPoetTest {
     // load queue and compare data after second sending
     $this->sendingQueuesRepository->refresh($sendingQueue);
     $this->scheduledTasksRepository->refresh($scheduledTask);
-    expect($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED))->equals([]);
-    expect($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED))->equals([$this->subscriber, $wrongSubscriber]);
-    expect($sendingQueue->getCountTotal())->equals(2);
-    expect($sendingQueue->getCountProcessed())->equals(2);
-    expect($sendingQueue->getCountToProcess())->equals(0);
+    verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED))->equals([]);
+    verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED))->equals([$this->subscriber, $wrongSubscriber]);
+    verify($sendingQueue->getCountTotal())->equals(2);
+    verify($sendingQueue->getCountProcessed())->equals(2);
+    verify($sendingQueue->getCountToProcess())->equals(0);
   }
 
   public function testItUpdatesUpdateTime() {
@@ -764,7 +764,7 @@ class SendingQueueTest extends \MailPoetTest {
     // newsletter status is set to sent
     $updatedNewsletter = Newsletter::findOne($this->newsletter->id);
     $this->assertInstanceOf(Newsletter::class, $updatedNewsletter);
-    expect($updatedNewsletter->status)->equals(Newsletter::STATUS_SENT);
+    verify($updatedNewsletter->status)->equals(Newsletter::STATUS_SENT);
 
     // queue status is set to completed
     $sendingQueue = $this->sendingQueuesRepository->findOneById($this->queue->id);
@@ -773,16 +773,16 @@ class SendingQueueTest extends \MailPoetTest {
     $this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask);
     $this->sendingQueuesRepository->refresh($sendingQueue);
     $this->scheduledTasksRepository->refresh($scheduledTask);
-    expect($scheduledTask->getStatus())->equals(SendingQueue::STATUS_COMPLETED);
+    verify($scheduledTask->getStatus())->equals(SendingQueue::STATUS_COMPLETED);
 
     // queue subscriber processed/to process count is updated
-    expect($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED))
+    verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED))
       ->equals([]);
-    expect($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED))
+    verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED))
       ->equals([$this->subscriber]);
-    expect($sendingQueue->getCountTotal())->equals(1);
-    expect($sendingQueue->getCountProcessed())->equals(1);
-    expect($sendingQueue->getCountToProcess())->equals(0);
+    verify($sendingQueue->getCountTotal())->equals(1);
+    verify($sendingQueue->getCountProcessed())->equals(1);
+    verify($sendingQueue->getCountToProcess())->equals(0);
 
     // statistics entry should be created
     $statistics = StatisticsNewsletters::where('newsletter_id', $this->newsletter->id)
@@ -817,11 +817,11 @@ class SendingQueueTest extends \MailPoetTest {
     $this->sendingQueuesRepository->refresh($sendingQueue);
     $this->scheduledTasksRepository->refresh($scheduledTask);
 
-    expect($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED))
+    verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED))
       ->equals([]);
-    expect($sendingQueue->getCountTotal())->equals(0);
-    expect($sendingQueue->getCountProcessed())->equals(0);
-    expect($sendingQueue->getCountToProcess())->equals(0);
+    verify($sendingQueue->getCountTotal())->equals(0);
+    verify($sendingQueue->getCountProcessed())->equals(0);
+    verify($sendingQueue->getCountToProcess())->equals(0);
   }
 
   public function testItPreventsSendingNewsletterToRecipientWhoIsUnsubscribed() {
@@ -855,11 +855,11 @@ class SendingQueueTest extends \MailPoetTest {
     $this->scheduledTasksRepository->refresh($scheduledTask);
 
     // Unprocessable subscribers were removed
-    expect($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED))
+    verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED))
       ->equals([$this->subscriber]); // subscriber that should be processed
-    expect($sendingQueue->getCountTotal())->equals(1);
-    expect($sendingQueue->getCountProcessed())->equals(1);
-    expect($sendingQueue->getCountToProcess())->equals(0);
+    verify($sendingQueue->getCountTotal())->equals(1);
+    verify($sendingQueue->getCountProcessed())->equals(1);
+    verify($sendingQueue->getCountToProcess())->equals(0);
   }
 
   public function testItRemovesNonexistentSubscribersFromProcessingList() {
@@ -889,17 +889,17 @@ class SendingQueueTest extends \MailPoetTest {
     $this->sendingQueuesRepository->refresh($sendingQueue);
     $this->scheduledTasksRepository->refresh($scheduledTask);
     // queue subscriber processed/to process count is updated
-    expect($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED))
+    verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED))
       ->equals([]);
-    expect($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED))
+    verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED))
       ->equals([$this->subscriber]);
-    expect($sendingQueue->getCountTotal())->equals(1);
-    expect($sendingQueue->getCountProcessed())->equals(1);
-    expect($sendingQueue->getCountToProcess())->equals(0);
+    verify($sendingQueue->getCountTotal())->equals(1);
+    verify($sendingQueue->getCountProcessed())->equals(1);
+    verify($sendingQueue->getCountToProcess())->equals(0);
 
     // statistics entry should be created only for 1 subscriber
     $statistics = StatisticsNewsletters::findMany();
-    expect(count($statistics))->equals(1);
+    verify(count($statistics))->equals(1);
   }
 
   public function testItDoesNotCallMailerWithEmptyBatch() {
@@ -931,13 +931,13 @@ class SendingQueueTest extends \MailPoetTest {
     $this->sendingQueuesRepository->refresh($sendingQueue);
     $this->scheduledTasksRepository->refresh($scheduledTask);
     // queue subscriber processed/to process count is updated
-    expect($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED))
+    verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED))
       ->equals([]);
-    expect($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED))
+    verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED))
       ->equals([$this->subscriber]);
-    expect($sendingQueue->getCountTotal())->equals(1);
-    expect($sendingQueue->getCountProcessed())->equals(1);
-    expect($sendingQueue->getCountToProcess())->equals(0);
+    verify($sendingQueue->getCountTotal())->equals(1);
+    verify($sendingQueue->getCountProcessed())->equals(1);
+    verify($sendingQueue->getCountToProcess())->equals(0);
   }
 
   public function testItUpdatesQueueSubscriberCountWhenNoneOfSubscribersExist() {
@@ -963,13 +963,13 @@ class SendingQueueTest extends \MailPoetTest {
     $this->sendingQueuesRepository->refresh($sendingQueue);
     $this->scheduledTasksRepository->refresh($scheduledTask);
     // queue subscriber processed/to process count is updated
-    expect($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED))
+    verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_UNPROCESSED))
       ->equals([]);
-    expect($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED))
+    verify($scheduledTask->getSubscribersByProcessed(ScheduledTaskSubscriber::STATUS_PROCESSED))
       ->equals([]);
-    expect($sendingQueue->getCountTotal())->equals(0);
-    expect($sendingQueue->getCountProcessed())->equals(0);
-    expect($sendingQueue->getCountToProcess())->equals(0);
+    verify($sendingQueue->getCountTotal())->equals(0);
+    verify($sendingQueue->getCountProcessed())->equals(0);
+    verify($sendingQueue->getCountToProcess())->equals(0);
   }
 
   public function testItDoesNotSendToTrashedSubscribers() {
@@ -989,7 +989,7 @@ class SendingQueueTest extends \MailPoetTest {
     $sendingQueue = $this->sendingQueuesRepository->findOneById($this->queue->id);
     $this->assertInstanceOf(SendingQueueEntity::class, $sendingQueue);
     $this->sendingQueuesRepository->refresh($sendingQueue);
-    expect($sendingQueue->getCountTotal())->equals(0);
+    verify($sendingQueue->getCountTotal())->equals(0);
   }
 
   /**
@@ -1015,7 +1015,7 @@ class SendingQueueTest extends \MailPoetTest {
     $sendingQueue = $this->sendingQueuesRepository->findOneById($this->queue->id);
     $this->assertInstanceOf(SendingQueueEntity::class, $sendingQueue);
     $this->sendingQueuesRepository->refresh($sendingQueue);
-    expect($sendingQueue->getCountTotal())->equals($expectSending ? 1 : 0);
+    verify($sendingQueue->getCountTotal())->equals($expectSending ? 1 : 0);
     // Transactional emails shouldn't update last sending at
     $this->subscribersRepository->refresh($subscriber);
     expect($subscriber->getLastSendingAt())->null();
@@ -1048,7 +1048,7 @@ class SendingQueueTest extends \MailPoetTest {
     $sendingQueue = $this->sendingQueuesRepository->findOneById($this->queue->id);
     $this->assertInstanceOf(SendingQueueEntity::class, $sendingQueue);
     $this->sendingQueuesRepository->refresh($sendingQueue);
-    expect($sendingQueue->getCountTotal())->equals(0);
+    verify($sendingQueue->getCountTotal())->equals(0);
   }
 
   public function testItDoesNotSendToSubscribersUnsubscribedFromSegments() {
@@ -1068,7 +1068,7 @@ class SendingQueueTest extends \MailPoetTest {
     $sendingQueue = $this->sendingQueuesRepository->findOneById($this->queue->id);
     $this->assertInstanceOf(SendingQueueEntity::class, $sendingQueue);
     $this->sendingQueuesRepository->refresh($sendingQueue);
-    expect($sendingQueue->getCountTotal())->equals(0);
+    verify($sendingQueue->getCountTotal())->equals(0);
   }
 
   public function testItDoesNotSendToInactiveSubscribers() {
@@ -1088,7 +1088,7 @@ class SendingQueueTest extends \MailPoetTest {
     $sendingQueue = $this->sendingQueuesRepository->findOneById($this->queue->id);
     $this->assertInstanceOf(SendingQueueEntity::class, $sendingQueue);
     $this->sendingQueuesRepository->refresh($sendingQueue);
-    expect($sendingQueue->getCountTotal())->equals(0);
+    verify($sendingQueue->getCountTotal())->equals(0);
   }
 
   public function testItPausesSendingWhenProcessedSubscriberListCannotBeUpdated() {
@@ -1137,11 +1137,11 @@ class SendingQueueTest extends \MailPoetTest {
       );
       $this->fail('Paused sending exception was not thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('Sending has been paused.');
+      verify($e->getMessage())->equals('Sending has been paused.');
     }
     $mailerLog = MailerLog::getMailerLog();
-    expect($mailerLog['status'])->equals(MailerLog::STATUS_PAUSED);
-    expect($mailerLog['error'])->equals(
+    verify($mailerLog['status'])->equals(MailerLog::STATUS_PAUSED);
+    verify($mailerLog['error'])->equals(
       [
         'operation' => 'processed_list_update',
         'error_message' => 'QUEUE-100-PROCESSED-LIST-UPDATE',
@@ -1164,8 +1164,8 @@ class SendingQueueTest extends \MailPoetTest {
     // newsletter is sent and hash remains intact
     $updatedNewsletter = Newsletter::findOne($this->newsletter->id);
     $this->assertInstanceOf(Newsletter::class, $updatedNewsletter);
-    expect($updatedNewsletter->status)->equals(Newsletter::STATUS_SENT);
-    expect($updatedNewsletter->hash)->equals($this->newsletter->hash);
+    verify($updatedNewsletter->status)->equals(Newsletter::STATUS_SENT);
+    verify($updatedNewsletter->hash)->equals($this->newsletter->hash);
   }
 
   public function testItAllowsSettingCustomBatchSize() {
@@ -1176,7 +1176,7 @@ class SendingQueueTest extends \MailPoetTest {
     $wp = new WPFunctions;
     $wp->addFilter('mailpoet_cron_worker_sending_queue_batch_size', $filter);
     $sendingQueueWorker = $this->getSendingQueueWorker();
-    expect($sendingQueueWorker->getBatchSize())->equals($customBatchSizeValue);
+    verify($sendingQueueWorker->getBatchSize())->equals($customBatchSizeValue);
     $wp->removeFilter('mailpoet_cron_worker_sending_queue_batch_size', $filter);
   }
 
@@ -1216,7 +1216,7 @@ class SendingQueueTest extends \MailPoetTest {
 
     $refetchedTask = ScheduledTask::where('id', $task->id)->findOne();
     $this->assertInstanceOf(ScheduledTask::class, $refetchedTask); // PHPStan
-    expect($refetchedTask->scheduledAt)->equals($inOneHour);
+    verify($refetchedTask->scheduledAt)->equals($inOneHour);
   }
 
   public function testItPauseSendingTaskThatHasTrashedSegment() {
@@ -1234,9 +1234,9 @@ class SendingQueueTest extends \MailPoetTest {
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
     $this->entityManager->refresh($task);
     $this->entityManager->refresh($newsletter);
-    expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_PAUSED);
-    expect($newsletter->getStatus())->equals(NewsletterEntity::STATUS_SENDING);
-    expect($this->wp->getTransient(SendingQueueWorker::EMAIL_WITH_INVALID_SEGMENT_OPTION))->equals('Subject With Trashed');
+    verify($task->getStatus())->equals(ScheduledTaskEntity::STATUS_PAUSED);
+    verify($newsletter->getStatus())->equals(NewsletterEntity::STATUS_SENDING);
+    verify($this->wp->getTransient(SendingQueueWorker::EMAIL_WITH_INVALID_SEGMENT_OPTION))->equals('Subject With Trashed');
   }
 
   public function testItPauseSendingTaskThatHasDeletedSegment() {
@@ -1256,9 +1256,9 @@ class SendingQueueTest extends \MailPoetTest {
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
     $this->entityManager->refresh($task);
     $this->entityManager->refresh($newsletter);
-    expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_PAUSED);
-    expect($newsletter->getStatus())->equals(NewsletterEntity::STATUS_SENDING);
-    expect($this->wp->getTransient(SendingQueueWorker::EMAIL_WITH_INVALID_SEGMENT_OPTION))->equals('Subject With Deleted');
+    verify($task->getStatus())->equals(ScheduledTaskEntity::STATUS_PAUSED);
+    verify($newsletter->getStatus())->equals(NewsletterEntity::STATUS_SENDING);
+    verify($this->wp->getTransient(SendingQueueWorker::EMAIL_WITH_INVALID_SEGMENT_OPTION))->equals('Subject With Deleted');
   }
 
   public function testItGeneratesPartOfAnMD5CampaignIdStoredAsSendingQueueMeta() {
@@ -1280,7 +1280,7 @@ class SendingQueueTest extends \MailPoetTest {
     $meta = $this->queue->getSendingQueueEntity()->getMeta();
     expect(isset($meta['campaignId']))->true();
     $campaignId = $meta['campaignId'];
-    expect(strlen($campaignId))->equals(16);
+    verify(strlen($campaignId))->equals(16);
   }
 
   public function testItPassesCampaignIdToMailerViaExtraParamsMeta() {
@@ -1304,7 +1304,7 @@ class SendingQueueTest extends \MailPoetTest {
     $meta = $this->queue->getSendingQueueEntity()->getMeta();
     expect(isset($meta['campaignId']))->true();
     $campaignId = $meta['campaignId'];
-    expect($mailerTaskExtraParams['meta']['campaign_id'])->equals($campaignId);
+    verify($mailerTaskExtraParams['meta']['campaign_id'])->equals($campaignId);
   }
 
   public function testCampaignIdsAreTheSameForDifferentSubscribers() {
@@ -1336,9 +1336,9 @@ class SendingQueueTest extends \MailPoetTest {
     $meta = $this->queue->getSendingQueueEntity()->getMeta();
     expect(isset($meta['campaignId']))->true();
     $campaignId = $meta['campaignId'];
-    expect(count($mailerTaskCampaignIds))->equals(2);
+    verify(count($mailerTaskCampaignIds))->equals(2);
     foreach (array_values($mailerTaskCampaignIds) as $mailerTaskCampaignId) {
-      expect($mailerTaskCampaignId)->equals($campaignId);
+      verify($mailerTaskCampaignId)->equals($campaignId);
     }
   }
 
@@ -1357,8 +1357,8 @@ class SendingQueueTest extends \MailPoetTest {
     $task = $queue->getTask();
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
 
-    expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_INVALID);
-    expect($newsletter->getStatus())->equals(NewsletterEntity::STATUS_SENDING);
+    verify($task->getStatus())->equals(ScheduledTaskEntity::STATUS_INVALID);
+    verify($newsletter->getStatus())->equals(NewsletterEntity::STATUS_SENDING);
   }
 
   private function createNewsletter(string $type, $subject, string $status = NewsletterEntity::STATUS_DRAFT): NewsletterEntity {
diff --git a/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingThrottlingHandlerTest.php b/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingThrottlingHandlerTest.php
index 43728ba648..1c474fefb5 100644
--- a/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingThrottlingHandlerTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/SendingQueue/SendingThrottlingHandlerTest.php
@@ -21,36 +21,36 @@ class SendingThrottlingHandlerTest extends \MailPoetTest {
 
   public function testItReturnsDefaultBatchSize(): void {
     $batchSize = $this->throttlingHandler->getBatchSize();
-    expect($batchSize)->equals(SendingThrottlingHandler::BATCH_SIZE);
+    verify($batchSize)->equals(SendingThrottlingHandler::BATCH_SIZE);
   }
 
   public function testItThrottlesBatchSizeToHalf(): void {
     $batchSize = $this->throttlingHandler->getBatchSize();
-    expect($batchSize)->equals(SendingThrottlingHandler::BATCH_SIZE);
-    expect($this->throttlingHandler->throttleBatchSize())->equals($batchSize / 2);
+    verify($batchSize)->equals(SendingThrottlingHandler::BATCH_SIZE);
+    verify($this->throttlingHandler->throttleBatchSize())->equals($batchSize / 2);
   }
 
   public function testItIncreaseSuccessRequestCountInRow(): void {
     $this->throttlingHandler->throttleBatchSize();
     $this->throttlingHandler->processSuccess();
     $throttlingSettings = $this->settings->get(SendingThrottlingHandler::SETTINGS_KEY);
-    expect($throttlingSettings['success_count'])->equals(1);
+    verify($throttlingSettings['success_count'])->equals(1);
   }
 
   public function testItSetsBatchSizeMinimumToOne(): void {
     for ($i = 1; $i <= 10; $i++) {
       $this->throttlingHandler->throttleBatchSize();
     }
-    expect($this->throttlingHandler->getBatchSize())->equals(1);
+    verify($this->throttlingHandler->getBatchSize())->equals(1);
   }
 
   public function testInIncreasesBatchSizeBack(): void {
     $this->settings->set(SendingThrottlingHandler::SETTINGS_KEY, []);
     $this->throttlingHandler->throttleBatchSize();
-    expect($this->throttlingHandler->getBatchSize())->equals(SendingThrottlingHandler::BATCH_SIZE / 2);
+    verify($this->throttlingHandler->getBatchSize())->equals(SendingThrottlingHandler::BATCH_SIZE / 2);
     for ($i = 1; $i <= SendingThrottlingHandler::SUCCESS_THRESHOLD_TO_INCREASE; $i++) {
       $this->throttlingHandler->processSuccess();
     }
-    expect($this->throttlingHandler->getBatchSize())->equals(SendingThrottlingHandler::BATCH_SIZE);
+    verify($this->throttlingHandler->getBatchSize())->equals(SendingThrottlingHandler::BATCH_SIZE);
   }
 }
diff --git a/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/LinksTest.php b/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/LinksTest.php
index e1b7817ada..a86ba39663 100644
--- a/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/LinksTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/LinksTest.php
@@ -45,10 +45,10 @@ class LinksTest extends \MailPoetTest {
     $newsletterLink = $this->newsletterLinkRepository->findOneBy(['hash' => $links[0]['hash']]);
     $this->assertInstanceOf(NewsletterLinkEntity::class, $newsletterLink);
     $this->assertInstanceOf(NewsletterEntity::class, $newsletterLink->getNewsletter());
-    expect($newsletterLink->getNewsletter()->getId())->equals($this->newsletter->getId());
+    verify($newsletterLink->getNewsletter()->getId())->equals($this->newsletter->getId());
     $this->assertInstanceOf(SendingQueueEntity::class, $newsletterLink->getQueue());
-    expect($newsletterLink->getQueue()->getId())->equals($this->queue->getId());
-    expect($newsletterLink->getUrl())->equals($links[0]['link']);
+    verify($newsletterLink->getQueue()->getId())->equals($this->queue->getId());
+    verify($newsletterLink->getUrl())->equals($links[0]['link']);
   }
 
   public function testItCanHashAndReplaceLinks() {
@@ -63,7 +63,7 @@ class LinksTest extends \MailPoetTest {
       ->stringContainsString($processedAndHashedLinks[0]['hash']);
     expect($processedRenderedNewsletterBody['text'])
       ->stringContainsString($processedAndHashedLinks[0]['hash']);
-    expect($processedAndHashedLinks[0]['link'])->equals('http://example.com');
+    verify($processedAndHashedLinks[0]['link'])->equals('http://example.com');
   }
 
   public function testItCanProcessRenderedBody() {
@@ -93,6 +93,6 @@ class LinksTest extends \MailPoetTest {
         'url' => NewsletterLinkEntity::INSTANT_UNSUBSCRIBE_LINK_SHORT_CODE,
       ]
     );
-    expect($unsubscribeCount)->equals(1);
+    verify($unsubscribeCount)->equals(1);
   }
 }
diff --git a/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/MailerTest.php b/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/MailerTest.php
index 12f6cb34b9..de02e8bd5d 100644
--- a/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/MailerTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/MailerTest.php
@@ -61,9 +61,9 @@ class MailerTest extends \MailPoetTest {
   public function testItUpdatesMailerLogSentCount() {
     $mailerTask = $this->diContainer->get(MailerTask::class);
     $mailerLog = $mailerTask->getMailerLog();
-    expect(array_sum($mailerLog['sent']))->equals(0);
+    verify(array_sum($mailerLog['sent']))->equals(0);
     $mailerLog = $mailerTask->updateSentCount();
-    expect(array_sum($mailerLog['sent']))->equals(1);
+    verify(array_sum($mailerLog['sent']))->equals(1);
   }
 
   public function testItGetsProcessingMethod() {
@@ -76,7 +76,7 @@ class MailerTest extends \MailPoetTest {
       ]
     );
     $mailerTask = new MailerTask($this->diContainer->get(MailerFactory::class));
-    expect($mailerTask->getProcessingMethod())->equals('bulk');
+    verify($mailerTask->getProcessingMethod())->equals('bulk');
 
     // when using other methods, newsletters should be processed individually
     $this->settings->set(
@@ -86,7 +86,7 @@ class MailerTest extends \MailPoetTest {
       ]
     );
     $mailerTask = new MailerTask($this->diContainer->get(MailerFactory::class));
-    expect($mailerTask->getProcessingMethod())->equals('individual');
+    verify($mailerTask->getProcessingMethod())->equals('individual');
   }
 
   public function testItCanPrepareSubscriberForSending() {
@@ -97,7 +97,7 @@ class MailerTest extends \MailPoetTest {
     $subscriber->save();
     $mailerTask = $this->diContainer->get(MailerTask::class);
     $preparedSubscriber = $mailerTask->prepareSubscriberForSending($subscriber);
-    expect($preparedSubscriber)->equals('John Doe <test@example.com>');
+    verify($preparedSubscriber)->equals('John Doe <test@example.com>');
   }
 
   public function testItCanSend() {
@@ -118,6 +118,6 @@ class MailerTest extends \MailPoetTest {
     // mock mailer instance and ensure that send method is invoked
     $mailerTask = new MailerTask($mailerFactoryMock);
     // send method should return true
-    expect($mailerTask->send('Newsletter', 'Subscriber'))->equals(['response' => true]);
+    verify($mailerTask->send('Newsletter', 'Subscriber'))->equals(['response' => true]);
   }
 }
diff --git a/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php b/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php
index ed04d41899..4d25e74df2 100644
--- a/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/NewsletterTest.php
@@ -251,7 +251,7 @@ class NewsletterTest extends \MailPoetTest {
     expect($newsletterPost)->isInstanceOf(NewsletterPostEntity::class);
     expect($result)->notEquals(false);
     $this->assertInstanceOf(NewsletterPostEntity::class, $newsletterPost);
-    expect($newsletterPost->getPostId())->equals('10');
+    verify($newsletterPost->getPostId())->equals('10');
   }
 
   public function testItUpdatesStatusAndSetsSentAtDateOnlyForStandardAndPostNotificationNewsletters() {
@@ -268,10 +268,10 @@ class NewsletterTest extends \MailPoetTest {
     $this->newsletterTask->markNewsletterAsSent($newsletter, $this->sendingTask);
     $updatedNewsletter = $this->newslettersRepository->findOneById($newsletter->getId());
     $this->assertInstanceOf(NewsletterEntity::class, $updatedNewsletter);
-    expect($updatedNewsletter->getStatus())->equals(NewsletterEntity::STATUS_SENT);
+    verify($updatedNewsletter->getStatus())->equals(NewsletterEntity::STATUS_SENT);
     $sentAt = $updatedNewsletter->getSentAt();
     $this->assertInstanceOf(\DateTime::class, $sentAt);
-    expect($sentAt->getTimestamp())->equals($sendingQueue->processedAt->getTimestamp(), 1);
+    verify($sentAt->getTimestamp())->equals($sendingQueue->processedAt->getTimestamp(), 1);
 
     // newsletter type is 'notification history'
     $newsletter->setType(NewsletterEntity::TYPE_NOTIFICATION_HISTORY);
@@ -281,10 +281,10 @@ class NewsletterTest extends \MailPoetTest {
     $this->newsletterTask->markNewsletterAsSent($newsletter, $this->sendingTask);
     $updatedNewsletter = $this->newslettersRepository->findOneById($newsletter->getId());
     $this->assertInstanceOf(NewsletterEntity::class, $updatedNewsletter);
-    expect($updatedNewsletter->getStatus())->equals(NewsletterEntity::STATUS_SENT);
+    verify($updatedNewsletter->getStatus())->equals(NewsletterEntity::STATUS_SENT);
     $sentAt = $updatedNewsletter->getSentAt();
     $this->assertInstanceOf(\DateTime::class, $sentAt);
-    expect($sentAt->getTimestamp())->equals($sendingQueue->processedAt->getTimestamp(), 1);
+    verify($sentAt->getTimestamp())->equals($sendingQueue->processedAt->getTimestamp(), 1);
 
     // all other newsletter types
     $newsletter->setType(NewsletterEntity::TYPE_WELCOME);
@@ -314,7 +314,7 @@ class NewsletterTest extends \MailPoetTest {
     $this->newslettersRepository->flush();
     $this->newsletter = $this->newsletterTask->preProcessNewsletter($this->newsletter, $this->sendingTask);
     $this->sendingTask = SendingTask::getByNewsletterId($this->newsletter->getId());
-    expect($this->sendingTask->newsletterRenderedSubject)
+    verify($this->sendingTask->newsletterRenderedSubject)
       ->equals('No subject');
   }
 
@@ -338,9 +338,9 @@ class NewsletterTest extends \MailPoetTest {
       $this->subscriber,
       $this->sendingTask
     );
-    expect($result['subject'])->equals('queue subject');
-    expect($result['body']['html'])->equals('queue HTML body');
-    expect($result['body']['text'])->equals('queue TEXT body');
+    verify($result['subject'])->equals('queue subject');
+    verify($result['body']['html'])->equals('queue HTML body');
+    verify($result['body']['text'])->equals('queue TEXT body');
   }
 
   public function testItRendersShortcodesAndReplacesSubscriberDataInLinks() {
@@ -386,8 +386,8 @@ class NewsletterTest extends \MailPoetTest {
 
       expect(is_array($mailerLog['error']));
       if (is_array($mailerLog['error'])) {
-        expect($mailerLog['error']['operation'])->equals('queue_save');
-        expect($mailerLog['error']['error_message'])->equals('There was an error processing your newsletter during sending. If possible, please contact us and report this issue.');
+        verify($mailerLog['error']['operation'])->equals('queue_save');
+        verify($mailerLog['error']['error_message'])->equals('There was an error processing your newsletter during sending. If possible, please contact us and report this issue.');
       }
     }
   }
@@ -410,8 +410,8 @@ class NewsletterTest extends \MailPoetTest {
       $mailerLog = MailerLog::getMailerLog();
       expect(is_array($mailerLog['error']));
       if (is_array($mailerLog['error'])) {
-        expect($mailerLog['error']['operation'])->equals('queue_save');
-        expect($mailerLog['error']['error_message'])->equals('There was an error processing your newsletter during sending. If possible, please contact us and report this issue.');
+        verify($mailerLog['error']['operation'])->equals('queue_save');
+        verify($mailerLog['error']['error_message'])->equals('There was an error processing your newsletter during sending. If possible, please contact us and report this issue.');
       }
     }
   }
@@ -449,8 +449,8 @@ class NewsletterTest extends \MailPoetTest {
       $mailerLog = MailerLog::getMailerLog();
       expect(is_array($mailerLog['error']));
       if (is_array($mailerLog['error'])) {
-        expect($mailerLog['error']['operation'])->equals('queue_save');
-        expect($mailerLog['error']['error_message'])->equals('There was an error processing your newsletter during sending. If possible, please contact us and report this issue.');
+        verify($mailerLog['error']['operation'])->equals('queue_save');
+        verify($mailerLog['error']['error_message'])->equals('There was an error processing your newsletter during sending. If possible, please contact us and report this issue.');
       }
     }
   }
@@ -488,7 +488,7 @@ class NewsletterTest extends \MailPoetTest {
       })]
     );
     $newsletterTask = new NewsletterTask(null, null, null, $emoji);
-    expect($newsletterTask->preProcessNewsletter($this->newsletter, $sendingTaskMock))->equals($this->newsletter);
+    verify($newsletterTask->preProcessNewsletter($this->newsletter, $sendingTaskMock))->equals($this->newsletter);
   }
 
   /**
@@ -528,7 +528,7 @@ class NewsletterTest extends \MailPoetTest {
       'text' => 'text body',
     ];
     $campaignId = $this->newsletterTask->calculateCampaignId($newsletter, $renderedNewsletters);
-    expect($campaignId)->equals($this->newsletterTask->calculateCampaignId($newsletter, $renderedNewsletters));
+    verify($campaignId)->equals($this->newsletterTask->calculateCampaignId($newsletter, $renderedNewsletters));
   }
 
   public function testCampaignIdChangesIfSubjectChanges() {
@@ -559,7 +559,7 @@ class NewsletterTest extends \MailPoetTest {
     $newsletter->setSubject('Subject');
     $this->entityManager->persist($newsletter);
     $this->entityManager->flush();
-    expect($originalCampaignId)->equals($this->newsletterTask->calculateCampaignId($newsletter, $renderedNewsletters));
+    verify($originalCampaignId)->equals($this->newsletterTask->calculateCampaignId($newsletter, $renderedNewsletters));
   }
 
   public function testCampaignIdDependsOnNewsletterId() {
@@ -607,15 +607,15 @@ class NewsletterTest extends \MailPoetTest {
     $newsletterTask = new NewsletterTask();
     $sendingQueueMeta = $sendingQueue->getMeta();
     expect($sendingQueueMeta)->null();
-    expect($newsletterTask->preProcessNewsletter($this->newsletter, $this->sendingTask))->equals($this->newsletter);
+    verify($newsletterTask->preProcessNewsletter($this->newsletter, $this->sendingTask))->equals($this->newsletter);
     $this->entityManager->refresh($sendingQueue);
     $updatedMeta = $sendingQueue->getMeta();
     expect($updatedMeta)->array();
     expect($updatedMeta)->hasKey('filterSegment');
     $filterData = $updatedMeta['filterSegment']['filters'][0]['data'] ?? [];
-    expect($filterData['value'])->equals(50);
-    expect($filterData['operator'])->equals('higherThan');
-    expect($filterData['connect'])->equals('and');
+    verify($filterData['value'])->equals(50);
+    verify($filterData['operator'])->equals('higherThan');
+    verify($filterData['connect'])->equals('and');
   }
 
   public function testItRecoverNewsletterFromInvalidSendingState(): void {
diff --git a/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/PostsTest.php b/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/PostsTest.php
index d40ae176e4..5b96f3ff94 100644
--- a/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/PostsTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/PostsTest.php
@@ -25,7 +25,7 @@ class PostsTest extends \MailPoetTest {
     $renderedNewsletter = [
       'html' => 'Sample newsletter',
     ];
-    expect($this->postsTask->extractAndSave($renderedNewsletter, $newsletter))->equals(false);
+    verify($this->postsTask->extractAndSave($renderedNewsletter, $newsletter))->equals(false);
   }
 
   public function testItCanExtractAndSavePosts() {
@@ -44,7 +44,7 @@ class PostsTest extends \MailPoetTest {
     $renderedNewsletter = [
       'html' => '<a data-post-id="' . $postId . '" href="#">sample post</a>',
     ];
-    expect($this->postsTask->extractAndSave($renderedNewsletter, $newsletter))->equals(true);
+    verify($this->postsTask->extractAndSave($renderedNewsletter, $newsletter))->equals(true);
     $newsletterPostRepository = ContainerWrapper::getInstance()->get(NewsletterPostsRepository::class);
     $newsletterPost = $newsletterPostRepository->findOneBy(['newsletter' => $parent]);
     $this->assertInstanceOf(NewsletterPostEntity::class, $newsletterPost);
@@ -63,8 +63,8 @@ class PostsTest extends \MailPoetTest {
     $renderedNewsletter = [
       'html' => '<a data-post-id="' . $postId . '" href="#">sample post</a>',
     ];
-    expect($this->postsTask->extractAndSave($renderedNewsletter, $newsletter))->equals(false);
+    verify($this->postsTask->extractAndSave($renderedNewsletter, $newsletter))->equals(false);
     $newsletter->setType(NewsletterEntity::TYPE_STANDARD);
-    expect($this->postsTask->extractAndSave($renderedNewsletter, $newsletter))->equals(false);
+    verify($this->postsTask->extractAndSave($renderedNewsletter, $newsletter))->equals(false);
   }
 }
diff --git a/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php b/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php
index 42db9c38a6..c8a370e524 100644
--- a/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/SendingQueue/Tasks/ShortcodesTest.php
@@ -27,7 +27,7 @@ class ShortcodesTest extends \MailPoetTest {
     $subscriber = (new SubscriberFactory())->withFirstName('John')->withLastName('Doe')->create();
     $renderedBody = '[subscriber:firstname] [subscriber:lastname]';
     $result = Shortcodes::process($renderedBody, null, $newsletter, $subscriber, $queue);
-    expect($result)->equals('John Doe');
+    verify($result)->equals('John Doe');
   }
 
   public function testItCanReplaceShortcodesInOneStringUsingContentsFromAnother() {
@@ -38,10 +38,10 @@ class ShortcodesTest extends \MailPoetTest {
 
     // [newsletter:post_title] depends on the "data-post-id" tag and the shortcode will
     // get replaced with an empty string if that tag is not found
-    expect(trim(Shortcodes::process($content)))->equals('Subject line with one shortcode:');
+    verify(trim(Shortcodes::process($content)))->equals('Subject line with one shortcode:');
 
     // when tag is found, the shortcode will be processed and replaced
-    expect(Shortcodes::process($content, $contentSource))->equals('Subject line with one shortcode: ' . $wpPost->post_title); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify(Shortcodes::process($content, $contentSource))->equals('Subject line with one shortcode: ' . $wpPost->post_title); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
   }
 
   public function _after() {
diff --git a/mailpoet/tests/integration/Cron/Workers/SimpleWorkerTest.php b/mailpoet/tests/integration/Cron/Workers/SimpleWorkerTest.php
index cde3045bc6..25b4406488 100644
--- a/mailpoet/tests/integration/Cron/Workers/SimpleWorkerTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/SimpleWorkerTest.php
@@ -37,7 +37,7 @@ class SimpleWorkerTest extends \MailPoetTest {
       new $workerClass();
       $this->fail('SimpleWorker did not throw an exception');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('Constant TASK_TYPE is not defined on subclass ' . $workerClass);
+      verify($e->getMessage())->equals('Constant TASK_TYPE is not defined on subclass ' . $workerClass);
     }
   }
 
@@ -49,11 +49,11 @@ class SimpleWorkerTest extends \MailPoetTest {
 
   public function testItDoesNotScheduleTaskTwice() {
     $worker = new MockSimpleWorker();
-    expect(count($this->scheduledTasksRepository->findBy(['type' => MockSimpleWorker::TASK_TYPE])))->equals(0);
+    verify(count($this->scheduledTasksRepository->findBy(['type' => MockSimpleWorker::TASK_TYPE])))->equals(0);
     $worker->schedule();
-    expect(count($this->scheduledTasksRepository->findBy(['type' => MockSimpleWorker::TASK_TYPE])))->equals(1);
+    verify(count($this->scheduledTasksRepository->findBy(['type' => MockSimpleWorker::TASK_TYPE])))->equals(1);
     $worker->schedule();
-    expect(count($this->scheduledTasksRepository->findBy(['type' => MockSimpleWorker::TASK_TYPE])))->equals(1);
+    verify(count($this->scheduledTasksRepository->findBy(['type' => MockSimpleWorker::TASK_TYPE])))->equals(1);
   }
 
   public function testItCalculatesNextRunDateWithinNextWeekBoundaries() {
diff --git a/mailpoet/tests/integration/Cron/Workers/StatsNotifications/AutomatedEmailsTest.php b/mailpoet/tests/integration/Cron/Workers/StatsNotifications/AutomatedEmailsTest.php
index 05788295e5..4ef9b1a9be 100644
--- a/mailpoet/tests/integration/Cron/Workers/StatsNotifications/AutomatedEmailsTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/StatsNotifications/AutomatedEmailsTest.php
@@ -85,7 +85,7 @@ class AutomatedEmailsTest extends \MailPoetTest {
       'automated' => false,
       'address' => 'email@example.com',
     ]);
-    expect($this->statsNotifications->checkProcessingRequirements())->equals(false);
+    verify($this->statsNotifications->checkProcessingRequirements())->equals(false);
   }
 
   public function testItDoesntWorkIfNoEmail() {
@@ -93,16 +93,16 @@ class AutomatedEmailsTest extends \MailPoetTest {
       'automated' => true,
       'address' => '',
     ]);
-    expect($this->statsNotifications->checkProcessingRequirements())->equals(false);
+    verify($this->statsNotifications->checkProcessingRequirements())->equals(false);
   }
 
   public function testItDoesntWorkIfTrackingIsDisabled() {
     $this->settings->set('tracking.level', TrackingConfig::LEVEL_BASIC);
-    expect($this->statsNotifications->checkProcessingRequirements())->equals(false);
+    verify($this->statsNotifications->checkProcessingRequirements())->equals(false);
   }
 
   public function testItDoesWorkIfEnabled() {
-    expect($this->statsNotifications->checkProcessingRequirements())->equals(true);
+    verify($this->statsNotifications->checkProcessingRequirements())->equals(true);
   }
 
   public function testItDoesntRenderIfNoNewslettersFound() {
@@ -113,7 +113,7 @@ class AutomatedEmailsTest extends \MailPoetTest {
 
     $result = $this->cronWorkerRunner->run($this->statsNotifications);
 
-    expect($result)->equals(true);
+    verify($result)->equals(true);
   }
 
   public function testItRenders() {
@@ -131,7 +131,7 @@ class AutomatedEmailsTest extends \MailPoetTest {
 
     $result = $this->cronWorkerRunner->run($this->statsNotifications);
 
-    expect($result)->equals(true);
+    verify($result)->equals(true);
   }
 
   public function testItSends() {
@@ -152,7 +152,7 @@ class AutomatedEmailsTest extends \MailPoetTest {
 
     $result = $this->cronWorkerRunner->run($this->statsNotifications);
 
-    expect($result)->equals(true);
+    verify($result)->equals(true);
   }
 
   public function testItPreparesContext() {
diff --git a/mailpoet/tests/integration/Cron/Workers/StatsNotifications/NewsletterLinkRepositoryTest.php b/mailpoet/tests/integration/Cron/Workers/StatsNotifications/NewsletterLinkRepositoryTest.php
index 3e1e11173f..6fdfc5335e 100644
--- a/mailpoet/tests/integration/Cron/Workers/StatsNotifications/NewsletterLinkRepositoryTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/StatsNotifications/NewsletterLinkRepositoryTest.php
@@ -51,7 +51,7 @@ class NewsletterLinkRepositoryTest extends \MailPoetTest {
     $repository = $this->diContainer->get(NewsletterLinkRepository::class);
     $topLink = $repository->findTopLinkForNewsletter((int)$newsletter->getId());
     $this->assertInstanceOf(NewsletterLinkEntity::class, $topLink);
-    expect($topLink->getUrl())->equals('http://example1.com');
+    verify($topLink->getUrl())->equals('http://example1.com');
 
     $newsletter2 = new NewsletterEntity();
     $newsletter2->setType(NewsletterEntity::TYPE_STANDARD);
diff --git a/mailpoet/tests/integration/Cron/Workers/SubscribersLastEngagementTest.php b/mailpoet/tests/integration/Cron/Workers/SubscribersLastEngagementTest.php
index b370a7d7ae..521edcbfed 100644
--- a/mailpoet/tests/integration/Cron/Workers/SubscribersLastEngagementTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/SubscribersLastEngagementTest.php
@@ -28,7 +28,7 @@ class SubscribersLastEngagementTest extends \MailPoetTest {
 
     $this->worker->processTaskStrategy(new ScheduledTaskEntity(), microtime(true));
     $this->entityManager->refresh($subscriber);
-    expect($subscriber->getLastEngagementAt())->equals($openTime);
+    verify($subscriber->getLastEngagementAt())->equals($openTime);
   }
 
   public function testItCanSetLastEngagementFromClicks() {
@@ -39,7 +39,7 @@ class SubscribersLastEngagementTest extends \MailPoetTest {
 
     $this->worker->processTaskStrategy(new ScheduledTaskEntity(), microtime(true));
     $this->entityManager->refresh($subscriber);
-    expect($subscriber->getLastEngagementAt())->equals($clickTime);
+    verify($subscriber->getLastEngagementAt())->equals($clickTime);
   }
 
   public function testItPicksLatestTimeFromClick() {
@@ -52,7 +52,7 @@ class SubscribersLastEngagementTest extends \MailPoetTest {
 
     $this->worker->processTaskStrategy(new ScheduledTaskEntity(), microtime(true));
     $this->entityManager->refresh($subscriber);
-    expect($subscriber->getLastEngagementAt())->equals($clickTime);
+    verify($subscriber->getLastEngagementAt())->equals($clickTime);
   }
 
   public function testItPicksLatestTimeFromOpen() {
@@ -65,7 +65,7 @@ class SubscribersLastEngagementTest extends \MailPoetTest {
 
     $this->worker->processTaskStrategy(new ScheduledTaskEntity(), microtime(true));
     $this->entityManager->refresh($subscriber);
-    expect($subscriber->getLastEngagementAt())->equals($openTime);
+    verify($subscriber->getLastEngagementAt())->equals($openTime);
   }
 
   public function testItKeepsNullIfNoTimeFound() {
@@ -115,9 +115,9 @@ class SubscribersLastEngagementTest extends \MailPoetTest {
     expect($result)->true();
     $this->entityManager->refresh($subscriberInFirstBatch);
     $this->entityManager->refresh($subscriberInSecondBatch);
-    expect($subscriberInFirstBatch->getLastEngagementAt())->equals($firstOpenTime);
-    expect($subscriberInSecondBatch->getLastEngagementAt())->equals($secondOpenTime);
-    expect($task->getMeta())->equals(['nextId' => 2001]);
+    verify($subscriberInFirstBatch->getLastEngagementAt())->equals($firstOpenTime);
+    verify($subscriberInSecondBatch->getLastEngagementAt())->equals($secondOpenTime);
+    verify($task->getMeta())->equals(['nextId' => 2001]);
   }
 
   private function createSubscriber($email = null): SubscriberEntity {
diff --git a/mailpoet/tests/integration/Cron/Workers/SubscribersLifetimeEmailCountTest.php b/mailpoet/tests/integration/Cron/Workers/SubscribersLifetimeEmailCountTest.php
index d6f09a2e64..d540b31db7 100644
--- a/mailpoet/tests/integration/Cron/Workers/SubscribersLifetimeEmailCountTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/SubscribersLifetimeEmailCountTest.php
@@ -52,7 +52,7 @@ class SubscribersLifetimeEmailCountTest extends \MailPoetTest {
     $settings->set('tracking.level', TrackingConfig::LEVEL_PARTIAL);
     $settings->set('deactivate_subscriber_after_inactive_days', 0);
 
-    expect($this->worker->checkProcessingRequirements())->equals(false);
+    verify($this->worker->checkProcessingRequirements())->equals(false);
   }
 
   public function testItCalculatesTotalSubscribersEmailCountsOnFirstRun() {
@@ -66,10 +66,10 @@ class SubscribersLifetimeEmailCountTest extends \MailPoetTest {
     $this->entityManager->clear();
     $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber1);
-    expect($subscriber1->getEmailCount())->equals(80);
+    verify($subscriber1->getEmailCount())->equals(80);
     $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber2);
-    expect($subscriber2->getEmailCount())->equals(8);
+    verify($subscriber2->getEmailCount())->equals(8);
   }
 
   public function testItStartsFromLastIdInTaskMeta() {
@@ -86,10 +86,10 @@ class SubscribersLifetimeEmailCountTest extends \MailPoetTest {
     $this->entityManager->clear();
     $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber1);
-    expect($subscriber1->getEmailCount())->equals(0);
+    verify($subscriber1->getEmailCount())->equals(0);
     $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber2);
-    expect($subscriber2->getEmailCount())->equals(8);
+    verify($subscriber2->getEmailCount())->equals(8);
   }
 
   public function testItWorksIfTaskMetaIsString() {
@@ -107,10 +107,10 @@ class SubscribersLifetimeEmailCountTest extends \MailPoetTest {
     $this->entityManager->clear();
     $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber1);
-    expect($subscriber1->getEmailCount())->equals(0);
+    verify($subscriber1->getEmailCount())->equals(0);
     $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber2);
-    expect($subscriber2->getEmailCount())->equals(8);
+    verify($subscriber2->getEmailCount())->equals(8);
   }
 
   public function testItUpdatesSubscribersEmailCountsAfterFirstRun() {
@@ -133,7 +133,7 @@ class SubscribersLifetimeEmailCountTest extends \MailPoetTest {
     $this->entityManager->clear();
     $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber1);
-    expect($subscriber1->getEmailCount())->equals(81);
+    verify($subscriber1->getEmailCount())->equals(81);
 
   }
 
diff --git a/mailpoet/tests/integration/Cron/Workers/UnsubscribeTokensTest.php b/mailpoet/tests/integration/Cron/Workers/UnsubscribeTokensTest.php
index 2bfca1f32c..be88631edb 100644
--- a/mailpoet/tests/integration/Cron/Workers/UnsubscribeTokensTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/UnsubscribeTokensTest.php
@@ -47,8 +47,8 @@ class UnsubscribeTokensTest extends \MailPoetTest {
     $worker->processTaskStrategy(new ScheduledTaskEntity(), microtime(true));
     $this->subscriberWithToken = Subscriber::findOne($this->subscriberWithToken->id);
     $this->subscriberWithoutToken = Subscriber::findOne($this->subscriberWithoutToken->id);
-    expect($this->subscriberWithToken->unsubscribe_token)->equals('aaabbbcccdddeee');
-    expect(strlen($this->subscriberWithoutToken->unsubscribe_token))->equals(15);
+    verify($this->subscriberWithToken->unsubscribe_token)->equals('aaabbbcccdddeee');
+    verify(strlen($this->subscriberWithoutToken->unsubscribe_token))->equals(15);
   }
 
   public function testItAddsTokensToNewsletters() {
@@ -58,7 +58,7 @@ class UnsubscribeTokensTest extends \MailPoetTest {
     $this->newsletterWithoutToken = Newsletter::findOne($this->newsletterWithoutToken->id);
     $this->assertInstanceOf(Newsletter::class, $this->newsletterWithToken);
     $this->assertInstanceOf(Newsletter::class, $this->newsletterWithoutToken);
-    expect($this->newsletterWithToken->unsubscribeToken)->equals('aaabbbcccdddeee');
-    expect(strlen($this->newsletterWithoutToken->unsubscribeToken))->equals(15);
+    verify($this->newsletterWithToken->unsubscribeToken)->equals('aaabbbcccdddeee');
+    verify(strlen($this->newsletterWithoutToken->unsubscribeToken))->equals(15);
   }
 }
diff --git a/mailpoet/tests/integration/Cron/Workers/WooCommerceOrdersTest.php b/mailpoet/tests/integration/Cron/Workers/WooCommerceOrdersTest.php
index 496b2f7c81..c4534d8579 100644
--- a/mailpoet/tests/integration/Cron/Workers/WooCommerceOrdersTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/WooCommerceOrdersTest.php
@@ -80,7 +80,7 @@ class WooCommerceOrdersTest extends \MailPoetTest {
     $this->cronWorkerRunner->run($this->worker);
     $task = $this->scheduledTaskRepository->findOneBy(['type' => WooCommercePastOrders::TASK_TYPE]);
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
-    expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
+    verify($task->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
 
     // 2. prepare and run
     expect($this->worker->checkProcessingRequirements())->true();
@@ -88,7 +88,7 @@ class WooCommerceOrdersTest extends \MailPoetTest {
     $this->entityManager->clear();
     $task = $this->scheduledTaskRepository->findOneBy(['type' => WooCommercePastOrders::TASK_TYPE]);
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
-    expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_COMPLETED);
+    verify($task->getStatus())->equals(ScheduledTaskEntity::STATUS_COMPLETED);
 
     // 3. complete (do not schedule again)
     expect($this->worker->checkProcessingRequirements())->false();
@@ -96,7 +96,7 @@ class WooCommerceOrdersTest extends \MailPoetTest {
     $this->entityManager->clear();
     $task = $this->scheduledTaskRepository->findOneBy(['type' => WooCommercePastOrders::TASK_TYPE]);
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
-    expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_COMPLETED);
+    verify($task->getStatus())->equals(ScheduledTaskEntity::STATUS_COMPLETED);
 
     $this->entityManager->clear();
     $tasks = $this->scheduledTaskRepository->findBy(['type' => WooCommercePastOrders::TASK_TYPE]);
@@ -116,7 +116,7 @@ class WooCommerceOrdersTest extends \MailPoetTest {
     $this->entityManager->clear();
     $tasks = $this->scheduledTaskRepository->findBy(['type' => WooCommercePastOrders::TASK_TYPE]);
     expect($tasks)->count(1);
-    expect($tasks[0]->getStatus())->equals(null); // null means 'running'
+    verify($tasks[0]->getStatus())->equals(null); // null means 'running'
   }
 
   public function testItContinuesFromLastId() {
@@ -131,20 +131,20 @@ class WooCommerceOrdersTest extends \MailPoetTest {
 
     $task = $this->scheduledTaskRepository->findOneBy(['type' => WooCommercePastOrders::TASK_TYPE]);
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
-    expect($task->getMeta())->equals(['last_processed_id' => 3]);
+    verify($task->getMeta())->equals(['last_processed_id' => 3]);
 
     $this->cronWorkerRunner->run($this->worker); // run for 4, 5
 
     $task = $this->scheduledTaskRepository->findOneBy(['type' => WooCommercePastOrders::TASK_TYPE]);
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
-    expect($task->getMeta())->equals(['last_processed_id' => 5]);
+    verify($task->getMeta())->equals(['last_processed_id' => 5]);
 
     $this->cronWorkerRunner->run($this->worker); // complete
 
     $this->entityManager->clear();
     $tasks = $this->scheduledTaskRepository->findBy(['type' => WooCommercePastOrders::TASK_TYPE]);
     expect($tasks)->count(1);
-    expect($tasks[0]->getStatus())->equals(ScheduledTaskEntity::STATUS_COMPLETED);
+    verify($tasks[0]->getStatus())->equals(ScheduledTaskEntity::STATUS_COMPLETED);
   }
 
   private function createClick($createdDaysAgo = 5) {
diff --git a/mailpoet/tests/integration/Cron/Workers/WooCommerceSyncTest.php b/mailpoet/tests/integration/Cron/Workers/WooCommerceSyncTest.php
index 4b9c1496c9..ab5641ebfb 100644
--- a/mailpoet/tests/integration/Cron/Workers/WooCommerceSyncTest.php
+++ b/mailpoet/tests/integration/Cron/Workers/WooCommerceSyncTest.php
@@ -52,6 +52,6 @@ class WooCommerceSyncTest extends \MailPoetTest {
       null,
       Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'))
     );
-    expect($worker->processTaskStrategy($task, microtime(true)))->equals(true);
+    verify($worker->processTaskStrategy($task, microtime(true)))->equals(true);
   }
 }
diff --git a/mailpoet/tests/integration/Doctrine/ConfigurationFactoryTest.php b/mailpoet/tests/integration/Doctrine/ConfigurationFactoryTest.php
index 41ce92035c..50d9caff70 100644
--- a/mailpoet/tests/integration/Doctrine/ConfigurationFactoryTest.php
+++ b/mailpoet/tests/integration/Doctrine/ConfigurationFactoryTest.php
@@ -21,7 +21,7 @@ class ConfigurationFactoryTest extends \MailPoetTest {
     expect($configuration->getNamingStrategy())->isInstanceOf(UnderscoreNamingStrategy::class);
 
     // metadata
-    expect($configuration->getClassMetadataFactoryName())->equals(TablePrefixMetadataFactory::class);
+    verify($configuration->getClassMetadataFactoryName())->equals(TablePrefixMetadataFactory::class);
     expect($configuration->getMetadataCache())->isInstanceOf(PSRMetadataCache::class);
     expect($configuration->getMetadataDriverImpl())->isInstanceOf(AnnotationDriver::class);
 
@@ -30,19 +30,19 @@ class ConfigurationFactoryTest extends \MailPoetTest {
     expect($configuration->getResultCacheImpl())->isInstanceOf(ArrayCache::class);
 
     // proxies
-    expect(realpath($configuration->getProxyDir()))->equals(realpath(__DIR__ . '/../../../generated/doctrine-proxies'));
-    expect($configuration->getProxyNamespace())->equals('MailPoetDoctrineProxies');
+    verify(realpath($configuration->getProxyDir()))->equals(realpath(__DIR__ . '/../../../generated/doctrine-proxies'));
+    verify($configuration->getProxyNamespace())->equals('MailPoetDoctrineProxies');
   }
 
   public function testItSetsUpEnvironmentSpecificOptions() {
     // dev mode
     $configurationFactory = new ConfigurationFactory(new AnnotationReaderProvider(), true);
     $configuration = $configurationFactory->createConfiguration();
-    expect($configuration->getAutoGenerateProxyClasses())->equals(AbstractProxyFactory::AUTOGENERATE_FILE_NOT_EXISTS);
+    verify($configuration->getAutoGenerateProxyClasses())->equals(AbstractProxyFactory::AUTOGENERATE_FILE_NOT_EXISTS);
 
     // production mode
     $configurationFactory = new ConfigurationFactory(new AnnotationReaderProvider(), false);
     $configuration = $configurationFactory->createConfiguration();
-    expect($configuration->getAutoGenerateProxyClasses())->equals(AbstractProxyFactory::AUTOGENERATE_NEVER);
+    verify($configuration->getAutoGenerateProxyClasses())->equals(AbstractProxyFactory::AUTOGENERATE_NEVER);
   }
 }
diff --git a/mailpoet/tests/integration/Doctrine/ConnectionFactoryTest.php b/mailpoet/tests/integration/Doctrine/ConnectionFactoryTest.php
index d252708768..ca154d2c68 100644
--- a/mailpoet/tests/integration/Doctrine/ConnectionFactoryTest.php
+++ b/mailpoet/tests/integration/Doctrine/ConnectionFactoryTest.php
@@ -33,12 +33,12 @@ class ConnectionFactoryTest extends \MailPoetTest {
     expect($connection->getDriver())->isInstanceOf(PDOMySql\Driver::class);
     expect($connection->getDatabasePlatform())->isInstanceOf(MySqlPlatform::class);
     $params = $connection->getParams();
-    expect($params['host'])->equals(Env::$dbHost);
+    verify($params['host'])->equals(Env::$dbHost);
     expect($params)->notContains('unix_socket');
-    expect($params['user'])->equals(Env::$dbUsername);
-    expect($params['password'])->equals(Env::$dbPassword);
-    expect($params['charset'])->equals(Env::$dbCharset);
-    expect($connection->getDatabase())->equals(Env::$dbName);
+    verify($params['user'])->equals(Env::$dbUsername);
+    verify($params['password'])->equals(Env::$dbPassword);
+    verify($params['charset'])->equals(Env::$dbCharset);
+    verify($connection->getDatabase())->equals(Env::$dbName);
 
     expect(Type::getType(JsonType::NAME))->isInstanceOf(JsonType::class);
     expect(Type::getType(JsonOrSerializedType::NAME))->isInstanceOf(JsonOrSerializedType::class);
@@ -50,7 +50,7 @@ class ConnectionFactoryTest extends \MailPoetTest {
       Env::$dbPort = 3456;
       $connectionFactory = new ConnectionFactory();
       $connection = $connectionFactory->createConnection();
-      expect($connection->getParams()['port'])->equals(3456);
+      verify($connection->getParams()['port'])->equals(3456);
     } finally {
       Env::$dbPort = $backup;
     }
@@ -72,7 +72,7 @@ class ConnectionFactoryTest extends \MailPoetTest {
     $params = $connection->getParams();
     expect(isset($params['host']))->false();
     expect(isset($params['port']))->false();
-    expect($params['unix_socket'])->equals('socket');
+    verify($params['unix_socket'])->equals('socket');
   }
 
   public function testItSetsUpIpV6() {
@@ -81,12 +81,12 @@ class ConnectionFactoryTest extends \MailPoetTest {
     Env::$dbHost = '::1';
     $connectionFactory = new ConnectionFactory();
     $connection = $connectionFactory->createConnection();
-    expect($connection->getParams()['host'])->equals('[::1]');
+    verify($connection->getParams()['host'])->equals('[::1]');
 
     Env::$dbHost = 'b57e:9b70:ab96:6a0b:5ba2:49e3:ebba:a036';
     $connectionFactory = new ConnectionFactory();
     $connection = $connectionFactory->createConnection();
-    expect($connection->getParams()['host'])->equals('[b57e:9b70:ab96:6a0b:5ba2:49e3:ebba:a036]');
+    verify($connection->getParams()['host'])->equals('[b57e:9b70:ab96:6a0b:5ba2:49e3:ebba:a036]');
 
     // try to actually connect to the DB over IPv6
     Env::$dbHost = '::ffff:' . gethostbyname($this->envBackup['db_host']);
@@ -112,14 +112,14 @@ class ConnectionFactoryTest extends \MailPoetTest {
     ')->fetchAssociative();
 
     // check timezone, SQL mode, wait timeout
-    expect($result['@@session.time_zone'])->equals(Env::$dbTimezoneOffset);
+    verify($result['@@session.time_zone'])->equals(Env::$dbTimezoneOffset);
     expect($result['@@session.wait_timeout'])->greaterOrEquals(60);
 
     // check "SET NAMES ... COLLATE ..."
-    expect($result['@@session.character_set_client'])->equals(Env::$dbCharset);
-    expect($result['@@session.character_set_connection'])->equals(Env::$dbCharset);
-    expect($result['@@session.character_set_results'])->equals(Env::$dbCharset);
-    expect($result['@@session.collation_connection'])->equals(Env::$dbCollation);
+    verify($result['@@session.character_set_client'])->equals(Env::$dbCharset);
+    verify($result['@@session.character_set_connection'])->equals(Env::$dbCharset);
+    verify($result['@@session.character_set_results'])->equals(Env::$dbCharset);
+    verify($result['@@session.collation_connection'])->equals(Env::$dbCollation);
   }
 
   public function testItSelectivelyUpdatesWaitTimeoutOption() {
@@ -137,7 +137,7 @@ class ConnectionFactoryTest extends \MailPoetTest {
     ]);
     $connection = $connectionFactory->createConnection();
     $current = $connection->executeQuery('SELECT @@session.wait_timeout')->fetchColumn();
-    expect($current)->equals(999999);
+    verify($current)->equals(999999);
   }
 
   public function _after() {
diff --git a/mailpoet/tests/integration/Doctrine/EventListeners/EmojiEncodingListenerTest.php b/mailpoet/tests/integration/Doctrine/EventListeners/EmojiEncodingListenerTest.php
index 7c14e2f6ac..27c3c180d6 100644
--- a/mailpoet/tests/integration/Doctrine/EventListeners/EmojiEncodingListenerTest.php
+++ b/mailpoet/tests/integration/Doctrine/EventListeners/EmojiEncodingListenerTest.php
@@ -20,10 +20,10 @@ class EmojiEncodingListenerTest extends \MailPoetTest {
     $this->replaceListeners($originalListener, $emojiEncodingListenerWithMockedEmoji);
     $this->entityManager->persist($form);
     $this->entityManager->flush();
-    expect($form->getBody())->equals(['sanitizedBody']);
+    verify($form->getBody())->equals(['sanitizedBody']);
     $form->setBody(['updatedBody']);
     $this->entityManager->flush();
-    expect($form->getBody())->equals(['sanitizedBody']);
+    verify($form->getBody())->equals(['sanitizedBody']);
     $this->replaceListeners($emojiEncodingListenerWithMockedEmoji, $originalListener);
   }
 
diff --git a/mailpoet/tests/integration/Doctrine/EventListeners/TimestampListenerTest.php b/mailpoet/tests/integration/Doctrine/EventListeners/TimestampListenerTest.php
index 215a246f8a..8f059520bc 100644
--- a/mailpoet/tests/integration/Doctrine/EventListeners/TimestampListenerTest.php
+++ b/mailpoet/tests/integration/Doctrine/EventListeners/TimestampListenerTest.php
@@ -51,8 +51,8 @@ class TimestampListenerTest extends EventListenersBaseTest {
     $this->entityManager->persist($entity);
     $this->entityManager->flush();
 
-    expect($entity->getCreatedAt())->equals($this->now);
-    expect($entity->getUpdatedAt())->equals($this->now);
+    verify($entity->getCreatedAt())->equals($this->now);
+    verify($entity->getUpdatedAt())->equals($this->now);
   }
 
   public function testItSetsTimestampOnUpdate() {
@@ -72,8 +72,8 @@ class TimestampListenerTest extends EventListenersBaseTest {
 
     $createdAt = $entity->getCreatedAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $createdAt);
-    expect($createdAt->format('Y-m-d H:i:s'))->equals('2000-01-01 12:00:00');
-    expect($entity->getUpdatedAt())->equals($this->now);
+    verify($createdAt->format('Y-m-d H:i:s'))->equals('2000-01-01 12:00:00');
+    verify($entity->getUpdatedAt())->equals($this->now);
   }
 
   public function testItUsesDifferentTimesWhenCreatingDifferentEntities() {
diff --git a/mailpoet/tests/integration/EmailEditor/Engine/Renderer/BlocksRegistryTest.php b/mailpoet/tests/integration/EmailEditor/Engine/Renderer/BlocksRegistryTest.php
index e059b75d3f..54b3847ae8 100644
--- a/mailpoet/tests/integration/EmailEditor/Engine/Renderer/BlocksRegistryTest.php
+++ b/mailpoet/tests/integration/EmailEditor/Engine/Renderer/BlocksRegistryTest.php
@@ -25,7 +25,7 @@ class BlocksRegistryTest extends \MailPoetTest {
     $renderer = new Paragraph();
     $this->registry->addBlockRenderer('test', $renderer);
     $storedRenderer = $this->registry->getBlockRenderer('test');
-    expect($storedRenderer)->equals($renderer);
+    verify($storedRenderer)->equals($renderer);
   }
 
   public function testItAllowsToReplaceRendererViaFilter() {
@@ -37,7 +37,7 @@ class BlocksRegistryTest extends \MailPoetTest {
     };
     add_filter('mailpoet_block_renderer_test', $callback);
     $storedRenderer = $this->registry->getBlockRenderer('test');
-    expect($storedRenderer)->equals($dummyRenderer);
+    verify($storedRenderer)->equals($dummyRenderer);
     remove_filter('mailpoet_block_renderer_test', $callback);
   }
 }
diff --git a/mailpoet/tests/integration/EmailEditor/Engine/Renderer/BlocksRendererTest.php b/mailpoet/tests/integration/EmailEditor/Engine/Renderer/BlocksRendererTest.php
index 1507baa3cd..e408650c4b 100644
--- a/mailpoet/tests/integration/EmailEditor/Engine/Renderer/BlocksRendererTest.php
+++ b/mailpoet/tests/integration/EmailEditor/Engine/Renderer/BlocksRendererTest.php
@@ -24,7 +24,7 @@ class BlocksRendererTest extends \MailPoetTest {
         'innerHTML' => 'Buddy!',
       ],
     ]);
-    expect($content)->equals('HelloBuddy!');
+    verify($content)->equals('HelloBuddy!');
   }
 
   public function testItSkipsUnknownBlocks() {
@@ -39,7 +39,7 @@ class BlocksRendererTest extends \MailPoetTest {
         'innerHTML' => 'Buddy!',
       ],
     ]);
-    expect($content)->equals('Hello');
+    verify($content)->equals('Hello');
   }
 
   public function testItCanProcessNestedBlocks() {
@@ -58,7 +58,7 @@ class BlocksRendererTest extends \MailPoetTest {
         ],
       ],
     ]);
-    expect($content)->equals('[HelloBuddy!]');
+    verify($content)->equals('[HelloBuddy!]');
   }
 
   public function _after() {
diff --git a/mailpoet/tests/integration/EmailEditor/Integration/MailPoet/EmailApiControllerTest.php b/mailpoet/tests/integration/EmailEditor/Integration/MailPoet/EmailApiControllerTest.php
index 9fa9cfce3e..5fc6bf67d5 100644
--- a/mailpoet/tests/integration/EmailEditor/Integration/MailPoet/EmailApiControllerTest.php
+++ b/mailpoet/tests/integration/EmailEditor/Integration/MailPoet/EmailApiControllerTest.php
@@ -30,9 +30,9 @@ class EmailApiControllerTest extends \MailPoetTest {
       ->create();
 
     $emailData = $this->emailApiController->getEmailData(['id' => $wpPostId]);
-    expect($emailData['subject'])->equals('New subject');
-    expect($emailData['preheader'])->equals('New preheader');
-    expect($emailData['id'])->equals($newsletter->getId());
+    verify($emailData['subject'])->equals('New subject');
+    verify($emailData['preheader'])->equals('New preheader');
+    verify($emailData['id'])->equals($newsletter->getId());
   }
 
   public function testItSaveEmailDataToNewsletterEntity(): void {
@@ -50,8 +50,8 @@ class EmailApiControllerTest extends \MailPoetTest {
     $this->entityManager->clear();
     $newsletter = $this->newslettersRepository->findOneById($newsletter->getId());
     $this->assertInstanceOf(NewsletterEntity::class, $newsletter);
-    expect($newsletter->getSubject())->equals('New subject');
-    expect($newsletter->getPreheader())->equals('New preheader');
+    verify($newsletter->getSubject())->equals('New subject');
+    verify($newsletter->getPreheader())->equals('New preheader');
   }
 
   public function testItThrowsErrorWhenNewsletterDoesNotExist(): void {
@@ -64,7 +64,7 @@ class EmailApiControllerTest extends \MailPoetTest {
 
       $this->fail('Incorrect state exception should have been thrown.');
     } catch (NotFoundException $exception) {
-      expect($exception->getHttpStatusCode())->equals(APIResponse::STATUS_NOT_FOUND);
+      verify($exception->getHttpStatusCode())->equals(APIResponse::STATUS_NOT_FOUND);
       expect($exception->getMessage())->stringContainsString('Newsletter was not found');
     }
   }
@@ -83,7 +83,7 @@ class EmailApiControllerTest extends \MailPoetTest {
 
       $this->fail('Incorrect state exception should have been thrown.');
     } catch (UnexpectedValueException $exception) {
-      expect($exception->getHttpStatusCode())->equals(APIResponse::STATUS_BAD_REQUEST);
+      verify($exception->getHttpStatusCode())->equals(APIResponse::STATUS_BAD_REQUEST);
       expect($exception->getMessage())->stringContainsString('Newsletter ID does not match the post ID');
     }
   }
diff --git a/mailpoet/tests/integration/EmailEditor/Integration/MailPoet/EmailEditorTest.php b/mailpoet/tests/integration/EmailEditor/Integration/MailPoet/EmailEditorTest.php
index b777222a11..7fe6b3103e 100644
--- a/mailpoet/tests/integration/EmailEditor/Integration/MailPoet/EmailEditorTest.php
+++ b/mailpoet/tests/integration/EmailEditor/Integration/MailPoet/EmailEditorTest.php
@@ -35,19 +35,19 @@ class EmailEditorTest extends \MailPoetTest {
   public function testItCreatesAssociatedNewsletterEntity() {
     $this->emailEditor->initialize();
     $newsletters = $this->newslettersRepository->findAll();
-    expect(count($newsletters))->equals(0);
+    verify(count($newsletters))->equals(0);
     $wp = $this->diContainer->get(WPFunctions::class);
     // Add email post
     $postId = $wp->wpInsertPost(['post_type' => 'mailpoet_email']);
     $newsletters = $this->newslettersRepository->findAll();
-    expect(count($newsletters))->equals(1);
+    verify(count($newsletters))->equals(1);
     expect($newsletters[0]->getWpPostId())->greaterThan(0);
-    expect($newsletters[0]->getWpPostId())->equals($postId);
+    verify($newsletters[0]->getWpPostId())->equals($postId);
     // Add non-email standard post
     $wp->wpInsertPost(['post_type' => 'post']);
     $newsletters = $this->newslettersRepository->findAll();
     // Newsletters count should not change
-    expect(count($newsletters))->equals(1);
+    verify(count($newsletters))->equals(1);
   }
 
   public function _after() {
diff --git a/mailpoet/tests/integration/Entities/NewsletterEntityTest.php b/mailpoet/tests/integration/Entities/NewsletterEntityTest.php
index c661ec26b8..74c0329c01 100644
--- a/mailpoet/tests/integration/Entities/NewsletterEntityTest.php
+++ b/mailpoet/tests/integration/Entities/NewsletterEntityTest.php
@@ -75,7 +75,7 @@ class NewsletterEntityTest extends \MailPoetTest {
     $this->assertInstanceOf(NewsletterOptionEntity::class, $newsletterOption);
 
     expect($newsletterOptionField)->notNull();
-    expect($newsletterOption->getValue())->equals($optionValue);
+    verify($newsletterOption->getValue())->equals($optionValue);
     expect($newsletter->getOption(NewsletterOptionFieldEntity::NAME_SEGMENT))->null();
   }
 
@@ -102,7 +102,7 @@ class NewsletterEntityTest extends \MailPoetTest {
     $newsletter->setStatus(NewsletterEntity::STATUS_DRAFT);
 
     // verify
-    expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_PAUSED);
+    verify($task->getStatus())->equals(ScheduledTaskEntity::STATUS_PAUSED);
   }
 
   public function testItActivatesTaskWhenActivatingNewsletter() {
@@ -128,7 +128,7 @@ class NewsletterEntityTest extends \MailPoetTest {
     $newsletter->setStatus(NewsletterEntity::STATUS_ACTIVE);
 
     // verify
-    expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
+    verify($task->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
   }
 
   public function testItDoesNotActivateTaskIfInTooMuchInPast() {
@@ -155,7 +155,7 @@ class NewsletterEntityTest extends \MailPoetTest {
     $newsletter->setStatus(NewsletterEntity::STATUS_ACTIVE);
 
     // verify
-    expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_PAUSED);
+    verify($task->getStatus())->equals(ScheduledTaskEntity::STATUS_PAUSED);
   }
 
   public function testItGetProcessedAtReturnsNullIfEmailHasNotBeingQueuedYet() {
@@ -193,7 +193,7 @@ class NewsletterEntityTest extends \MailPoetTest {
     $this->entityManager->flush();
 
     $this->entityManager->refresh($newsletter);
-    expect($newsletter->getFilterSegmentId())->equals(2);
+    verify($newsletter->getFilterSegmentId())->equals(2);
   }
 
   public function testItInheritsFilterSegmentIdFromParent(): void {
@@ -208,7 +208,7 @@ class NewsletterEntityTest extends \MailPoetTest {
     $this->entityManager->flush();
 
     $this->entityManager->refresh($notificationNewsletter);
-    expect($notificationNewsletter->getFilterSegmentId())->equals(2);
+    verify($notificationNewsletter->getFilterSegmentId())->equals(2);
 
     $notificationHistoryNewsletter = $this->createNewsletter(NewsletterEntity::TYPE_NOTIFICATION_HISTORY);
     expect($notificationHistoryNewsletter->getFilterSegmentId())->null();
@@ -217,7 +217,7 @@ class NewsletterEntityTest extends \MailPoetTest {
     $this->entityManager->persist($notificationHistoryNewsletter);
     $this->entityManager->flush();
     $this->entityManager->refresh($notificationHistoryNewsletter);
-    expect($notificationHistoryNewsletter->getFilterSegmentId())->equals(2);
+    verify($notificationHistoryNewsletter->getFilterSegmentId())->equals(2);
   }
 
   private function createNewsletter(string $type = NewsletterEntity::TYPE_STANDARD): NewsletterEntity {
diff --git a/mailpoet/tests/integration/Form/ApiDataSanitizerTest.php b/mailpoet/tests/integration/Form/ApiDataSanitizerTest.php
index b7ba560ebc..e85d1f1054 100644
--- a/mailpoet/tests/integration/Form/ApiDataSanitizerTest.php
+++ b/mailpoet/tests/integration/Form/ApiDataSanitizerTest.php
@@ -50,11 +50,11 @@ class ApiDataSanitizerTest extends \MailPoetTest {
     $paragraph = $result[0];
     $nestedHeading = $result[1]['body'][0];
     $nestedCheckbox = $result[1]['body'][1];
-    expect($paragraph['params']['content'])->equals('alert(1);Paragraph');
-    expect($paragraph['params']['align'])->equals('left');
-    expect($nestedHeading['params']['content'])->equals('alert(2);Heading');
-    expect($nestedHeading['params']['align'])->equals('right');
-    expect($nestedCheckbox['params']['values'][0]['value'])->equals('alert(3);Checkbox');
-    expect($nestedCheckbox['params']['label'])->equals('Label');
+    verify($paragraph['params']['content'])->equals('alert(1);Paragraph');
+    verify($paragraph['params']['align'])->equals('left');
+    verify($nestedHeading['params']['content'])->equals('alert(2);Heading');
+    verify($nestedHeading['params']['align'])->equals('right');
+    verify($nestedCheckbox['params']['values'][0]['value'])->equals('alert(3);Checkbox');
+    verify($nestedCheckbox['params']['label'])->equals('Label');
   }
 }
diff --git a/mailpoet/tests/integration/Form/Block/BlockRendererHelperTest.php b/mailpoet/tests/integration/Form/Block/BlockRendererHelperTest.php
index b52bee9bfd..b5c431e848 100644
--- a/mailpoet/tests/integration/Form/Block/BlockRendererHelperTest.php
+++ b/mailpoet/tests/integration/Form/Block/BlockRendererHelperTest.php
@@ -11,6 +11,6 @@ class BlockRendererHelperTest extends \MailPoetTest {
     $text = '[mailpoet_subscribers_count] [gallery attr="attr"]inside[/gallery][unknown]';
     $rendererHelper = $this->diContainer->get(BlockRendererHelper::class);
     $escaped = $rendererHelper->escapeShortCodes($text);
-    expect($escaped)->equals('&#91;mailpoet_subscribers_count&#93; &#91;gallery attr="attr"&#93;inside&#91;/gallery&#93;[unknown]');
+    verify($escaped)->equals('&#91;mailpoet_subscribers_count&#93; &#91;gallery attr="attr"&#93;inside&#91;/gallery&#93;[unknown]');
   }
 }
diff --git a/mailpoet/tests/integration/Form/FormHtmlSanitizerTest.php b/mailpoet/tests/integration/Form/FormHtmlSanitizerTest.php
index 1939224011..bf7497fab1 100644
--- a/mailpoet/tests/integration/Form/FormHtmlSanitizerTest.php
+++ b/mailpoet/tests/integration/Form/FormHtmlSanitizerTest.php
@@ -13,22 +13,22 @@ class FormHtmlSanitizerTest extends \MailPoetTest {
   }
 
   public function testItKeepsAllowedTags() {
-    expect($this->sanitizer->sanitize(''))->equals('');
-    expect($this->sanitizer->sanitize('<span style="font-family: BioRhyme">Style</span>'))->equals('<span style="font-family: BioRhyme">Style</span>');
-    expect($this->sanitizer->sanitize('<span data-font="BioRhyme">DataFont</span>'))->equals('<span data-font="BioRhyme">DataFont</span>');
-    expect($this->sanitizer->sanitize('<span class="my-class">Class</span>'))->equals('<span class="my-class">Class</span>');
-    expect($this->sanitizer->sanitize('Text <span>👋</span> around'))->equals('Text <span>👋</span> around');
-    expect($this->sanitizer->sanitize('<strong>Strong</strong><em>Em</em><br />'))->equals('<strong>Strong</strong><em>Em</em><br />');
-    expect($this->sanitizer->sanitize('<sub>Strong</sub><sup>Em</sup><s>s</s><kbd>kbd</kbd>'))->equals('<sub>Strong</sub><sup>Em</sup><s>s</s><kbd>kbd</kbd>');
-    expect($this->sanitizer->sanitize('<code>Code</code>'))->equals('<code>Code</code>');
-    expect($this->sanitizer->sanitize('<a href="http://example.com/" data-type="post" data-id="1" target="_blank" rel="noreferrer">link</a>'))->equals('<a href="http://example.com/" data-type="post" data-id="1" target="_blank" rel="noreferrer">link</a>');
-    expect($this->sanitizer->sanitize('<img class="wp-image-55" style="width: 150px;height: 1px" src="http://test.com/logo-1.jpg" alt="alt text">'))->equals('<img class="wp-image-55" style="width: 150px;height: 1px" src="http://test.com/logo-1.jpg" alt="alt text">');
+    verify($this->sanitizer->sanitize(''))->equals('');
+    verify($this->sanitizer->sanitize('<span style="font-family: BioRhyme">Style</span>'))->equals('<span style="font-family: BioRhyme">Style</span>');
+    verify($this->sanitizer->sanitize('<span data-font="BioRhyme">DataFont</span>'))->equals('<span data-font="BioRhyme">DataFont</span>');
+    verify($this->sanitizer->sanitize('<span class="my-class">Class</span>'))->equals('<span class="my-class">Class</span>');
+    verify($this->sanitizer->sanitize('Text <span>👋</span> around'))->equals('Text <span>👋</span> around');
+    verify($this->sanitizer->sanitize('<strong>Strong</strong><em>Em</em><br />'))->equals('<strong>Strong</strong><em>Em</em><br />');
+    verify($this->sanitizer->sanitize('<sub>Strong</sub><sup>Em</sup><s>s</s><kbd>kbd</kbd>'))->equals('<sub>Strong</sub><sup>Em</sup><s>s</s><kbd>kbd</kbd>');
+    verify($this->sanitizer->sanitize('<code>Code</code>'))->equals('<code>Code</code>');
+    verify($this->sanitizer->sanitize('<a href="http://example.com/" data-type="post" data-id="1" target="_blank" rel="noreferrer">link</a>'))->equals('<a href="http://example.com/" data-type="post" data-id="1" target="_blank" rel="noreferrer">link</a>');
+    verify($this->sanitizer->sanitize('<img class="wp-image-55" style="width: 150px;height: 1px" src="http://test.com/logo-1.jpg" alt="alt text">'))->equals('<img class="wp-image-55" style="width: 150px;height: 1px" src="http://test.com/logo-1.jpg" alt="alt text">');
   }
 
   public function testItRemovesUnwantedHtml() {
-    expect($this->sanitizer->sanitize('<script>'))->equals('');
-    expect($this->sanitizer->sanitize('<span>Hello<img src="http://nonsense" onerror="alert(1)"/></span>'))->equals('<span>Hello<img src="http://nonsense" /></span>');
-    expect($this->sanitizer->sanitize('<a href="#" onclick="alert(1)">click me</a>'))->equals('<a href="#">click me</a>');
-    expect($this->sanitizer->sanitize('<a href="javascript:alert(1)">click me</a>'))->equals('<a href="alert(1)">click me</a>');
+    verify($this->sanitizer->sanitize('<script>'))->equals('');
+    verify($this->sanitizer->sanitize('<span>Hello<img src="http://nonsense" onerror="alert(1)"/></span>'))->equals('<span>Hello<img src="http://nonsense" /></span>');
+    verify($this->sanitizer->sanitize('<a href="#" onclick="alert(1)">click me</a>'))->equals('<a href="#">click me</a>');
+    verify($this->sanitizer->sanitize('<a href="javascript:alert(1)">click me</a>'))->equals('<a href="alert(1)">click me</a>');
   }
 }
diff --git a/mailpoet/tests/integration/Form/FormMessageControllerTest.php b/mailpoet/tests/integration/Form/FormMessageControllerTest.php
index 97fb4fd60e..50f1311f4e 100644
--- a/mailpoet/tests/integration/Form/FormMessageControllerTest.php
+++ b/mailpoet/tests/integration/Form/FormMessageControllerTest.php
@@ -24,9 +24,9 @@ class FormMessageControllerTest extends \MailPoetTest {
 
   public function testItReturnsCorrectSuccessMessage(): void {
     $this->settings->set('signup_confirmation.enabled', 1);
-    expect($this->controller->getDefaultSuccessMessage())->equals(__('Check your inbox or spam folder to confirm your subscription.', 'mailpoet'));
+    verify($this->controller->getDefaultSuccessMessage())->equals(__('Check your inbox or spam folder to confirm your subscription.', 'mailpoet'));
     $this->settings->set('signup_confirmation.enabled', 0);
-    expect($this->controller->getDefaultSuccessMessage())->equals(__('You’ve been successfully subscribed to our newsletter!', 'mailpoet'));
+    verify($this->controller->getDefaultSuccessMessage())->equals(__('You’ve been successfully subscribed to our newsletter!', 'mailpoet'));
   }
 
   public function testItUpdatesSuccessMessagesForForms(): void {
@@ -41,7 +41,7 @@ class FormMessageControllerTest extends \MailPoetTest {
     $forms = $this->formsRepository->findAll();
     expect($forms)->count(1);
     foreach ($forms as $form) {
-      expect($form->getSettings()['success_message'] ?? null)->equals(__('You’ve been successfully subscribed to our newsletter!', 'mailpoet'));
+      verify($form->getSettings()['success_message'] ?? null)->equals(__('You’ve been successfully subscribed to our newsletter!', 'mailpoet'));
     }
 
     $this->settings->set('signup_confirmation.enabled', 1);
@@ -49,7 +49,7 @@ class FormMessageControllerTest extends \MailPoetTest {
     $forms = $this->formsRepository->findAll();
     expect($forms)->count(1);
     foreach ($forms as $form) {
-      expect($form->getSettings()['success_message'] ?? null)->equals(__('Check your inbox or spam folder to confirm your subscription.', 'mailpoet'));
+      verify($form->getSettings()['success_message'] ?? null)->equals(__('Check your inbox or spam folder to confirm your subscription.', 'mailpoet'));
     }
   }
 }
diff --git a/mailpoet/tests/integration/Form/FormSaveControllerTest.php b/mailpoet/tests/integration/Form/FormSaveControllerTest.php
index d65ceb7384..4ebce401df 100644
--- a/mailpoet/tests/integration/Form/FormSaveControllerTest.php
+++ b/mailpoet/tests/integration/Form/FormSaveControllerTest.php
@@ -17,10 +17,10 @@ class FormSaveControllerTest extends \MailPoetTest {
   public function testItDuplicatesForms() {
     $form = $this->createForm();
     $duplicate = $this->saveController->duplicate($form);
-    expect($duplicate->getName())->equals('Copy of ' . $form->getName());
-    expect($duplicate->getDeletedAt())->equals(null);
-    expect($duplicate->getBody())->equals($form->getBody());
-    expect($duplicate->getStatus())->equals($form->getStatus());
+    verify($duplicate->getName())->equals('Copy of ' . $form->getName());
+    verify($duplicate->getDeletedAt())->equals(null);
+    verify($duplicate->getBody())->equals($form->getBody());
+    verify($duplicate->getStatus())->equals($form->getStatus());
   }
 
   private function createForm(): FormEntity {
diff --git a/mailpoet/tests/integration/Form/WidgetTest.php b/mailpoet/tests/integration/Form/WidgetTest.php
index a983b1e852..e77d624563 100644
--- a/mailpoet/tests/integration/Form/WidgetTest.php
+++ b/mailpoet/tests/integration/Form/WidgetTest.php
@@ -33,7 +33,7 @@ class WidgetTest extends \MailPoetTest {
       ]
     );
     $DOM = pQuery::parseStr($renderedFormWidget);
-    expect($DOM->query('form')->attr('target'))->equals('_self');
+    verify($DOM->query('form')->attr('target'))->equals('_self');
 
     // form target is modified to _top via hook
     (new WPFunctions)->addFilter(
@@ -51,6 +51,6 @@ class WidgetTest extends \MailPoetTest {
       ]
     );
     $DOM = pQuery::parseStr($renderedFormWidget);
-    expect($DOM->query('form')->attr('target'))->equals('_top');
+    verify($DOM->query('form')->attr('target'))->equals('_top');
   }
 }
diff --git a/mailpoet/tests/integration/Homepage/HomepageDataControllerTest.php b/mailpoet/tests/integration/Homepage/HomepageDataControllerTest.php
index 9dbb5abf8a..4428677bc9 100644
--- a/mailpoet/tests/integration/Homepage/HomepageDataControllerTest.php
+++ b/mailpoet/tests/integration/Homepage/HomepageDataControllerTest.php
@@ -173,8 +173,8 @@ class HomepageDataControllerTest extends \MailPoetTest {
 
   public function testItFetchesSubscriberStatsForZeroSubscribers(): void {
     $subscribersStats = $this->homepageDataController->getPageData()['subscribersStats'];
-    expect($subscribersStats['global']['subscribed'])->equals(0);
-    expect($subscribersStats['global']['unsubscribed'])->equals(0);
+    verify($subscribersStats['global']['subscribed'])->equals(0);
+    verify($subscribersStats['global']['unsubscribed'])->equals(0);
   }
 
   public function testItFetchesCorrectGlobalSubscriberStats(): void {
@@ -206,8 +206,8 @@ class HomepageDataControllerTest extends \MailPoetTest {
     $this->entityManager->flush();
 
     $subscribersStats = $this->homepageDataController->getPageData()['subscribersStats'];
-    expect($subscribersStats['global']['subscribed'])->equals(2);
-    expect($subscribersStats['global']['unsubscribed'])->equals(2);
+    verify($subscribersStats['global']['subscribed'])->equals(2);
+    verify($subscribersStats['global']['unsubscribed'])->equals(2);
   }
 
   public function testCountMultipleGlobalUnsubscribesOfTheSameSubscriberOnlyOnce(): void {
@@ -224,7 +224,7 @@ class HomepageDataControllerTest extends \MailPoetTest {
     $this->entityManager->flush();
 
     $subscribersStats = $this->homepageDataController->getPageData()['subscribersStats'];
-    expect($subscribersStats['global']['unsubscribed'])->equals(1);
+    verify($subscribersStats['global']['unsubscribed'])->equals(1);
   }
 
   public function testItFetchesCorrectGlobalSubscriberChange(): void {
@@ -235,7 +235,7 @@ class HomepageDataControllerTest extends \MailPoetTest {
       (new Subscriber())->create();
     }
     $subscribersStats = $this->homepageDataController->getPageData()['subscribersStats'];
-    expect($subscribersStats['global']['changePercent'])->equals(1000);
+    verify($subscribersStats['global']['changePercent'])->equals(1000);
 
     // 10 New Subscribers + 6 Old Subscribers
     for ($i = 0; $i < 6; $i++) {
@@ -243,7 +243,7 @@ class HomepageDataControllerTest extends \MailPoetTest {
     }
     $this->clearSubscribersCountCache();
     $subscribersStats = $this->homepageDataController->getPageData()['subscribersStats'];
-    expect($subscribersStats['global']['changePercent'])->equals(166.7);
+    verify($subscribersStats['global']['changePercent'])->equals(166.7);
 
     // 10 New Subscribers + 6 Old Subscribers + 10 New Unsubscribed
     for ($i = 0; $i < 10; $i++) {
@@ -253,7 +253,7 @@ class HomepageDataControllerTest extends \MailPoetTest {
     }
     $this->clearSubscribersCountCache();
     $subscribersStats = $this->homepageDataController->getPageData()['subscribersStats'];
-    expect($subscribersStats['global']['changePercent'])->equals(0);
+    verify($subscribersStats['global']['changePercent'])->equals(0);
 
     // 10 New Subscribers + 6 Old Subscribers + 11 New Unsubscribed
     $unsubscribed = (new Subscriber())->withLastSubscribedAt($thirtyOneDaysAgo)->withStatus(SubscriberEntity::STATUS_UNSUBSCRIBED)->create();
@@ -261,7 +261,7 @@ class HomepageDataControllerTest extends \MailPoetTest {
     $this->entityManager->flush();
     $this->clearSubscribersCountCache();
     $subscribersStats = $this->homepageDataController->getPageData()['subscribersStats'];
-    expect($subscribersStats['global']['changePercent'])->equals(-5.9);
+    verify($subscribersStats['global']['changePercent'])->equals(-5.9);
   }
 
   public function testItFetchesCorrectListLevelSubscribedStats(): void {
@@ -286,11 +286,11 @@ class HomepageDataControllerTest extends \MailPoetTest {
     $this->assertInstanceOf(SubscriberSegmentEntity::class, $subscriberSegment);
     $this->setUpdatedAtForEntity($subscriberSegment, $thirtyOneDaysAgo);
     $subscribersStats = $this->homepageDataController->getPageData()['subscribersStats'];
-    expect($subscribersStats['lists'][0]['id'])->equals($segment->getId());
-    expect($subscribersStats['lists'][0]['name'])->equals($segment->getName());
-    expect($subscribersStats['lists'][0]['subscribed'])->equals(1);
-    expect($subscribersStats['lists'][0]['unsubscribed'])->equals(0);
-    expect($subscribersStats['lists'][0]['averageEngagementScore'])->equals(0.5);
+    verify($subscribersStats['lists'][0]['id'])->equals($segment->getId());
+    verify($subscribersStats['lists'][0]['name'])->equals($segment->getName());
+    verify($subscribersStats['lists'][0]['subscribed'])->equals(1);
+    verify($subscribersStats['lists'][0]['unsubscribed'])->equals(0);
+    verify($subscribersStats['lists'][0]['averageEngagementScore'])->equals(0.5);
   }
 
   public function testItFetchesCorrectListLevelUnsubscribedStats(): void {
@@ -323,10 +323,10 @@ class HomepageDataControllerTest extends \MailPoetTest {
     $this->setUpdatedAtForEntity($subscriberSegment, $thirtyOneDaysAgo);
 
     $subscribersStats = $this->homepageDataController->getPageData()['subscribersStats'];
-    expect($subscribersStats['lists'][0]['id'])->equals($segment->getId());
-    expect($subscribersStats['lists'][0]['name'])->equals($segment->getName());
-    expect($subscribersStats['lists'][0]['unsubscribed'])->equals(1);
-    expect($subscribersStats['lists'][0]['subscribed'])->equals(0);
+    verify($subscribersStats['lists'][0]['id'])->equals($segment->getId());
+    verify($subscribersStats['lists'][0]['name'])->equals($segment->getName());
+    verify($subscribersStats['lists'][0]['unsubscribed'])->equals(1);
+    verify($subscribersStats['lists'][0]['subscribed'])->equals(0);
   }
 
   private function cleanup() {
diff --git a/mailpoet/tests/integration/Logging/LogHandlerTest.php b/mailpoet/tests/integration/Logging/LogHandlerTest.php
index bff19adc7f..370c481fc8 100644
--- a/mailpoet/tests/integration/Logging/LogHandlerTest.php
+++ b/mailpoet/tests/integration/Logging/LogHandlerTest.php
@@ -40,7 +40,7 @@ class LogHandlerTest extends \MailPoetTest {
     $this->assertInstanceOf(LogEntity::class, $log);
     $createdAt = $log->getCreatedAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $createdAt);
-    expect($createdAt->format('Y-m-d H:i:s'))->equals($time->format('Y-m-d H:i:s'));
+    verify($createdAt->format('Y-m-d H:i:s'))->equals($time->format('Y-m-d H:i:s'));
   }
 
   public function testItPurgesOldLogs() {
@@ -140,7 +140,7 @@ class LogHandlerTest extends \MailPoetTest {
     $this->assertInstanceOf(LogEntity::class, $log);
     $createdAt = $log->getCreatedAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $createdAt);
-    expect($createdAt->format('Y-m-d H:i:s'))->equals($time->format('Y-m-d H:i:s'));
+    verify($createdAt->format('Y-m-d H:i:s'))->equals($time->format('Y-m-d H:i:s'));
   }
 
   /**
diff --git a/mailpoet/tests/integration/Logging/LogRepositoryTest.php b/mailpoet/tests/integration/Logging/LogRepositoryTest.php
index 46e721ff76..bf96f7540d 100644
--- a/mailpoet/tests/integration/Logging/LogRepositoryTest.php
+++ b/mailpoet/tests/integration/Logging/LogRepositoryTest.php
@@ -29,6 +29,6 @@ class LogRepositoryTest extends \MailPoetTest {
       $logsInDB[] = $log->getId();
     }
     sort($logsInDB);
-    expect([$log2->getId(), $log3->getId(), $log4->getId()])->equals($logsInDB);
+    verify([$log2->getId(), $log3->getId(), $log4->getId()])->equals($logsInDB);
   }
 }
diff --git a/mailpoet/tests/integration/Mailer/MailerFactoryTest.php b/mailpoet/tests/integration/Mailer/MailerFactoryTest.php
index 43254fc0c2..8da7a8cd20 100644
--- a/mailpoet/tests/integration/Mailer/MailerFactoryTest.php
+++ b/mailpoet/tests/integration/Mailer/MailerFactoryTest.php
@@ -128,17 +128,17 @@ class MailerFactoryTest extends \MailPoetTest {
     $mailer = $this->factory->getDefaultMailer();
     $mailerMethod = $mailer->mailerMethod;
     $this->assertInstanceOf(PHPMail::class, $mailerMethod);
-    expect($mailerMethod->sender)->equals([
+    verify($mailerMethod->sender)->equals([
       'from_name' => 'Sender',
       'from_email' => 'sender@email.com',
       'from_name_email' => 'Sender <sender@email.com>',
     ]);
-    expect($mailerMethod->replyTo)->equals([
+    verify($mailerMethod->replyTo)->equals([
       'reply_to_name' => 'Reply To',
       'reply_to_email' => 'reply@email.com',
       'reply_to_name_email' => 'Reply To <reply@email.com>',
     ]);
-    expect($mailerMethod->returnPath)->equals($this->returnPath);
+    verify($mailerMethod->returnPath)->equals($this->returnPath);
   }
 
   public function testItUsesSenderAsReplyToWhenReplyToIsNotSet() {
@@ -146,7 +146,7 @@ class MailerFactoryTest extends \MailPoetTest {
     $mailer = $this->factory->getDefaultMailer();
     $mailerMethod = $mailer->mailerMethod;
     $this->assertInstanceOf(PHPMail::class, $mailerMethod);
-    expect($mailerMethod->replyTo)->equals([
+    verify($mailerMethod->replyTo)->equals([
       'reply_to_name' => 'Sender',
       'reply_to_email' => 'sender@email.com',
       'reply_to_name_email' => 'Sender <sender@email.com>',
@@ -158,7 +158,7 @@ class MailerFactoryTest extends \MailPoetTest {
     $mailer = $this->factory->getDefaultMailer();
     $mailerMethod = $mailer->mailerMethod;
     $this->assertInstanceOf(PHPMail::class, $mailerMethod);
-    expect($mailerMethod->returnPath)->equals('sender@email.com');
+    verify($mailerMethod->returnPath)->equals('sender@email.com');
   }
 
   public function testItUsesSenderAddressInReplyToInCaseReplyToHasOnlyName() {
@@ -166,7 +166,7 @@ class MailerFactoryTest extends \MailPoetTest {
     $mailer = $this->factory->getDefaultMailer();
     $mailerMethod = $mailer->mailerMethod;
     $this->assertInstanceOf(PHPMail::class, $mailerMethod);
-    expect($mailerMethod->replyTo)->equals([
+    verify($mailerMethod->replyTo)->equals([
       'reply_to_name' => 'Reply To',
       'reply_to_email' => 'sender@email.com',
       'reply_to_name_email' => 'Reply To <sender@email.com>',
@@ -186,8 +186,8 @@ class MailerFactoryTest extends \MailPoetTest {
     $mailer = $this->factory->getDefaultMailer();
     $mailerMethod = $mailer->mailerMethod;
     $this->assertInstanceOf(PHPMail::class, $mailerMethod);
-    expect($mailerMethod->sender['from_name'])->equals(sprintf('=?utf-8?B?%s?=', base64_encode('Sender Außergewöhnlichen тест системы')));
-    expect($mailerMethod->replyTo['reply_to_name'])->equals(sprintf('=?utf-8?B?%s?=', base64_encode('Reply-To Außergewöhnlichen тест системы')));
+    verify($mailerMethod->sender['from_name'])->equals(sprintf('=?utf-8?B?%s?=', base64_encode('Sender Außergewöhnlichen тест системы')));
+    verify($mailerMethod->replyTo['reply_to_name'])->equals(sprintf('=?utf-8?B?%s?=', base64_encode('Reply-To Außergewöhnlichen тест системы')));
   }
 
   public function testItCachesDefaultMailerInstance() {
diff --git a/mailpoet/tests/integration/Mailer/MailerLogTest.php b/mailpoet/tests/integration/Mailer/MailerLogTest.php
index c5bc7a49e8..0b3eecec3e 100644
--- a/mailpoet/tests/integration/Mailer/MailerLogTest.php
+++ b/mailpoet/tests/integration/Mailer/MailerLogTest.php
@@ -24,13 +24,13 @@ class MailerLogTest extends \MailPoetTest {
       'started' => time(),
     ];
     $this->settings->set(MailerLog::SETTING_NAME, $mailerLog);
-    expect(MailerLog::getMailerLog())->equals($mailerLog);
+    verify(MailerLog::getMailerLog())->equals($mailerLog);
   }
 
   public function testItGetsMailerLogWhenOneDoesNotExist() {
     $resultExpectedGreaterThan = time() - 1;
     $mailerLog = MailerLog::getMailerLog();
-    expect($mailerLog['sent'])->equals([]);
+    verify($mailerLog['sent'])->equals([]);
     expect($mailerLog['started'])->greaterThan($resultExpectedGreaterThan);
   }
 
@@ -42,7 +42,7 @@ class MailerLogTest extends \MailPoetTest {
     $mailerConfig['method'] = Mailer::METHOD_MAILPOET;
     $settings->set(Mailer::MAILER_CONFIG_SETTING_NAME, $mailerConfig);
     expect(MailerLog::incrementSentCount())->null();
-    expect(MailerLog::sentSince())->equals($expectedCount);
+    verify(MailerLog::sentSince())->equals($expectedCount);
   }
 
   public function testItResetsErrorOnIncrementCountEvenForMSS() {
@@ -61,7 +61,7 @@ class MailerLogTest extends \MailPoetTest {
   public function testItCreatesMailer() {
     $resultExpectedGreaterThan = time() - 1;
     $mailerLog = MailerLog::createMailerLog();
-    expect($mailerLog['sent'])->equals([]);
+    verify($mailerLog['sent'])->equals([]);
     expect($mailerLog['started'])->greaterThan($resultExpectedGreaterThan);
   }
 
@@ -74,7 +74,7 @@ class MailerLogTest extends \MailPoetTest {
     $this->settings->set(MailerLog::SETTING_NAME, $mailerLog);
     MailerLog::resetMailerLog();
     $updatedMailerLog = $this->settings->get(MailerLog::SETTING_NAME);
-    expect($updatedMailerLog['sent'])->equals([]);
+    verify($updatedMailerLog['sent'])->equals([]);
     expect($updatedMailerLog['started'])->greaterThan($mailerLog['started']);
   }
 
@@ -85,7 +85,7 @@ class MailerLogTest extends \MailPoetTest {
     $mailerLog['started'] = $started;
     MailerLog::updateMailerLog($mailerLog);
     $updatedMailerLog = $this->settings->get(MailerLog::SETTING_NAME);
-    expect($updatedMailerLog)->equals($mailerLog);
+    verify($updatedMailerLog)->equals($mailerLog);
   }
 
   public function testItIncrementsSentCount() {
@@ -98,7 +98,7 @@ class MailerLogTest extends \MailPoetTest {
     $this->settings->set(MailerLog::SETTING_NAME, $mailerLog);
     MailerLog::incrementSentCount();
     $updatedMailerLog = $this->settings->get(MailerLog::SETTING_NAME);
-    expect(array_sum($updatedMailerLog['sent']))->equals(2);
+    verify(array_sum($updatedMailerLog['sent']))->equals(2);
   }
 
   public function testItTruncatesOutdatedEntriesWhenIncrementingSentCount() {
@@ -123,7 +123,7 @@ class MailerLogTest extends \MailPoetTest {
     $this->settings->set(Mailer::MAILER_CONFIG_SETTING_NAME, $mailerConfig);
     MailerLog::incrementSentCount();
     $updatedMailerLog = $this->settings->get(MailerLog::SETTING_NAME);
-    expect(array_sum($updatedMailerLog['sent']))->equals(11);
+    verify(array_sum($updatedMailerLog['sent']))->equals(11);
   }
 
   public function testItChecksWhenSendingLimitIsReached() {
@@ -187,7 +187,7 @@ class MailerLogTest extends \MailPoetTest {
     $mailerLog['status'] = MailerLog::STATUS_PAUSED;
     MailerLog::updateMailerLog($mailerLog);
     $mailerLog = MailerLog::getMailerLog();
-    expect($mailerLog['status'])->equals(MailerLog::STATUS_PAUSED);
+    verify($mailerLog['status'])->equals(MailerLog::STATUS_PAUSED);
     // status is reset when sending is resumed
     MailerLog::resumeSending();
     $mailerLog = MailerLog::getMailerLog();
@@ -203,7 +203,7 @@ class MailerLogTest extends \MailPoetTest {
     // status is set to PAUSED, retry attempt and retry at time are cleared
     MailerLog::pauseSending($mailerLog);
     $mailerLog = MailerLog::getMailerLog();
-    expect($mailerLog['status'])->equals(MailerLog::STATUS_PAUSED);
+    verify($mailerLog['status'])->equals(MailerLog::STATUS_PAUSED);
     expect($mailerLog['retry_attempt'])->null();
     expect($mailerLog['retry_at'])->null();
   }
@@ -218,9 +218,9 @@ class MailerLogTest extends \MailPoetTest {
     $this->expectException('\Exception');
     MailerLog::processError($operation = 'send', $error = 'email rejected');
     $mailerLog = MailerLog::getMailerLog();
-    expect($mailerLog['retry_attempt'])->equals(1);
+    verify($mailerLog['retry_attempt'])->equals(1);
     expect($mailerLog['retry_at'])->greaterThan(time());
-    expect($mailerLog['error'])->equals(
+    verify($mailerLog['error'])->equals(
       [
         'operation' => 'send',
         'error_message' => $error,
@@ -236,9 +236,9 @@ class MailerLogTest extends \MailPoetTest {
     $this->expectException('\Exception');
     MailerLog::processNonBlockingError($operation = 'send', $error = 'email rejected');
     $mailerLog = MailerLog::getMailerLog();
-    expect($mailerLog['retry_attempt'])->equals(1);
+    verify($mailerLog['retry_attempt'])->equals(1);
     expect($mailerLog['retry_at'])->greaterThan(time());
-    expect($mailerLog['error'])->equals(
+    verify($mailerLog['error'])->equals(
       [
         'operation' => 'send',
         'error_message' => $error,
@@ -254,13 +254,13 @@ class MailerLogTest extends \MailPoetTest {
       MailerLog::processError($operation = 'send', $error = 'email rejected - sending paused', $errorCode = null, $pauseSending = true);
       $this->fail('Paused sending exception was not thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('Sending has been paused.');
+      verify($e->getMessage())->equals('Sending has been paused.');
     }
     $mailerLog = MailerLog::getMailerLog();
     expect($mailerLog['retry_attempt'])->null();
     expect($mailerLog['retry_at'])->null();
-    expect($mailerLog['status'])->equals(MailerLog::STATUS_PAUSED);
-    expect($mailerLog['error'])->equals(
+    verify($mailerLog['status'])->equals(MailerLog::STATUS_PAUSED);
+    verify($mailerLog['error'])->equals(
       [
         'operation' => 'send',
         'error_message' => $error,
@@ -277,9 +277,9 @@ class MailerLogTest extends \MailPoetTest {
     expect($mailerLog['transactional_email_error_count'])->null();
     MailerLog::processTransactionalEmailError(MailerError::OPERATION_SEND, 'email rejected');
     $mailerLog = MailerLog::getMailerLog();
-    expect($mailerLog['transactional_email_last_error_at'])->equals(time(), 1);
-    expect($mailerLog['transactional_email_error_count'])->equals(1);
-    expect($mailerLog['error'])->equals(
+    verify($mailerLog['transactional_email_last_error_at'])->equals(time(), 1);
+    verify($mailerLog['transactional_email_error_count'])->equals(1);
+    verify($mailerLog['error'])->equals(
       [
         'operation' => MailerError::OPERATION_SEND,
         'error_message' => 'email rejected',
@@ -295,8 +295,8 @@ class MailerLogTest extends \MailPoetTest {
     MailerLog::updateMailerLog($mailerLog);
     MailerLog::processTransactionalEmailError(MailerError::OPERATION_SEND, 'email rejected');
     $mailerLog = MailerLog::getMailerLog();
-    expect($mailerLog['transactional_email_last_error_at'])->equals($almostTwoMinutesAgo);
-    expect($mailerLog['transactional_email_error_count'])->equals(1);
+    verify($mailerLog['transactional_email_last_error_at'])->equals($almostTwoMinutesAgo);
+    verify($mailerLog['transactional_email_error_count'])->equals(1);
   }
 
   public function testItIncreaseCounterOfTransactionalEmailSendingErrorWhenLastLoggedOlderThanIgnoreThreshold() {
@@ -307,8 +307,8 @@ class MailerLogTest extends \MailPoetTest {
     MailerLog::updateMailerLog($mailerLog);
     MailerLog::processTransactionalEmailError(MailerError::OPERATION_SEND, 'email rejected');
     $mailerLog = MailerLog::getMailerLog();
-    expect($mailerLog['transactional_email_last_error_at'])->equals(time(), 1);
-    expect($mailerLog['transactional_email_error_count'])->equals(2);
+    verify($mailerLog['transactional_email_last_error_at'])->equals(time(), 1);
+    verify($mailerLog['transactional_email_error_count'])->equals(2);
   }
 
   public function testItPausesSendingWhenTransactionalEmailSendingErrorCountReachesLimit() {
@@ -345,7 +345,7 @@ class MailerLogTest extends \MailPoetTest {
       MailerLog::enforceExecutionRequirements();
       self::fail('Sending frequency exception was not thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('Sending frequency limit has been reached.');
+      verify($e->getMessage())->equals('Sending frequency limit has been reached.');
     }
   }
 
@@ -367,7 +367,7 @@ class MailerLogTest extends \MailPoetTest {
       MailerLog::enforceExecutionRequirements();
       self::fail('Sending frequency exception was not thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('Sending frequency limit has been reached.');
+      verify($e->getMessage())->equals('Sending frequency limit has been reached.');
     }
   }
 
@@ -400,7 +400,7 @@ class MailerLogTest extends \MailPoetTest {
       MailerLog::enforceExecutionRequirements($mailerLog);
       self::fail('Sending waiting to be retried exception was not thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('Sending is waiting to be retried.');
+      verify($e->getMessage())->equals('Sending is waiting to be retried.');
     }
   }
 
@@ -415,10 +415,10 @@ class MailerLogTest extends \MailPoetTest {
       MailerLog::enforceExecutionRequirements($mailerLog);
       self::fail('Sending paused exception was not thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('Sending has been paused.');
+      verify($e->getMessage())->equals('Sending has been paused.');
     }
     $mailerLog = MailerLog::getMailerLog();
-    expect($mailerLog['status'])->equals(MailerLog::STATUS_PAUSED);
+    verify($mailerLog['status'])->equals(MailerLog::STATUS_PAUSED);
   }
 
   public function testItClearsSendingErrorLog() {
@@ -439,7 +439,7 @@ class MailerLogTest extends \MailPoetTest {
     expect($mailerLog['error'])->null();
     expect($mailerLog['transactional_email_last_error_at'])->null();
     expect($mailerLog['transactional_email_error_count'])->null();
-    expect($mailerLog['status'])->equals('status');
+    verify($mailerLog['status'])->equals('status');
   }
 
   public function testItEnforcesPausedStatus() {
@@ -449,7 +449,7 @@ class MailerLogTest extends \MailPoetTest {
       MailerLog::enforceExecutionRequirements($mailerLog);
       self::fail('Sending paused exception was not thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('Sending has been paused.');
+      verify($e->getMessage())->equals('Sending has been paused.');
     }
   }
 }
diff --git a/mailpoet/tests/integration/Mailer/MailerTest.php b/mailpoet/tests/integration/Mailer/MailerTest.php
index 621d311588..8b263fa413 100644
--- a/mailpoet/tests/integration/Mailer/MailerTest.php
+++ b/mailpoet/tests/integration/Mailer/MailerTest.php
@@ -47,33 +47,33 @@ class MailerTest extends \MailPoetTest {
 
   public function testItCanTransformSubscriber() {
     $mailer = $this->mailerFactory->buildMailer($this->mailer, $this->sender, $this->replyTo);
-    expect($mailer->formatSubscriberNameAndEmailAddress('test@email.com'))
+    verify($mailer->formatSubscriberNameAndEmailAddress('test@email.com'))
       ->equals('test@email.com');
-    expect($mailer->formatSubscriberNameAndEmailAddress(
+    verify($mailer->formatSubscriberNameAndEmailAddress(
       [
         'email' => 'test@email.com',
       ])
     )->equals('test@email.com');
-    expect($mailer->formatSubscriberNameAndEmailAddress(
+    verify($mailer->formatSubscriberNameAndEmailAddress(
       [
         'first_name' => 'First',
         'email' => 'test@email.com',
       ])
     )->equals('First <test@email.com>');
-    expect($mailer->formatSubscriberNameAndEmailAddress(
+    verify($mailer->formatSubscriberNameAndEmailAddress(
       [
         'last_name' => 'Last',
         'email' => 'test@email.com',
       ])
     )->equals('Last <test@email.com>');
-    expect($mailer->formatSubscriberNameAndEmailAddress(
+    verify($mailer->formatSubscriberNameAndEmailAddress(
       [
         'first_name' => 'First',
         'last_name' => 'Last',
         'email' => 'test@email.com',
       ])
     )->equals('First Last <test@email.com>');
-    expect($mailer->formatSubscriberNameAndEmailAddress(
+    verify($mailer->formatSubscriberNameAndEmailAddress(
       [
         'full_name' => 'First Last',
         'email' => 'test@email.com',
diff --git a/mailpoet/tests/integration/Mailer/MetaInfoTest.php b/mailpoet/tests/integration/Mailer/MetaInfoTest.php
index 56145dccac..71016946fa 100644
--- a/mailpoet/tests/integration/Mailer/MetaInfoTest.php
+++ b/mailpoet/tests/integration/Mailer/MetaInfoTest.php
@@ -29,7 +29,7 @@ class MetaInfoTest extends \MailPoetTest {
   }
 
   public function testItGetsMetaInfoForSendingTest() {
-    expect($this->meta->getSendingTestMetaInfo())->equals([
+    verify($this->meta->getSendingTestMetaInfo())->equals([
       'email_type' => 'sending_test',
       'subscriber_status' => 'unknown',
       'subscriber_source' => 'administrator',
@@ -37,7 +37,7 @@ class MetaInfoTest extends \MailPoetTest {
   }
 
   public function testItGetsMetaInfoForPreview() {
-    expect($this->meta->getPreviewMetaInfo())->equals([
+    verify($this->meta->getPreviewMetaInfo())->equals([
       'email_type' => 'preview',
       'subscriber_status' => 'unknown',
       'subscriber_source' => 'administrator',
@@ -45,7 +45,7 @@ class MetaInfoTest extends \MailPoetTest {
   }
 
   public function testItGetsMetaInfoForStatsNotifications() {
-    expect($this->meta->getStatsNotificationMetaInfo())->equals([
+    verify($this->meta->getStatsNotificationMetaInfo())->equals([
       'email_type' => 'email_stats_notification',
       'subscriber_status' => 'unknown',
       'subscriber_source' => 'administrator',
@@ -53,7 +53,7 @@ class MetaInfoTest extends \MailPoetTest {
   }
 
   public function testItGetsMetaInfoForWordPressTransactionalEmails() {
-    expect($this->meta->getWordPressTransactionalMetaInfo())->equals([
+    verify($this->meta->getWordPressTransactionalMetaInfo())->equals([
       'email_type' => 'transactional',
       'subscriber_status' => 'unknown',
       'subscriber_source' => 'unknown',
@@ -63,7 +63,7 @@ class MetaInfoTest extends \MailPoetTest {
       'getStatus' => 'subscribed',
       'getSource' => 'form',
     ]);
-    expect($this->meta->getWordPressTransactionalMetaInfo($subscriber))->equals([
+    verify($this->meta->getWordPressTransactionalMetaInfo($subscriber))->equals([
       'email_type' => 'transactional',
       'subscriber_status' => 'subscribed',
       'subscriber_source' => 'form',
@@ -77,7 +77,7 @@ class MetaInfoTest extends \MailPoetTest {
       ->withEmail('test@metainfo.com')
       ->create();
 
-    expect($this->meta->getConfirmationMetaInfo($subscriber))->equals([
+    verify($this->meta->getConfirmationMetaInfo($subscriber))->equals([
       'email_type' => 'confirmation',
       'subscriber_status' => 'unconfirmed',
       'subscriber_source' => 'form',
@@ -85,7 +85,7 @@ class MetaInfoTest extends \MailPoetTest {
   }
 
   public function testItGetsMetaInfoForNewSubscriberNotifications() {
-    expect($this->meta->getNewSubscriberNotificationMetaInfo())->equals([
+    verify($this->meta->getNewSubscriberNotificationMetaInfo())->equals([
       'email_type' => 'new_subscriber_notification',
       'subscriber_status' => 'unknown',
       'subscriber_source' => 'administrator',
@@ -101,7 +101,7 @@ class MetaInfoTest extends \MailPoetTest {
       ->withType(NewsletterEntity::TYPE_STANDARD)
       ->create();
 
-    expect($this->meta->getNewsletterMetaInfo($newsletter, $subscriber))->equals([
+    verify($this->meta->getNewsletterMetaInfo($newsletter, $subscriber))->equals([
       'email_type' => 'newsletter',
       'subscriber_status' => 'subscribed',
       'subscriber_source' => 'form',
@@ -112,7 +112,7 @@ class MetaInfoTest extends \MailPoetTest {
     $newsletter = $this->newsletterFactory
       ->withType(NewsletterEntity::TYPE_WELCOME)
       ->create();
-    expect($this->meta->getNewsletterMetaInfo($newsletter, $this->subscriber))->equals([
+    verify($this->meta->getNewsletterMetaInfo($newsletter, $this->subscriber))->equals([
       'email_type' => 'welcome',
       'subscriber_status' => 'subscribed',
       'subscriber_source' => 'form',
@@ -127,12 +127,12 @@ class MetaInfoTest extends \MailPoetTest {
       ->withType(NewsletterEntity::TYPE_NOTIFICATION_HISTORY)
       ->create();
 
-    expect($this->meta->getNewsletterMetaInfo($newsletter1, $this->subscriber))->equals([
+    verify($this->meta->getNewsletterMetaInfo($newsletter1, $this->subscriber))->equals([
       'email_type' => 'post_notification',
       'subscriber_status' => 'subscribed',
       'subscriber_source' => 'form',
     ]);
-    expect($this->meta->getNewsletterMetaInfo($newsletter2, $this->subscriber))->equals([
+    verify($this->meta->getNewsletterMetaInfo($newsletter2, $this->subscriber))->equals([
       'email_type' => 'post_notification',
       'subscriber_status' => 'subscribed',
       'subscriber_source' => 'form',
@@ -149,12 +149,12 @@ class MetaInfoTest extends \MailPoetTest {
       ->withAutomaticTypeWooCommerceProductInCategoryPurchased()
       ->create();
 
-    expect($this->meta->getNewsletterMetaInfo($newsletter1, $this->subscriber))->equals([
+    verify($this->meta->getNewsletterMetaInfo($newsletter1, $this->subscriber))->equals([
       'email_type' => 'automatic_woocommerce_woocommerce_first_purchase',
       'subscriber_status' => 'subscribed',
       'subscriber_source' => 'form',
     ]);
-    expect($this->meta->getNewsletterMetaInfo($newsletter2, $this->subscriber))->equals([
+    verify($this->meta->getNewsletterMetaInfo($newsletter2, $this->subscriber))->equals([
       'email_type' => 'automatic_woocommerce_woocommerce_product_purchased_in_category',
       'subscriber_status' => 'subscribed',
       'subscriber_source' => 'form',
@@ -168,12 +168,12 @@ class MetaInfoTest extends \MailPoetTest {
     $newsletter2 = $this->newsletterFactory
       ->withType(NewsletterEntity::TYPE_RE_ENGAGEMENT)
       ->create();
-    expect($this->meta->getNewsletterMetaInfo($newsletter1, $this->subscriber))->equals([
+    verify($this->meta->getNewsletterMetaInfo($newsletter1, $this->subscriber))->equals([
       'email_type' => 're_engagement',
       'subscriber_status' => 'subscribed',
       'subscriber_source' => 'form',
     ]);
-    expect($this->meta->getNewsletterMetaInfo($newsletter2, $this->subscriber))->equals([
+    verify($this->meta->getNewsletterMetaInfo($newsletter2, $this->subscriber))->equals([
       'email_type' => 're_engagement',
       'subscriber_status' => 'subscribed',
       'subscriber_source' => 'form',
@@ -185,7 +185,7 @@ class MetaInfoTest extends \MailPoetTest {
       ->withType('random')
       ->create();
 
-    expect($this->meta->getNewsletterMetaInfo($newsletter1, $this->subscriber))->equals([
+    verify($this->meta->getNewsletterMetaInfo($newsletter1, $this->subscriber))->equals([
       'email_type' => 'random',
       'subscriber_status' => 'subscribed',
       'subscriber_source' => 'form',
diff --git a/mailpoet/tests/integration/Mailer/Methods/AmazonSESTest.php b/mailpoet/tests/integration/Mailer/Methods/AmazonSESTest.php
index ef823aef3c..7cae3d8d95 100644
--- a/mailpoet/tests/integration/Mailer/Methods/AmazonSESTest.php
+++ b/mailpoet/tests/integration/Mailer/Methods/AmazonSESTest.php
@@ -69,16 +69,16 @@ class AmazonSESTest extends \MailPoetTest {
   }
 
   public function testItsConstructorWorks() {
-    expect($this->mailer->awsEndpoint)
+    verify($this->mailer->awsEndpoint)
       ->equals(
         sprintf('email.%s.amazonaws.com', $this->settings['region'])
       );
-    expect($this->mailer->url)
+    verify($this->mailer->url)
       ->equals(
         sprintf('https://email.%s.amazonaws.com', $this->settings['region'])
       );
-    expect(preg_match('!^\d{8}T\d{6}Z$!', $this->mailer->date))->equals(1);
-    expect(preg_match('!^\d{8}$!', $this->mailer->dateWithoutTime))->equals(1);
+    verify(preg_match('!^\d{8}T\d{6}Z$!', $this->mailer->date))->equals(1);
+    verify(preg_match('!^\d{8}$!', $this->mailer->dateWithoutTime))->equals(1);
   }
 
   public function testItChecksForValidRegion() {
@@ -95,41 +95,41 @@ class AmazonSESTest extends \MailPoetTest {
       );
       $this->fail('Unsupported region exception was not thrown');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('Unsupported Amazon SES region');
+      verify($e->getMessage())->equals('Unsupported Amazon SES region');
     }
   }
 
   public function testItCanGenerateBody() {
     $body = $this->mailer->getBody($this->newsletter, $this->subscriber);
-    expect($body['Action'])->equals('SendRawEmail');
-    expect($body['Version'])->equals('2010-12-01');
-    expect($body['Source'])->equals($this->sender['from_name_email']);
-    expect($body['RawMessage.Data'])
+    verify($body['Action'])->equals('SendRawEmail');
+    verify($body['Version'])->equals('2010-12-01');
+    verify($body['Source'])->equals($this->sender['from_name_email']);
+    verify($body['RawMessage.Data'])
       ->equals($this->mailer->encodeMessage($this->mailer->rawMessage));
   }
 
   public function testItCanCreateMessage() {
     $mailer = $this->mailer->configureMailerWithMessage($this->newsletter, $this->subscriber, $this->extraParams);
-    expect($mailer->CharSet)->equals('UTF-8'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->getToAddresses())->equals([[
+    verify($mailer->CharSet)->equals('UTF-8'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->getToAddresses())->equals([[
       'blackhole@mailpoet.com',
       'Recipient',
     ]]);
-    expect($mailer->getAllRecipientAddresses())->equals(['blackhole@mailpoet.com' => true]);
-    expect($mailer->From)->equals($this->sender['from_email']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->FromName)->equals($this->sender['from_name']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->getReplyToAddresses())->equals([
+    verify($mailer->getAllRecipientAddresses())->equals(['blackhole@mailpoet.com' => true]);
+    verify($mailer->From)->equals($this->sender['from_email']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->FromName)->equals($this->sender['from_name']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->getReplyToAddresses())->equals([
       $this->replyTo['reply_to_email'] => [
         $this->replyTo['reply_to_email'],
         $this->replyTo['reply_to_name'],
       ],
     ]);
-    expect($mailer->Sender)->equals($this->returnPath); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->ContentType)->equals('text/html'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->Subject)->equals($this->newsletter['subject']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->Body)->equals($this->newsletter['body']['html']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->AltBody)->equals($this->newsletter['body']['text']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->getCustomHeaders())->equals([[
+    verify($mailer->Sender)->equals($this->returnPath); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->ContentType)->equals('text/html'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->Subject)->equals($this->newsletter['subject']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->Body)->equals($this->newsletter['body']['html']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->AltBody)->equals($this->newsletter['body']['text']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->getCustomHeaders())->equals([[
       'List-Unsubscribe',
       '<https://www.mailpoet.com>',
     ]]);
@@ -143,14 +143,14 @@ class AmazonSESTest extends \MailPoetTest {
     // substitute the message to synchronize hashes
     $body['RawMessage.Data'] = $rawMessage;
     $body = array_map('urlencode', $body);
-    expect($request['timeout'])->equals(10);
-    expect($request['httpversion'])->equals('1.1');
-    expect($request['method'])->equals('POST');
-    expect($request['headers']['Host'])->equals($this->mailer->awsEndpoint);
-    expect($request['headers']['Authorization'])
+    verify($request['timeout'])->equals(10);
+    verify($request['httpversion'])->equals('1.1');
+    verify($request['method'])->equals('POST');
+    verify($request['headers']['Host'])->equals($this->mailer->awsEndpoint);
+    verify($request['headers']['Authorization'])
       ->equals($this->mailer->signRequest($body));
-    expect($request['headers']['X-Amz-Date'])->equals($this->mailer->date);
-    expect($request['body'])->equals(urldecode(http_build_query($body)));
+    verify($request['headers']['X-Amz-Date'])->equals($this->mailer->date);
+    verify($request['body'])->equals(urldecode(http_build_query($body)));
   }
 
   public function testItCanCreateCanonicalRequest() {
@@ -159,7 +159,7 @@ class AmazonSESTest extends \MailPoetTest {
       "\n",
       $this->mailer->getCanonicalRequest($body)
     );
-    expect($canonicalRequest)
+    verify($canonicalRequest)
       ->equals(
         [
           'POST',
@@ -178,7 +178,7 @@ class AmazonSESTest extends \MailPoetTest {
 
   public function testItCanCreateCredentialScope() {
     $credentialScope = $this->mailer->getCredentialScope();
-    expect($credentialScope)
+    verify($credentialScope)
       ->equals(
         $this->mailer->dateWithoutTime . '/' .
         $this->mailer->awsRegion . '/' .
@@ -196,7 +196,7 @@ class AmazonSESTest extends \MailPoetTest {
       $canonicalRequest
     );
     $stringToSing = explode("\n", $stringToSing);
-    expect($stringToSing)
+    verify($stringToSing)
       ->equals(
         [
           $this->mailer->awsSigningAlgorithm,
@@ -217,7 +217,7 @@ class AmazonSESTest extends \MailPoetTest {
         $this->mailer->getCredentialScope() . ', ' .
         'SignedHeaders=host;x-amz-date, Signature='
       );
-    expect(preg_match('!Signature=[A-Fa-f0-9]{64}$!', $signedRequest))
+    verify(preg_match('!Signature=[A-Fa-f0-9]{64}$!', $signedRequest))
       ->equals(1);
   }
 
diff --git a/mailpoet/tests/integration/Mailer/Methods/MailPoetAPITest.php b/mailpoet/tests/integration/Mailer/Methods/MailPoetAPITest.php
index df2ccc0b71..1f3b8c2834 100644
--- a/mailpoet/tests/integration/Mailer/Methods/MailPoetAPITest.php
+++ b/mailpoet/tests/integration/Mailer/Methods/MailPoetAPITest.php
@@ -69,15 +69,15 @@ class MailPoetAPITest extends \MailPoetTest {
   public function testItCanGenerateBodyForSingleMessage() {
     $body = $this->mailer->getBody($this->newsletter, $this->subscriber);
     $subscriber = $this->mailer->processSubscriber($this->subscriber);
-    expect($body[0]['to']['address'])->equals($subscriber['email']);
-    expect($body[0]['to']['name'])->equals($subscriber['name']);
-    expect($body[0]['from']['address'])->equals($this->sender['from_email']);
-    expect($body[0]['from']['name'])->equals($this->sender['from_name']);
-    expect($body[0]['reply_to']['address'])->equals($this->replyTo['reply_to_email']);
-    expect($body[0]['reply_to']['name'])->equals($this->replyTo['reply_to_name']);
-    expect($body[0]['subject'])->equals($this->newsletter['subject']);
-    expect($body[0]['html'])->equals($this->newsletter['body']['html']);
-    expect($body[0]['text'])->equals($this->newsletter['body']['text']);
+    verify($body[0]['to']['address'])->equals($subscriber['email']);
+    verify($body[0]['to']['name'])->equals($subscriber['name']);
+    verify($body[0]['from']['address'])->equals($this->sender['from_email']);
+    verify($body[0]['from']['name'])->equals($this->sender['from_name']);
+    verify($body[0]['reply_to']['address'])->equals($this->replyTo['reply_to_email']);
+    verify($body[0]['reply_to']['name'])->equals($this->replyTo['reply_to_name']);
+    verify($body[0]['subject'])->equals($this->newsletter['subject']);
+    verify($body[0]['html'])->equals($this->newsletter['body']['html']);
+    verify($body[0]['text'])->equals($this->newsletter['body']['text']);
   }
 
   public function testItRemovesReplyToNameIfEmpty() {
@@ -95,7 +95,7 @@ class MailPoetAPITest extends \MailPoetTest {
       $this->diContainer->get(Url::class)
     );
     $body = $mailer->getBody($this->newsletter, $this->subscriber);
-    expect($body[0]['reply_to'])->equals([
+    verify($body[0]['reply_to'])->equals([
       'address' => 'reply-to@mailpoet.com',
     ]);
   }
@@ -104,17 +104,17 @@ class MailPoetAPITest extends \MailPoetTest {
     $newsletters = array_fill(0, 10, $this->newsletter);
     $subscribers = array_fill(0, 10, $this->subscriber);
     $body = $this->mailer->getBody($newsletters, $subscribers);
-    expect(count($body))->equals(10);
+    verify(count($body))->equals(10);
     $subscriber = $this->mailer->processSubscriber($this->subscriber);
-    expect($body[0]['to']['address'])->equals($subscriber['email']);
-    expect($body[0]['to']['name'])->equals($subscriber['name']);
-    expect($body[0]['from']['address'])->equals($this->sender['from_email']);
-    expect($body[0]['from']['name'])->equals($this->sender['from_name']);
-    expect($body[0]['reply_to']['address'])->equals($this->replyTo['reply_to_email']);
-    expect($body[0]['reply_to']['name'])->equals($this->replyTo['reply_to_name']);
-    expect($body[0]['subject'])->equals($this->newsletter['subject']);
-    expect($body[0]['html'])->equals($this->newsletter['body']['html']);
-    expect($body[0]['text'])->equals($this->newsletter['body']['text']);
+    verify($body[0]['to']['address'])->equals($subscriber['email']);
+    verify($body[0]['to']['name'])->equals($subscriber['name']);
+    verify($body[0]['from']['address'])->equals($this->sender['from_email']);
+    verify($body[0]['from']['name'])->equals($this->sender['from_name']);
+    verify($body[0]['reply_to']['address'])->equals($this->replyTo['reply_to_email']);
+    verify($body[0]['reply_to']['name'])->equals($this->replyTo['reply_to_name']);
+    verify($body[0]['subject'])->equals($this->newsletter['subject']);
+    verify($body[0]['html'])->equals($this->newsletter['body']['html']);
+    verify($body[0]['text'])->equals($this->newsletter['body']['text']);
   }
 
   public function testItCanAddExtraParametersToSingleMessage() {
@@ -124,8 +124,8 @@ class MailPoetAPITest extends \MailPoetTest {
       'meta' => $this->metaInfo,
     ];
     $body = $this->mailer->getBody($this->newsletter, $this->subscriber, $extraParams);
-    expect($body[0]['unsubscribe'])->equals(['url' => $extraParams['one_click_unsubscribe'], 'post' => true]);
-    expect($body[0]['meta'])->equals($extraParams['meta']);
+    verify($body[0]['unsubscribe'])->equals(['url' => $extraParams['one_click_unsubscribe'], 'post' => true]);
+    verify($body[0]['meta'])->equals($extraParams['meta']);
   }
 
   public function testItCanAddExtraParametersToMultipleMessages() {
@@ -149,32 +149,32 @@ class MailPoetAPITest extends \MailPoetTest {
     ];
 
     $body = $this->mailer->getBody($newsletters, $subscribers, $extraParams);
-    expect(count($body))->equals(10);
+    verify(count($body))->equals(10);
 
     for ($i = 0; $i < count($newsletters); $i++) {
       $hasHttps = strpos($extraParams['unsubscribe_url'][$i], 'https://') !== false;
       $url = $hasHttps ? $extraParams['one_click_unsubscribe'][$i] : $extraParams['unsubscribe_url'][$i];
-      expect($body[$i]['unsubscribe'])->equals(['url' => $url, 'post' => $hasHttps]);
+      verify($body[$i]['unsubscribe'])->equals(['url' => $url, 'post' => $hasHttps]);
     }
 
-    expect($body[0]['meta'])->equals($extraParams['meta'][0]);
-    expect($body[9]['meta'])->equals($extraParams['meta'][9]);
+    verify($body[0]['meta'])->equals($extraParams['meta'][0]);
+    verify($body[9]['meta'])->equals($extraParams['meta'][9]);
   }
 
   public function testItCanProcessSubscriber() {
-    expect($this->mailer->processSubscriber('test@test.com'))
+    verify($this->mailer->processSubscriber('test@test.com'))
       ->equals(
         [
           'email' => 'test@test.com',
           'name' => '',
         ]);
-    expect($this->mailer->processSubscriber('First <test@test.com>'))
+    verify($this->mailer->processSubscriber('First <test@test.com>'))
       ->equals(
         [
           'email' => 'test@test.com',
           'name' => 'First',
         ]);
-    expect($this->mailer->processSubscriber('First Last <test@test.com>'))
+    verify($this->mailer->processSubscriber('First Last <test@test.com>'))
       ->equals(
         [
           'email' => 'test@test.com',
@@ -227,7 +227,7 @@ class MailPoetAPITest extends \MailPoetTest {
     $result = $this->mailer->send($this->newsletter, $this->subscriber);
     expect($result['response'])->false();
     expect($result['error'])->isInstanceOf(MailerError::class);
-    expect($result['error']->getOperation())->equals(MailerError::OPERATION_CONNECT);
+    verify($result['error']->getOperation())->equals(MailerError::OPERATION_CONNECT);
   }
 
   public function testFormatErrorNotArray() {
@@ -243,7 +243,7 @@ class MailPoetAPITest extends \MailPoetTest {
     $result = $this->mailer->send($this->newsletter, $this->subscriber);
     expect($result['response'])->false();
     expect($result['error'])->isInstanceOf(MailerError::class);
-    expect($result['error']->getOperation())->equals(MailerError::OPERATION_SEND);
+    verify($result['error']->getOperation())->equals(MailerError::OPERATION_SEND);
   }
 
   public function testFormatErrorTooBig() {
@@ -274,7 +274,7 @@ class MailPoetAPITest extends \MailPoetTest {
     $result = $this->mailer->send([$this->newsletter, $this->newsletter], ['a@example.com', 'c d <b@example.com>']);
     expect($result['response'])->false();
     expect($result['error'])->isInstanceOf(MailerError::class);
-    expect($result['error']->getOperation())->equals(MailerError::OPERATION_SEND);
+    verify($result['error']->getOperation())->equals(MailerError::OPERATION_SEND);
   }
 
   public function testFormatPayloadErrorWithErrorMessage() {
@@ -290,7 +290,7 @@ class MailPoetAPITest extends \MailPoetTest {
     $result = $this->mailer->send([$this->newsletter, $this->newsletter], ['a@example.com', 'c d <b@example.com>']);
     expect($result['response'])->false();
     expect($result['error'])->isInstanceOf(MailerError::class);
-    expect($result['error']->getOperation())->equals(MailerError::OPERATION_SEND);
+    verify($result['error']->getOperation())->equals(MailerError::OPERATION_SEND);
   }
 
   public function testItCallsAuthorizedEmailsValidationOnRelatedError() {
diff --git a/mailpoet/tests/integration/Mailer/Methods/PHPMailTest.php b/mailpoet/tests/integration/Mailer/Methods/PHPMailTest.php
index f9ec0d8ed4..af2ffb6846 100644
--- a/mailpoet/tests/integration/Mailer/Methods/PHPMailTest.php
+++ b/mailpoet/tests/integration/Mailer/Methods/PHPMailTest.php
@@ -56,14 +56,14 @@ class PHPMailTest extends \MailPoetTest {
     expect($mailer)->isInstanceOf(PHPMailer::class);
 
     // uses PHP's mail() function
-    expect($mailer->Mailer)->equals('mail'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->Mailer)->equals('mail'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
   }
 
   public function testItCanConfigureMailerWithMessage() {
     $mailer = $this->mailer
       ->configureMailerWithMessage($this->newsletter, $this->subscriber, $this->extraParams);
-    expect($mailer->CharSet)->equals('UTF-8'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->getToAddresses())->equals(
+    verify($mailer->CharSet)->equals('UTF-8'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->getToAddresses())->equals(
       [
         [
           'blackhole@mailpoet.com',
@@ -71,11 +71,11 @@ class PHPMailTest extends \MailPoetTest {
         ],
       ]
     );
-    expect($mailer->getAllRecipientAddresses())
+    verify($mailer->getAllRecipientAddresses())
       ->equals(['blackhole@mailpoet.com' => true]);
-    expect($mailer->From)->equals($this->sender['from_email']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->FromName)->equals($this->sender['from_name']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->getReplyToAddresses())->equals(
+    verify($mailer->From)->equals($this->sender['from_email']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->FromName)->equals($this->sender['from_name']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->getReplyToAddresses())->equals(
       [
         'reply-to@mailpoet.com' => [
           'reply-to@mailpoet.com',
@@ -83,14 +83,14 @@ class PHPMailTest extends \MailPoetTest {
         ],
       ]
     );
-    expect($mailer->Sender)->equals($this->returnPath); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->ContentType)->equals('text/html'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->Subject)->equals($this->newsletter['subject']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->Body) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->Sender)->equals($this->returnPath); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->ContentType)->equals('text/html'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->Subject)->equals($this->newsletter['subject']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->Body) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
       ->equals($this->newsletter['body']['html']);
-    expect($mailer->AltBody) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->AltBody) // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
       ->equals($this->newsletter['body']['text']);
-    expect($mailer->getCustomHeaders())->equals(
+    verify($mailer->getCustomHeaders())->equals(
       [
         [
           'List-Unsubscribe',
@@ -108,22 +108,22 @@ class PHPMailTest extends \MailPoetTest {
           'text' => 'TEXT body',
         ],
       ], $this->subscriber);
-    expect($mailer->ContentType)->equals('text/plain'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->Body)->equals('TEXT body'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->ContentType)->equals('text/plain'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->Body)->equals('TEXT body'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
   }
 
   public function testItCanProcessSubscriber() {
-    expect($this->mailer->processSubscriber('test@test.com'))->equals(
+    verify($this->mailer->processSubscriber('test@test.com'))->equals(
       [
         'email' => 'test@test.com',
         'name' => '',
       ]);
-    expect($this->mailer->processSubscriber('First <test@test.com>'))->equals(
+    verify($this->mailer->processSubscriber('First <test@test.com>'))->equals(
       [
         'email' => 'test@test.com',
         'name' => 'First',
       ]);
-    expect($this->mailer->processSubscriber('First Last <test@test.com>'))->equals(
+    verify($this->mailer->processSubscriber('First Last <test@test.com>'))->equals(
       [
         'email' => 'test@test.com',
         'name' => 'First Last',
diff --git a/mailpoet/tests/integration/Mailer/Methods/SMTPTest.php b/mailpoet/tests/integration/Mailer/Methods/SMTPTest.php
index 236436aca1..ef5ea395bf 100644
--- a/mailpoet/tests/integration/Mailer/Methods/SMTPTest.php
+++ b/mailpoet/tests/integration/Mailer/Methods/SMTPTest.php
@@ -77,51 +77,51 @@ class SMTPTest extends \MailPoetTest {
 
   public function testItCanBuildMailer() {
     $mailer = $this->mailer->buildMailer();
-    expect($mailer->Host)
+    verify($mailer->Host)
       ->equals($this->settings['host']);
-    expect($mailer->Port)
+    verify($mailer->Port)
       ->equals($this->settings['port']);
-    expect($mailer->Username)
+    verify($mailer->Username)
       ->equals($this->settings['login']);
-    expect($mailer->Password)
+    verify($mailer->Password)
       ->equals($this->settings['password']);
-    expect($mailer->SMTPSecure)
+    verify($mailer->SMTPSecure)
       ->equals($this->settings['encryption']);
   }
 
   public function testItCanCreateMessage() {
     $mailer = $this->mailer
       ->configureMailerWithMessage($this->newsletter, $this->subscriber, $this->extraParams);
-    expect($mailer->CharSet)->equals('UTF-8'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->getToAddresses())->equals([
+    verify($mailer->CharSet)->equals('UTF-8'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->getToAddresses())->equals([
         ['blackhole@mailpoet.com', 'Recipient'],
     ]);
-    expect($mailer->getAllRecipientAddresses())->equals(['blackhole@mailpoet.com' => true]);
-    expect($mailer->From)->equals($this->sender['from_email']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->FromName)->equals($this->sender['from_name']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->getReplyToAddresses())->equals([
+    verify($mailer->getAllRecipientAddresses())->equals(['blackhole@mailpoet.com' => true]);
+    verify($mailer->From)->equals($this->sender['from_email']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->FromName)->equals($this->sender['from_name']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->getReplyToAddresses())->equals([
       'reply-to@mailpoet.com' => ['reply-to@mailpoet.com', 'Reply To'],
     ]);
-    expect($mailer->Sender)->equals($this->returnPath); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->ContentType)->equals('text/html'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->Subject)->equals($this->newsletter['subject']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->Body)->equals($this->newsletter['body']['html']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->AltBody)->equals($this->newsletter['body']['text']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($mailer->getCustomHeaders())->equals([['List-Unsubscribe', '<https://www.mailpoet.com>']]);
+    verify($mailer->Sender)->equals($this->returnPath); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->ContentType)->equals('text/html'); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->Subject)->equals($this->newsletter['subject']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->Body)->equals($this->newsletter['body']['html']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->AltBody)->equals($this->newsletter['body']['text']); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($mailer->getCustomHeaders())->equals([['List-Unsubscribe', '<https://www.mailpoet.com>']]);
   }
 
   public function testItCanProcessSubscriber() {
-    expect($this->mailer->processSubscriber('test@test.com'))
+    verify($this->mailer->processSubscriber('test@test.com'))
       ->equals([
         'email' => 'test@test.com',
         'name' => '',
       ]);
-    expect($this->mailer->processSubscriber('First <test@test.com>'))
+    verify($this->mailer->processSubscriber('First <test@test.com>'))
       ->equals([
         'email' => 'test@test.com',
         'name' => 'First',
       ]);
-    expect($this->mailer->processSubscriber('First Last <test@test.com>'))
+    verify($this->mailer->processSubscriber('First Last <test@test.com>'))
       ->equals([
         'email' => 'test@test.com',
         'name' => 'First Last',
@@ -154,7 +154,7 @@ class SMTPTest extends \MailPoetTest {
       }
     );
     $mailer = $this->mailer->buildMailer();
-    expect($mailer->SMTPOptions)->equals(
+    verify($mailer->SMTPOptions)->equals(
       [
         'ssl' => [
           'verify_peer' => false,
@@ -166,7 +166,7 @@ class SMTPTest extends \MailPoetTest {
 
   public function testItAppliesTimeoutFilter() {
     $mailer = $this->mailer->buildMailer();
-    expect($mailer->Timeout)->equals(\MailPoet\Mailer\Methods\SMTP::SMTP_CONNECTION_TIMEOUT);
+    verify($mailer->Timeout)->equals(\MailPoet\Mailer\Methods\SMTP::SMTP_CONNECTION_TIMEOUT);
     (new WPFunctions)->addFilter(
       'mailpoet_mailer_smtp_connection_timeout',
       function() {
@@ -174,7 +174,7 @@ class SMTPTest extends \MailPoetTest {
       }
     );
     $mailer = $this->mailer->buildMailer();
-    expect($mailer->Timeout)->equals(20);
+    verify($mailer->Timeout)->equals(20);
   }
 
   public function testItChecksBlacklistBeforeSending() {
@@ -222,11 +222,11 @@ class SMTPTest extends \MailPoetTest {
     });
 
     $mailer = $this->mailer->buildMailer();
-    expect($mailer->Host)->equals('filter_host');
-    expect($mailer->Port)->equals('filter_port');
-    expect($mailer->SMTPSecure)->equals('filter_encryption');
-    expect($mailer->SMTPAuth)->equals(true);
-    expect($mailer->Username)->equals('filter_username');
-    expect($mailer->Password)->equals('filter_password');
+    verify($mailer->Host)->equals('filter_host');
+    verify($mailer->Port)->equals('filter_port');
+    verify($mailer->SMTPSecure)->equals('filter_encryption');
+    verify($mailer->SMTPAuth)->equals(true);
+    verify($mailer->Username)->equals('filter_username');
+    verify($mailer->Password)->equals('filter_password');
   }
 }
diff --git a/mailpoet/tests/integration/Mailer/Methods/SendGridTest.php b/mailpoet/tests/integration/Mailer/Methods/SendGridTest.php
index 43dd72965b..4441568a10 100644
--- a/mailpoet/tests/integration/Mailer/Methods/SendGridTest.php
+++ b/mailpoet/tests/integration/Mailer/Methods/SendGridTest.php
@@ -58,31 +58,31 @@ class SendGridTest extends \MailPoetTest {
   public function testItCanGenerateBody() {
     $body = $this->mailer->getBody($this->newsletter, $this->subscriber, $this->extraParams);
     expect($body['to'])->stringContainsString($this->subscriber);
-    expect($body['from'])->equals($this->sender['from_email']);
-    expect($body['fromname'])->equals($this->sender['from_name']);
-    expect($body['replyto'])->equals($this->replyTo['reply_to_email']);
-    expect($body['subject'])->equals($this->newsletter['subject']);
+    verify($body['from'])->equals($this->sender['from_email']);
+    verify($body['fromname'])->equals($this->sender['from_name']);
+    verify($body['replyto'])->equals($this->replyTo['reply_to_email']);
+    verify($body['subject'])->equals($this->newsletter['subject']);
     $headers = json_decode($body['headers'], true);
     $this->assertIsArray($headers);
-    expect($headers['List-Unsubscribe'])
+    verify($headers['List-Unsubscribe'])
       ->equals('<' . $this->extraParams['unsubscribe_url'] . '>');
-    expect($body['html'])->equals($this->newsletter['body']['html']);
-    expect($body['text'])->equals($this->newsletter['body']['text']);
+    verify($body['html'])->equals($this->newsletter['body']['html']);
+    verify($body['text'])->equals($this->newsletter['body']['text']);
   }
 
   public function testItCanCreateRequest() {
     $body = $this->mailer->getBody($this->newsletter, $this->subscriber);
     $request = $this->mailer->request($this->newsletter, $this->subscriber);
-    expect($request['timeout'])->equals(10);
-    expect($request['httpversion'])->equals('1.1');
-    expect($request['method'])->equals('POST');
-    expect($request['headers']['Authorization'])
+    verify($request['timeout'])->equals(10);
+    verify($request['httpversion'])->equals('1.1');
+    verify($request['method'])->equals('POST');
+    verify($request['headers']['Authorization'])
       ->equals('Bearer ' . $this->settings['api_key']);
-    expect($request['body'])->equals(http_build_query($body));
+    verify($request['body'])->equals(http_build_query($body));
   }
 
   public function testItCanDoBasicAuth() {
-    expect($this->mailer->auth())
+    verify($this->mailer->auth())
       ->equals('Bearer ' . $this->settings['api_key']);
   }
 
diff --git a/mailpoet/tests/integration/Migrations/App/Migration_20221028_105818_App_Test.php b/mailpoet/tests/integration/Migrations/App/Migration_20221028_105818_App_Test.php
index 1fd2c3e0e2..e8e43ba251 100644
--- a/mailpoet/tests/integration/Migrations/App/Migration_20221028_105818_App_Test.php
+++ b/mailpoet/tests/integration/Migrations/App/Migration_20221028_105818_App_Test.php
@@ -135,37 +135,37 @@ class Migration_20221028_105818_App_Test extends \MailPoetTest {
     $this->settings->set('tracking', ['enabled' => true]);
     $this->settings->set('woocommerce.accept_cookie_revenue_tracking.enabled', null);
     $this->migration->run();
-    expect($this->settings->get('tracking.level'))->equals(TrackingConfig::LEVEL_FULL);
+    verify($this->settings->get('tracking.level'))->equals(TrackingConfig::LEVEL_FULL);
     expect($wp->getTransient(ChangedTrackingNotice::OPTION_NAME))->false();
     // WooCommerce disabled and Tracking disabled
     $this->settings->set('tracking', ['enabled' => false]);
     $this->settings->set('woocommerce.accept_cookie_revenue_tracking.enabled', null);
     $this->migration->run();
-    expect($this->settings->get('tracking.level'))->equals(TrackingConfig::LEVEL_BASIC);
+    verify($this->settings->get('tracking.level'))->equals(TrackingConfig::LEVEL_BASIC);
     expect($wp->getTransient(ChangedTrackingNotice::OPTION_NAME))->false();
     // WooCommerce enabled with cookie enabled and Tracking enabled
     $this->settings->set('tracking', ['enabled' => true]);
     $this->settings->set('woocommerce.accept_cookie_revenue_tracking.enabled', "1");
     $this->migration->run();
-    expect($this->settings->get('tracking.level'))->equals(TrackingConfig::LEVEL_FULL);
+    verify($this->settings->get('tracking.level'))->equals(TrackingConfig::LEVEL_FULL);
     expect($wp->getTransient(ChangedTrackingNotice::OPTION_NAME))->false();
     // WooCommerce enabled with cookie disabled and Tracking enabled
     $this->settings->set('tracking', ['enabled' => true]);
     $this->settings->set('woocommerce.accept_cookie_revenue_tracking.enabled', "");
     $this->migration->run();
-    expect($this->settings->get('tracking.level'))->equals(TrackingConfig::LEVEL_PARTIAL);
+    verify($this->settings->get('tracking.level'))->equals(TrackingConfig::LEVEL_PARTIAL);
     expect($wp->getTransient(ChangedTrackingNotice::OPTION_NAME))->false();
     // WooCommerce enabled with cookie disabled and Tracking disabled
     $this->settings->set('tracking', ['enabled' => false]);
     $this->settings->set('woocommerce.accept_cookie_revenue_tracking.enabled', "");
     $this->migration->run();
-    expect($this->settings->get('tracking.level'))->equals(TrackingConfig::LEVEL_BASIC);
+    verify($this->settings->get('tracking.level'))->equals(TrackingConfig::LEVEL_BASIC);
     expect($wp->getTransient(ChangedTrackingNotice::OPTION_NAME))->false();
     // WooCommerce enabled with cookie enabled and Tracking disabled
     $this->settings->set('tracking', ['enabled' => false]);
     $this->settings->set('woocommerce.accept_cookie_revenue_tracking.enabled', "1");
     $this->migration->run();
-    expect($this->settings->get('tracking.level'))->equals(TrackingConfig::LEVEL_FULL);
-    expect($wp->getTransient(ChangedTrackingNotice::OPTION_NAME))->equals(true);
+    verify($this->settings->get('tracking.level'))->equals(TrackingConfig::LEVEL_FULL);
+    verify($wp->getTransient(ChangedTrackingNotice::OPTION_NAME))->equals(true);
   }
 }
diff --git a/mailpoet/tests/integration/Migrations/Db/Migration_20221028_105818_Test.php b/mailpoet/tests/integration/Migrations/Db/Migration_20221028_105818_Test.php
index 913748d6ad..732ba04906 100644
--- a/mailpoet/tests/integration/Migrations/Db/Migration_20221028_105818_Test.php
+++ b/mailpoet/tests/integration/Migrations/Db/Migration_20221028_105818_Test.php
@@ -28,8 +28,8 @@ class Migration_20221028_105818_Test extends \MailPoetTest {
     $this->migration->run();
     $filter = $this->entityManager->find(DynamicSegmentFilterEntity::class, $id);
     $this->assertInstanceOf(DynamicSegmentFilterEntity::class, $filter);
-    expect($filter->getFilterData()->getAction())->equals(EmailAction::ACTION_OPENED);
-    expect($filter->getFilterData()->getData())->equals(['newsletters' => [1], 'operator' => 'any']);
+    verify($filter->getFilterData()->getAction())->equals(EmailAction::ACTION_OPENED);
+    verify($filter->getFilterData()->getData())->equals(['newsletters' => [1], 'operator' => 'any']);
   }
 
   public function testItMigratesEmailOpensFiltersCorrectly() {
@@ -39,8 +39,8 @@ class Migration_20221028_105818_Test extends \MailPoetTest {
     $this->migration->run();
     $filter = $this->entityManager->find(DynamicSegmentFilterEntity::class, $id);
     $this->assertInstanceOf(DynamicSegmentFilterEntity::class, $filter);
-    expect($filter->getFilterData()->getAction())->equals(EmailAction::ACTION_MACHINE_OPENED);
-    expect($filter->getFilterData()->getData())->equals(['newsletters' => [1], 'operator' => 'any']);
+    verify($filter->getFilterData()->getAction())->equals(EmailAction::ACTION_MACHINE_OPENED);
+    verify($filter->getFilterData()->getData())->equals(['newsletters' => [1], 'operator' => 'any']);
   }
 
   public function testItMigratesEmailNotOpenedFiltersCorrectly() {
@@ -50,8 +50,8 @@ class Migration_20221028_105818_Test extends \MailPoetTest {
     $this->migration->run();
     $filter = $this->entityManager->find(DynamicSegmentFilterEntity::class, $id);
     $this->assertInstanceOf(DynamicSegmentFilterEntity::class, $filter);
-    expect($filter->getFilterData()->getAction())->equals(EmailAction::ACTION_OPENED);
-    expect($filter->getFilterData()->getData())->equals(['newsletters' => [1], 'operator' => 'none']);
+    verify($filter->getFilterData()->getAction())->equals(EmailAction::ACTION_OPENED);
+    verify($filter->getFilterData()->getData())->equals(['newsletters' => [1], 'operator' => 'none']);
   }
 
   public function testItMigratesEmailClicksFiltersCorrectly() {
@@ -65,10 +65,10 @@ class Migration_20221028_105818_Test extends \MailPoetTest {
     $filterLink = $this->entityManager->find(DynamicSegmentFilterEntity::class, $id2);
     $this->assertInstanceOf(DynamicSegmentFilterEntity::class, $filterNoLink);
     $this->assertInstanceOf(DynamicSegmentFilterEntity::class, $filterLink);
-    expect($filterNoLink->getFilterData()->getAction())->equals(EmailAction::ACTION_CLICKED);
-    expect($filterNoLink->getFilterData()->getData())->equals(['newsletter_id' => '1', 'operator' => 'any', 'link_ids' => []]);
-    expect($filterLink->getFilterData()->getAction())->equals(EmailAction::ACTION_CLICKED);
-    expect($filterLink->getFilterData()->getData())->equals(['newsletter_id' => '1', 'operator' => 'any', 'link_ids' => [2]]);
+    verify($filterNoLink->getFilterData()->getAction())->equals(EmailAction::ACTION_CLICKED);
+    verify($filterNoLink->getFilterData()->getData())->equals(['newsletter_id' => '1', 'operator' => 'any', 'link_ids' => []]);
+    verify($filterLink->getFilterData()->getAction())->equals(EmailAction::ACTION_CLICKED);
+    verify($filterLink->getFilterData()->getData())->equals(['newsletter_id' => '1', 'operator' => 'any', 'link_ids' => [2]]);
   }
 
   public function testItMigratesEmailNotClickedFiltersCorrectly() {
@@ -82,10 +82,10 @@ class Migration_20221028_105818_Test extends \MailPoetTest {
     $filterLink = $this->entityManager->find(DynamicSegmentFilterEntity::class, $id2);
     $this->assertInstanceOf(DynamicSegmentFilterEntity::class, $filterNoLink);
     $this->assertInstanceOf(DynamicSegmentFilterEntity::class, $filterLink);
-    expect($filterNoLink->getFilterData()->getAction())->equals(EmailAction::ACTION_CLICKED);
-    expect($filterNoLink->getFilterData()->getData())->equals(['newsletter_id' => '1', 'operator' => 'none', 'link_ids' => []]);
-    expect($filterLink->getFilterData()->getAction())->equals(EmailAction::ACTION_CLICKED);
-    expect($filterLink->getFilterData()->getData())->equals(['newsletter_id' => '1', 'operator' => 'none', 'link_ids' => [2]]);
+    verify($filterNoLink->getFilterData()->getAction())->equals(EmailAction::ACTION_CLICKED);
+    verify($filterNoLink->getFilterData()->getData())->equals(['newsletter_id' => '1', 'operator' => 'none', 'link_ids' => []]);
+    verify($filterLink->getFilterData()->getAction())->equals(EmailAction::ACTION_CLICKED);
+    verify($filterLink->getFilterData()->getData())->equals(['newsletter_id' => '1', 'operator' => 'none', 'link_ids' => [2]]);
   }
 
   private function createSegmentFilter(string $action, array $data, string $type, $segmentId = 1): int {
diff --git a/mailpoet/tests/integration/Migrations/Db/Migration_20230111_120000_Test.php b/mailpoet/tests/integration/Migrations/Db/Migration_20230111_120000_Test.php
index 84fdd12f5f..2cd3dd104d 100644
--- a/mailpoet/tests/integration/Migrations/Db/Migration_20230111_120000_Test.php
+++ b/mailpoet/tests/integration/Migrations/Db/Migration_20230111_120000_Test.php
@@ -39,10 +39,10 @@ class Migration_20230111_120000_Test extends \MailPoetTest {
     foreach ($this->segments as $segment) {
       $this->entityManager->refresh($segment);
     }
-    expect($this->segments[0]->getDisplayInManageSubscriptionPage())->equals(true);
-    expect($this->segments[1]->getDisplayInManageSubscriptionPage())->equals(false);
-    expect($this->segments[2]->getDisplayInManageSubscriptionPage())->equals(true);
-    expect($this->settings->fetch('subscription.segments'))->equals([]);
+    verify($this->segments[0]->getDisplayInManageSubscriptionPage())->equals(true);
+    verify($this->segments[1]->getDisplayInManageSubscriptionPage())->equals(false);
+    verify($this->segments[2]->getDisplayInManageSubscriptionPage())->equals(true);
+    verify($this->settings->fetch('subscription.segments'))->equals([]);
   }
 
   public function testItSetsAllToTrueWithoutDefinedSetting() {
@@ -51,8 +51,8 @@ class Migration_20230111_120000_Test extends \MailPoetTest {
     foreach ($this->segments as $segment) {
       $this->entityManager->refresh($segment);
     }
-    expect($this->segments[0]->getDisplayInManageSubscriptionPage())->equals(true);
-    expect($this->segments[1]->getDisplayInManageSubscriptionPage())->equals(true);
-    expect($this->segments[2]->getDisplayInManageSubscriptionPage())->equals(true);
+    verify($this->segments[0]->getDisplayInManageSubscriptionPage())->equals(true);
+    verify($this->segments[1]->getDisplayInManageSubscriptionPage())->equals(true);
+    verify($this->segments[2]->getDisplayInManageSubscriptionPage())->equals(true);
   }
 }
diff --git a/mailpoet/tests/integration/Models/CustomFieldTest.php b/mailpoet/tests/integration/Models/CustomFieldTest.php
index 9d93955d95..0583102a56 100644
--- a/mailpoet/tests/integration/Models/CustomFieldTest.php
+++ b/mailpoet/tests/integration/Models/CustomFieldTest.php
@@ -42,7 +42,7 @@ class CustomFieldTest extends \MailPoetTest {
   }
 
   public function testItCanBeUpdated() {
-    expect($this->customField->name)->equals($this->data['name']);
+    verify($this->customField->name)->equals($this->data['name']);
 
     $updatedCustomField = CustomField::createOrUpdate([
       'id' => $this->customField->id,
@@ -50,26 +50,26 @@ class CustomFieldTest extends \MailPoetTest {
     ]);
 
     expect($updatedCustomField->getErrors())->false();
-    expect($updatedCustomField->name)->equals('Country');
-    expect($updatedCustomField->id)->equals($this->customField->id);
+    verify($updatedCustomField->name)->equals('Country');
+    verify($updatedCustomField->id)->equals($this->customField->id);
   }
 
   public function testItHasAName() {
-    expect($this->customField->name)->equals($this->data['name']);
+    verify($this->customField->name)->equals($this->data['name']);
   }
 
   public function testItHasAType() {
-    expect($this->customField->type)->equals($this->data['type']);
+    verify($this->customField->type)->equals($this->data['type']);
   }
 
   public function testItHasSerializedParams() {
     $params = unserialize($this->customField->params);
-    expect($params)->equals($this->data['params']);
+    verify($params)->equals($this->data['params']);
   }
 
   public function testItCanDecodeParams() {
     $customField = $this->customField->asArray();
-    expect($customField['params'])->equals($this->data['params']);
+    verify($customField['params'])->equals($this->data['params']);
   }
 
   public function testItHasToBeValid() {
@@ -79,8 +79,8 @@ class CustomFieldTest extends \MailPoetTest {
     $errors = $result->getErrors();
 
     expect(is_array($errors))->true();
-    expect($errors[0])->equals('Please specify a name.');
-    expect($errors[1])->equals('Please specify a type.');
+    verify($errors[0])->equals('Please specify a name.');
+    verify($errors[1])->equals('Please specify a type.');
   }
 
   public function testItHasACreatedAtOnCreation() {
@@ -92,7 +92,7 @@ class CustomFieldTest extends \MailPoetTest {
   public function testItHasAnUpdatedAtOnCreation() {
     $customField = CustomField::findOne($this->customField->id);
     $this->assertInstanceOf(CustomField::class, $customField);
-    expect($customField->updatedAt)->equals($customField->createdAt);
+    verify($customField->updatedAt)->equals($customField->createdAt);
   }
 
   public function testItUpdatesTheUpdatedAtOnUpdate() {
@@ -107,7 +107,7 @@ class CustomFieldTest extends \MailPoetTest {
 
     $updatedCustomField = CustomField::findOne($customField->id);
     $this->assertInstanceOf(CustomField::class, $updatedCustomField);
-    expect($updatedCustomField->createdAt)->equals($createdAt);
+    verify($updatedCustomField->createdAt)->equals($createdAt);
     $isTimeUpdated = (
       $updatedCustomField->updatedAt > $updatedCustomField->createdAt
     );
@@ -127,7 +127,7 @@ class CustomFieldTest extends \MailPoetTest {
     $customField = CustomField::findOne($this->customField->id);
     $this->assertInstanceOf(CustomField::class, $customField);
     $subscribers = $customField->subscribers()->findArray();
-    expect(count($subscribers))->equals(2);
+    verify(count($subscribers))->equals(2);
   }
 
   public function testItCanHaveAValue() {
@@ -141,6 +141,6 @@ class CustomFieldTest extends \MailPoetTest {
     $customField = CustomField::findOne($this->customField->id);
     $this->assertInstanceOf(CustomField::class, $customField);
     $subscriber = $customField->subscribers()->findOne();
-    expect($subscriber->value)->equals($association->value);
+    verify($subscriber->value)->equals($association->value);
   }
 }
diff --git a/mailpoet/tests/integration/Models/ModelTest.php b/mailpoet/tests/integration/Models/ModelTest.php
index 7d9a2a5e10..b6d39907ab 100644
--- a/mailpoet/tests/integration/Models/ModelTest.php
+++ b/mailpoet/tests/integration/Models/ModelTest.php
@@ -23,7 +23,7 @@ class ModelTest extends \MailPoetTest {
       $this->fail('Exception was not thrown');
     } catch (\Exception $e) {
       expect($e instanceof \PDOException)->false();
-      expect($e->getMessage())->equals($message);
+      verify($e->getMessage())->equals($message);
     }
   }
 
@@ -31,12 +31,12 @@ class ModelTest extends \MailPoetTest {
     $model = MPModel::create();
     $model->first = 'first';
     $model->last = 'last';
-    expect($model->asArray('first'))->equals(
+    verify($model->asArray('first'))->equals(
       [
         'first' => 'first',
       ]
     );
-    expect($model->asArray('last', 'first'))->equals(
+    verify($model->asArray('last', 'first'))->equals(
       [
         'last' => 'last',
         'first' => 'first',
@@ -48,21 +48,21 @@ class ModelTest extends \MailPoetTest {
     $model = MPModel::create();
     $model->setError('error1');
     $model->setError('error2');
-    expect($model->getErrors())->equals(['error1', 'error2']);
+    verify($model->getErrors())->equals(['error1', 'error2']);
   }
 
   public function testSetErrorsAsArray() {
     $model = MPModel::create();
     $model->setError(['error1']);
     $model->setError(['error2', 'error1']);
-    expect($model->getErrors())->equals(['error1', 'error2']);
+    verify($model->getErrors())->equals(['error1', 'error2']);
   }
 
   public function testSetErrorsWithCode() {
     $model = MPModel::create();
     $model->setError('error1');
     $model->setError('error2', 5);
-    expect($model->getErrors())->equals(['error1', 5 => 'error2']);
+    verify($model->getErrors())->equals(['error1', 5 => 'error2']);
   }
 
   public function testSetErrorCodeForDuplicateRecords() {
diff --git a/mailpoet/tests/integration/Models/NewsletterTest.php b/mailpoet/tests/integration/Models/NewsletterTest.php
index 6035e75bb2..650fd50d63 100644
--- a/mailpoet/tests/integration/Models/NewsletterTest.php
+++ b/mailpoet/tests/integration/Models/NewsletterTest.php
@@ -64,25 +64,25 @@ class NewsletterTest extends \MailPoetTest {
   public function testItHasASubject() {
     $newsletter = Newsletter::findOne($this->newsletter->id);
     $this->assertInstanceOf(Newsletter::class, $newsletter);
-    expect($newsletter->subject)->equals($this->newsletter->subject);
+    verify($newsletter->subject)->equals($this->newsletter->subject);
   }
 
   public function testItHasAType() {
     $newsletter = Newsletter::findOne($this->newsletter->id);
     $this->assertInstanceOf(Newsletter::class, $newsletter);
-    expect($newsletter->type)->equals($this->newsletter->type);
+    verify($newsletter->type)->equals($this->newsletter->type);
   }
 
   public function testItHasABody() {
     $newsletter = Newsletter::findOne($this->newsletter->id);
     $this->assertInstanceOf(Newsletter::class, $newsletter);
-    expect($newsletter->body)->equals($this->newsletter->body);
+    verify($newsletter->body)->equals($this->newsletter->body);
   }
 
   public function testItHasPreheader() {
     $newsletter = Newsletter::findOne($this->newsletter->id);
     $this->assertInstanceOf(Newsletter::class, $newsletter);
-    expect($newsletter->preheader)->equals($this->newsletter->preheader);
+    verify($newsletter->preheader)->equals($this->newsletter->preheader);
   }
 
   public function testItHasACreatedAtOnCreation() {
@@ -94,7 +94,7 @@ class NewsletterTest extends \MailPoetTest {
   public function testItHasAnUpdatedAtOnCreation() {
     $newsletter = Newsletter::findOne($this->newsletter->id);
     $this->assertInstanceOf(Newsletter::class, $newsletter);
-    expect($newsletter->updatedAt)->equals($newsletter->createdAt);
+    verify($newsletter->updatedAt)->equals($newsletter->createdAt);
   }
 
   public function testItUpdatesTheUpdatedAtOnUpdate() {
@@ -109,7 +109,7 @@ class NewsletterTest extends \MailPoetTest {
 
     $updatedNewsletter = Newsletter::findOne($newsletter->id);
     $this->assertInstanceOf(Newsletter::class, $updatedNewsletter);
-    expect($updatedNewsletter->createdAt)->equals($createdAt);
+    verify($updatedNewsletter->createdAt)->equals($createdAt);
     $isTimeUpdated = (
       $updatedNewsletter->updatedAt > $updatedNewsletter->createdAt
     );
@@ -119,16 +119,16 @@ class NewsletterTest extends \MailPoetTest {
   public function testItCanBeQueued() {
     $queue = $this->newsletter->getQueue();
     expect($queue->id > 0)->true();
-    expect($queue->newsletterId)->equals($this->newsletter->id);
+    verify($queue->newsletterId)->equals($this->newsletter->id);
   }
 
   public function testItCanHaveSegments() {
     $newsletterSegments = $this->newsletter->segments()->findArray();
     expect($newsletterSegments)->count(2);
-    expect($newsletterSegments[0]['id'])->equals($this->segment1->id);
-    expect($newsletterSegments[0]['name'])->equals('Segment 1');
-    expect($newsletterSegments[1]['id'])->equals($this->segment2->id);
-    expect($newsletterSegments[1]['name'])->equals('Segment 2');
+    verify($newsletterSegments[0]['id'])->equals($this->segment1->id);
+    verify($newsletterSegments[0]['name'])->equals('Segment 1');
+    verify($newsletterSegments[1]['id'])->equals($this->segment2->id);
+    verify($newsletterSegments[1]['name'])->equals('Segment 2');
   }
 
   public function testItCanHaveParentNewsletter() {
@@ -141,7 +141,7 @@ class NewsletterTest extends \MailPoetTest {
     $newsletter->save();
     $parent = $newsletter->parent()->findOne();
     expect($parent)->isInstanceOf('MailPoet\Models\Newsletter');
-    expect($parent->id)->equals($parentNewsletter->id);
+    verify($parent->id)->equals($parentNewsletter->id);
   }
 
   public function testItCanHaveDeletedSegments() {
@@ -149,9 +149,9 @@ class NewsletterTest extends \MailPoetTest {
     $this->newsletter->withSegments(true);
     $newsletterSegments = $this->newsletter->segments;
     expect($newsletterSegments)->count(2);
-    expect($newsletterSegments[0]['id'])->equals($this->segment1->id);
-    expect($newsletterSegments[0]['name'])->equals('Segment 1');
-    expect($newsletterSegments[1]['id'])->equals($this->segment2->id);
+    verify($newsletterSegments[0]['id'])->equals($this->segment1->id);
+    verify($newsletterSegments[0]['name'])->equals('Segment 1');
+    verify($newsletterSegments[1]['id'])->equals($this->segment2->id);
     expect($newsletterSegments[1]['name'])->stringContainsString('Deleted');
   }
 
@@ -168,7 +168,7 @@ class NewsletterTest extends \MailPoetTest {
     $newsletter = Newsletter::where('subject', 'new newsletter')
       ->findOne();
     $this->assertInstanceOf(Newsletter::class, $newsletter);
-    expect($newsletter->subject)->equals('new newsletter');
+    verify($newsletter->subject)->equals('new newsletter');
 
     $isUpdated = Newsletter::createOrUpdate(
       [
@@ -177,13 +177,13 @@ class NewsletterTest extends \MailPoetTest {
       ]);
     $newsletter = Newsletter::findOne($newsletter->id);
     $this->assertInstanceOf(Newsletter::class, $newsletter);
-    expect($newsletter->subject)->equals('updated newsletter');
+    verify($newsletter->subject)->equals('updated newsletter');
   }
 
   public function testItCannotSetAnEmptyDeletedAt() {
     $this->newsletter->deletedAt = '';
     $newsletter = $this->newsletter->save();
-    expect($newsletter->deletedAt)->equals('NULL');
+    verify($newsletter->deletedAt)->equals('NULL');
   }
 
   public function testItCanHaveOptions() {
@@ -194,16 +194,16 @@ class NewsletterTest extends \MailPoetTest {
     $newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_STANDARD)
       ->findOne($this->newsletter->id);
     $this->assertInstanceOf(Newsletter::class, $newsletter);
-    expect($newsletter->event)->equals($newsletterOption->getValue());
+    verify($newsletter->event)->equals($newsletterOption->getValue());
   }
 
   public function testItGeneratesHashOnNewsletterSave() {
-    expect(strlen($this->newsletter->hash))
+    verify(strlen($this->newsletter->hash))
       ->equals(Security::HASH_LENGTH);
   }
 
   public function testItGetsQueueFromNewsletter() {
-    expect($this->newsletter->queue()->findOne()->id)->equals($this->sendingQueue->id);
+    verify($this->newsletter->queue()->findOne()->id)->equals($this->sendingQueue->id);
   }
 
   public function testItCanBeRestored() {
@@ -214,7 +214,7 @@ class NewsletterTest extends \MailPoetTest {
     $this->newsletter->restore();
     $this->newsletter = $this->reloadNewsletter($this->newsletter);
     expect($this->newsletter->deletedAt)->null();
-    expect($this->newsletter->status)->equals(Newsletter::STATUS_SENT);
+    verify($this->newsletter->status)->equals(Newsletter::STATUS_SENT);
   }
 
   public function testItCanBulkRestoreNewsletters() {
@@ -420,7 +420,7 @@ class NewsletterTest extends \MailPoetTest {
     // if meta option exists, it should be returned as an array
     $newsletter = Newsletter::filter('filterWithOptions', Newsletter::TYPE_AUTOMATIC)->findOne($newsletter->id);
     $this->assertInstanceOf(Newsletter::class, $newsletter);
-    expect($newsletter->getMeta())->equals($meta);
+    verify($newsletter->getMeta())->equals($meta);
   }
 
   public function testPausesTaskWhenNewsletterWithActivationIsDisabled() {
@@ -437,7 +437,7 @@ class NewsletterTest extends \MailPoetTest {
       $newsletter->setStatus(Newsletter::STATUS_DRAFT);
       $taskFound = ScheduledTask::findOne($task->id());
       $this->assertInstanceOf(ScheduledTask::class, $taskFound);
-      expect($taskFound->status)->equals(ScheduledTask::STATUS_PAUSED);
+      verify($taskFound->status)->equals(ScheduledTask::STATUS_PAUSED);
     }
   }
 
@@ -459,7 +459,7 @@ class NewsletterTest extends \MailPoetTest {
       $newsletter->setStatus(Newsletter::STATUS_ACTIVE);
       $taskFound = ScheduledTask::findOne($task->id());
       $this->assertInstanceOf(ScheduledTask::class, $taskFound);
-      expect($taskFound->status)->equals(ScheduledTask::STATUS_SCHEDULED);
+      verify($taskFound->status)->equals(ScheduledTask::STATUS_SCHEDULED);
     }
   }
 
@@ -470,7 +470,7 @@ class NewsletterTest extends \MailPoetTest {
       'status' => Newsletter::STATUS_DRAFT,
     ]);
     $newsletter = $newsletter->setStatus(Newsletter::STATUS_ACTIVE);
-    expect($newsletter->status)->equals(Newsletter::STATUS_DRAFT);
+    verify($newsletter->status)->equals(Newsletter::STATUS_DRAFT);
     expect($newsletter->getErrors())->notEmpty();
   }
 
diff --git a/mailpoet/tests/integration/Models/ScheduledTaskSubscriberTest.php b/mailpoet/tests/integration/Models/ScheduledTaskSubscriberTest.php
index f14aef8f8b..a61c99112e 100644
--- a/mailpoet/tests/integration/Models/ScheduledTaskSubscriberTest.php
+++ b/mailpoet/tests/integration/Models/ScheduledTaskSubscriberTest.php
@@ -33,9 +33,9 @@ class ScheduledTaskSubscriberTest extends \MailPoetTest {
   }
 
   public function testItCanBeCreated() {
-    expect($this->taskSubscriber->task_id)->equals($this->task->id);
-    expect($this->taskSubscriber->subscriber_id)->equals($this->subscriber->id);
-    expect($this->taskSubscriber->processed)->equals(ScheduledTaskSubscriber::STATUS_UNPROCESSED);
+    verify($this->taskSubscriber->task_id)->equals($this->task->id);
+    verify($this->taskSubscriber->subscriber_id)->equals($this->subscriber->id);
+    verify($this->taskSubscriber->processed)->equals(ScheduledTaskSubscriber::STATUS_UNPROCESSED);
   }
 
   public function testItCanBeUpdated() {
@@ -44,7 +44,7 @@ class ScheduledTaskSubscriberTest extends \MailPoetTest {
       'subscriber_id' => $this->subscriber->id,
       'processed' => ScheduledTaskSubscriber::STATUS_PROCESSED,
     ]);
-    expect($taskSubscriber->processed)->equals(ScheduledTaskSubscriber::STATUS_PROCESSED);
+    verify($taskSubscriber->processed)->equals(ScheduledTaskSubscriber::STATUS_PROCESSED);
   }
 
   public function testItCanAddMultipleSubscribers() {
@@ -54,27 +54,27 @@ class ScheduledTaskSubscriberTest extends \MailPoetTest {
     $taskSubscribers = ScheduledTaskSubscriber::where('task_id', $this->task->id)
       ->orderByAsc('subscriber_id')
       ->findMany();
-    expect(count($taskSubscribers))->equals(count($subscriberIds));
-    expect($taskSubscribers[0]->subscriber_id)->equals($subscriberIds[0]);
-    expect($taskSubscribers[1]->subscriber_id)->equals($subscriberIds[1]);
-    expect($taskSubscribers[2]->subscriber_id)->equals($subscriberIds[2]);
+    verify(count($taskSubscribers))->equals(count($subscriberIds));
+    verify($taskSubscribers[0]->subscriber_id)->equals($subscriberIds[0]);
+    verify($taskSubscribers[1]->subscriber_id)->equals($subscriberIds[1]);
+    verify($taskSubscribers[2]->subscriber_id)->equals($subscriberIds[2]);
   }
 
   public function testItCangetUnprocessedCount() {
     $count = ScheduledTaskSubscriber::getUnprocessedCount($this->task->id);
-    expect($count)->equals(1);
+    verify($count)->equals(1);
     $this->taskSubscriber->processed = ScheduledTaskSubscriber::STATUS_PROCESSED;
     $this->taskSubscriber->save();
     $count = ScheduledTaskSubscriber::getUnprocessedCount($this->task->id);
-    expect($count)->equals(0);
+    verify($count)->equals(0);
   }
 
   public function testItCanGetProcessedCount() {
     $count = ScheduledTaskSubscriber::getProcessedCount($this->task->id);
-    expect($count)->equals(0);
+    verify($count)->equals(0);
     $this->taskSubscriber->processed = ScheduledTaskSubscriber::STATUS_PROCESSED;
     $this->taskSubscriber->save();
     $count = ScheduledTaskSubscriber::getProcessedCount($this->task->id);
-    expect($count)->equals(1);
+    verify($count)->equals(1);
   }
 }
diff --git a/mailpoet/tests/integration/Models/ScheduledTaskTest.php b/mailpoet/tests/integration/Models/ScheduledTaskTest.php
index fd44c1a18b..d2b15db6a8 100644
--- a/mailpoet/tests/integration/Models/ScheduledTaskTest.php
+++ b/mailpoet/tests/integration/Models/ScheduledTaskTest.php
@@ -24,11 +24,11 @@ class ScheduledTaskTest extends \MailPoetTest {
 
   public function testItCanBeCompleted() {
     $this->task->complete();
-    expect($this->task->status)->equals(ScheduledTask::STATUS_COMPLETED);
+    verify($this->task->status)->equals(ScheduledTask::STATUS_COMPLETED);
   }
 
   public function testItSetsDefaultPriority() {
-    expect($this->task->priority)->equals(ScheduledTask::PRIORITY_MEDIUM);
+    verify($this->task->priority)->equals(ScheduledTask::PRIORITY_MEDIUM);
   }
 
   public function testItUnPauseAllByNewsletters() {
@@ -70,16 +70,16 @@ class ScheduledTaskTest extends \MailPoetTest {
     ScheduledTask::setScheduledAllByNewsletter($newsletter);
     $task1Found = ScheduledTask::findOne($task1->id());
     $this->assertInstanceOf(ScheduledTask::class, $task1Found);
-    expect($task1Found->status)->equals(ScheduledTask::STATUS_SCHEDULED);
+    verify($task1Found->status)->equals(ScheduledTask::STATUS_SCHEDULED);
     $task2Found = ScheduledTask::findOne($task2->id());
     $this->assertInstanceOf(ScheduledTask::class, $task2Found);
-    expect($task2Found->status)->equals(ScheduledTask::STATUS_COMPLETED);
+    verify($task2Found->status)->equals(ScheduledTask::STATUS_COMPLETED);
     $task3Found = ScheduledTask::findOne($task3->id());
     $this->assertInstanceOf(ScheduledTask::class, $task3Found);
-    expect($task3Found->status)->equals(ScheduledTask::STATUS_SCHEDULED);
+    verify($task3Found->status)->equals(ScheduledTask::STATUS_SCHEDULED);
     $outdatedTaskFound = ScheduledTask::findOne($outdatedTask->id());
     $this->assertInstanceOf(ScheduledTask::class, $outdatedTaskFound);
-    expect($outdatedTaskFound->status)->equals(ScheduledTask::STATUS_PAUSED);
+    verify($outdatedTaskFound->status)->equals(ScheduledTask::STATUS_PAUSED);
   }
 
   public function testItPauseAllByNewsletters() {
@@ -103,10 +103,10 @@ class ScheduledTaskTest extends \MailPoetTest {
     ScheduledTask::pauseAllByNewsletter($newsletter);
     $task1Found = ScheduledTask::findOne($task1->id());
     $this->assertInstanceOf(ScheduledTask::class, $task1Found);
-    expect($task1Found->status)->equals(ScheduledTask::STATUS_COMPLETED);
+    verify($task1Found->status)->equals(ScheduledTask::STATUS_COMPLETED);
     $task2Found = ScheduledTask::findOne($task2->id());
     $this->assertInstanceOf(ScheduledTask::class, $task2Found);
-    expect($task2Found->status)->equals(ScheduledTask::STATUS_PAUSED);
+    verify($task2Found->status)->equals(ScheduledTask::STATUS_PAUSED);
   }
 
   public function testItDeletesRelatedScheduledTaskSubscriber() {
@@ -124,11 +124,11 @@ class ScheduledTaskTest extends \MailPoetTest {
       'subscriber_id' => 3,
     ]);
     $count = ScheduledTaskSubscriber::where('task_id', $taskId)->count();
-    expect($count)->equals(3);
+    verify($count)->equals(3);
 
     $this->task->delete();
     $count = ScheduledTaskSubscriber::where('task_id', $taskId)->count();
-    expect($count)->equals(0);
+    verify($count)->equals(0);
   }
 
   public function testItJsonEncodesMetaWhenSaving() {
@@ -146,7 +146,7 @@ class ScheduledTaskTest extends \MailPoetTest {
     /** @var string $taskMeta */
     $taskMeta = $task->meta;
     expect(Helpers::isJson($taskMeta))->true();
-    expect(json_decode($taskMeta, true))->equals($meta);
+    verify(json_decode($taskMeta, true))->equals($meta);
   }
 
   public function testItDoesNotJsonEncodesMetaEqualToNull() {
@@ -159,6 +159,6 @@ class ScheduledTaskTest extends \MailPoetTest {
     $this->assertInstanceOf(ScheduledTask::class, $task);
 
     expect(Helpers::isJson($task->meta))->false();
-    expect($task->meta)->equals($meta);
+    verify($task->meta)->equals($meta);
   }
 }
diff --git a/mailpoet/tests/integration/Models/SegmentTest.php b/mailpoet/tests/integration/Models/SegmentTest.php
index 084d52b958..e96b753848 100644
--- a/mailpoet/tests/integration/Models/SegmentTest.php
+++ b/mailpoet/tests/integration/Models/SegmentTest.php
@@ -66,7 +66,7 @@ class SegmentTest extends \MailPoetTest {
   }
 
   public function testItCanHaveName() {
-    expect($this->segment->name)->equals($this->segmentData['name']);
+    verify($this->segment->name)->equals($this->segmentData['name']);
   }
 
   public function nameMustBeUnique() {
@@ -76,13 +76,13 @@ class SegmentTest extends \MailPoetTest {
     $errors = $result->getErrors();
 
     expect(is_array($errors))->true();
-    expect($errors[0])->equals(
+    verify($errors[0])->equals(
       'Another record already exists. Please specify a different "name".'
     );
   }
 
   public function testItCanHaveDescription() {
-    expect($this->segment->description)->equals($this->segmentData['description']);
+    verify($this->segment->description)->equals($this->segmentData['description']);
   }
 
   public function testItHasToBeValid() {
@@ -92,7 +92,7 @@ class SegmentTest extends \MailPoetTest {
     $errors = $result->getErrors();
 
     expect(is_array($errors))->true();
-    expect($errors[0])->equals('Please specify a name.');
+    verify($errors[0])->equals('Please specify a name.');
   }
 
   public function testItHasACreatedAtOnCreation() {
@@ -104,7 +104,7 @@ class SegmentTest extends \MailPoetTest {
   public function testItHasAnUpdatedAtOnCreation() {
     $segment = Segment::findOne($this->segment->id);
     $this->assertInstanceOf(Segment::class, $segment);
-    expect($segment->updatedAt)
+    verify($segment->updatedAt)
       ->equals($segment->createdAt);
   }
 
@@ -120,7 +120,7 @@ class SegmentTest extends \MailPoetTest {
 
     $updatedSegment = Segment::findOne($segment->id);
     $this->assertInstanceOf(Segment::class, $updatedSegment);
-    expect($updatedSegment->createdAt)->equals($createdAt);
+    verify($updatedSegment->createdAt)->equals($createdAt);
     $isTimeUpdated = (
       $updatedSegment->updatedAt > $updatedSegment->createdAt
     );
@@ -137,7 +137,7 @@ class SegmentTest extends \MailPoetTest {
     $segment = Segment::where('name', 'new list')
       ->findOne();
     $this->assertInstanceOf(Segment::class, $segment);
-    expect($segment->name)->equals('new list');
+    verify($segment->name)->equals('new list');
 
     $isUpdated = Segment::createOrUpdate(
       [
@@ -147,7 +147,7 @@ class SegmentTest extends \MailPoetTest {
     $segment = Segment::where('name', 'updated list')
       ->findOne();
     $this->assertInstanceOf(Segment::class, $segment);
-    expect($segment->name)->equals('updated list');
+    verify($segment->name)->equals('updated list');
   }
 
   public function testItCanHaveManySubscribers() {
@@ -165,7 +165,7 @@ class SegmentTest extends \MailPoetTest {
     $subscribers = $segment->subscribers()
       ->findArray();
 
-    expect(count($subscribers))->equals(4);
+    verify(count($subscribers))->equals(4);
   }
 
   public function testItCanHaveManyNewsletters() {
@@ -183,6 +183,6 @@ class SegmentTest extends \MailPoetTest {
     $newsletters = $segment->newsletters()
       ->findArray();
 
-    expect(count($newsletters))->equals(2);
+    verify(count($newsletters))->equals(2);
   }
 }
diff --git a/mailpoet/tests/integration/Models/SendingQueueTest.php b/mailpoet/tests/integration/Models/SendingQueueTest.php
index 2d46ee65ab..30f4a8e582 100644
--- a/mailpoet/tests/integration/Models/SendingQueueTest.php
+++ b/mailpoet/tests/integration/Models/SendingQueueTest.php
@@ -30,7 +30,7 @@ class SendingQueueTest extends \MailPoetTest {
       'text' => 'text',
     ];
     $queue->newsletterRenderedBody = serialize($data);
-    expect($queue->getNewsletterRenderedBody())->equals($data);
+    verify($queue->getNewsletterRenderedBody())->equals($data);
   }
 
   public function testItReadsJsonEncodedRenderedNewsletterBody() {
@@ -40,7 +40,7 @@ class SendingQueueTest extends \MailPoetTest {
       'text' => 'text',
     ];
     $queue->newsletterRenderedBody = json_encode($data);
-    expect($queue->getNewsletterRenderedBody())->equals($data);
+    verify($queue->getNewsletterRenderedBody())->equals($data);
   }
 
   public function testItJsonEncodesRenderedNewsletterBodyWhenSaving() {
@@ -60,7 +60,7 @@ class SendingQueueTest extends \MailPoetTest {
     /** @var string queue_newsletter_rendered_body */
     $queueNewsletterRenderedBody = $queue->newsletterRenderedBody;
     expect(Helpers::isJson($queueNewsletterRenderedBody))->true();
-    expect(json_decode($queueNewsletterRenderedBody, true))->equals($data);
+    verify(json_decode($queueNewsletterRenderedBody, true))->equals($data);
   }
 
   public function testItJsonEncodesMetaWhenSaving() {
@@ -79,7 +79,7 @@ class SendingQueueTest extends \MailPoetTest {
 
     expect(Helpers::isJson($queue->meta))->true();
     $this->assertIsString($queue->meta);
-    expect(json_decode((string)$queue->meta, true))->equals($meta);
+    verify(json_decode((string)$queue->meta, true))->equals($meta);
   }
 
   public function testItDoesNotJsonEncodesMetaEqualToNull() {
@@ -94,7 +94,7 @@ class SendingQueueTest extends \MailPoetTest {
     $this->assertInstanceOf(SendingQueue::class, $queue);
 
     expect(Helpers::isJson($queue->meta))->false();
-    expect($queue->meta)->equals($meta);
+    verify($queue->meta)->equals($meta);
   }
 
   public function testItReencodesSerializedObjectToJsonEncoded() {
@@ -111,12 +111,12 @@ class SendingQueueTest extends \MailPoetTest {
     );
     $sendingQueue = SendingQueue::findOne($queue->id);
     $this->assertInstanceOf(SendingQueue::class, $sendingQueue);
-    expect($sendingQueue->newsletterRenderedBody)->equals(serialize($newsletterRenderedBody));
+    verify($sendingQueue->newsletterRenderedBody)->equals(serialize($newsletterRenderedBody));
 
     // re-saving the queue will re-rencode the body using json_encode()
     $sendingQueue->save();
     $sendingQueue = SendingQueue::findOne($queue->id);
     $this->assertInstanceOf(SendingQueue::class, $sendingQueue);
-    expect($sendingQueue->newsletterRenderedBody)->equals(json_encode($newsletterRenderedBody));
+    verify($sendingQueue->newsletterRenderedBody)->equals(json_encode($newsletterRenderedBody));
   }
 }
diff --git a/mailpoet/tests/integration/Models/SubscriberCustomFieldTest.php b/mailpoet/tests/integration/Models/SubscriberCustomFieldTest.php
index 0adcd4af31..6c074371f4 100644
--- a/mailpoet/tests/integration/Models/SubscriberCustomFieldTest.php
+++ b/mailpoet/tests/integration/Models/SubscriberCustomFieldTest.php
@@ -37,9 +37,9 @@ class SubscriberCustomFieldTest extends \MailPoetTest {
     $data = array_map('array_values', $this->data);
     SubscriberCustomField::createMultiple($data);
     $records = SubscriberCustomField::findArray();
-    expect(count($records))->equals(2);
-    expect($records[0]['value'])->equals('Test 1');
-    expect($records[1]['value'])->equals('Test 2');
+    verify(count($records))->equals(2);
+    verify($records[0]['value'])->equals('Test 1');
+    verify($records[1]['value'])->equals('Test 2');
   }
 
   public function testItCanUpdateMultipleRecords() {
@@ -50,8 +50,8 @@ class SubscriberCustomFieldTest extends \MailPoetTest {
     $updatedData = array_map('array_values', $updatedData);
     SubscriberCustomField::updateMultiple($updatedData);
     $records = SubscriberCustomField::findArray();
-    expect($records[0]['value'])->equals('Updated');
-    expect($records[1]['value'])->equals('Test 2');
+    verify($records[0]['value'])->equals('Updated');
+    verify($records[1]['value'])->equals('Test 2');
   }
 
   public function testItCanDeleteManySubscriberRelations() {
diff --git a/mailpoet/tests/integration/Models/SubscriberSegmentTest.php b/mailpoet/tests/integration/Models/SubscriberSegmentTest.php
index df6a7691c3..b9b9263f62 100644
--- a/mailpoet/tests/integration/Models/SubscriberSegmentTest.php
+++ b/mailpoet/tests/integration/Models/SubscriberSegmentTest.php
@@ -50,7 +50,7 @@ class SubscriberSegmentTest extends \MailPoetTest {
 
     $subscribedSegments = $this->subscriber->segments()->findArray();
     expect($subscribedSegments)->count(1);
-    expect($subscribedSegments[0]['name'])->equals($this->segment1->name);
+    verify($subscribedSegments[0]['name'])->equals($this->segment1->name);
 
     // reset subscriptions to second segment
     SubscriberSegment::resetSubscriptions($this->subscriber, [
@@ -59,7 +59,7 @@ class SubscriberSegmentTest extends \MailPoetTest {
 
     $subscribedSegments = $this->subscriber->segments()->findArray();
     expect($subscribedSegments)->count(1);
-    expect($subscribedSegments[0]['name'])->equals($this->segment2->name);
+    verify($subscribedSegments[0]['name'])->equals($this->segment2->name);
   }
 
   public function testItCanUnsubscribeFromSegments() {
@@ -84,7 +84,7 @@ class SubscriberSegmentTest extends \MailPoetTest {
 
     $subscribedSegments = $this->subscriber->segments()->findArray();
     expect($subscribedSegments)->count(1);
-    expect($subscribedSegments[0]['name'])->equals($this->segment2->name);
+    verify($subscribedSegments[0]['name'])->equals($this->segment2->name);
   }
 
   public function testItDoesNotUnsubscribeFromWPSegment() {
@@ -118,24 +118,24 @@ class SubscriberSegmentTest extends \MailPoetTest {
 
     // verify that subscriber is subscribed to 3 segments
     $subscriber = Subscriber::findOne($subscriber->id)->withSubscriptions();
-    expect($subscriber->subscriptions[0]['status'])->equals(Subscriber::STATUS_SUBSCRIBED);
-    expect($subscriber->subscriptions[0]['segment_id'])->equals($segment1->id);
-    expect($subscriber->subscriptions[1]['status'])->equals(Subscriber::STATUS_SUBSCRIBED);
-    expect($subscriber->subscriptions[1]['segment_id'])->equals($segment2->id);
-    expect($subscriber->subscriptions[2]['status'])->equals(Subscriber::STATUS_SUBSCRIBED);
-    expect($subscriber->subscriptions[2]['segment_id'])->equals($segment3->id);
+    verify($subscriber->subscriptions[0]['status'])->equals(Subscriber::STATUS_SUBSCRIBED);
+    verify($subscriber->subscriptions[0]['segment_id'])->equals($segment1->id);
+    verify($subscriber->subscriptions[1]['status'])->equals(Subscriber::STATUS_SUBSCRIBED);
+    verify($subscriber->subscriptions[1]['segment_id'])->equals($segment2->id);
+    verify($subscriber->subscriptions[2]['status'])->equals(Subscriber::STATUS_SUBSCRIBED);
+    verify($subscriber->subscriptions[2]['segment_id'])->equals($segment3->id);
 
     // verify that subscriber is not subscribed only to the non-WP segment (#2)
     $subscriber = $this->subscriber;
     SubscriberSegment::unsubscribeFromSegments($subscriber, [$segment1->id, $segment2->id, $segment3->id]);
     $subscriber = Subscriber::findOne($subscriber->id)->withSubscriptions();
 
-    expect($subscriber->subscriptions[0]['status'])->equals(Subscriber::STATUS_SUBSCRIBED);
-    expect($subscriber->subscriptions[0]['segment_id'])->equals($segment1->id);
-    expect($subscriber->subscriptions[1]['status'])->equals(Subscriber::STATUS_UNSUBSCRIBED);
-    expect($subscriber->subscriptions[1]['segment_id'])->equals($segment2->id);
-    expect($subscriber->subscriptions[2]['status'])->equals(Subscriber::STATUS_UNSUBSCRIBED);
-    expect($subscriber->subscriptions[2]['segment_id'])->equals($segment3->id);
+    verify($subscriber->subscriptions[0]['status'])->equals(Subscriber::STATUS_SUBSCRIBED);
+    verify($subscriber->subscriptions[0]['segment_id'])->equals($segment1->id);
+    verify($subscriber->subscriptions[1]['status'])->equals(Subscriber::STATUS_UNSUBSCRIBED);
+    verify($subscriber->subscriptions[1]['segment_id'])->equals($segment2->id);
+    verify($subscriber->subscriptions[2]['status'])->equals(Subscriber::STATUS_UNSUBSCRIBED);
+    verify($subscriber->subscriptions[2]['segment_id'])->equals($segment3->id);
   }
 
   public function testItCanUnsubscribeFromAllSegments() {
@@ -163,7 +163,7 @@ class SubscriberSegmentTest extends \MailPoetTest {
       )
       ->where('status', Subscriber::STATUS_UNSUBSCRIBED)
       ->count();
-    expect($subscriptionsCount)->equals(2);
+    verify($subscriptionsCount)->equals(2);
   }
 
   public function testItCanResubscribeToAllSegments() {
@@ -209,7 +209,7 @@ class SubscriberSegmentTest extends \MailPoetTest {
     $subscriptionsCount = SubscriberSegment::where(
         'subscriber_id', $this->subscriber->id
       )->count();
-    expect($subscriptionsCount)->equals(0);
+    verify($subscriptionsCount)->equals(0);
   }
 
   public function testItCanDeleteManySubscriptions() {
@@ -229,14 +229,14 @@ class SubscriberSegmentTest extends \MailPoetTest {
       $this->segment1->id, $this->segment2->id,
     ]);
 
-    expect(SubscriberSegment::count())->equals(4);
+    verify(SubscriberSegment::count())->equals(4);
 
     $result = SubscriberSegment::deleteManySubscriptions([
       $this->subscriber->id, $subscriber2->id,
     ]);
     expect($result)->true();
 
-    expect(SubscriberSegment::count())->equals(0);
+    verify(SubscriberSegment::count())->equals(0);
   }
 
   public function testItCanCreateOrUpdate() {
@@ -252,7 +252,7 @@ class SubscriberSegmentTest extends \MailPoetTest {
     // check that we have the proper status
     $created = SubscriberSegment::findOne($result->id);
     $this->assertInstanceOf(SubscriberSegment::class, $created);
-    expect($created->status)->equals(Subscriber::STATUS_SUBSCRIBED);
+    verify($created->status)->equals(Subscriber::STATUS_SUBSCRIBED);
 
     // update same combination of subscriber/segment with a different status
     $result = SubscriberSegment::createOrUpdate([
@@ -266,7 +266,7 @@ class SubscriberSegmentTest extends \MailPoetTest {
     // check updated status
     $updated = SubscriberSegment::findOne($created->id);
     $this->assertInstanceOf(SubscriberSegment::class, $updated);
-    expect($updated->status)->equals(Subscriber::STATUS_UNSUBSCRIBED);
+    verify($updated->status)->equals(Subscriber::STATUS_UNSUBSCRIBED);
 
     // we should have only one relationship for that user
     $subscriptionsCount = SubscriberSegment::where(
@@ -274,7 +274,7 @@ class SubscriberSegmentTest extends \MailPoetTest {
       )
       ->where('segment_id', $this->segment1->id)
       ->count();
-    expect($subscriptionsCount)->equals(1);
+    verify($subscriptionsCount)->equals(1);
   }
 
   public function testItCanFilterBySubscribedStatus() {
@@ -290,10 +290,10 @@ class SubscriberSegmentTest extends \MailPoetTest {
     ]);
 
     $subscriptionsCount = SubscriberSegment::count();
-    expect($subscriptionsCount)->equals(2);
+    verify($subscriptionsCount)->equals(2);
 
     $subscriptionsCount = SubscriberSegment::filter('subscribed')->count();
-    expect($subscriptionsCount)->equals(1);
+    verify($subscriptionsCount)->equals(1);
   }
 
   public function testItCannotUnsubscribeFromWPAndWooCommerceSegments() {
@@ -312,7 +312,7 @@ class SubscriberSegmentTest extends \MailPoetTest {
     // the subscriber should still be subscribed to the WP segment
     $subscribedSegments = $this->subscriber->segments()->findArray();
     expect($subscribedSegments)->count(1);
-    expect($subscribedSegments[0]['name'])->equals($this->wpSegment->name);
+    verify($subscribedSegments[0]['name'])->equals($this->wpSegment->name);
   }
 
   public function testItCannotDeleteSubscriptionToWPAndWooCommerceSegments() {
@@ -331,7 +331,7 @@ class SubscriberSegmentTest extends \MailPoetTest {
     // the subscriber should still be subscribed to the WP segment
     $subscribedSegments = $this->subscriber->segments()->findArray();
     expect($subscribedSegments)->count(2);
-    expect($subscribedSegments[0]['name'])->equals($this->wpSegment->name);
-    expect($subscribedSegments[1]['name'])->equals($this->wcSegment->name);
+    verify($subscribedSegments[0]['name'])->equals($this->wpSegment->name);
+    verify($subscribedSegments[1]['name'])->equals($this->wcSegment->name);
   }
 }
diff --git a/mailpoet/tests/integration/Models/SubscriberTest.php b/mailpoet/tests/integration/Models/SubscriberTest.php
index bbaee13251..3e72de5b7b 100644
--- a/mailpoet/tests/integration/Models/SubscriberTest.php
+++ b/mailpoet/tests/integration/Models/SubscriberTest.php
@@ -47,7 +47,7 @@ class SubscriberTest extends \MailPoetTest {
     $subscriber =
       Subscriber::where('email', $this->testData['email'])
         ->findOne();
-    expect($subscriber->firstName)
+    verify($subscriber->firstName)
       ->equals($this->testData['first_name']);
   }
 
@@ -55,7 +55,7 @@ class SubscriberTest extends \MailPoetTest {
     $subscriber =
       Subscriber::where('email', $this->testData['email'])
         ->findOne();
-    expect($subscriber->lastName)
+    verify($subscriber->lastName)
       ->equals($this->testData['last_name']);
   }
 
@@ -63,7 +63,7 @@ class SubscriberTest extends \MailPoetTest {
     $subscriber =
       Subscriber::where('email', $this->testData['email'])
         ->findOne();
-    expect($subscriber->email)
+    verify($subscriber->email)
       ->equals($this->testData['email']);
   }
 
@@ -111,7 +111,7 @@ class SubscriberTest extends \MailPoetTest {
     $subscriber =
       Subscriber::where('email', $this->testData['email'])
         ->findOne();
-    expect($subscriber->status)->equals(Subscriber::STATUS_UNCONFIRMED);
+    verify($subscriber->status)->equals(Subscriber::STATUS_UNCONFIRMED);
   }
 
   public function testItCanChangeStatus() {
@@ -123,7 +123,7 @@ class SubscriberTest extends \MailPoetTest {
     expect($subscriber->getErrors())->false();
     $subscriberUpdated = Subscriber::where('email', $this->testData['email'])
       ->findOne();
-    expect($subscriberUpdated->status)->equals(Subscriber::STATUS_SUBSCRIBED);
+    verify($subscriberUpdated->status)->equals(Subscriber::STATUS_SUBSCRIBED);
   }
 
   public function testItUpdateLastSubscribedAtCorrectly() {
@@ -152,26 +152,26 @@ class SubscriberTest extends \MailPoetTest {
     $subscriber->save();
     $subscriberUpdated = Subscriber::where('email', $this->testData['email'])
       ->findOne();
-    expect($subscriberUpdated->lastSubscribedAt)->equals($lastSubscribedAt->toDateTimeString());
+    verify($subscriberUpdated->lastSubscribedAt)->equals($lastSubscribedAt->toDateTimeString());
   }
 
   public function testItHasSearchFilter() {
     $subscriber = Subscriber::filter('search', 'john')
       ->findOne();
-    expect($subscriber->firstName)->equals($this->testData['first_name']);
+    verify($subscriber->firstName)->equals($this->testData['first_name']);
     $subscriber = Subscriber::filter('search', 'mailer')
       ->findOne();
-    expect($subscriber->lastName)->equals($this->testData['last_name']);
+    verify($subscriber->lastName)->equals($this->testData['last_name']);
     $subscriber = Subscriber::filter('search', 'mailpoet')
       ->findOne();
-    expect($subscriber->email)->equals($this->testData['email']);
+    verify($subscriber->email)->equals($this->testData['email']);
   }
 
   public function testItHasGroupFilter() {
     $subscribers = Subscriber::filter('groupBy', Subscriber::STATUS_UNCONFIRMED)
       ->findMany();
     foreach ($subscribers as $subscriber) {
-      expect($subscriber->status)->equals(Subscriber::STATUS_UNCONFIRMED);
+      verify($subscriber->status)->equals(Subscriber::STATUS_UNCONFIRMED);
     }
 
     $this->subscriber->status = Subscriber::STATUS_SUBSCRIBED;
@@ -179,7 +179,7 @@ class SubscriberTest extends \MailPoetTest {
     $subscribers = Subscriber::filter('groupBy', Subscriber::STATUS_SUBSCRIBED)
       ->findMany();
     foreach ($subscribers as $subscriber) {
-      expect($subscriber->status)->equals(Subscriber::STATUS_SUBSCRIBED);
+      verify($subscriber->status)->equals(Subscriber::STATUS_SUBSCRIBED);
     }
 
     $this->subscriber->status = Subscriber::STATUS_UNSUBSCRIBED;
@@ -187,7 +187,7 @@ class SubscriberTest extends \MailPoetTest {
     $subscribers = Subscriber::filter('groupBy', Subscriber::STATUS_UNSUBSCRIBED)
       ->findMany();
     foreach ($subscribers as $subscriber) {
-      expect($subscriber->status)->equals(Subscriber::STATUS_UNSUBSCRIBED);
+      verify($subscriber->status)->equals(Subscriber::STATUS_UNSUBSCRIBED);
     }
 
     $this->subscriber->status = Subscriber::STATUS_BOUNCED;
@@ -195,7 +195,7 @@ class SubscriberTest extends \MailPoetTest {
     $subscribers = Subscriber::filter('groupBy', Subscriber::STATUS_BOUNCED)
       ->findMany();
     foreach ($subscribers as $subscriber) {
-      expect($subscriber->status)->equals(Subscriber::STATUS_BOUNCED);
+      verify($subscriber->status)->equals(Subscriber::STATUS_BOUNCED);
     }
   }
 
@@ -295,7 +295,7 @@ class SubscriberTest extends \MailPoetTest {
     $subscriber = Subscriber::findOne($this->subscriber->id);
 
     $subscriberSegment = $subscriber->segments()->findOne();
-    expect($subscriberSegment->id)->equals($segment->id);
+    verify($subscriberSegment->id)->equals($segment->id);
   }
 
   public function testItCanHaveCustomFields() {
@@ -312,7 +312,7 @@ class SubscriberTest extends \MailPoetTest {
 
     $subscriber = Subscriber::filter('filterWithCustomFields')
       ->findOne($this->subscriber->id);
-    expect($subscriber->DOB)->equals($association->value);
+    verify($subscriber->DOB)->equals($association->value);
   }
 
   public function testItCanCreateSubscriberWithCustomFields() {
@@ -380,17 +380,17 @@ class SubscriberTest extends \MailPoetTest {
     $subscriber = Subscriber::findOne($subscriberWithCustomField->id)
       ->withCustomFields();
 
-    expect($subscriber->id)->equals($subscriberWithCustomField->id);
-    expect($subscriber->email)->equals('user.with.cf@mailpoet.com');
-    expect($subscriber->{'cf_' . $customField->id})->equals('Paris');
+    verify($subscriber->id)->equals($subscriberWithCustomField->id);
+    verify($subscriber->email)->equals('user.with.cf@mailpoet.com');
+    verify($subscriber->{'cf_' . $customField->id})->equals('Paris');
     // date specified as array gets converted to string
-    expect($subscriber->{'cf_' . $customField2->id})->equals('1984-03-09 00:00:00');
+    verify($subscriber->{'cf_' . $customField2->id})->equals('1984-03-09 00:00:00');
     // date in different format specified as array is stored correctly
-    expect($subscriber->{'cf_' . $customField4->id})->equals('2020-04-25 00:00:00');
+    verify($subscriber->{'cf_' . $customField4->id})->equals('2020-04-25 00:00:00');
     // date specified as string is stored as is
-    expect($subscriber->{'cf_' . $customField3->id})->equals('2013-07');
+    verify($subscriber->{'cf_' . $customField3->id})->equals('2013-07');
     // year-month date in different format specified as array is stored correctly
-    expect($subscriber->{'cf_' . $customField5->id})->equals('2020-05-01 00:00:00');
+    verify($subscriber->{'cf_' . $customField5->id})->equals('2020-05-01 00:00:00');
   }
 
   public function testItShouldUnsubscribeFromAllSegments() {
@@ -435,15 +435,15 @@ class SubscriberTest extends \MailPoetTest {
 
     $record = Subscriber::where('email', $data['email'])
       ->findOne();
-    expect($record->firstName)->equals($data['first_name']);
-    expect($record->lastName)->equals($data['last_name']);
+    verify($record->firstName)->equals($data['first_name']);
+    verify($record->lastName)->equals($data['last_name']);
     $record->lastName = 'Mailer';
     $result = Subscriber::createOrUpdate($record->asArray());
     expect($result)->notEquals(false);
     expect($result->getValidationErrors())->isEmpty();
     $record = Subscriber::where('email', $data['email'])
       ->findOne();
-    expect($record->lastName)->equals('Mailer');
+    verify($record->lastName)->equals('Mailer');
   }
 
   public function testItCanCreateOrUpdateMultipleRecords() {
@@ -470,15 +470,15 @@ class SubscriberTest extends \MailPoetTest {
     ];
     Subscriber::createMultiple($columns, $values);
     $subscribers = Subscriber::findArray();
-    expect(count($subscribers))->equals(2);
-    expect($subscribers[1]['email'])->equals($values[1]['email']);
-    expect($subscribers[1]['status'])->equals($values[1]['status']);
+    verify(count($subscribers))->equals(2);
+    verify($subscribers[1]['email'])->equals($values[1]['email']);
+    verify($subscribers[1]['status'])->equals($values[1]['status']);
 
     $values[0]['first_name'] = 'John';
     Subscriber::updateMultiple($columns, $values);
     $subscribers = Subscriber::findArray();
-    expect($subscribers[0]['first_name'])->equals($values[0]['first_name']);
-    expect($subscribers[0]['status'])->equals('unsubscribed');
+    verify($subscribers[0]['first_name'])->equals($values[0]['first_name']);
+    verify($subscribers[0]['status'])->equals('unsubscribed');
   }
 
   public function testItCanBeUpdatedByEmail() {
@@ -488,12 +488,12 @@ class SubscriberTest extends \MailPoetTest {
       'last_name' => 'DoDo',
     ]);
 
-    expect($this->subscriber->id())->equals($subscriberUpdated->id());
+    verify($this->subscriber->id())->equals($subscriberUpdated->id());
 
     $subscriber = Subscriber::findOne($this->subscriber->id());
-    expect($subscriber->email)->equals($this->testData['email']);
-    expect($subscriber->firstName)->equals('JoJo');
-    expect($subscriber->lastName)->equals('DoDo');
+    verify($subscriber->email)->equals($this->testData['email']);
+    verify($subscriber->firstName)->equals('JoJo');
+    verify($subscriber->lastName)->equals('DoDo');
   }
 
   public function testItCanSetCustomField() {
@@ -515,7 +515,7 @@ class SubscriberTest extends \MailPoetTest {
 
     $subscriber = $subscriber->withCustomFields()->asArray();
 
-    expect($subscriber['cf_' . $customField->id()])->equals(
+    verify($subscriber['cf_' . $customField->id()])->equals(
       mktime(0, 0, 0, $value['month'], $value['day'], $value['year'])
     );
   }
@@ -523,7 +523,7 @@ class SubscriberTest extends \MailPoetTest {
   public function testItCanGetCustomField() {
     $subscriber = Subscriber::findOne($this->subscriber->id());
 
-    expect($subscriber->getCustomField(9999, 'default_value'))
+    verify($subscriber->getCustomField(9999, 'default_value'))
       ->equals('default_value');
 
     $customField = CustomField::createOrUpdate([
@@ -533,7 +533,7 @@ class SubscriberTest extends \MailPoetTest {
 
     $subscriber->setCustomField($customField->id(), 'non_default_value');
 
-    expect($subscriber->getCustomField($customField->id(), 'default_value'))
+    verify($subscriber->getCustomField($customField->id(), 'default_value'))
       ->equals('non_default_value');
   }
 
@@ -593,11 +593,11 @@ class SubscriberTest extends \MailPoetTest {
       'last_name' => 'WP User',
       'wp_user_id' => 1,
     ]);
-    expect($wpSubscriber->trash())->equals(false);
+    verify($wpSubscriber->trash())->equals(false);
 
     $subscriber = Subscriber::findOne($wpSubscriber->id);
     expect($subscriber)->notEquals(false);
-    expect($subscriber->deletedAt)->equals(null);
+    verify($subscriber->deletedAt)->equals(null);
   }
 
   public function testItCannotDeleteWpUser() {
@@ -607,7 +607,7 @@ class SubscriberTest extends \MailPoetTest {
       'last_name' => 'WP User',
       'wp_user_id' => 1,
     ]);
-    expect($wpSubscriber->delete())->equals(false);
+    verify($wpSubscriber->delete())->equals(false);
 
     $subscriber = Subscriber::findOne($wpSubscriber->id);
     expect($subscriber)->notEquals(false);
@@ -620,11 +620,11 @@ class SubscriberTest extends \MailPoetTest {
       'last_name' => 'WooCommerce Customer',
       'is_woocommerce_user' => 1,
     ]);
-    expect($wpSubscriber->trash())->equals(false);
+    verify($wpSubscriber->trash())->equals(false);
 
     $subscriber = Subscriber::findOne($wpSubscriber->id);
     expect($subscriber)->notEquals(false);
-    expect($subscriber->deletedAt)->equals(null);
+    verify($subscriber->deletedAt)->equals(null);
   }
 
   public function testItCannotDeleteWooCommerceCustomer() {
@@ -634,7 +634,7 @@ class SubscriberTest extends \MailPoetTest {
       'last_name' => 'WooCommerce Customer',
       'is_woocommerce_user' => 1,
     ]);
-    expect($wpSubscriber->delete())->equals(false);
+    verify($wpSubscriber->delete())->equals(false);
 
     $subscriber = Subscriber::findOne($wpSubscriber->id);
     expect($subscriber)->notEquals(false);
@@ -690,13 +690,13 @@ class SubscriberTest extends \MailPoetTest {
 
     // counts only subscribed & unconfirmed users
     $total = Subscriber::getTotalSubscribers();
-    expect($total)->equals(2);
+    verify($total)->equals(2);
 
     $subscriber1->status = Subscriber::STATUS_UNSUBSCRIBED;
     $subscriber1->save();
 
     $total = Subscriber::getTotalSubscribers();
-    expect($total)->equals(1);
+    verify($total)->equals(1);
   }
 
   public function testItDoesNotFindDeletedOrNonexistentSubscribersInSegments() {
@@ -733,7 +733,7 @@ class SubscriberTest extends \MailPoetTest {
         $segment[3]->id,
       ]
     )->findMany();
-    expect(Subscriber::extractSubscribersIds($subscribers))->equals(
+    verify(Subscriber::extractSubscribersIds($subscribers))->equals(
       [$subscriber[3]->id]
     );
   }
@@ -771,7 +771,7 @@ class SubscriberTest extends \MailPoetTest {
         $segment[3]->id,
       ]
     )->findMany();
-    expect(Subscriber::extractSubscribersIds($subscribers))->equals(
+    verify(Subscriber::extractSubscribersIds($subscribers))->equals(
       [
         $subscriber[1]->id,
         $subscriber[3]->id,
@@ -813,7 +813,7 @@ class SubscriberTest extends \MailPoetTest {
         $segment[3]->id,
       ]
     )->findMany();
-    expect(Subscriber::extractSubscribersIds($subscribers))->equals(
+    verify(Subscriber::extractSubscribersIds($subscribers))->equals(
       [$subscriber[1]->id]
     );
   }
@@ -821,31 +821,31 @@ class SubscriberTest extends \MailPoetTest {
   public function testItSetsDefaultValuesForRequiredFields() {
     // MySQL running in strict mode requires a value to be set for certain fields
     $values = Subscriber::setRequiredFieldsDefaultValues([]);
-    expect($values['first_name'])->equals('');
-    expect($values['last_name'])->equals('');
-    expect($values['status'])->equals(Subscriber::STATUS_UNCONFIRMED);
-    expect(strlen($values['unsubscribe_token']))->equals(15);
-    expect(strlen($values['link_token']))->equals(32);
+    verify($values['first_name'])->equals('');
+    verify($values['last_name'])->equals('');
+    verify($values['status'])->equals(Subscriber::STATUS_UNCONFIRMED);
+    verify(strlen($values['unsubscribe_token']))->equals(15);
+    verify(strlen($values['link_token']))->equals(32);
   }
 
   public function testItSetsDefaultStatusDependingOnSingupConfirmationOption() {
     // when signup confirmation is disabled, status should be 'subscribed'
     $this->settings->set('signup_confirmation.enabled', false);
     $values = Subscriber::setRequiredFieldsDefaultValues([]);
-    expect($values['first_name'])->equals('');
-    expect($values['last_name'])->equals('');
-    expect($values['status'])->equals(Subscriber::STATUS_SUBSCRIBED);
-    expect(strlen($values['unsubscribe_token']))->equals(15);
+    verify($values['first_name'])->equals('');
+    verify($values['last_name'])->equals('');
+    verify($values['status'])->equals(Subscriber::STATUS_SUBSCRIBED);
+    verify(strlen($values['unsubscribe_token']))->equals(15);
 
     $this->settings->set('signup_confirmation.enabled', true);
     // when signup confirmation is enabled, status should be 'unconfirmed'
     $values = Subscriber::setRequiredFieldsDefaultValues([]);
-    expect($values['status'])->equals(Subscriber::STATUS_UNCONFIRMED);
+    verify($values['status'])->equals(Subscriber::STATUS_UNCONFIRMED);
 
     // when status is specified, it should not change regardless of signup confirmation option
     $this->settings->set('signup_confirmation.enabled', true);
     $values = Subscriber::setRequiredFieldsDefaultValues(['status' => Subscriber::STATUS_SUBSCRIBED]);
-    expect($values['status'])->equals(Subscriber::STATUS_SUBSCRIBED);
+    verify($values['status'])->equals(Subscriber::STATUS_SUBSCRIBED);
   }
 
   public function testItSetsDefaultValuesForNewSubscribers() {
@@ -857,7 +857,7 @@ class SubscriberTest extends \MailPoetTest {
     expect($result->getErrors())->false();
     expect($result->firstName)->isEmpty();
     expect($result->lastName)->isEmpty();
-    expect($result->status)->equals(Subscriber::STATUS_UNCONFIRMED);
+    verify($result->status)->equals(Subscriber::STATUS_UNCONFIRMED);
   }
 
   public function testItDoesNotSetDefaultValuesForExistingSubscribers() {
@@ -868,8 +868,8 @@ class SubscriberTest extends \MailPoetTest {
       ]
     );
     expect($result->getErrors())->false();
-    expect($result->firstName)->equals($this->testData['first_name']);
-    expect($result->lastName)->equals($this->testData['last_name']);
+    verify($result->firstName)->equals($this->testData['first_name']);
+    verify($result->lastName)->equals($this->testData['last_name']);
   }
 
   public function testItExtractsCustomFieldsFromObject() {
@@ -881,14 +881,14 @@ class SubscriberTest extends \MailPoetTest {
       'last_name' => 'Doe',
     ];
     list($data, $customValues) = Subscriber::extractCustomFieldsFromFromObject($data);
-    expect($data)->equals(
+    verify($data)->equals(
       [
         'email' => 'test@example.com',
         'first_name' => 'John',
         'last_name' => 'Doe',
       ]
     );
-    expect($customValues)->equals(
+    verify($customValues)->equals(
       [
         '1' => 'Paris',
         '2' => 'France',
diff --git a/mailpoet/tests/integration/Newsletter/ApiDataSanitizerTest.php b/mailpoet/tests/integration/Newsletter/ApiDataSanitizerTest.php
index 0ecf8767a4..080936d61e 100644
--- a/mailpoet/tests/integration/Newsletter/ApiDataSanitizerTest.php
+++ b/mailpoet/tests/integration/Newsletter/ApiDataSanitizerTest.php
@@ -44,14 +44,14 @@ class ApiDataSanitizerTest extends \MailPoetTest {
     $container = $result['content']['blocks'][0];
     $block1 = $container['blocks'][0];
     $block2 = $container['blocks'][1];
-    expect($container['columnLayout'])->equals(false);
-    expect($block1['type'])->equals('text');
-    expect($block1['text'])->equals('<p>Thanks for reading. See you soon!</p>');
-    expect($block2['type'])->equals('footer');
-    expect($block2['text'])->equals('<p><a href="[link:subscription_unsubscribe_url]">Unsubscribe</a><br />Add your postal address here!</p>');
+    verify($container['columnLayout'])->equals(false);
+    verify($block1['type'])->equals('text');
+    verify($block1['text'])->equals('<p>Thanks for reading. See you soon!</p>');
+    verify($block2['type'])->equals('footer');
+    verify($block2['text'])->equals('<p><a href="[link:subscription_unsubscribe_url]">Unsubscribe</a><br />Add your postal address here!</p>');
     $image = $result['content']['blocks'][1];
-    expect($image['type'])->equals('header');
-    expect($image['link'])->equals('');
-    expect($image['text'])->equals('http://some.url/wp-c\'"&gt;ontent/fake-logo.png');
+    verify($image['type'])->equals('header');
+    verify($image['link'])->equals('');
+    verify($image['text'])->equals('http://some.url/wp-c\'"&gt;ontent/fake-logo.png');
   }
 }
diff --git a/mailpoet/tests/integration/Newsletter/AutomatedLatestContentAPITest.php b/mailpoet/tests/integration/Newsletter/AutomatedLatestContentAPITest.php
index 191eb269a1..48e951bc6e 100644
--- a/mailpoet/tests/integration/Newsletter/AutomatedLatestContentAPITest.php
+++ b/mailpoet/tests/integration/Newsletter/AutomatedLatestContentAPITest.php
@@ -167,21 +167,21 @@ class AutomatedLatestContentAPITest extends \MailPoetTest {
     ]);
     expect($result->data)->count(1);
 
-    expect($result->data[0][0]->post_title)->equals($publishedPostTitle);
+    verify($result->data[0][0]->post_title)->equals($publishedPostTitle);
 
     $this->loginWithRole("editor");
     $result = $this->alcAPI->getBulkTransformedPosts([
       "blocks" => [$singleBlockQuery],
     ]);
     expect($result->data)->count(1);
-    expect($result->data[0][0]->post_title)->equals($publishedPostTitle);
+    verify($result->data[0][0]->post_title)->equals($publishedPostTitle);
 
     $this->loginWithRole("administrator");
     $result = $this->alcAPI->getBulkTransformedPosts([
       "blocks" => [$singleBlockQuery],
     ]);
     expect($result->data)->count(1);
-    expect($result->data[0][0]->post_title)->equals($publishedPostTitle);
+    verify($result->data[0][0]->post_title)->equals($publishedPostTitle);
   }
 
   /**
diff --git a/mailpoet/tests/integration/Newsletter/AutomatedLatestContentTest.php b/mailpoet/tests/integration/Newsletter/AutomatedLatestContentTest.php
index 284468ce75..fc8a943091 100644
--- a/mailpoet/tests/integration/Newsletter/AutomatedLatestContentTest.php
+++ b/mailpoet/tests/integration/Newsletter/AutomatedLatestContentTest.php
@@ -34,7 +34,7 @@ class AutomatedLatestContentTest extends \MailPoetTest {
     ];
 
     $query = new BlockPostQuery(['args' => $args]);
-    expect($query->getQueryParams()['tax_query'])->equals([
+    verify($query->getQueryParams()['tax_query'])->equals([
       [
         [
           'taxonomy' => 'post_tag',
@@ -68,7 +68,7 @@ class AutomatedLatestContentTest extends \MailPoetTest {
 
     $query = (new BlockPostQuery(['args' => $args]))->getQueryParams()['tax_query'];
 
-    expect($query[0][0]['operator'])->equals('NOT IN');
-    expect($query[0]['relation'])->equals('AND');
+    verify($query[0][0]['operator'])->equals('NOT IN');
+    verify($query[0]['relation'])->equals('AND');
   }
 }
diff --git a/mailpoet/tests/integration/Newsletter/Blocks/AbandonedCartContentTest.php b/mailpoet/tests/integration/Newsletter/Blocks/AbandonedCartContentTest.php
index ba14654095..d621737c50 100644
--- a/mailpoet/tests/integration/Newsletter/Blocks/AbandonedCartContentTest.php
+++ b/mailpoet/tests/integration/Newsletter/Blocks/AbandonedCartContentTest.php
@@ -91,7 +91,7 @@ class AbandonedCartContentTest extends \MailPoetTest {
     $sendingTask = $this->createSendingTask($newsletter);
     $result = $this->block->render($newsletter, $this->accBlock, false, $sendingTask);
     $encodedResult = json_encode($result);
-    expect($encodedResult)->equals('[]');
+    verify($encodedResult)->equals('[]');
   }
 
   public function testItDoesNotRenderIfAutomaticNewsletterIsNotForAbandonedCart() {
@@ -100,7 +100,7 @@ class AbandonedCartContentTest extends \MailPoetTest {
     $sendingTask = $this->createSendingTask($newsletter);
     $result = $this->block->render($newsletter, $this->accBlock, false, $sendingTask);
     $encodedResult = json_encode($result);
-    expect($encodedResult)->equals('[]');
+    verify($encodedResult)->equals('[]');
   }
 
   public function testItRendersLatestProductsInPreviewMode() {
@@ -123,7 +123,7 @@ class AbandonedCartContentTest extends \MailPoetTest {
     $this->accBlock['pricePosition'] = 'hidden';
     $result = $this->block->render($newsletter, $this->accBlock, false);
     $encodedResult = json_encode($result);
-    expect($encodedResult)->equals('[]');
+    verify($encodedResult)->equals('[]');
   }
 
   public function testItDoesNotRenderIfCartIsEmpty() {
@@ -134,7 +134,7 @@ class AbandonedCartContentTest extends \MailPoetTest {
     $sendingTask = $this->createSendingTask($newsletter, [AbandonedCart::TASK_META_NAME => []]);
     $result = $this->block->render($newsletter, $this->accBlock, false, $sendingTask);
     $encodedResult = json_encode($result);
-    expect($encodedResult)->equals('[]');
+    verify($encodedResult)->equals('[]');
   }
 
   public function testItRendersAbandonedCartContentBlock() {
diff --git a/mailpoet/tests/integration/Newsletter/Editor/PostContentManagerTest.php b/mailpoet/tests/integration/Newsletter/Editor/PostContentManagerTest.php
index 97a17d972d..9562c0c68e 100644
--- a/mailpoet/tests/integration/Newsletter/Editor/PostContentManagerTest.php
+++ b/mailpoet/tests/integration/Newsletter/Editor/PostContentManagerTest.php
@@ -18,51 +18,51 @@ class PostContentManagerTest extends \MailPoetTest {
 
   public function testFilterContentRetainsStructuralTags() {
     $html = '<p>some paragraph text</p>';
-    expect($this->postContent->filterContent($html, 'full'))->equals(
+    verify($this->postContent->filterContent($html, 'full'))->equals(
       '<p class="' . PostContentManager::WP_POST_CLASS . '">some paragraph text</p>'
     );
 
     $html = '<span>spanning</span>';
-    expect($this->postContent->filterContent($html, 'full'))->equals(
+    verify($this->postContent->filterContent($html, 'full'))->equals(
       '<p class="' . PostContentManager::WP_POST_CLASS . '">' . $html . '</p>'
     );
 
     $html = '<blockquote>do not strip this</blockquote>';
-    expect($this->postContent->filterContent($html, 'full'))->equals(
+    verify($this->postContent->filterContent($html, 'full'))->equals(
       '<blockquote><p class="' . PostContentManager::WP_POST_CLASS . '">do not strip this</p></blockquote>'
     );
 
     $html = '<ul><li>First item</li><li>Second item</li></ul>';
-    expect($this->postContent->filterContent($html, 'full'))->equals(
+    verify($this->postContent->filterContent($html, 'full'))->equals(
       "<ul>\n<li>First item</li>\n<li>Second item</li>\n</ul>"
     );
 
     $html = '<ol><li>First item</li><li>Second item</li></ol>';
-    expect($this->postContent->filterContent($html, 'full'))->equals(
+    verify($this->postContent->filterContent($html, 'full'))->equals(
       "<ol>\n<li>First item</li>\n<li>Second item</li>\n</ol>"
     );
   }
 
   public function testFilterContentRetainsHeadings() {
     $html = '<h1>heading 1</h1>';
-    expect($this->postContent->filterContent($html, 'full'))->equals($html);
+    verify($this->postContent->filterContent($html, 'full'))->equals($html);
 
     $html = '<h2>heading 2</h2>';
-    expect($this->postContent->filterContent($html, 'full'))->equals($html);
+    verify($this->postContent->filterContent($html, 'full'))->equals($html);
 
     $html = '<h3>heading 3</h3>';
-    expect($this->postContent->filterContent($html, 'full'))->equals($html);
+    verify($this->postContent->filterContent($html, 'full'))->equals($html);
 
     $html = '<h1>heading 1</h1>';
-    expect($this->postContent->filterContent($html, 'excerpt'))
+    verify($this->postContent->filterContent($html, 'excerpt'))
       ->equals('<p class="' . PostContentManager::WP_POST_CLASS . '">heading 1</p>');
 
     $html = '<h2>heading 2</h2>';
-    expect($this->postContent->filterContent($html, 'excerpt'))
+    verify($this->postContent->filterContent($html, 'excerpt'))
       ->equals('<p class="' . PostContentManager::WP_POST_CLASS . '">heading 2</p>');
 
     $html = '<h3>heading 3</h3>';
-    expect($this->postContent->filterContent($html, 'excerpt'))
+    verify($this->postContent->filterContent($html, 'excerpt'))
       ->equals('<p class="' . PostContentManager::WP_POST_CLASS . '">heading 3</p>');
   }
 
@@ -75,7 +75,7 @@ class PostContentManagerTest extends \MailPoetTest {
       'Text<br />new line',
     ];
     foreach ($textTags as $html) {
-      expect($this->postContent->filterContent($html, 'full'))->equals(
+      verify($this->postContent->filterContent($html, 'full'))->equals(
         '<p class="' . PostContentManager::WP_POST_CLASS . '">' . $html . '</p>'
       );
     }
@@ -83,12 +83,12 @@ class PostContentManagerTest extends \MailPoetTest {
 
   public function testFilterContentRetainsImagesAndLinks() {
     $html = '<img src="#" alt="some alt" />';
-    expect($this->postContent->filterContent($html, 'full'))->equals(
+    verify($this->postContent->filterContent($html, 'full'))->equals(
       '<p class="' . PostContentManager::WP_POST_CLASS . '"><img src="#" alt="some alt" /></p>'
     );
 
     $html = '<a href="#" title="link title">some link</a>';
-    expect($this->postContent->filterContent($html, 'full'))->equals(
+    verify($this->postContent->filterContent($html, 'full'))->equals(
       '<p class="' . PostContentManager::WP_POST_CLASS . '">' . $html . '</p>'
     );
   }
@@ -107,7 +107,7 @@ class PostContentManagerTest extends \MailPoetTest {
     ];
 
     foreach ($undesirableTags as $html) {
-      expect($this->postContent->filterContent($html, 'full'))->equals('');
+      verify($this->postContent->filterContent($html, 'full'))->equals('');
     }
   }
 
@@ -130,7 +130,7 @@ class PostContentManagerTest extends \MailPoetTest {
     ];
 
     foreach ($undesirableTags as $html) {
-      expect($this->postContent->filterContent($html, 'excerpt'))->equals('');
+      verify($this->postContent->filterContent($html, 'excerpt'))->equals('');
     }
   }
 
@@ -142,7 +142,7 @@ class PostContentManagerTest extends \MailPoetTest {
       'post_content' => '<p>one two three four five six</p>',
     ];
     $excerpt = $postContentManager->getContent($post, 'excerpt');
-    expect($excerpt)->equals('one two three four five six');
+    verify($excerpt)->equals('one two three four five six');
     (new WPFunctions)->addFilter(
       'mailpoet_newsletter_post_excerpt_length',
       function() {
@@ -153,7 +153,7 @@ class PostContentManagerTest extends \MailPoetTest {
       $this->make(WooCommerceHelper::class, ['isWooCommerceActive' => false])
     );
     $excerpt = $postContentManager->getContent($post, 'excerpt');
-    expect($excerpt)->equals('one two &hellip;');
+    verify($excerpt)->equals('one two &hellip;');
   }
 
   public function testItStripsShortcodesWhenGettingPostContent() {
@@ -161,26 +161,26 @@ class PostContentManagerTest extends \MailPoetTest {
     $post = (object)[
       'post_excerpt' => '[shortcode]some text in excerpt[/shortcode]',
     ];
-    expect($this->postContent->getContent($post, 'excerpt'))->equals('some text in excerpt');
+    verify($this->postContent->getContent($post, 'excerpt'))->equals('some text in excerpt');
 
     // shortcodes are stripped in post content when excerpt doesn't exist
     $post = (object)[
       'post_content' => '[shortcode]some text in content[/shortcode]',
     ];
-    expect($this->postContent->getContent($post, 'excerpt'))->equals('some text in content');
+    verify($this->postContent->getContent($post, 'excerpt'))->equals('some text in content');
 
     // shortcodes are stripped in post content
     $post = (object)[
       'post_content' => '[shortcode]some text in content[/shortcode]',
     ];
-    expect($this->postContent->getContent($post, ''))->equals('some text in content');
+    verify($this->postContent->getContent($post, ''))->equals('some text in content');
   }
 
   public function testItRemovesImageCaptionsFromClassicEditorPosts() {
     $post = (object)[
       'post_content' => 'Text [caption id="attachment_23" align="alignnone" width="300"]<img class="size-medium wp-image-23" src="i.png" alt="Alt" width="300" height="300" />Caption[/caption] Text [caption id="attachment_23" align="alignnone" width="300"]<img class="size-medium wp-image-23" src="i.png" alt="Alt" width="300" height="300" />Caption[/caption] Text',
     ];
-    expect($this->postContent->getContent($post, 'excerpt'))->equals('Text Text Text');
+    verify($this->postContent->getContent($post, 'excerpt'))->equals('Text Text Text');
   }
 
   public function testItRemovesImageCaptionsFromGutenbergPosts() {
@@ -205,17 +205,17 @@ EOT;
     $post = (object)[
       'post_content' => $content,
     ];
-    expect($this->postContent->getContent($post, 'excerpt'))->equals('Text Text Text');
+    verify($this->postContent->getContent($post, 'excerpt'))->equals('Text Text Text');
   }
 
   public function testItReplaceParagraphClass(): void {
     $html = '<p class="has-text-align-left">some paragraph text</p>';
-    expect($this->postContent->filterContent($html, 'full'))->equals(
+    verify($this->postContent->filterContent($html, 'full'))->equals(
       '<p class="' . PostContentManager::WP_POST_CLASS . '">some paragraph text</p>'
     );
 
     $html = '<p class="has-text-align-center"><span>some text</span></p>';
-    expect($this->postContent->filterContent($html, 'excerpt'))
+    verify($this->postContent->filterContent($html, 'excerpt'))
       ->equals('<p class="' . PostContentManager::WP_POST_CLASS . '"><span>some text</span></p>');
   }
 }
diff --git a/mailpoet/tests/integration/Newsletter/Editor/PostContentTransformerTest.php b/mailpoet/tests/integration/Newsletter/Editor/PostContentTransformerTest.php
index c5ff06f997..a693689329 100644
--- a/mailpoet/tests/integration/Newsletter/Editor/PostContentTransformerTest.php
+++ b/mailpoet/tests/integration/Newsletter/Editor/PostContentTransformerTest.php
@@ -42,7 +42,7 @@ class PostContentTransformerTest extends \MailPoetTest {
 
     $transformer = $this->getTransformer($args, $this->contentMock, $this->titleMock, $this->imageMock);
     $result = $transformer->transform([]);
-    expect($result)->equals([$this->imageMock, $this->titleMock, $this->contentMock[0]]);
+    verify($result)->equals([$this->imageMock, $this->titleMock, $this->contentMock[0]]);
   }
 
   public function testShouldAddImageBelowTitleForExcerptWithoutLayout() {
@@ -54,7 +54,7 @@ class PostContentTransformerTest extends \MailPoetTest {
 
     $transformer = $this->getTransformer($args, $this->contentMock, $this->titleMock, $this->imageMock);
     $result = $transformer->transform([]);
-    expect($result)->equals([$this->titleMock, $this->imageMock, $this->contentMock[0]]);
+    verify($result)->equals([$this->titleMock, $this->imageMock, $this->contentMock[0]]);
   }
 
   public function testShouldTransformContentWithoutLayoutWhenImageIsMissing() {
@@ -66,7 +66,7 @@ class PostContentTransformerTest extends \MailPoetTest {
 
     $transformer = $this->getTransformer($args, $this->contentMock, $this->titleMock, null);
     $result = $transformer->transform([]);
-    expect($result)->equals([$this->titleMock, $this->contentMock[0]]);
+    verify($result)->equals([$this->titleMock, $this->contentMock[0]]);
   }
 
   public function testShouldNotAddImageForTitleOnlyWhenImageIsPresentWithoutLayout() {
@@ -78,7 +78,7 @@ class PostContentTransformerTest extends \MailPoetTest {
 
     $transformer = $this->getTransformer($args, $this->contentMock, $this->titleMock, $this->imageMock);
     $result = $transformer->transform([]);
-    expect($result)->equals([$this->titleMock, $this->contentMock[0]]);
+    verify($result)->equals([$this->titleMock, $this->contentMock[0]]);
   }
 
   public function testShouldPrependTitleTextToContentTextIfFirstContentBlockIsTextual() {
@@ -94,7 +94,7 @@ class PostContentTransformerTest extends \MailPoetTest {
     $result = $transformer->transform([]);
     $expected = $this->contentMock[0];
     $expected['text'] = 'Titlefoo';
-    expect($result)->equals([$expected]);
+    verify($result)->equals([$expected]);
   }
 
   public function testShouldCreateLayoutStructureForCenteredImageWithLayout() {
@@ -106,16 +106,16 @@ class PostContentTransformerTest extends \MailPoetTest {
 
     $transformer = $this->getTransformer($args, $this->contentMock, $this->titleMock, $this->imageMock);
     $result = $transformer->transform([]);
-    expect($result[0]['type'])->equals('container');
-    expect($result[0]['orientation'])->equals('horizontal');
+    verify($result[0]['type'])->equals('container');
+    verify($result[0]['orientation'])->equals('horizontal');
     expect($result[0]['styles'])->notEmpty();
-    expect($result[0]['blocks'][0]['type'])->equals('container');
-    expect($result[0]['blocks'][0]['orientation'])->equals('vertical');
+    verify($result[0]['blocks'][0]['type'])->equals('container');
+    verify($result[0]['blocks'][0]['orientation'])->equals('vertical');
     expect($result[0]['blocks'][0]['styles'])->notEmpty();
     $resultBlocks = $result[0]['blocks'][0]['blocks'];
-    expect(count($resultBlocks))->equals(3);
-    expect($resultBlocks[0]['text'])->equals('Title');
-    expect($resultBlocks[1]['type'])->equals('image');
+    verify(count($resultBlocks))->equals(3);
+    verify($resultBlocks[0]['text'])->equals('Title');
+    verify($resultBlocks[1]['type'])->equals('image');
   }
 
   public function testShouldCreateLayoutStructureForCenteredImageWithLayoutWithTitleAboveExcerpt() {
@@ -129,9 +129,9 @@ class PostContentTransformerTest extends \MailPoetTest {
     $transformer = $this->getTransformer($args, $this->contentMock, $this->titleMock, $this->imageMock);
     $result = $transformer->transform([]);
     $resultBlocks = $result[0]['blocks'][0]['blocks'];
-    expect(count($resultBlocks))->equals(3);
-    expect($resultBlocks[0])->equals($this->imageMock);
-    expect($resultBlocks[1])->equals($this->titleMock);
+    verify(count($resultBlocks))->equals(3);
+    verify($resultBlocks[0])->equals($this->imageMock);
+    verify($resultBlocks[1])->equals($this->titleMock);
 
   }
 
@@ -144,14 +144,14 @@ class PostContentTransformerTest extends \MailPoetTest {
 
     $transformer = $this->getTransformer($args, $this->contentMock, $this->titleMock, $this->imageMock);
     $result = $transformer->transform([]);
-    expect($result[0]['type'])->equals('container');
-    expect($result[0]['orientation'])->equals('horizontal');
+    verify($result[0]['type'])->equals('container');
+    verify($result[0]['orientation'])->equals('horizontal');
     expect($result[0]['styles'])->notEmpty();
-    expect($result[0]['blocks'][0]['type'])->equals('container');
-    expect($result[0]['blocks'][0]['orientation'])->equals('vertical');
+    verify($result[0]['blocks'][0]['type'])->equals('container');
+    verify($result[0]['blocks'][0]['orientation'])->equals('vertical');
     expect($result[0]['blocks'][0]['styles'])->notEmpty();
-    expect(count($result[0]['blocks'][0]['blocks']))->equals(1);
-    expect(count($result[1]['blocks']))->equals(2);
+    verify(count($result[0]['blocks'][0]['blocks']))->equals(1);
+    verify(count($result[1]['blocks']))->equals(2);
   }
 
   public function testShouldAddCenteredImageForExcerptWithLayout() {
@@ -163,7 +163,7 @@ class PostContentTransformerTest extends \MailPoetTest {
 
     $transformer = $this->getTransformer($args, $this->contentMock, $this->titleMock, $this->imageMock);
     $result = $transformer->transform([]);
-    expect($result[0]['blocks'][0]['blocks'])->equals([$this->titleMock, $this->imageMock, $this->contentMock[0]]);
+    verify($result[0]['blocks'][0]['blocks'])->equals([$this->titleMock, $this->imageMock, $this->contentMock[0]]);
   }
 
   public function testShouldHandleOldStructureImagePositionValueAndAddImageForExcerptWithLayout() {
@@ -175,7 +175,7 @@ class PostContentTransformerTest extends \MailPoetTest {
 
     $transformer = $this->getTransformer($args, $this->contentMock, $this->titleMock, $this->imageMock);
     $result = $transformer->transform([]);
-    expect($result[0]['blocks'][0]['blocks'])->equals([$this->titleMock, $this->imageMock, $this->contentMock[0]]);
+    verify($result[0]['blocks'][0]['blocks'])->equals([$this->titleMock, $this->imageMock, $this->contentMock[0]]);
   }
 
   public function testShouldAddLeftPositionedImageForExcerptWithLayout() {
@@ -187,9 +187,9 @@ class PostContentTransformerTest extends \MailPoetTest {
 
     $transformer = $this->getTransformer($args, $this->contentMock, $this->titleMock, $this->imageMock);
     $result = $transformer->transform([]);
-    expect($result[0]['blocks'][0]['blocks'])->equals([$this->titleMock]);
-    expect($result[1]['blocks'][0]['blocks'])->equals([$this->imageMock]);
-    expect($result[1]['blocks'][1]['blocks'])->equals([$this->contentMock[0]]);
+    verify($result[0]['blocks'][0]['blocks'])->equals([$this->titleMock]);
+    verify($result[1]['blocks'][0]['blocks'])->equals([$this->imageMock]);
+    verify($result[1]['blocks'][1]['blocks'])->equals([$this->contentMock[0]]);
   }
 
   public function testShouldAddLeftPositionedImageForExcerptWithTitleAboveExcerpt() {
@@ -202,9 +202,9 @@ class PostContentTransformerTest extends \MailPoetTest {
 
     $transformer = $this->getTransformer($args, $this->contentMock, $this->titleMock, $this->imageMock);
     $result = $transformer->transform([]);
-    expect($result[0]['blocks'][0]['blocks'])->equals([$this->imageMock]);
-    expect($result[0]['blocks'][1]['blocks'][0])->equals($this->titleMock);
-    expect($result[0]['blocks'][1]['blocks'][1])->equals($this->contentMock[0]);
+    verify($result[0]['blocks'][0]['blocks'])->equals([$this->imageMock]);
+    verify($result[0]['blocks'][1]['blocks'][0])->equals($this->titleMock);
+    verify($result[0]['blocks'][1]['blocks'][1])->equals($this->contentMock[0]);
   }
 
   public function testShouldAddRightPositionedImageForExcerptWithLayout() {
@@ -216,9 +216,9 @@ class PostContentTransformerTest extends \MailPoetTest {
 
     $transformer = $this->getTransformer($args, $this->contentMock, $this->titleMock, $this->imageMock);
     $result = $transformer->transform([]);
-    expect($result[0]['blocks'][0]['blocks'])->equals([$this->titleMock]);
-    expect($result[1]['blocks'][0]['blocks'])->equals([$this->contentMock[0]]);
-    expect($result[1]['blocks'][1]['blocks'])->equals([$this->imageMock]);
+    verify($result[0]['blocks'][0]['blocks'])->equals([$this->titleMock]);
+    verify($result[1]['blocks'][0]['blocks'])->equals([$this->contentMock[0]]);
+    verify($result[1]['blocks'][1]['blocks'])->equals([$this->imageMock]);
   }
 
   public function testShouldNotAddImageForTitleOnlyWithLayout() {
@@ -230,7 +230,7 @@ class PostContentTransformerTest extends \MailPoetTest {
 
     $transformer = $this->getTransformer($args, $this->contentMock, $this->titleMock, $this->imageMock);
     $result = $transformer->transform([]);
-    expect($result[0]['blocks'][0]['blocks'])->equals([$this->titleMock, $this->contentMock[0]]);
+    verify($result[0]['blocks'][0]['blocks'])->equals([$this->titleMock, $this->contentMock[0]]);
   }
 
   public function testShouldAddImageForFullPost() {
@@ -242,9 +242,9 @@ class PostContentTransformerTest extends \MailPoetTest {
 
     $transformer = $this->getTransformer($args, $this->contentMock, $this->titleMock, $this->imageMock);
     $result = $transformer->transform([]);
-    expect($result[0]['blocks'][0]['blocks'][0])->equals($this->titleMock);
-    expect($result[0]['blocks'][0]['blocks'][1])->equals($this->imageMock);
-    expect($result[0]['blocks'][0]['blocks'][2])->equals($this->contentMock[0]);
+    verify($result[0]['blocks'][0]['blocks'][0])->equals($this->titleMock);
+    verify($result[0]['blocks'][0]['blocks'][1])->equals($this->imageMock);
+    verify($result[0]['blocks'][0]['blocks'][2])->equals($this->contentMock[0]);
     expect($result[0]['blocks'][0]['blocks'])->count(3);
   }
 
@@ -257,8 +257,8 @@ class PostContentTransformerTest extends \MailPoetTest {
 
     $transformer = $this->getTransformer($args, $this->contentMock, $this->titleMock, $this->imageMock);
     $result = $transformer->transform([]);
-    expect($result[0]['blocks'][0]['blocks'][0])->equals($this->titleMock);
-    expect($result[0]['blocks'][0]['blocks'][1])->equals($this->contentMock[0]);
+    verify($result[0]['blocks'][0]['blocks'][0])->equals($this->titleMock);
+    verify($result[0]['blocks'][0]['blocks'][1])->equals($this->contentMock[0]);
     expect($result[0]['blocks'][0]['blocks'])->count(2);
   }
 
@@ -271,9 +271,9 @@ class PostContentTransformerTest extends \MailPoetTest {
 
     $transformer = $this->getTransformer($args, $this->contentMock, $this->titleMock, $this->imageMock, true);
     $result = $transformer->transform([]);
-    expect($result[0]['blocks'][0]['blocks'][0])->equals($this->titleMock);
-    expect($result[0]['blocks'][0]['blocks'][1])->equals($this->imageMock);
-    expect($result[0]['blocks'][0]['blocks'][2])->equals($this->contentMock[0]);
+    verify($result[0]['blocks'][0]['blocks'][0])->equals($this->titleMock);
+    verify($result[0]['blocks'][0]['blocks'][1])->equals($this->imageMock);
+    verify($result[0]['blocks'][0]['blocks'][2])->equals($this->contentMock[0]);
     expect($result[0]['blocks'][0]['blocks'])->count(3);
   }
 
diff --git a/mailpoet/tests/integration/Newsletter/Links/LinksTest.php b/mailpoet/tests/integration/Newsletter/Links/LinksTest.php
index 5826ab1c7e..2407b86a67 100644
--- a/mailpoet/tests/integration/Newsletter/Links/LinksTest.php
+++ b/mailpoet/tests/integration/Newsletter/Links/LinksTest.php
@@ -37,7 +37,7 @@ class LinksTest extends \MailPoetTest {
     $template = '<a href="http://example.com">some site</a> http://link2.com <img src="http://link3.com">';
     $result = $this->links->extract($template);
 
-    expect($result[0])->equals(
+    verify($result[0])->equals(
       [
         'type' => Links::LINK_TYPE_URL,
         'link' => 'http://example.com',
@@ -48,7 +48,7 @@ class LinksTest extends \MailPoetTest {
   public function testItOnlyHashesAndReplacesLinksInAnchorTags() {
     $template = '<a href="http://example.com"><img src="http://example.com" /></a>';
     $result = $this->links->process($template, 0, 0);
-    expect($result[0])->equals(
+    verify($result[0])->equals(
       sprintf(
         '<a href="%s-%s"><img src="http://example.com" /></a>',
         Links::DATA_TAG_CLICK,
@@ -65,7 +65,7 @@ class LinksTest extends \MailPoetTest {
 
     $template = '<a href="http://example.com"><img src="http://example.com" /></a>';
     $result = $this->links->process($template, $link->getNewsletter()->getId(), $link->getQueue()->getId());
-    expect($result[0])->equals(
+    verify($result[0])->equals(
       sprintf(
         '<a href="%s-%s"><img src="http://example.com" /></a>',
         Links::DATA_TAG_CLICK,
@@ -78,7 +78,7 @@ class LinksTest extends \MailPoetTest {
     $template = '[notlink:shortcode] [link:some_link_shortcode]';
     $result = $this->links->extract($template);
 
-    expect($result[0])->equals(
+    verify($result[0])->equals(
       [
         'type' => Links::LINK_TYPE_SHORTCODE,
         'link' => '[link:some_link_shortcode]',
@@ -91,7 +91,7 @@ class LinksTest extends \MailPoetTest {
     list($updatedContent, $hashedLinks) = $this->links->process($template, 0, 0);
 
     // 2 links were hashed
-    expect(count($hashedLinks))->equals(2);
+    verify(count($hashedLinks))->equals(2);
     // links in returned content were replaced with hashes
     expect($updatedContent)
       ->stringContainsString(Links::DATA_TAG_CLICK . '-' . $hashedLinks[0]['hash']);
@@ -103,7 +103,7 @@ class LinksTest extends \MailPoetTest {
   public function testItHashesAndReplacesLinksWithSpecialCharacters() {
     $template = '<a href="http://сайт.cóm/彌撒時間">some site</a>';
     $result = $this->links->process($template, 0, 0);
-    expect($result[0])->equals(
+    verify($result[0])->equals(
       sprintf(
         '<a href="%s-%s">some site</a>',
         Links::DATA_TAG_CLICK,
@@ -151,10 +151,10 @@ class LinksTest extends \MailPoetTest {
       $data['preview']
     );
     // URL data object should be an indexed array
-    expect($urlDataObject)->equals(array_values($data));
+    verify($urlDataObject)->equals(array_values($data));
     // transformed URL object should be an associative array
     $transformedUrlDataObject = $this->links->transformUrlDataObject($urlDataObject);
-    expect($transformedUrlDataObject)->equals($data);
+    verify($transformedUrlDataObject)->equals($data);
   }
 
   public function testItReplacesHashedLinksWithSubscriberData() {
@@ -182,8 +182,8 @@ class LinksTest extends \MailPoetTest {
     foreach ($result['data'] as $data) {
       $data = Router::decodeRequestData($data);
       $data = $this->links->transformUrlDataObject($data);
-      expect($data['subscriber_id'])->equals($subscriber->getId());
-      expect($data['queue_id'])->equals($queue->getId());
+      verify($data['subscriber_id'])->equals($subscriber->getId());
+      verify($data['queue_id'])->equals($queue->getId());
       expect(isset($data['subscriber_token']))->true();
     }
   }
@@ -209,8 +209,8 @@ class LinksTest extends \MailPoetTest {
     // 1 database record was created
     $newsletterLink = $this->newsletterLinkRepository->findOneBy(['newsletter' => $newsletterId, 'queue' => $queueId]);
     $this->assertInstanceOf(NewsletterLinkEntity::class, $newsletterLink);
-    expect($newsletterLink->getHash())->equals('123');
-    expect($newsletterLink->getUrl())->equals('http://example.com');
+    verify($newsletterLink->getHash())->equals('123');
+    verify($newsletterLink->getUrl())->equals('http://example.com');
   }
 
   public function testItCanReuseAlreadySavedLinks() {
@@ -231,9 +231,9 @@ class LinksTest extends \MailPoetTest {
 
     list($content, $links) = $this->links->process('<a href="http://example.com">x</a>', $this->newsletter->getId(), 2);
     expect(is_array($links))->true();
-    expect(count($links))->equals(1);
-    expect($links[0]['hash'])->equals('123');
-    expect($links[0]['url'])->equals('http://example.com');
+    verify(count($links))->equals(1);
+    verify($links[0]['hash'])->equals('123');
+    verify($links[0]['url'])->equals('http://example.com');
   }
 
   public function testItMatchesHashedLinks() {
@@ -271,13 +271,13 @@ class LinksTest extends \MailPoetTest {
       ],
     ];
     $links = $this->links->ensureInstantUnsubscribeLink($links);
-    expect(count($links))->equals(2);
-    expect($links[1]['link'])->equals(NewsletterLinkEntity::INSTANT_UNSUBSCRIBE_LINK_SHORT_CODE);
-    expect($links[1]['type'])->equals(Links::LINK_TYPE_SHORTCODE);
+    verify(count($links))->equals(2);
+    verify($links[1]['link'])->equals(NewsletterLinkEntity::INSTANT_UNSUBSCRIBE_LINK_SHORT_CODE);
+    verify($links[1]['type'])->equals(Links::LINK_TYPE_SHORTCODE);
     expect($links[1])->hasKey('processed_link');
     expect($links[1])->hasKey('hash');
     $links = $this->links->ensureInstantUnsubscribeLink($links);
-    expect(count($links))->equals(2);
+    verify(count($links))->equals(2);
   }
 
   public function testItCanConvertAllHashedLinksToUrls() {
diff --git a/mailpoet/tests/integration/Newsletter/Listing/NewsletterListingRepositoryTest.php b/mailpoet/tests/integration/Newsletter/Listing/NewsletterListingRepositoryTest.php
index b4f13c5d46..d899c7e099 100644
--- a/mailpoet/tests/integration/Newsletter/Listing/NewsletterListingRepositoryTest.php
+++ b/mailpoet/tests/integration/Newsletter/Listing/NewsletterListingRepositoryTest.php
@@ -310,8 +310,8 @@ class NewsletterListingRepositoryTest extends \MailPoetTest {
     ]));
 
     expect($filters['segment'])->count(2); // All list + 1 segments
-    expect($filters['segment'][0]['label'])->equals('All Lists');
-    expect($filters['segment'][1]['label'])->equals('Segment 1 (1)');
-    expect($filters['segment'][1]['value'])->equals($segment1->getId());
+    verify($filters['segment'][0]['label'])->equals('All Lists');
+    verify($filters['segment'][1]['label'])->equals('Segment 1 (1)');
+    verify($filters['segment'][1]['value'])->equals($segment1->getId());
   }
 }
diff --git a/mailpoet/tests/integration/Newsletter/NewsletterHtmlSanitizerTest.php b/mailpoet/tests/integration/Newsletter/NewsletterHtmlSanitizerTest.php
index abff7cfbee..be92d3acf4 100644
--- a/mailpoet/tests/integration/Newsletter/NewsletterHtmlSanitizerTest.php
+++ b/mailpoet/tests/integration/Newsletter/NewsletterHtmlSanitizerTest.php
@@ -13,25 +13,25 @@ class NewsletterHtmlSanitizerTest extends \MailPoetTest {
   }
 
   public function testItKeepsAllowedTags() {
-    expect($this->sanitizer->sanitize(''))->equals('');
-    expect($this->sanitizer->sanitize('<span style="font-family: BioRhyme">Style</span>'))->equals('<span style="font-family: BioRhyme">Style</span>');
-    expect($this->sanitizer->sanitize('<span class="my-class">Class</span>'))->equals('<span class="my-class">Class</span>');
-    expect($this->sanitizer->sanitize('<h1>Heading one</h1><p>Some text</p>'))->equals('<h1>Heading one</h1><p>Some text</p>');
-    expect($this->sanitizer->sanitize('Text <span>👋</span> around'))->equals('Text <span>👋</span> around');
-    expect($this->sanitizer->sanitize('<strong>Strong</strong><em>Em</em><br />'))->equals('<strong>Strong</strong><em>Em</em><br />');
-    expect($this->sanitizer->sanitize('<ul><li>list 1</li><li>list 2</li></ul>'))->equals('<ul><li>list 1</li><li>list 2</li></ul>');
-    expect($this->sanitizer->sanitize('<table><tr><th>Head</th></tr><tr><td>Cell</td></tr></table>'))->equals('<table><tr><th>Head</th></tr><tr><td>Cell</td></tr></table>');
-    expect($this->sanitizer->sanitize('<a href="http://example.com/" target="_blank" class="some-class">link</a>'))->equals('<a href="http://example.com/" target="_blank" class="some-class">link</a>');
-    expect($this->sanitizer->sanitize('<a href="[link:subscribe]" target="_blank" style="color: blue;font-size: 12px">Subscribe</a>'))->equals('<a href="[link:subscribe]" target="_blank" style="color: blue;font-size: 12px">Subscribe</a>');
-    expect($this->sanitizer->sanitize('<span style="color:rgb(0,0,0)">Does not sanitize RGB</span>'))->equals('<span style="color:rgb(0,0,0)">Does not sanitize RGB</span>');
+    verify($this->sanitizer->sanitize(''))->equals('');
+    verify($this->sanitizer->sanitize('<span style="font-family: BioRhyme">Style</span>'))->equals('<span style="font-family: BioRhyme">Style</span>');
+    verify($this->sanitizer->sanitize('<span class="my-class">Class</span>'))->equals('<span class="my-class">Class</span>');
+    verify($this->sanitizer->sanitize('<h1>Heading one</h1><p>Some text</p>'))->equals('<h1>Heading one</h1><p>Some text</p>');
+    verify($this->sanitizer->sanitize('Text <span>👋</span> around'))->equals('Text <span>👋</span> around');
+    verify($this->sanitizer->sanitize('<strong>Strong</strong><em>Em</em><br />'))->equals('<strong>Strong</strong><em>Em</em><br />');
+    verify($this->sanitizer->sanitize('<ul><li>list 1</li><li>list 2</li></ul>'))->equals('<ul><li>list 1</li><li>list 2</li></ul>');
+    verify($this->sanitizer->sanitize('<table><tr><th>Head</th></tr><tr><td>Cell</td></tr></table>'))->equals('<table><tr><th>Head</th></tr><tr><td>Cell</td></tr></table>');
+    verify($this->sanitizer->sanitize('<a href="http://example.com/" target="_blank" class="some-class">link</a>'))->equals('<a href="http://example.com/" target="_blank" class="some-class">link</a>');
+    verify($this->sanitizer->sanitize('<a href="[link:subscribe]" target="_blank" style="color: blue;font-size: 12px">Subscribe</a>'))->equals('<a href="[link:subscribe]" target="_blank" style="color: blue;font-size: 12px">Subscribe</a>');
+    verify($this->sanitizer->sanitize('<span style="color:rgb(0,0,0)">Does not sanitize RGB</span>'))->equals('<span style="color:rgb(0,0,0)">Does not sanitize RGB</span>');
   }
 
   public function testItRemovesUnwantedHtml() {
-    expect($this->sanitizer->sanitize('<script>'))->equals('');
-    expect($this->sanitizer->sanitize('<span>Hello<img src="http://nonsense" onerror="alert(1)"/></span>'))->equals('<span>Hello</span>');
-    expect($this->sanitizer->sanitize('<a href="#" onclick="alert(1)">click me</a>'))->equals('<a href="#">click me</a>');
-    expect($this->sanitizer->sanitize('<a href="javascript:alert(1)">click me</a>'))->equals('<a href="alert(1)">click me</a>');
-    expect($this->sanitizer->sanitize('<p>Thanks<img src=x onerror=alert(4)> See you soon!</p>'))->equals('<p>Thanks See you soon!</p>');
-    expect($this->sanitizer->sanitize('<img class="wp-image-55" style="width: 150px;height: 1px" src="http://test.com/logo-1.jpg" alt="alt text">'))->equals('');
+    verify($this->sanitizer->sanitize('<script>'))->equals('');
+    verify($this->sanitizer->sanitize('<span>Hello<img src="http://nonsense" onerror="alert(1)"/></span>'))->equals('<span>Hello</span>');
+    verify($this->sanitizer->sanitize('<a href="#" onclick="alert(1)">click me</a>'))->equals('<a href="#">click me</a>');
+    verify($this->sanitizer->sanitize('<a href="javascript:alert(1)">click me</a>'))->equals('<a href="alert(1)">click me</a>');
+    verify($this->sanitizer->sanitize('<p>Thanks<img src=x onerror=alert(4)> See you soon!</p>'))->equals('<p>Thanks See you soon!</p>');
+    verify($this->sanitizer->sanitize('<img class="wp-image-55" style="width: 150px;height: 1px" src="http://test.com/logo-1.jpg" alt="alt text">'))->equals('');
   }
 }
diff --git a/mailpoet/tests/integration/Newsletter/NewsletterRepositoryTest.php b/mailpoet/tests/integration/Newsletter/NewsletterRepositoryTest.php
index e7df6dc38e..eb01e8717e 100644
--- a/mailpoet/tests/integration/Newsletter/NewsletterRepositoryTest.php
+++ b/mailpoet/tests/integration/Newsletter/NewsletterRepositoryTest.php
@@ -95,8 +95,8 @@ class NewsletterRepositoryTest extends \MailPoetTest {
     // Should trash the newsletters
     expect($standardNewsletter->getDeletedAt())->null();
     expect($notification->getDeletedAt())->null();
-    expect($standardNewsletter->getStatus())->equals(NewsletterEntity::STATUS_SENDING);
-    expect($notification->getStatus())->equals(NewsletterEntity::STATUS_ACTIVE);
+    verify($standardNewsletter->getStatus())->equals(NewsletterEntity::STATUS_SENDING);
+    verify($notification->getStatus())->equals(NewsletterEntity::STATUS_ACTIVE);
 
     // Should restore sending queue and task
     $standardQueue = $standardNewsletter->getLatestQueue();
@@ -108,7 +108,7 @@ class NewsletterRepositoryTest extends \MailPoetTest {
     $this->entityManager->refresh($scheduledTask);
     expect($scheduledTask->getDeletedAt())->null();
     // Pause sending tasks which were in progress
-    expect($scheduledTask->getStatus())->equals(ScheduledTaskEntity::STATUS_PAUSED);
+    verify($scheduledTask->getStatus())->equals(ScheduledTaskEntity::STATUS_PAUSED);
 
     // Should restore children + task + queue
     $this->entityManager->refresh($notificationHistory);
@@ -121,7 +121,7 @@ class NewsletterRepositoryTest extends \MailPoetTest {
     $this->assertInstanceOf(ScheduledTaskEntity::class, $scheduledTask);
     $this->entityManager->refresh($scheduledTask);
     expect($scheduledTask->getDeletedAt())->null();
-    expect($scheduledTask->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
+    verify($scheduledTask->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
   }
 
   public function testItBulkDeleteNewslettersAndChildren() {
@@ -285,8 +285,8 @@ class NewsletterRepositoryTest extends \MailPoetTest {
     $results = $this->repository->getArchives(['segmentIds' => [$segment->getId()]]);
 
     expect($results)->count(1);
-    expect($results[0]->getId())->equals($newsletters[1]->getId());
-    expect($results[0]->getType())->equals(NewsletterEntity::TYPE_NOTIFICATION_HISTORY);
+    verify($results[0]->getId())->equals($newsletters[1]->getId());
+    verify($results[0]->getType())->equals(NewsletterEntity::TYPE_NOTIFICATION_HISTORY);
   }
 
   public function testItGetsAllArchiveNewsletters() {
@@ -320,10 +320,10 @@ class NewsletterRepositoryTest extends \MailPoetTest {
     $results = $this->repository->getArchives();
 
     expect($results)->count(2);
-    expect($results[0]->getId())->equals($newsletters[1]->getId());
-    expect($results[0]->getType())->equals(NewsletterEntity::TYPE_STANDARD);
-    expect($results[1]->getId())->equals($newsletters[6]->getId());
-    expect($results[1]->getType())->equals(NewsletterEntity::TYPE_NOTIFICATION_HISTORY);
+    verify($results[0]->getId())->equals($newsletters[1]->getId());
+    verify($results[0]->getType())->equals(NewsletterEntity::TYPE_STANDARD);
+    verify($results[1]->getId())->equals($newsletters[6]->getId());
+    verify($results[1]->getType())->equals(NewsletterEntity::TYPE_NOTIFICATION_HISTORY);
   }
 
   private function createNewsletter(string $type, string $status = NewsletterEntity::STATUS_DRAFT, $parent = null): NewsletterEntity {
diff --git a/mailpoet/tests/integration/Newsletter/NewsletterSaveControllerTest.php b/mailpoet/tests/integration/Newsletter/NewsletterSaveControllerTest.php
index 1522959390..f2329de715 100644
--- a/mailpoet/tests/integration/Newsletter/NewsletterSaveControllerTest.php
+++ b/mailpoet/tests/integration/Newsletter/NewsletterSaveControllerTest.php
@@ -47,15 +47,15 @@ class NewsletterSaveControllerTest extends \MailPoetTest {
     ];
 
     $newsletter = $this->saveController->save($newsletterData);
-    expect($newsletter->getType())->equals('Updated type');
-    expect($newsletter->getSubject())->equals('Updated subject');
-    expect($newsletter->getPreheader())->equals('Updated preheader');
-    expect($newsletter->getBody())->equals(['value' => 'Updated body']);
-    expect($newsletter->getSenderName())->equals('Updated sender name');
-    expect($newsletter->getSenderAddress())->equals('Updated sender address');
-    expect($newsletter->getReplyToName())->equals('Updated reply-to name');
-    expect($newsletter->getReplyToAddress())->equals('Updated reply-to address');
-    expect($newsletter->getGaCampaign())->equals('Updated GA campaign');
+    verify($newsletter->getType())->equals('Updated type');
+    verify($newsletter->getSubject())->equals('Updated subject');
+    verify($newsletter->getPreheader())->equals('Updated preheader');
+    verify($newsletter->getBody())->equals(['value' => 'Updated body']);
+    verify($newsletter->getSenderName())->equals('Updated sender name');
+    verify($newsletter->getSenderAddress())->equals('Updated sender address');
+    verify($newsletter->getReplyToName())->equals('Updated reply-to name');
+    verify($newsletter->getReplyToAddress())->equals('Updated reply-to address');
+    verify($newsletter->getGaCampaign())->equals('Updated GA campaign');
   }
 
   public function testItDoesNotRerenderPostNotificationsUponUpdate() {
@@ -117,7 +117,7 @@ class NewsletterSaveControllerTest extends \MailPoetTest {
     })->first();
 
     $this->assertInstanceOf(NewsletterOptionEntity::class, $scheduleOption); // PHPStan
-    expect($scheduleOption->getValue())->equals('0 14 * * 1');
+    verify($scheduleOption->getValue())->equals('0 14 * * 1');
 
     // schedule should be recalculated when options change
     $newsletterData['options']['intervalType'] = PostNotificationScheduler::INTERVAL_IMMEDIATELY;
@@ -129,7 +129,7 @@ class NewsletterSaveControllerTest extends \MailPoetTest {
     })->first();
 
     $this->assertInstanceOf(NewsletterOptionEntity::class, $scheduleOption); // PHPStan
-    expect($scheduleOption->getValue())->equals('* * * * *');
+    verify($scheduleOption->getValue())->equals('* * * * *');
   }
 
   public function testItCanReschedulePreviouslyScheduledSendingQueueJobs() {
@@ -173,7 +173,7 @@ class NewsletterSaveControllerTest extends \MailPoetTest {
     expect($task1->getScheduledAt())->notEquals($currentTime);
     $this->assertInstanceOf(NewsletterOptionEntity::class, $scheduleOption); // PHPStan
 
-    expect($task1->getScheduledAt())->equals($this->scheduler->getNextRunDate($scheduleOption->getValue()));
+    verify($task1->getScheduledAt())->equals($this->scheduler->getNextRunDate($scheduleOption->getValue()));
     expect($task2->getScheduledAt())->null();
   }
 
@@ -194,12 +194,12 @@ class NewsletterSaveControllerTest extends \MailPoetTest {
     ];
 
     $newsletter = $this->saveController->save($newsletterData);
-    expect(count($newsletter->getNewsletterSegments()))->equals(1);
+    verify(count($newsletter->getNewsletterSegments()))->equals(1);
     $newsletterSegment = $newsletter->getNewsletterSegments()->first();
     $this->assertInstanceOf(NewsletterSegmentEntity::class, $newsletterSegment); // PHPStan
     $segment = $newsletterSegment->getSegment();
     $this->assertInstanceOf(SegmentEntity::class, $segment); // PHPStan
-    expect($segment->getName())->equals('Segment 1');
+    verify($segment->getName())->equals('Segment 1');
   }
 
   public function testItDoesNotSaveSegmentsForAutomationEmails() {
@@ -218,7 +218,7 @@ class NewsletterSaveControllerTest extends \MailPoetTest {
     ];
 
     $newsletter = $this->saveController->save($newsletterData);
-    expect(count($newsletter->getNewsletterSegments()))->equals(0);
+    verify(count($newsletter->getNewsletterSegments()))->equals(0);
   }
 
   public function testItDeletesSendingQueueAndSetsNewsletterStatusToDraftWhenItIsUnscheduled() {
@@ -243,7 +243,7 @@ class NewsletterSaveControllerTest extends \MailPoetTest {
     ];
 
     $newsletter = $this->saveController->save($newsletterData);
-    expect($newsletter->getStatus())->equals(NewsletterEntity::STATUS_DRAFT);
+    verify($newsletter->getStatus())->equals(NewsletterEntity::STATUS_DRAFT);
     expect($newsletter->getLatestQueue())->null();
     expect($this->diContainer->get(SendingQueuesRepository::class)->findOneById($queueId))->null();
   }
@@ -307,12 +307,12 @@ class NewsletterSaveControllerTest extends \MailPoetTest {
   public function testItDuplicatesNewsletter() {
     $newsletter = $this->createNewsletter(NewsletterEntity::TYPE_STANDARD, NewsletterEntity::STATUS_SENT);
     $duplicate = $this->saveController->duplicate($newsletter);
-    expect($duplicate->getSubject())->equals('Copy of ' . $newsletter->getSubject());
+    verify($duplicate->getSubject())->equals('Copy of ' . $newsletter->getSubject());
     expect($duplicate->getHash())->string();
     expect($duplicate->getHash())->notEmpty();
     expect($duplicate->getHash())->notEquals($newsletter->getHash());
-    expect($duplicate->getBody())->equals($newsletter->getBody());
-    expect($duplicate->getStatus())->equals(NewsletterEntity::STATUS_DRAFT);
+    verify($duplicate->getBody())->equals($newsletter->getBody());
+    verify($duplicate->getStatus())->equals(NewsletterEntity::STATUS_DRAFT);
   }
 
   public function testItDuplicatesNewsletterWithAssociatedPost() {
@@ -324,7 +324,7 @@ class NewsletterSaveControllerTest extends \MailPoetTest {
     $duplicate = $this->saveController->duplicate($newsletter);
     expect($duplicate->getWpPostId())->notEquals($postId);
     $post = $wp->getPost($duplicate->getWpPostId());
-    expect($post->post_content)->equals('newsletter content'); // @phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($post->post_content)->equals('newsletter content'); // @phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
   }
 
   public function testItCreatesNewNewsletter() {
@@ -334,8 +334,8 @@ class NewsletterSaveControllerTest extends \MailPoetTest {
     ];
 
     $newsletter = $this->saveController->save($data);
-    expect($newsletter->getSubject())->equals($data['subject']);
-    expect($newsletter->getType())->equals($data['type']);
+    verify($newsletter->getSubject())->equals($data['subject']);
+    verify($newsletter->getType())->equals($data['type']);
     expect($newsletter->getHash())->notNull();
     expect($newsletter->getId())->notNull();
   }
diff --git a/mailpoet/tests/integration/Newsletter/NewsletterValidatorTest.php b/mailpoet/tests/integration/Newsletter/NewsletterValidatorTest.php
index df9f68d693..13e3c3c683 100644
--- a/mailpoet/tests/integration/Newsletter/NewsletterValidatorTest.php
+++ b/mailpoet/tests/integration/Newsletter/NewsletterValidatorTest.php
@@ -28,19 +28,19 @@ class NewsletterValidatorTest extends \MailPoetTest {
     $bridge = Stub::make(Bridge::class, ['isMailpoetSendingServiceEnabled' => true]);
     $validator = $this->getServiceWithOverrides(NewsletterValidator::class, ['bridge' => $bridge]);
     $validationError = $validator->validate($newsletter);
-    expect($validationError)->equals('All emails must include an "Unsubscribe" link. Add a footer widget to your email to continue.');
+    verify($validationError)->equals('All emails must include an "Unsubscribe" link. Add a footer widget to your email to continue.');
   }
 
   public function testItRequiresBodyContent() {
     $newsletter = (new Newsletter())->withBody('')->create();
     $validationError = $this->newsletterValidator->validate($newsletter);
-    expect($validationError)->equals('Poet, please add prose to your masterpiece before you send it to your followers.');
+    verify($validationError)->equals('Poet, please add prose to your masterpiece before you send it to your followers.');
   }
 
   public function testItRequiresContentBlocks() {
     $newsletter = (new Newsletter())->withBody(['content' => ['type' => 'container', 'columnLayout' => false, 'orientation' => 'vertical', 'blocks' => []]])->create();
     $validationError = $this->newsletterValidator->validate($newsletter);
-    expect($validationError)->equals('Poet, please add prose to your masterpiece before you send it to your followers.');
+    verify($validationError)->equals('Poet, please add prose to your masterpiece before you send it to your followers.');
   }
 
   public function testItIsValidWithAContentBlock() {
@@ -57,7 +57,7 @@ class NewsletterValidatorTest extends \MailPoetTest {
   public function testItRequiresReengagementShortcodes() {
     $newsletter = (new Newsletter())->withReengagementType()->withDefaultBody()->create();
     $validationError = $this->newsletterValidator->validate($newsletter);
-    expect($validationError)->equals('A re-engagement email must include a link with [link:subscription_re_engage_url] shortcode.');
+    verify($validationError)->equals('A re-engagement email must include a link with [link:subscription_re_engage_url] shortcode.');
   }
 
   public function testReengagementNewsletterIsValidWithRequiredShortcode() {
@@ -90,13 +90,13 @@ class NewsletterValidatorTest extends \MailPoetTest {
       'trackingConfig' => Stub::make(TrackingConfig::class, ['isEmailTrackingEnabled' => false]),
     ]);
     $validationError = $validator->validate($newsletter);
-    expect($validationError)->equals('Re-engagement emails are disabled because open and click tracking is disabled in MailPoet → Settings → Advanced.');
+    verify($validationError)->equals('Re-engagement emails are disabled because open and click tracking is disabled in MailPoet → Settings → Advanced.');
   }
 
   public function testAlcEmailFailsValidationWithoutAlcBlock() {
     $newsletter = (new Newsletter())->withDefaultBody()->withPostNotificationsType()->create();
     $validationError = $this->newsletterValidator->validate($newsletter);
-    expect($validationError)->equals('Please add an “Automatic Latest Content” widget to the email from the right sidebar.');
+    verify($validationError)->equals('Please add an “Automatic Latest Content” widget to the email from the right sidebar.');
   }
 
   public function testAlcEmailPassesWithAlcBlock() {
diff --git a/mailpoet/tests/integration/Newsletter/Preview/SendPreviewControllerTest.php b/mailpoet/tests/integration/Newsletter/Preview/SendPreviewControllerTest.php
index 1061d97f1d..dc7015db5b 100644
--- a/mailpoet/tests/integration/Newsletter/Preview/SendPreviewControllerTest.php
+++ b/mailpoet/tests/integration/Newsletter/Preview/SendPreviewControllerTest.php
@@ -67,9 +67,9 @@ class SendPreviewControllerTest extends \MailPoetTest {
 
           expect(is_array($newsletter))->true();
           expect($newsletter['body']['text'])->stringContainsString('Hello test');
-          expect($subscriber)->equals($subscriber);
-          expect($extraParams['unsubscribe_url'])->equals(home_url());
-          expect($extraParams['meta'])->equals($mailerMetaInfo->getPreviewMetaInfo());
+          verify($subscriber)->equals($subscriber);
+          verify($extraParams['unsubscribe_url'])->equals(home_url());
+          verify($extraParams['meta'])->equals($mailerMetaInfo->getPreviewMetaInfo());
 
           // system links are replaced with hashes
           expect($newsletter['body']['html'])->stringContainsString('href="' . $viewInBrowserLink . '">View in browser');
@@ -100,7 +100,7 @@ class SendPreviewControllerTest extends \MailPoetTest {
       'send' => function ($newsletter, $subscriber) {
         expect(is_array($newsletter))->true();
         expect($newsletter['body']['text'])->stringContainsString('Hello test');
-        expect($subscriber)->equals($subscriber);
+        verify($subscriber)->equals($subscriber);
         return [
           'response' => false,
           'error' => $this->make(MailerError::class, [
diff --git a/mailpoet/tests/integration/Newsletter/RendererTest.php b/mailpoet/tests/integration/Newsletter/RendererTest.php
index 6fe313bddb..a88126425b 100644
--- a/mailpoet/tests/integration/Newsletter/RendererTest.php
+++ b/mailpoet/tests/integration/Newsletter/RendererTest.php
@@ -79,12 +79,12 @@ class RendererTest extends \MailPoetTest {
     //  2x column
     //  3x column
     //  1x footer
-    expect(count($DOM('.mailpoet_cols-one')))->equals(2);
-    expect(count($DOM('.mailpoet_cols-two')))->equals(2);
-    expect(count($DOM('.mailpoet_cols-three')))->equals(3);
+    verify(count($DOM('.mailpoet_cols-one')))->equals(2);
+    verify(count($DOM('.mailpoet_cols-two')))->equals(2);
+    verify(count($DOM('.mailpoet_cols-three')))->equals(3);
 
     // nested vertical container should be rendered
-    expect(count($DOM('.nested-vertical-container')))->equals(1);
+    verify(count($DOM('.nested-vertical-container')))->equals(1);
   }
 
   public function testItRendersOneColumn() {
@@ -109,7 +109,7 @@ class RendererTest extends \MailPoetTest {
     foreach ($DOM('table.mailpoet_cols-one > tbody') as $column) {
       $renderedColumnContent[] = trim($column->text());
     };
-    expect($renderedColumnContent)->equals($columnContent);
+    verify($renderedColumnContent)->equals($columnContent);
     expect((string)$DOM)->stringContainsString(' bgcolor="#999999"');
   }
 
@@ -136,7 +136,7 @@ class RendererTest extends \MailPoetTest {
     foreach ($DOM('table.mailpoet_cols-two > tbody') as $column) {
       $renderedColumnContent[] = trim($column->text());
     };
-    expect($renderedColumnContent)->equals($columnContent);
+    verify($renderedColumnContent)->equals($columnContent);
     expect((string)$DOM)->stringContainsString(' bgcolor="#999999"');
   }
 
@@ -164,7 +164,7 @@ class RendererTest extends \MailPoetTest {
     foreach ($DOM('table.mailpoet_cols-three > tbody') as $column) {
       $renderedColumnContent[] = trim($column->text());
     };
-    expect($renderedColumnContent)->equals($columnContent);
+    verify($renderedColumnContent)->equals($columnContent);
     expect((string)$DOM)->stringContainsString(' bgcolor="#999999"');
   }
 
@@ -272,7 +272,7 @@ class RendererTest extends \MailPoetTest {
     $template = $newsletter['content']['blocks'][0]['blocks'][0]['blocks'][1];
     $DOM = $this->dOMParser->parseStr((new Image)->render($template, self::COLUMN_BASE_WIDTH));
     // element should be properly nested, it's width set and style applied
-    expect($DOM('tr > td > img', 0)->attr('width'))->equals(620);
+    verify($DOM('tr > td > img', 0)->attr('width'))->equals(620);
   }
 
   public function testItRendersAlignedImage() {
@@ -281,21 +281,21 @@ class RendererTest extends \MailPoetTest {
     // default alignment (center)
     unset($template['styles']['block']['textAlign']);
     $DOM = $this->dOMParser->parseStr((new Image)->render($template, $columnCount = 1));
-    expect($DOM('tr > td', 0)->attr('align'))->equals('center');
+    verify($DOM('tr > td', 0)->attr('align'))->equals('center');
     $template['styles']['block']['textAlign'] = 'center';
     $DOM = $this->dOMParser->parseStr((new Image)->render($template, $columnCount = 1));
-    expect($DOM('tr > td', 0)->attr('align'))->equals('center');
+    verify($DOM('tr > td', 0)->attr('align'))->equals('center');
     $template['styles']['block']['textAlign'] = 'something odd';
     $DOM = $this->dOMParser->parseStr((new Image)->render($template, $columnCount = 1));
-    expect($DOM('tr > td', 0)->attr('align'))->equals('center');
+    verify($DOM('tr > td', 0)->attr('align'))->equals('center');
     // left alignment
     $template['styles']['block']['textAlign'] = 'left';
     $DOM = $this->dOMParser->parseStr((new Image)->render($template, $columnCount = 1));
-    expect($DOM('tr > td', 0)->attr('align'))->equals('left');
+    verify($DOM('tr > td', 0)->attr('align'))->equals('left');
     // right alignment
     $template['styles']['block']['textAlign'] = 'right';
     $DOM = $this->dOMParser->parseStr((new Image)->render($template, $columnCount = 1));
-    expect($DOM('tr > td', 0)->attr('align'))->equals('right');
+    verify($DOM('tr > td', 0)->attr('align'))->equals('right');
   }
 
   public function testItDoesNotRenderImageWithoutSrc() {
@@ -307,7 +307,7 @@ class RendererTest extends \MailPoetTest {
       'alt' => 'some test alt text',
     ];
     $renderedImage = (new Image)->render($image, self::COLUMN_BASE_WIDTH);
-    expect($renderedImage)->equals('');
+    verify($renderedImage)->equals('');
   }
 
   public function testItForcesAbsoluteSrcForImages() {
@@ -342,7 +342,7 @@ class RendererTest extends \MailPoetTest {
     $DOM = $this->dOMParser->parseStr((new Image)->render($template, self::COLUMN_BASE_WIDTH));
     // element should be wrapped in <a> tag
     expect($DOM('tr > td > a', 0)->html())->stringContainsString('<img');
-    expect($DOM('tr > td > a', 0)->attr('href'))->equals($template['link']);
+    verify($DOM('tr > td > a', 0)->attr('href'))->equals($template['link']);
   }
 
   public function testItAdjustsImageDimensions() {
@@ -353,25 +353,25 @@ class RendererTest extends \MailPoetTest {
       'fullWidth' => true,
     ];
     $newImageDimensions = (new Image)->adjustImageDimensions($image, self::COLUMN_BASE_WIDTH);
-    expect($newImageDimensions['width'])->equals(660);
-    expect($newImageDimensions['height'])->equals(495);
+    verify($newImageDimensions['width'])->equals(660);
+    verify($newImageDimensions['height'])->equals(495);
     // nothing happens when image width = column width
     $image['width'] = 661;
     $newImageDimensions = (new Image)->adjustImageDimensions($image, self::COLUMN_BASE_WIDTH);
-    expect($newImageDimensions['width'])->equals(660);
+    verify($newImageDimensions['width'])->equals(660);
     // nothing happens when image width < column width
     $image['width'] = 659;
     $newImageDimensions = (new Image)->adjustImageDimensions($image, self::COLUMN_BASE_WIDTH);
-    expect($newImageDimensions['width'])->equals(659);
+    verify($newImageDimensions['width'])->equals(659);
     // image is reduced by 40px when it's width > padded column width
     $image['width'] = 621;
     $image['fullWidth'] = false;
     $newImageDimensions = (new Image)->adjustImageDimensions($image, self::COLUMN_BASE_WIDTH);
-    expect($newImageDimensions['width'])->equals(620);
+    verify($newImageDimensions['width'])->equals(620);
     // nothing happens when image with < padded column width
     $image['width'] = 619;
     $newImageDimensions = (new Image)->adjustImageDimensions($image, self::COLUMN_BASE_WIDTH);
-    expect($newImageDimensions['width'])->equals(619);
+    verify($newImageDimensions['width'])->equals(619);
   }
 
   public function testItRendersImageWithAutoDimensions() {
@@ -447,7 +447,7 @@ class RendererTest extends \MailPoetTest {
     // trailing line breaks should be cut off, but not inside an element
     $template = $newsletter['content']['blocks'][0]['blocks'][0]['blocks'][8];
     $DOM = $this->dOMParser->parseStr((new Text)->render($template));
-    expect(count($DOM('tr > td > br', 0)))
+    verify(count($DOM('tr > td > br', 0)))
       ->equals(0);
     expect($DOM('tr > td > h3', 0)->html())
       ->stringContainsString('<a');
@@ -458,7 +458,7 @@ class RendererTest extends \MailPoetTest {
     $template = $newsletter['content']['blocks'][0]['blocks'][0]['blocks'][3];
     $DOM = $this->dOMParser->parseStr((new Divider)->render($template));
     // element should be properly nested and its border-top-width set
-    expect(
+    verify(
       preg_match(
         '/border-top-width: 3px/',
         $DOM('tr > td.mailpoet_divider > table > tr > td.mailpoet_divider-cell', 0)->attr('style')
@@ -470,7 +470,7 @@ class RendererTest extends \MailPoetTest {
     $template = $newsletter['content']['blocks'][0]['blocks'][0]['blocks'][4];
     $DOM = $this->dOMParser->parseStr((new Spacer)->render($template));
     // element should be properly nested and its height set
-    expect($DOM('tr > td.mailpoet_spacer', 0)->attr('height'))->equals(50);
+    verify($DOM('tr > td.mailpoet_spacer', 0)->attr('height'))->equals(50);
   }
 
   public function testItSetsSpacerBackground() {
@@ -480,7 +480,7 @@ class RendererTest extends \MailPoetTest {
     expect($DOM('tr > td.mailpoet_spacer', 0)->attr('bgcolor'))->null();
     $template['styles']['block']['backgroundColor'] = '#ffff';
     $DOM = $this->dOMParser->parseStr((new Spacer)->render($template));
-    expect($DOM('tr > td.mailpoet_spacer', 0)->attr('bgcolor'))
+    verify($DOM('tr > td.mailpoet_spacer', 0)->attr('bgcolor'))
       ->equals('#ffff');
   }
 
@@ -489,7 +489,7 @@ class RendererTest extends \MailPoetTest {
     $template = $newsletter['content']['blocks'][0]['blocks'][0]['blocks'][5];
     $template['styles']['block']['width'] = '700px';
     $buttonWidth = (new Button)->calculateWidth($template, self::COLUMN_BASE_WIDTH);
-    expect($buttonWidth)->equals('618px'); //(width - (2 * border width)
+    verify($buttonWidth)->equals('618px'); //(width - (2 * border width)
   }
 
   public function testItRendersButton() {
@@ -500,27 +500,27 @@ class RendererTest extends \MailPoetTest {
     expect(
       $DOM('tr > td > div > table > tr > td > a.mailpoet_button', 0)->html()
     )->notEmpty();
-    expect(
+    verify(
       preg_match(
         '/line-height: 30px/',
         $DOM('a.mailpoet_button', 0)->attr('style'))
     )->equals(1);
-    expect(
+    verify(
       preg_match(
         '/arcsize="' . round(20 / 30 * 100) . '%"/',
         $DOM('tr > td > div > table > tr > td', 0)->text())
     )->equals(1);
-    expect(
+    verify(
       preg_match(
         '/style="height:30px.*?width:98px/',
         $DOM('tr > td > div > table > tr > td', 0)->text())
     )->equals(1);
-    expect(
+    verify(
       preg_match(
         '/style="color:#ffffff.*?font-family:Arial.*?font-size:14px/',
         $DOM('tr > td > div > table > tr > td', 0)->text())
     )->equals(1);
-    expect(
+    verify(
       preg_match(
         '/fillcolor="#666666/',
         $DOM('tr > td > div > table > tr > td', 0)->text())
@@ -532,7 +532,7 @@ class RendererTest extends \MailPoetTest {
     $template = $newsletter['content']['blocks'][0]['blocks'][0]['blocks'][5];
     $template['styles']['block']['fontFamily'] = 'Lucida';
     $DOM = $this->dOMParser->parseStr((new Button)->render($template, self::COLUMN_BASE_WIDTH));
-    expect(
+    verify(
       preg_match(
         '/font-family: \'Lucida Sans Unicode\', \'Lucida Grande\', sans-serif/',
         $DOM('a.mailpoet_button', 0)->attr('style'))
@@ -546,11 +546,11 @@ class RendererTest extends \MailPoetTest {
     // element should be properly nested, contain social icons and
     // image source/link href/alt should be  properly set
     expect($DOM('tr > td', 0)->html())->notEmpty();
-    expect($DOM('a', 0)->attr('href'))->equals('http://example.com');
+    verify($DOM('a', 0)->attr('href'))->equals('http://example.com');
     expect($DOM('td > a:nth-of-type(10) > img')->attr('src'))->stringContainsString('custom.png');
-    expect($DOM('td > a:nth-of-type(10) > img')->attr('alt'))->equals('custom');
+    verify($DOM('td > a:nth-of-type(10) > img')->attr('alt'))->equals('custom');
     // there should be 10 icons
-    expect(count($DOM('a > img')))->equals(10);
+    verify(count($DOM('a > img')))->equals(10);
   }
 
   public function testItDoesNotRenderSocialIconsWithoutImageSrc() {
@@ -564,7 +564,7 @@ class RendererTest extends \MailPoetTest {
       ],
     ];
     $renderedBlock = (new Social)->render($block);
-    expect($renderedBlock)->equals('');
+    verify($renderedBlock)->equals('');
   }
 
   public function testItRendersFooter() {
@@ -585,7 +585,7 @@ class RendererTest extends \MailPoetTest {
     $template = $this->renderer->render($this->newsletter);
     $DOM = $this->dOMParser->parseStr($template['html']);
     $subject = trim($DOM('title')->text());
-    expect($subject)->equals($this->newsletter->getSubject());
+    verify($subject)->equals($this->newsletter->getSubject());
   }
 
   public function testItSetsPreheader() {
@@ -595,7 +595,7 @@ class RendererTest extends \MailPoetTest {
     $template = $this->renderer->render($this->newsletter);
     $DOM = $this->dOMParser->parseStr($template['html']);
     $preheader = trim($DOM('td.mailpoet_preheader')->text());
-    expect($preheader)->equals($this->newsletter->getPreheader());
+    verify($preheader)->equals($this->newsletter->getPreheader());
   }
 
   public function testItDoesNotAddMailpoetLogoWhenUserIsPaying() {
@@ -634,15 +634,15 @@ class RendererTest extends \MailPoetTest {
     $this->newsletter->setBody($body);
     $template = $this->renderer->render($this->newsletter);
     // !important should be stripped from everywhere except from with the <style> tag
-    expect(preg_match('/<style.*?important/s', $template['html']))->equals(1);
-    expect(preg_match('/mailpoet_template.*?important/s', $template['html']))->equals(0);
+    verify(preg_match('/<style.*?important/s', $template['html']))->equals(1);
+    verify(preg_match('/mailpoet_template.*?important/s', $template['html']))->equals(0);
 
     // spaces are only replaces in image tag URLs
-    expect(preg_match('/image%20with%20space.jpg/s', $template['html']))->equals(1);
-    expect(preg_match('/link%20with%20space.jpg/s', $template['html']))->equals(0);
+    verify(preg_match('/image%20with%20space.jpg/s', $template['html']))->equals(1);
+    verify(preg_match('/link%20with%20space.jpg/s', $template['html']))->equals(0);
 
     // non mso condition for button is rendered correctly
-    expect(preg_match('/<\!--\[if \!mso\]><\!-- -->\s+<a class=\"mailpoet\_button\".+<\/a>\s+<\!--<\!\[endif\]-->/s', $template['html']))->equals(1);
+    verify(preg_match('/<\!--\[if \!mso\]><\!-- -->\s+<a class=\"mailpoet\_button\".+<\/a>\s+<\!--<\!\[endif\]-->/s', $template['html']))->equals(1);
   }
 
   // Test case for MAILPOET-3660
diff --git a/mailpoet/tests/integration/Newsletter/Scheduler/AutomaticEmailTest.php b/mailpoet/tests/integration/Newsletter/Scheduler/AutomaticEmailTest.php
index e106fd20b9..92e7cb5d03 100644
--- a/mailpoet/tests/integration/Newsletter/Scheduler/AutomaticEmailTest.php
+++ b/mailpoet/tests/integration/Newsletter/Scheduler/AutomaticEmailTest.php
@@ -60,13 +60,13 @@ class AutomaticEmailTest extends \MailPoetTest {
     $expectedTime = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'))->addHours(2);
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
     expect($task->getId())->greaterOrEquals(1);
-    expect($task->getPriority())->equals(SendingQueueEntity::PRIORITY_MEDIUM);
-    expect($task->getStatus())->equals(SendingQueueEntity::STATUS_SCHEDULED);
+    verify($task->getPriority())->equals(SendingQueueEntity::PRIORITY_MEDIUM);
+    verify($task->getStatus())->equals(SendingQueueEntity::STATUS_SCHEDULED);
     $this->tester->assertEqualDateTimes($expectedTime, $task->getScheduledAt(), 1);
     // task should have 1 associated user
     $subscribers = $task->getSubscribers()->toArray();
     expect($subscribers)->count(1);
-    expect($subscribers[0]->getSubscriber())->equals($subscriber);
+    verify($subscribers[0]->getSubscriber())->equals($subscriber);
   }
 
   public function testItAddsMetaToSendingQueueWhenCreatingAutomaticEmailSendingTask() {
@@ -92,8 +92,8 @@ class AutomaticEmailTest extends \MailPoetTest {
     $expectedTime = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'))->addHours(2);
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
     expect($task->getId())->greaterOrEquals(1);
-    expect($task->getPriority())->equals(SendingQueueEntity::PRIORITY_MEDIUM);
-    expect($task->getStatus())->equals(SendingQueueEntity::STATUS_SCHEDULED);
+    verify($task->getPriority())->equals(SendingQueueEntity::PRIORITY_MEDIUM);
+    verify($task->getStatus())->equals(SendingQueueEntity::STATUS_SCHEDULED);
     $this->tester->assertEqualDateTimes($expectedTime, $task->getScheduledAt(), 1);
     // task should not have any subscribers
     $subscribers = $task->getSubscribers();
@@ -185,13 +185,13 @@ class AutomaticEmailTest extends \MailPoetTest {
     $this->assertInstanceOf(SendingQueueEntity::class, $sendingQueue);
     $newsletter = $sendingQueue->getNewsletter();
     $this->assertInstanceOf(NewsletterEntity::class, $newsletter);
-    expect($newsletter->getId())->equals($newsletter2->getId());
+    verify($newsletter->getId())->equals($newsletter2->getId());
     // scheduled task should be created
     $task = $sendingQueue->getTask();
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
     expect($task->getId())->greaterOrEquals(1);
-    expect($task->getPriority())->equals(SendingQueueEntity::PRIORITY_MEDIUM);
-    expect($task->getStatus())->equals(SendingQueueEntity::STATUS_SCHEDULED);
+    verify($task->getPriority())->equals(SendingQueueEntity::PRIORITY_MEDIUM);
+    verify($task->getStatus())->equals(SendingQueueEntity::STATUS_SCHEDULED);
     $this->tester->assertEqualDateTimes($expectedTime, $task->getScheduledAt(), 1);
   }
 
diff --git a/mailpoet/tests/integration/Newsletter/Scheduler/PostNotificationTest.php b/mailpoet/tests/integration/Newsletter/Scheduler/PostNotificationTest.php
index 69900c9235..b078dc2c86 100644
--- a/mailpoet/tests/integration/Newsletter/Scheduler/PostNotificationTest.php
+++ b/mailpoet/tests/integration/Newsletter/Scheduler/PostNotificationTest.php
@@ -73,13 +73,13 @@ class PostNotificationTest extends \MailPoetTest {
     $this->assertInstanceOf(SendingQueueEntity::class, $sendingTask->getSendingQueue());
     expect($this->sendingQueuesRepository->findBy(['newsletter' => $newsletter]))->count(1);
     $this->assertInstanceOf(NewsletterEntity::class, $sendingTask->getSendingQueue()->getNewsletter());
-    expect($sendingTask->getSendingQueue()->getNewsletter()->getId())->equals($newsletter->getId());
+    verify($sendingTask->getSendingQueue()->getNewsletter()->getId())->equals($newsletter->getId());
 
-    expect($sendingTask->getStatus())->equals(SendingQueueEntity::STATUS_SCHEDULED);
+    verify($sendingTask->getStatus())->equals(SendingQueueEntity::STATUS_SCHEDULED);
 
 
-    expect($sendingTask->getScheduledAt())->equals($this->scheduler->getNextRunDate('* 5 * * *'));
-    expect($sendingTask->getPriority())->equals(SendingQueueEntity::PRIORITY_MEDIUM);
+    verify($sendingTask->getScheduledAt())->equals($this->scheduler->getNextRunDate('* 5 * * *'));
+    verify($sendingTask->getPriority())->equals(SendingQueueEntity::PRIORITY_MEDIUM);
 
     // duplicate queue record should not be created
     $newsletterId = $newsletter->getId();
@@ -112,11 +112,11 @@ class PostNotificationTest extends \MailPoetTest {
     $this->assertInstanceOf(SendingQueueEntity::class, $sendingTask->getSendingQueue());
     expect($this->sendingQueuesRepository->findBy(['newsletter' => $newsletter]))->count(2);
     $this->assertInstanceOf(NewsletterEntity::class, $sendingTask->getSendingQueue()->getNewsletter());
-    expect($sendingTask->getSendingQueue()->getNewsletter()->getId())->equals($newsletter->getId());
+    verify($sendingTask->getSendingQueue()->getNewsletter()->getId())->equals($newsletter->getId());
 
-    expect($sendingTask->getStatus())->equals(SendingQueueEntity::STATUS_SCHEDULED);
-    expect($sendingTask->getScheduledAt())->equals($this->scheduler->getNextRunDate('* 10 * * *'));
-    expect($sendingTask->getPriority())->equals(SendingQueueEntity::PRIORITY_MEDIUM);
+    verify($sendingTask->getStatus())->equals(SendingQueueEntity::STATUS_SCHEDULED);
+    verify($sendingTask->getScheduledAt())->equals($this->scheduler->getNextRunDate('* 10 * * *'));
+    verify($sendingTask->getPriority())->equals(SendingQueueEntity::PRIORITY_MEDIUM);
 
     // duplicate queue record should not be created
     $newsletterId = $newsletter->getId();
@@ -152,7 +152,7 @@ class PostNotificationTest extends \MailPoetTest {
       $currentTime :
       $currentTime->addDay();
     $queue = $this->sendingQueuesRepository->findOneBy(['newsletter' => $newsletter]);
-    expect($queue->getTask()->getScheduledAt()->format(DateTime::DEFAULT_DATE_TIME_FORMAT))
+    verify($queue->getTask()->getScheduledAt()->format(DateTime::DEFAULT_DATE_TIME_FORMAT))
       ->equals($nextRunDate->format('Y-m-d 05:00:00'));
 
     // testing scheduling by minutes
@@ -169,7 +169,7 @@ class PostNotificationTest extends \MailPoetTest {
       $currentTime :
       $currentTime->addDay();
     $queue = $this->sendingQueuesRepository->findOneBy(['newsletter' => $newsletter]);
-    expect($queue->getTask()->getScheduledAt()->format(DateTime::DEFAULT_DATE_TIME_FORMAT))
+    verify($queue->getTask()->getScheduledAt()->format(DateTime::DEFAULT_DATE_TIME_FORMAT))
       ->equals($nextRunDate->format('Y-m-d 05:45:00'));
   }
 
@@ -189,7 +189,7 @@ class PostNotificationTest extends \MailPoetTest {
     $scheduleOption = $newsletter->getOption(NewsletterOptionFieldEntity::NAME_SCHEDULE);
     $this->assertInstanceOf(NewsletterOptionEntity::class, $scheduleOption);
     $currentTime = 1483275600; // Sunday, 1 January 2017 @ 1:00pm (UTC)
-    expect($this->scheduler->getNextRunDate($scheduleOption->getValue(), $currentTime))
+    verify($this->scheduler->getNextRunDate($scheduleOption->getValue(), $currentTime))
       ->equals('2017-01-01 14:00:00');
 
     // testing scheduling by minutes
@@ -208,7 +208,7 @@ class PostNotificationTest extends \MailPoetTest {
     $scheduleOption = $newsletter->getOption(NewsletterOptionFieldEntity::NAME_SCHEDULE);
     $this->assertInstanceOf(NewsletterOptionEntity::class, $scheduleOption);
     $currentTime = 1483275600; // Sunday, 1 January 2017 @ 1:00pm (UTC)
-    expect($this->scheduler->getNextRunDate($scheduleOption->getValue(), $currentTime))
+    verify($this->scheduler->getNextRunDate($scheduleOption->getValue(), $currentTime))
       ->equals('2017-01-01 14:15:00');
   }
 
@@ -230,7 +230,7 @@ class PostNotificationTest extends \MailPoetTest {
     $scheduleOption = $newsletter->getOption(NewsletterOptionFieldEntity::NAME_SCHEDULE);
     $this->assertInstanceOf(NewsletterOptionEntity::class, $scheduleOption);
     $currentTime = 1483275600; // Sunday, 1 January 2017 @ 1:00pm (UTC)
-    expect($this->scheduler->getNextRunDate($scheduleOption->getValue(), $currentTime))
+    verify($this->scheduler->getNextRunDate($scheduleOption->getValue(), $currentTime))
       ->equals('2017-01-03 14:00:00');
 
     // testing scheduling by minutes
@@ -250,7 +250,7 @@ class PostNotificationTest extends \MailPoetTest {
     $scheduleOption = $newsletter->getOption(NewsletterOptionFieldEntity::NAME_SCHEDULE);
     $this->assertInstanceOf(NewsletterOptionEntity::class, $scheduleOption);
     $currentTime = 1483275600; // Sunday, 1 January 2017 @ 1:00pm (UTC)
-    expect($this->scheduler->getNextRunDate($scheduleOption->getValue(), $currentTime))
+    verify($this->scheduler->getNextRunDate($scheduleOption->getValue(), $currentTime))
       ->equals('2017-01-03 23:45:00');
   }
 
@@ -271,7 +271,7 @@ class PostNotificationTest extends \MailPoetTest {
     $scheduleOption = $newsletter->getOption(NewsletterOptionFieldEntity::NAME_SCHEDULE);
     $this->assertInstanceOf(NewsletterOptionEntity::class, $scheduleOption);
     $currentTime = 1483275600; // Sunday, 1 January 2017 @ 1:00pm (UTC)
-    expect($this->scheduler->getNextRunDate($scheduleOption->getValue(), $currentTime))
+    verify($this->scheduler->getNextRunDate($scheduleOption->getValue(), $currentTime))
       ->equals('2017-01-19 14:00:00');
 
     // testing scheduling by minutes
@@ -290,7 +290,7 @@ class PostNotificationTest extends \MailPoetTest {
     $scheduleOption = $newsletter->getOption(NewsletterOptionFieldEntity::NAME_SCHEDULE);
     $this->assertInstanceOf(NewsletterOptionEntity::class, $scheduleOption);
     $currentTime = 1483275600; // Sunday, 1 January 2017 @ 1:00pm (UTC)
-    expect($this->scheduler->getNextRunDate($scheduleOption->getValue(), $currentTime))
+    verify($this->scheduler->getNextRunDate($scheduleOption->getValue(), $currentTime))
       ->equals('2017-01-19 00:45:00');
   }
 
@@ -311,7 +311,7 @@ class PostNotificationTest extends \MailPoetTest {
     $scheduleOption = $newsletter->getOption(NewsletterOptionFieldEntity::NAME_SCHEDULE);
     $this->assertInstanceOf(NewsletterOptionEntity::class, $scheduleOption);
     $currentTime = 1485694800; // Sunday, 29 January 2017 @ 1:00pm (UTC)
-    expect($this->scheduler->getNextRunDate($scheduleOption->getValue(), $currentTime))
+    verify($this->scheduler->getNextRunDate($scheduleOption->getValue(), $currentTime))
       ->equals('2017-02-25 14:00:00');
 
     // testing scheduling by minutes
@@ -330,7 +330,7 @@ class PostNotificationTest extends \MailPoetTest {
     $scheduleOption = $newsletter->getOption(NewsletterOptionFieldEntity::NAME_SCHEDULE);
     $this->assertInstanceOf(NewsletterOptionEntity::class, $scheduleOption);
     $currentTime = 1485694800; // Sunday, 29 January 2017 @ 1:00pm (UTC)
-    expect($this->scheduler->getNextRunDate($scheduleOption->getValue(), $currentTime))
+    verify($this->scheduler->getNextRunDate($scheduleOption->getValue(), $currentTime))
       ->equals('2017-02-25 14:15:00');
   }
 
@@ -351,7 +351,7 @@ class PostNotificationTest extends \MailPoetTest {
     $scheduleOption = $newsletter->getOption(NewsletterOptionFieldEntity::NAME_SCHEDULE);
     $this->assertInstanceOf(NewsletterOptionEntity::class, $scheduleOption);
     $currentTime = 1483275600; // Sunday, 1 January 2017 @ 1:00pm (UTC)
-    expect($this->scheduler->getNextRunDate($scheduleOption->getValue(), $currentTime))
+    verify($this->scheduler->getNextRunDate($scheduleOption->getValue(), $currentTime))
       ->equals('2017-01-01 13:01:00');
   }
 
diff --git a/mailpoet/tests/integration/Newsletter/Scheduler/ReEngagementSchedulerTest.php b/mailpoet/tests/integration/Newsletter/Scheduler/ReEngagementSchedulerTest.php
index b2bc0d0bbb..ab3d29249c 100644
--- a/mailpoet/tests/integration/Newsletter/Scheduler/ReEngagementSchedulerTest.php
+++ b/mailpoet/tests/integration/Newsletter/Scheduler/ReEngagementSchedulerTest.php
@@ -119,18 +119,18 @@ class ReEngagementSchedulerTest extends \MailPoetTest {
     $task = $this->scheduler->scheduleAll()[0];
     $this->entityManager->refresh($task);
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
-    expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
-    expect($task->getType())->equals(Sending::TASK_TYPE);
+    verify($task->getStatus())->equals(ScheduledTaskEntity::STATUS_SCHEDULED);
+    verify($task->getType())->equals(Sending::TASK_TYPE);
     $scheduledAt = $task->getScheduledAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $scheduledAt);
-    expect($scheduledAt->getTimestamp())->equals(Carbon::now()->getTimestamp(), 1);
-    expect($task->getSubscribers()->count())->equals(2);
+    verify($scheduledAt->getTimestamp())->equals(Carbon::now()->getTimestamp(), 1);
+    verify($task->getSubscribers()->count())->equals(2);
 
     $sendingQueue = $this->entityManager->getRepository(SendingQueueEntity::class)->findOneBy(['task' => $task]);
     $this->assertInstanceOf(SendingQueueEntity::class, $sendingQueue);
-    expect($sendingQueue->getCountToProcess())->equals(2);
-    expect($sendingQueue->getCountTotal())->equals(2);
-    expect($sendingQueue->getCountProcessed())->equals(0);
+    verify($sendingQueue->getCountToProcess())->equals(2);
+    verify($sendingQueue->getCountTotal())->equals(2);
+    verify($sendingQueue->getCountProcessed())->equals(0);
   }
 
   public function testItSchedulesOneSubscriberInTwoSegmentsOnlyOnce() {
@@ -154,11 +154,11 @@ class ReEngagementSchedulerTest extends \MailPoetTest {
     $task = $this->scheduler->scheduleAll()[0];
     $this->entityManager->refresh($task);
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
-    expect($task->getSubscribers()->count())->equals(1);
+    verify($task->getSubscribers()->count())->equals(1);
 
     $sendingQueue = $this->entityManager->getRepository(SendingQueueEntity::class)->findOneBy(['task' => $task]);
     $this->assertInstanceOf(SendingQueueEntity::class, $sendingQueue);
-    expect($sendingQueue->getCountToProcess())->equals(1);
+    verify($sendingQueue->getCountToProcess())->equals(1);
   }
 
   private function createReEngagementEmail(int $monthsAfter, string $status = NewsletterEntity::STATUS_ACTIVE) {
diff --git a/mailpoet/tests/integration/Newsletter/Scheduler/SchedulerTest.php b/mailpoet/tests/integration/Newsletter/Scheduler/SchedulerTest.php
index f140414ace..27d23ac575 100644
--- a/mailpoet/tests/integration/Newsletter/Scheduler/SchedulerTest.php
+++ b/mailpoet/tests/integration/Newsletter/Scheduler/SchedulerTest.php
@@ -43,7 +43,7 @@ class SchedulerTest extends \MailPoetTest {
     // it accepts cron syntax and returns next run date
     $currentTime = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'));
     Carbon::setTestNow($currentTime); // mock carbon to return current time
-    expect($this->testee->getNextRunDate('* * * * *'))
+    verify($this->testee->getNextRunDate('* * * * *'))
       ->equals($currentTime->addMinute()->format('Y-m-d H:i:00'));
     // when invalid CRON expression is used, false response is returned
     expect($this->testee->getNextRunDate('invalid CRON expression'))->false();
@@ -53,14 +53,14 @@ class SchedulerTest extends \MailPoetTest {
     // it accepts cron syntax and returns previous run date
     $currentTime = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'));
     Carbon::setTestNow($currentTime); // mock carbon to return current time
-    expect($this->testee->getPreviousRunDate('* * * * *'))
+    verify($this->testee->getPreviousRunDate('* * * * *'))
       ->equals($currentTime->subMinute()->format('Y-m-d H:i:00'));
     // when invalid CRON expression is used, false response is returned
     expect($this->testee->getPreviousRunDate('invalid CRON expression'))->false();
   }
 
   public function testItFormatsDatetimeString() {
-    expect($this->testee->formatDatetimeString('April 20, 2016 4pm'))
+    verify($this->testee->formatDatetimeString('April 20, 2016 4pm'))
       ->equals('2016-04-20 16:00:00');
   }
 }
diff --git a/mailpoet/tests/integration/Newsletter/Scheduler/WelcomeTest.php b/mailpoet/tests/integration/Newsletter/Scheduler/WelcomeTest.php
index e6cdbc1187..17c1fcc824 100644
--- a/mailpoet/tests/integration/Newsletter/Scheduler/WelcomeTest.php
+++ b/mailpoet/tests/integration/Newsletter/Scheduler/WelcomeTest.php
@@ -93,10 +93,10 @@ class WelcomeTest extends \MailPoetTest {
     expect($queue->getId())->greaterOrEquals(1);
     $task = $queue->getTask();
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
-    expect($task->getPriority())->equals(ScheduledTaskEntity::PRIORITY_HIGH);
+    verify($task->getPriority())->equals(ScheduledTaskEntity::PRIORITY_HIGH);
     $scheduledAt = $task->getScheduledAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $scheduledAt);
-    expect($scheduledAt->format('Y-m-d H:i'))
+    verify($scheduledAt->format('Y-m-d H:i'))
       ->equals($currentTime->addHours(2)->format('Y-m-d H:i'));
   }
 
@@ -118,10 +118,10 @@ class WelcomeTest extends \MailPoetTest {
     expect($queue->getId())->greaterOrEquals(1);
     $task = $queue->getTask();
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
-    expect($task->getPriority())->equals(ScheduledTaskEntity::PRIORITY_HIGH);
+    verify($task->getPriority())->equals(ScheduledTaskEntity::PRIORITY_HIGH);
     $scheduledAt = $task->getScheduledAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $scheduledAt);
-    expect($scheduledAt->format('Y-m-d H:i'))
+    verify($scheduledAt->format('Y-m-d H:i'))
       ->equals($currentTime->addDays(2)->format('Y-m-d H:i'));
   }
 
@@ -143,10 +143,10 @@ class WelcomeTest extends \MailPoetTest {
     expect($queue->getId())->greaterOrEquals(1);
     $task = $queue->getTask();
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
-    expect($task->getPriority())->equals(ScheduledTaskEntity::PRIORITY_HIGH);
+    verify($task->getPriority())->equals(ScheduledTaskEntity::PRIORITY_HIGH);
     $scheduledAt = $task->getScheduledAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $scheduledAt);
-    expect($scheduledAt->format('Y-m-d H:i'))
+    verify($scheduledAt->format('Y-m-d H:i'))
       ->equals($currentTime->addWeeks(2)->format('Y-m-d H:i'));
   }
 
@@ -169,10 +169,10 @@ class WelcomeTest extends \MailPoetTest {
     expect($queue->getId())->greaterOrEquals(1);
     $task = $queue->getTask();
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
-    expect($task->getPriority())->equals(ScheduledTaskEntity::PRIORITY_HIGH);
+    verify($task->getPriority())->equals(ScheduledTaskEntity::PRIORITY_HIGH);
     $scheduledAt = $task->getScheduledAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $scheduledAt);
-    expect($scheduledAt->format('Y-m-d H:i'))
+    verify($scheduledAt->format('Y-m-d H:i'))
       ->equals($currentTime->format('Y-m-d H:i'));
   }
 
@@ -220,9 +220,9 @@ class WelcomeTest extends \MailPoetTest {
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
     $scheduledAt = $task->getScheduledAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $scheduledAt);
-    expect($scheduledAt->format('Y-m-d H:i'))
+    verify($scheduledAt->format('Y-m-d H:i'))
       ->equals($currentTime->addDay()->format('Y-m-d H:i'));
-    expect($result[0]->id())->equals($queue->getId());
+    verify($result[0]->id())->equals($queue->getId());
   }
 
   public function testItDoesNotScheduleWelcomeNotificationWhenSubscriberIsInTrash() {
@@ -390,7 +390,7 @@ class WelcomeTest extends \MailPoetTest {
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
     $scheduledAt = $task->getScheduledAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $scheduledAt);
-    expect($scheduledAt->format('Y-m-d H:i'))
+    verify($scheduledAt->format('Y-m-d H:i'))
       ->equals($currentTime->addDay()->format('Y-m-d H:i'));
   }
 
@@ -418,7 +418,7 @@ class WelcomeTest extends \MailPoetTest {
     $this->assertInstanceOf(ScheduledTaskEntity::class, $task);
     $scheduledAt = $task->getScheduledAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $scheduledAt);
-    expect($scheduledAt->format('Y-m-d H:i'))
+    verify($scheduledAt->format('Y-m-d H:i'))
       ->equals($currentTime->addDay()->format('Y-m-d H:i'));
   }
 
diff --git a/mailpoet/tests/integration/Newsletter/Segment/NewsletterSegmentRepositoryTest.php b/mailpoet/tests/integration/Newsletter/Segment/NewsletterSegmentRepositoryTest.php
index 55136d968a..fd83e7cf2a 100644
--- a/mailpoet/tests/integration/Newsletter/Segment/NewsletterSegmentRepositoryTest.php
+++ b/mailpoet/tests/integration/Newsletter/Segment/NewsletterSegmentRepositoryTest.php
@@ -69,13 +69,13 @@ class NewsletterSegmentRepositoryTest extends \MailPoetTest {
     ]);
 
     expect(isset($usedSegments[$unusedSegment->getId()]))->false();
-    expect($usedSegments[$dynamicWithScheduledNewsletter->getId()])->equals(['Scheduled']);
-    expect($usedSegments[$segmentWithSendingEmail->getId()])->equals(['Sending']);
-    expect($usedSegments[$segmentWithAutomaticEmail->getId()])->equals(['Automatic']);
-    expect($usedSegments[$segmentWithWelcomeEmail->getId()])->equals(['Welcome']);
-    expect($usedSegments[$segmentWithPostNotification->getId()])->equals(['Notification']);
+    verify($usedSegments[$dynamicWithScheduledNewsletter->getId()])->equals(['Scheduled']);
+    verify($usedSegments[$segmentWithSendingEmail->getId()])->equals(['Sending']);
+    verify($usedSegments[$segmentWithAutomaticEmail->getId()])->equals(['Automatic']);
+    verify($usedSegments[$segmentWithWelcomeEmail->getId()])->equals(['Welcome']);
+    verify($usedSegments[$segmentWithPostNotification->getId()])->equals(['Notification']);
     sort($usedSegments[$segmentWithMultipleActiveEmails->getId()]);
-    expect($usedSegments[$segmentWithMultipleActiveEmails->getId()])->equals(['Notification', 'Sending', 'Welcome2']);
+    verify($usedSegments[$segmentWithMultipleActiveEmails->getId()])->equals(['Notification', 'Sending', 'Welcome2']);
   }
 
   private function createNewsletter(string $type, $subject, string $status = NewsletterEntity::STATUS_DRAFT): NewsletterEntity {
diff --git a/mailpoet/tests/integration/Newsletter/Sending/ScheduledTaskSubscribersListingRepositoryTest.php b/mailpoet/tests/integration/Newsletter/Sending/ScheduledTaskSubscribersListingRepositoryTest.php
index 6260e086cb..a9de9bd719 100644
--- a/mailpoet/tests/integration/Newsletter/Sending/ScheduledTaskSubscribersListingRepositoryTest.php
+++ b/mailpoet/tests/integration/Newsletter/Sending/ScheduledTaskSubscribersListingRepositoryTest.php
@@ -59,21 +59,21 @@ class ScheduledTaskSubscribersListingRepositoryTest extends \MailPoetTest {
       'params' => [ 'task_ids' => [$this->scheduledTask->getId()]],
     ];
     [$all, $sent, $failed, $unprocessed] = $this->repository->getGroups($this->listingHandler->getListingDefinition($listingData));
-    expect($all['name'])->equals('all');
-    expect($all['label'])->equals('All');
-    expect($all['count'])->equals(3);
+    verify($all['name'])->equals('all');
+    verify($all['label'])->equals('All');
+    verify($all['count'])->equals(3);
 
-    expect($sent['name'])->equals('sent');
-    expect($sent['label'])->equals('Sent');
-    expect($sent['count'])->equals(1);
+    verify($sent['name'])->equals('sent');
+    verify($sent['label'])->equals('Sent');
+    verify($sent['count'])->equals(1);
 
-    expect($failed['name'])->equals('failed');
-    expect($failed['label'])->equals('Failed');
-    expect($failed['count'])->equals(1);
+    verify($failed['name'])->equals('failed');
+    verify($failed['label'])->equals('Failed');
+    verify($failed['count'])->equals(1);
 
-    expect($unprocessed['name'])->equals('unprocessed');
-    expect($unprocessed['label'])->equals('Unprocessed');
-    expect($unprocessed['count'])->equals(1);
+    verify($unprocessed['name'])->equals('unprocessed');
+    verify($unprocessed['label'])->equals('Unprocessed');
+    verify($unprocessed['count'])->equals(1);
   }
 
   public function testItReturnCorrectDataAndCountForGroupAll() {
@@ -84,19 +84,19 @@ class ScheduledTaskSubscribersListingRepositoryTest extends \MailPoetTest {
     $tasksSubscribers = $this->repository->getData($this->listingHandler->getListingDefinition($listingData));
     $count = $this->repository->getCount($this->listingHandler->getListingDefinition($listingData));
     expect($tasksSubscribers)->count(3);
-    expect($count)->equals(3);
+    verify($count)->equals(3);
 
     $this->assertInstanceOf(ScheduledTaskSubscriberEntity::class, $tasksSubscribers[0]);
     $this->assertInstanceOf(SubscriberEntity::class, $tasksSubscribers[0]->getSubscriber());
-    expect($tasksSubscribers[0]->getSubscriber()->getEmail())->equals('subscriberUprocessed@email.com');
+    verify($tasksSubscribers[0]->getSubscriber()->getEmail())->equals('subscriberUprocessed@email.com');
 
     $this->assertInstanceOf(ScheduledTaskSubscriberEntity::class, $tasksSubscribers[1]);
     $this->assertInstanceOf(SubscriberEntity::class, $tasksSubscribers[1]->getSubscriber());
-    expect($tasksSubscribers[1]->getSubscriber()->getEmail())->equals('subscriberProcessed@email.com');
+    verify($tasksSubscribers[1]->getSubscriber()->getEmail())->equals('subscriberProcessed@email.com');
 
     $this->assertInstanceOf(ScheduledTaskSubscriberEntity::class, $tasksSubscribers[2]);
     $this->assertInstanceOf(SubscriberEntity::class, $tasksSubscribers[2]->getSubscriber());
-    expect($tasksSubscribers[2]->getSubscriber()->getEmail())->equals('subscriberFailed@email.com');
+    verify($tasksSubscribers[2]->getSubscriber()->getEmail())->equals('subscriberFailed@email.com');
   }
 
   public function testItCanFilterByGroup() {
@@ -107,11 +107,11 @@ class ScheduledTaskSubscribersListingRepositoryTest extends \MailPoetTest {
     $tasksSubscribers = $this->repository->getData($this->listingHandler->getListingDefinition($listingData));
     $count = $this->repository->getCount($this->listingHandler->getListingDefinition($listingData));
     expect($tasksSubscribers)->count(1);
-    expect($count)->equals(1);
+    verify($count)->equals(1);
 
     $this->assertInstanceOf(ScheduledTaskSubscriberEntity::class, $tasksSubscribers[0]);
     $this->assertInstanceOf(SubscriberEntity::class, $tasksSubscribers[0]->getSubscriber());
-    expect($tasksSubscribers[0]->getSubscriber()->getEmail())->equals('subscriberFailed@email.com');
+    verify($tasksSubscribers[0]->getSubscriber()->getEmail())->equals('subscriberFailed@email.com');
   }
 
   public function testItCanSearchByEmail() {
@@ -123,10 +123,10 @@ class ScheduledTaskSubscribersListingRepositoryTest extends \MailPoetTest {
     $tasksSubscribers = $this->repository->getData($this->listingHandler->getListingDefinition($listingData));
     $count = $this->repository->getCount($this->listingHandler->getListingDefinition($listingData));
     expect($tasksSubscribers)->count(1);
-    expect($count)->equals(1);
+    verify($count)->equals(1);
 
     $this->assertInstanceOf(ScheduledTaskSubscriberEntity::class, $tasksSubscribers[0]);
     $this->assertInstanceOf(SubscriberEntity::class, $tasksSubscribers[0]->getSubscriber());
-    expect($tasksSubscribers[0]->getSubscriber()->getEmail())->equals('subscriberProcessed@email.com');
+    verify($tasksSubscribers[0]->getSubscriber()->getEmail())->equals('subscriberProcessed@email.com');
   }
 }
diff --git a/mailpoet/tests/integration/Newsletter/Sending/ScheduledTasksRepositoryTest.php b/mailpoet/tests/integration/Newsletter/Sending/ScheduledTasksRepositoryTest.php
index 83c55486ab..6f9c5625d7 100644
--- a/mailpoet/tests/integration/Newsletter/Sending/ScheduledTasksRepositoryTest.php
+++ b/mailpoet/tests/integration/Newsletter/Sending/ScheduledTasksRepositoryTest.php
@@ -115,7 +115,7 @@ class ScheduledTasksRepositoryTest extends \MailPoetTest {
     $task1 = $this->scheduledTaskFactory->create(SendingTask::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, Carbon::now()->addDay());
     $task2 = $this->scheduledTaskFactory->create(Bounce::TASK_TYPE, ScheduledTaskEntity::VIRTUAL_STATUS_RUNNING, Carbon::now()->addDay());
     $data = $this->repository->getLatestTasks();
-    expect(count($data))->equals(2);
+    verify(count($data))->equals(2);
     $ids = array_map(function ($d){ return $d->getId();
 
     }, $data);
@@ -137,16 +137,16 @@ class ScheduledTasksRepositoryTest extends \MailPoetTest {
     $this->scheduledTaskFactory->create(SendingTask::TASK_TYPE, ScheduledTaskEntity::STATUS_COMPLETED, Carbon::now()->addDay());
     $this->scheduledTaskFactory->create(Bounce::TASK_TYPE, ScheduledTaskEntity::STATUS_COMPLETED, Carbon::now()->addDay());
     $data = $this->repository->getLatestTasks(Bounce::TASK_TYPE);
-    expect(count($data))->equals(1);
-    expect($data[0]->getType())->equals(Bounce::TASK_TYPE);
+    verify(count($data))->equals(1);
+    verify($data[0]->getType())->equals(Bounce::TASK_TYPE);
   }
 
   public function testItCanFilterTasksByStatus() {
     $this->scheduledTaskFactory->create(SendingTask::TASK_TYPE, ScheduledTaskEntity::STATUS_COMPLETED, Carbon::now()->addDay());
     $this->scheduledTaskFactory->create(SendingTask::TASK_TYPE, ScheduledTaskEntity::STATUS_PAUSED, Carbon::now()->addDay());
     $data = $this->repository->getLatestTasks(null, [ScheduledTaskEntity::STATUS_COMPLETED]);
-    expect(count($data))->equals(1);
-    expect($data[0]->getStatus())->equals(ScheduledTaskEntity::STATUS_COMPLETED);
+    verify(count($data))->equals(1);
+    verify($data[0]->getStatus())->equals(ScheduledTaskEntity::STATUS_COMPLETED);
   }
 
   public function testItDoesNotFailForSendingTaskWithoutQueue() {
@@ -156,7 +156,7 @@ class ScheduledTasksRepositoryTest extends \MailPoetTest {
       Carbon::now()->addDay()
     );
     $data = $this->repository->getLatestTasks();
-    expect(count($data))->equals(1);
+    verify(count($data))->equals(1);
   }
 
   public function testItTouchesAllScheduledTasksByIds(): void {
diff --git a/mailpoet/tests/integration/Newsletter/Sending/SendingQueuesRepositoryTest.php b/mailpoet/tests/integration/Newsletter/Sending/SendingQueuesRepositoryTest.php
index ca8b1d2d42..fb70f59e3d 100644
--- a/mailpoet/tests/integration/Newsletter/Sending/SendingQueuesRepositoryTest.php
+++ b/mailpoet/tests/integration/Newsletter/Sending/SendingQueuesRepositoryTest.php
@@ -68,8 +68,8 @@ class SendingQueuesRepositoryTest extends \MailPoetTest {
     $this->repository->resume($queue);
     $this->entityManager->refresh($task);
 
-    expect($task->getStatus())->equals(ScheduledTaskEntity::STATUS_COMPLETED);
-    expect($newsletter->getStatus())->equals(NewsletterEntity::STATUS_SENT);
+    verify($task->getStatus())->equals(ScheduledTaskEntity::STATUS_COMPLETED);
+    verify($newsletter->getStatus())->equals(NewsletterEntity::STATUS_SENT);
   }
 
   public function testItResumesSending() {
@@ -88,7 +88,7 @@ class SendingQueuesRepositoryTest extends \MailPoetTest {
     $this->entityManager->refresh($task);
 
     expect($task->getStatus())->null();
-    expect($newsletter->getStatus())->equals(NewsletterEntity::STATUS_SENDING);
+    verify($newsletter->getStatus())->equals(NewsletterEntity::STATUS_SENDING);
   }
 
   public function testItReturnsCountOfQueuesByNewsletterAndTaskStatus() {
diff --git a/mailpoet/tests/integration/Newsletter/ShortcodesHelperTest.php b/mailpoet/tests/integration/Newsletter/ShortcodesHelperTest.php
index 513649693a..c6748d840b 100644
--- a/mailpoet/tests/integration/Newsletter/ShortcodesHelperTest.php
+++ b/mailpoet/tests/integration/Newsletter/ShortcodesHelperTest.php
@@ -15,7 +15,7 @@ class ShortcodesHelperTest extends \MailPoetTest {
 
   public function testGetsShortcodes() {
     $shortcodes = $this->shortcodesHelper->getShortcodes();
-    expect(array_keys($shortcodes))->equals(
+    verify(array_keys($shortcodes))->equals(
       [
         'Subscriber',
         'Newsletter',
@@ -29,17 +29,17 @@ class ShortcodesHelperTest extends \MailPoetTest {
 
   public function testItGetsCustomShortShortcodes() {
     $shortcodes = $this->shortcodesHelper->getShortcodes();
-    expect(count($shortcodes['Subscriber']))->equals(5);
+    verify(count($shortcodes['Subscriber']))->equals(5);
     $customField = new CustomFieldEntity();
     $customField->setName('name');
     $customField->setType('type');
     $this->entityManager->persist($customField);
     $this->entityManager->flush();
     $shortcodes = $this->shortcodesHelper->getShortcodes();
-    expect(count($shortcodes['Subscriber']))->equals(6);
+    verify(count($shortcodes['Subscriber']))->equals(6);
     $customSubscriberShortcode = end($shortcodes['Subscriber']);
-    expect($customSubscriberShortcode['text'])->equals($customField->getName());
-    expect($customSubscriberShortcode['shortcode'])
+    verify($customSubscriberShortcode['text'])->equals($customField->getName());
+    verify($customSubscriberShortcode['shortcode'])
       ->equals('[subscriber:cf_' . $customField->getId() . ']');
   }
 }
diff --git a/mailpoet/tests/integration/Newsletter/ShortcodesTest.php b/mailpoet/tests/integration/Newsletter/ShortcodesTest.php
index d3f69d072d..759c01cef4 100644
--- a/mailpoet/tests/integration/Newsletter/ShortcodesTest.php
+++ b/mailpoet/tests/integration/Newsletter/ShortcodesTest.php
@@ -68,29 +68,29 @@ class ShortcodesTest extends \MailPoetTest {
   public function testItCanExtractShortcodes() {
     $content = '[category:action] [notshortcode]';
     $shortcodes = $this->shortcodesObject->extract($content);
-    expect(count($shortcodes))->equals(1);
+    verify(count($shortcodes))->equals(1);
   }
 
   public function testItCanExtractOnlySelectShortcodes() {
     $content = '[link:action] [newsletter:action]';
     $limit = ['link'];
     $shortcodes = $this->shortcodesObject->extract($content, $limit);
-    expect(count($shortcodes))->equals(1);
-    expect(preg_match('/link/', $shortcodes[0]))->equals(1);
+    verify(count($shortcodes))->equals(1);
+    verify(preg_match('/link/', $shortcodes[0]))->equals(1);
   }
 
   public function testItCanMatchShortcodeDetails() {
     $shortcodesObject = $this->shortcodesObject;
     $content = '[category:action]';
     $details = $shortcodesObject->match($content);
-    expect($details['category'])->equals('category');
-    expect($details['action'])->equals('action');
+    verify($details['category'])->equals('category');
+    verify($details['action'])->equals('action');
     $content = '[category:action|default:default_value]';
     $details = $shortcodesObject->match($content);
-    expect($details['category'])->equals('category');
-    expect($details['action'])->equals('action');
-    expect($details['argument'])->equals('default');
-    expect($details['argument_value'])->equals('default_value');
+    verify($details['category'])->equals('category');
+    verify($details['action'])->equals('action');
+    verify($details['argument'])->equals('default');
+    verify($details['argument_value'])->equals('default_value');
     $content = '[category:action|default]';
     $details = $shortcodesObject->match($content);
     expect($details)->isEmpty();
@@ -108,32 +108,32 @@ class ShortcodesTest extends \MailPoetTest {
       'mailpoet_newsletter_shortcode',
       function($shortcode, $newsletter, $subscriber, $queue, $content, $arguments) {
         expect($arguments)->count(2);
-        expect($arguments['arg1'])->equals('val1');
-        expect($arguments['arg2'])->equals('val2');
+        verify($arguments['arg1'])->equals('val1');
+        verify($arguments['arg2'])->equals('val2');
         if (strpos($shortcode, '[some:shortcode') === 0) return 'success';
       }, 10, 6
     );
     $result = $shortcodesObject->process($shortcode);
-    expect($result[0])->equals('success');
+    verify($result[0])->equals('success');
   }
 
   public function testItCanProcessDateShortcodes() {
     $date = $this->diContainer->get(Date::class);
     $shortcodeDetails = ['action' => 'd'];
-    expect($date->process($shortcodeDetails))->equals(date_i18n('d', WPFunctions::get()->currentTime('timestamp')));
+    verify($date->process($shortcodeDetails))->equals(date_i18n('d', WPFunctions::get()->currentTime('timestamp')));
     $shortcodeDetails = ['action' => 'dordinal'];
-    expect($date->process($shortcodeDetails))->equals(date_i18n('jS', WPFunctions::get()->currentTime('timestamp')));
+    verify($date->process($shortcodeDetails))->equals(date_i18n('jS', WPFunctions::get()->currentTime('timestamp')));
     $shortcodeDetails = ['action' => 'dtext'];
-    expect($date->process($shortcodeDetails))->equals(date_i18n('l', WPFunctions::get()->currentTime('timestamp')));
+    verify($date->process($shortcodeDetails))->equals(date_i18n('l', WPFunctions::get()->currentTime('timestamp')));
     $shortcodeDetails = ['action' => 'm'];
-    expect($date->process($shortcodeDetails))->equals(date_i18n('m', WPFunctions::get()->currentTime('timestamp')));
+    verify($date->process($shortcodeDetails))->equals(date_i18n('m', WPFunctions::get()->currentTime('timestamp')));
     $shortcodeDetails = ['action' => 'mtext'];
-    expect($date->process($shortcodeDetails))->equals(date_i18n('F', WPFunctions::get()->currentTime('timestamp')));
+    verify($date->process($shortcodeDetails))->equals(date_i18n('F', WPFunctions::get()->currentTime('timestamp')));
     $shortcodeDetails = ['action' => 'y'];
-    expect($date->process($shortcodeDetails))->equals(date_i18n('Y', WPFunctions::get()->currentTime('timestamp')));
+    verify($date->process($shortcodeDetails))->equals(date_i18n('Y', WPFunctions::get()->currentTime('timestamp')));
     // allow custom date formats (http://php.net/manual/en/function.date.php)
     $shortcodeDetails = ['action' => 'custom', 'action_argument' => 'format', 'action_argument_value' => 'U F'];
-    expect($date->process($shortcodeDetails))->equals(date_i18n('U F', WPFunctions::get()->currentTime('timestamp')));
+    verify($date->process($shortcodeDetails))->equals(date_i18n('U F', WPFunctions::get()->currentTime('timestamp')));
   }
 
   public function testItCanProcessDateWhenNewsletterIsSent() {
@@ -141,7 +141,7 @@ class ShortcodesTest extends \MailPoetTest {
     $newsletter = $this->_createNewsletter();
     $newsletter->setSentAt(new \DateTimeImmutable('2017-12-31'));
     $shortcodeDetails = ['action' => 'd'];
-    expect($date->process($shortcodeDetails, $newsletter))->equals('31');
+    verify($date->process($shortcodeDetails, $newsletter))->equals('31');
   }
 
   public function testItCanProcessNewsletterShortcodes() {
@@ -152,15 +152,15 @@ class ShortcodesTest extends \MailPoetTest {
       '<a href="#">not post</a>';
     $result =
       $shortcodesObject->process(['[newsletter:subject]'], $content);
-    expect($result[0])->equals($this->newsletter->getSubject());
+    verify($result[0])->equals($this->newsletter->getSubject());
     $result =
       $shortcodesObject->process(['[newsletter:total]'], $content);
-    expect($result[0])->equals(2);
+    verify($result[0])->equals(2);
     $result =
       $shortcodesObject->process(['[newsletter:post_title]'], $content);
     $wpPost = get_post($this->wPPost);
     $this->assertInstanceOf(WP_Post::class, $wpPost);
-    expect($result['0'])->equals($wpPost->post_title); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($result['0'])->equals($wpPost->post_title); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
   }
 
   public function itCanProcessPostNotificationNewsletterNumberShortcode() {
@@ -171,7 +171,7 @@ class ShortcodesTest extends \MailPoetTest {
     );
     $this->shortcodesObject->setNewsletter($postNotificationHistory);
     $result = $this->shortcodesObject->process(['[newsletter:number]']);
-    expect($result['0'])->equals(1);
+    verify($result['0'])->equals(1);
 
     // create another post notification
     $postNotificationHistory = $this->_createNewsletter(
@@ -180,23 +180,23 @@ class ShortcodesTest extends \MailPoetTest {
     );
     $this->shortcodesObject->setNewsletter($postNotificationHistory);
     $result = $this->shortcodesObject->process(['[newsletter:number]']);
-    expect($result['0'])->equals(2);
+    verify($result['0'])->equals(2);
   }
 
   public function testSubscriberShortcodesRequireSubscriberObjectOrFalseValue() {
     // when subscriber is empty, original value is returned
     $this->shortcodesObject->setSubscriber(null);
     $result = $this->shortcodesObject->process(['[subscriber:firstname | default:test]']);
-    expect($result[0])->equals('[subscriber:firstname | default:test]');
+    verify($result[0])->equals('[subscriber:firstname | default:test]');
     // when subscriber is an object, proper value is returned
     $this->shortcodesObject->setSubscriber($this->subscriber);
     $result = $this->shortcodesObject->process(['[subscriber:firstname | default:test]']);
-    expect($result[0])->equals($this->subscriber->getFirstName());
+    verify($result[0])->equals($this->subscriber->getFirstName());
     // when subscriber hasn't name, the default value is returned
     $this->subscriber->setFirstName('');
     $this->shortcodesObject->setSubscriber($this->subscriber);
     $result = $this->shortcodesObject->process(['[subscriber:firstname | default:test]']);
-    expect($result[0])->equals('test');
+    verify($result[0])->equals('test');
   }
 
   public function testSubscriberFirstAndLastNameShortcodesReturnDefaultValueWhenDataIsEmpty() {
@@ -205,9 +205,9 @@ class ShortcodesTest extends \MailPoetTest {
     $subscriber->setFirstName('');
     $subscriber->setLastName('');
     $result = $this->shortcodesObject->process(['[subscriber:firstname | default:test]']);
-    expect($result[0])->equals('test');
+    verify($result[0])->equals('test');
     $result = $this->shortcodesObject->process(['[subscriber:lastname | default:test]']);
-    expect($result[0])->equals('test');
+    verify($result[0])->equals('test');
   }
 
   public function testSanitizeName() {
@@ -215,22 +215,22 @@ class ShortcodesTest extends \MailPoetTest {
     $subscriber->setFirstName(' "><img src=x onError=prompt(1)>');
     $subscriber->setLastName(' "><img src=x onError=prompt(2)>');
     $result = $this->shortcodesObject->process(['[subscriber:firstname | default:test]']);
-    expect($result[0])->equals(' &quot;&gt;&lt;img src=x onError=prompt(1)&gt;');
+    verify($result[0])->equals(' &quot;&gt;&lt;img src=x onError=prompt(1)&gt;');
     $result = $this->shortcodesObject->process(['[subscriber:lastname | default:test]']);
-    expect($result[0])->equals(' &quot;&gt;&lt;img src=x onError=prompt(2)&gt;');
+    verify($result[0])->equals(' &quot;&gt;&lt;img src=x onError=prompt(2)&gt;');
   }
 
   public function testItCanProcessSubscriberShortcodes() {
     $shortcodesObject = $this->shortcodesObject;
     $result =
       $shortcodesObject->process(['[subscriber:firstname]']);
-    expect($result[0])->equals($this->subscriber->getFirstName());
+    verify($result[0])->equals($this->subscriber->getFirstName());
     $result =
       $shortcodesObject->process(['[subscriber:lastname]']);
-    expect($result[0])->equals($this->subscriber->getLastName());
+    verify($result[0])->equals($this->subscriber->getLastName());
     $result =
       $shortcodesObject->process(['[subscriber:displayname]']);
-    expect($result[0])->equals($this->wPUser->user_login);
+    verify($result[0])->equals($this->wPUser->user_login);
 
     $subscribersRepository = $this->diContainer->get(SubscribersRepository::class);
     $subscriberCount = $subscribersRepository->countBy(
@@ -243,7 +243,7 @@ class ShortcodesTest extends \MailPoetTest {
 
     $result =
       $shortcodesObject->process(['[subscriber:count]']);
-    expect($result[0])->equals($subscriberCount);
+    verify($result[0])->equals($subscriberCount);
     $this->subscriber->setStatus('unsubscribed');
   }
 
@@ -258,18 +258,18 @@ class ShortcodesTest extends \MailPoetTest {
     $result = $shortcodesObject->process(
       ['[subscriber:cf_' . $customField->getId() . ']']
     );
-    expect($result[0])->equals('');
+    verify($result[0])->equals('');
     $result = $shortcodesObject->process(
       ['[subscriber:cf_' . $customField->getId() . ' | default:custom field value]']
     );
-    expect($result[0])->equals('custom field value');
+    verify($result[0])->equals('custom field value');
     $subscriberCustomField = new SubscriberCustomFieldEntity($subscriber, $customField, 'custom_field_value');
     $this->entityManager->persist($subscriberCustomField);
     $this->entityManager->flush();
     $result = $shortcodesObject->process(
       ['[subscriber:cf_' . $customField->getId() . ']']
     );
-    expect($result[0])->equals($subscriberCustomField->getValue());
+    verify($result[0])->equals($subscriberCustomField->getValue());
   }
 
   public function testItCanProcessLinkShortcodes() {
@@ -278,37 +278,37 @@ class ShortcodesTest extends \MailPoetTest {
       $shortcodesObject->process(['[link:subscription_unsubscribe_url]']);
     expect($result['0'])->regExp('/^http.*?action=confirm_unsubscribe/');
     $linkData = $this->getLinkData($result['0']);
-    expect($linkData['email'])->equals($this->subscriber->getEmail());
-    expect($linkData['token'])->equals($this->subscriber->getLinkToken());
+    verify($linkData['email'])->equals($this->subscriber->getEmail());
+    verify($linkData['token'])->equals($this->subscriber->getLinkToken());
 
     $result =
       $shortcodesObject->process(['[link:subscription_instant_unsubscribe_url]']);
     expect($result['0'])->regExp('/^http.*?action=unsubscribe/');
     $linkData = $this->getLinkData($result['0']);
-    expect($linkData['email'])->equals($this->subscriber->getEmail());
-    expect($linkData['token'])->equals($this->subscriber->getLinkToken());
+    verify($linkData['email'])->equals($this->subscriber->getEmail());
+    verify($linkData['token'])->equals($this->subscriber->getLinkToken());
 
     $result =
       $shortcodesObject->process(['[link:subscription_manage_url]']);
     expect($result['0'])->regExp('/^http.*?action=manage/');
     $linkData = $this->getLinkData($result['0']);
-    expect($linkData['email'])->equals($this->subscriber->getEmail());
-    expect($linkData['token'])->equals($this->subscriber->getLinkToken());
+    verify($linkData['email'])->equals($this->subscriber->getEmail());
+    verify($linkData['token'])->equals($this->subscriber->getLinkToken());
 
     $result =
       $shortcodesObject->process(['[link:newsletter_view_in_browser_url]']);
     expect($result['0'])->regExp('/^http.*?endpoint=view_in_browser/');
     $linkData = $this->getLinkData($result['0']);
-    expect($linkData['newsletter_id'])->equals($this->newsletter->getId());
-    expect($linkData['newsletter_hash'])->equals($this->newsletter->getHash());
-    expect($linkData['subscriber_token'])->equals($this->subscriber->getLinkToken());
-    expect($linkData['subscriber_id'])->equals($this->subscriber->getId());
+    verify($linkData['newsletter_id'])->equals($this->newsletter->getId());
+    verify($linkData['newsletter_hash'])->equals($this->newsletter->getHash());
+    verify($linkData['subscriber_token'])->equals($this->subscriber->getLinkToken());
+    verify($linkData['subscriber_id'])->equals($this->subscriber->getId());
 
     $result = $shortcodesObject->process(['[link:subscription_re_engage_url]']);
     expect($result['0'])->regExp('/^http.*?endpoint=subscription&action=re_engagement/');
     $linkData = $this->getLinkData($result['0']);
-    expect($linkData['email'])->equals($this->subscriber->getEmail());
-    expect($linkData['token'])->equals($this->subscriber->getLinkToken());
+    verify($linkData['email'])->equals($this->subscriber->getEmail());
+    verify($linkData['token'])->equals($this->subscriber->getLinkToken());
   }
 
   private function getLinkData(string $link): array {
@@ -373,7 +373,7 @@ class ShortcodesTest extends \MailPoetTest {
     $result = $shortcodesObject->process($shortcodes);
     // hash is returned
     foreach ($result as $index => $transformedShortcode) {
-      expect($transformedShortcode)->equals($links[$index]);
+      verify($transformedShortcode)->equals($links[$index]);
     }
   }
 
@@ -383,7 +383,7 @@ class ShortcodesTest extends \MailPoetTest {
     $subscriberWithoutLastname = new SubscriberEntity();
     $shortcodesObject->setSubscriber($subscriberWithoutLastname);
     $result = $shortcodesObject->process([$shortcode]);
-    expect($result[0])->equals('');
+    verify($result[0])->equals('');
   }
 
   public function testItCanProcessCustomLinkShortcodes() {
@@ -395,19 +395,19 @@ class ShortcodesTest extends \MailPoetTest {
     remove_all_filters('mailpoet_newsletter_shortcode_link');
     add_filter('mailpoet_newsletter_shortcode_link', function($shortcode, $newsletter, $subscriber, $queue, $arguments) {
       expect($arguments)->count(2);
-      expect($arguments['arg1'])->equals('val1');
-      expect($arguments['arg2'])->equals('val2');
+      verify($arguments['arg1'])->equals('val1');
+      verify($arguments['arg2'])->equals('val2');
       if ($shortcode === '[link:shortcode]') return 'success';
     }, 10, 5);
 
     $result = $shortcodesObject->process([$shortcode]);
-    expect($result[0])->equals('success');
+    verify($result[0])->equals('success');
     $this->settings->set('tracking.level', TrackingConfig::LEVEL_PARTIAL);
     // tracking function only works during sending, so queue object must not be false
     $shortcodesObject->setQueue($this->_createQueue());
     $result = $shortcodesObject->process([$shortcode], 'x');
     // when tracking is enabled, the shortcode is returned without arguments
-    expect($result[0])->equals('[link:shortcode]');
+    verify($result[0])->equals('[link:shortcode]');
   }
 
   public function testItCanProcessSiteTitleShortcode() {
@@ -417,7 +417,7 @@ class ShortcodesTest extends \MailPoetTest {
     $shortcode = '[site:title]';
     $shortcodesObject = $this->shortcodesObject;
     $result = $shortcodesObject->process([$shortcode]);
-    expect($result[0])->equals($siteName);
+    verify($result[0])->equals($siteName);
   }
 
   public function testItCanProcessSiteHomepageLinkShortcode() {
@@ -427,7 +427,7 @@ class ShortcodesTest extends \MailPoetTest {
     $shortcode = '[site:homepage_link]';
     $shortcodesObject = $this->shortcodesObject;
     $result = $shortcodesObject->process([$shortcode]);
-    expect($result[0])->equals("<a target=\"_blank\" href=\"{$siteUrl}\">{$siteName}</a>");
+    verify($result[0])->equals("<a target=\"_blank\" href=\"{$siteUrl}\">{$siteName}</a>");
   }
 
   public function testItCanProcessSiteHomepageUrlShortcode() {
@@ -437,7 +437,7 @@ class ShortcodesTest extends \MailPoetTest {
     $shortcode = '[site:homepage_url]';
     $shortcodesObject = $this->shortcodesObject;
     $result = $shortcodesObject->process([$shortcode]);
-    expect($result[0])->equals($siteUrl);
+    verify($result[0])->equals($siteUrl);
   }
 
   public function _createWPPost() {
diff --git a/mailpoet/tests/integration/Newsletter/UrlTest.php b/mailpoet/tests/integration/Newsletter/UrlTest.php
index 8547d3d3d3..a6d39dc37d 100644
--- a/mailpoet/tests/integration/Newsletter/UrlTest.php
+++ b/mailpoet/tests/integration/Newsletter/UrlTest.php
@@ -21,6 +21,6 @@ class UrlTest extends \MailPoetTest {
     $emptySubscriber = new SubscriberEntity();
     $urlEmptySubscriber = $newsletterUrl->getViewInBrowserUrl($newsletter, $emptySubscriber);
 
-    expect($urlNullSubscriber)->equals($urlEmptySubscriber);
+    verify($urlNullSubscriber)->equals($urlEmptySubscriber);
   }
 }
diff --git a/mailpoet/tests/integration/Newsletter/ViewInBrowser/ViewInBrowserControllerTest.php b/mailpoet/tests/integration/Newsletter/ViewInBrowser/ViewInBrowserControllerTest.php
index eefd3d411e..1640f960f5 100644
--- a/mailpoet/tests/integration/Newsletter/ViewInBrowser/ViewInBrowserControllerTest.php
+++ b/mailpoet/tests/integration/Newsletter/ViewInBrowser/ViewInBrowserControllerTest.php
@@ -133,7 +133,7 @@ class ViewInBrowserControllerTest extends \MailPoetTest {
       'render' => Expected::once(function (bool $isPreview, NewsletterEntity $newsletter, SubscriberEntity $subscriber = null, SendingQueueEntity $queue = null) {
         $this->assertNotNull($subscriber); // PHPStan
         expect($subscriber)->notNull();
-        expect($subscriber->getId())->equals(0);
+        verify($subscriber->getId())->equals(0);
       }),
     ]);
 
@@ -150,7 +150,7 @@ class ViewInBrowserControllerTest extends \MailPoetTest {
       'render' => Expected::once(function (bool $isPreview, NewsletterEntity $newsletter, SubscriberEntity $subscriber = null, SendingQueueEntity $queue = null) use ($subscriberId) {
         $this->assertNotNull($subscriber); // PHPStan
         expect($subscriber)->notNull();
-        expect($subscriber->getId())->equals($subscriberId);
+        verify($subscriber->getId())->equals($subscriberId);
       }),
     ]);
 
@@ -171,7 +171,7 @@ class ViewInBrowserControllerTest extends \MailPoetTest {
       'render' => Expected::once(function (bool $isPreview, NewsletterEntity $newsletter, SubscriberEntity $subscriber = null, SendingQueueEntity $queue = null) {
         $this->assertNotNull($queue); // PHPStan
         expect($queue)->notNull();
-        expect($queue->getId())->equals($this->sendingTask->id);
+        verify($queue->getId())->equals($this->sendingTask->id);
       }),
     ]);
 
@@ -187,7 +187,7 @@ class ViewInBrowserControllerTest extends \MailPoetTest {
       'render' => Expected::once(function (bool $isPreview, NewsletterEntity $newsletter, SubscriberEntity $subscriber = null, SendingQueueEntity $queue = null) {
         $this->assertNotNull($queue); // PHPStan
         expect($queue)->notNull();
-        expect($queue->getId())->equals($this->sendingTask->queue()->id);
+        verify($queue->getId())->equals($this->sendingTask->queue()->id);
       }),
     ]);
 
diff --git a/mailpoet/tests/integration/NewsletterTemplates/NewsletterTemplatesRepositoryTest.php b/mailpoet/tests/integration/NewsletterTemplates/NewsletterTemplatesRepositoryTest.php
index df1ec584b2..56941491a4 100644
--- a/mailpoet/tests/integration/NewsletterTemplates/NewsletterTemplatesRepositoryTest.php
+++ b/mailpoet/tests/integration/NewsletterTemplates/NewsletterTemplatesRepositoryTest.php
@@ -18,9 +18,9 @@ class NewsletterTemplatesRepositoryTest extends \MailPoetTest {
       'body' => '{"content": {}, "globalStyles": {}}',
       'thumbnail_data' => 'data:image/gif;base64,R0lGODlhAQABAAAAACw=',
     ]);
-    expect($createdTemplate->getName())->equals('Another template');
-    expect($createdTemplate->getBody())->equals(['content' => [], 'globalStyles' => []]);
-    expect($createdTemplate->getThumbnailData())->equals('data:image/gif;base64,R0lGODlhAQABAAAAACw=');
+    verify($createdTemplate->getName())->equals('Another template');
+    verify($createdTemplate->getBody())->equals(['content' => [], 'globalStyles' => []]);
+    verify($createdTemplate->getThumbnailData())->equals('data:image/gif;base64,R0lGODlhAQABAAAAACw=');
 
     $updatedTemplate = $this->newsletterTemplatesRepository->createOrUpdate([
       'id' => $createdTemplate->getId(),
@@ -28,9 +28,9 @@ class NewsletterTemplatesRepositoryTest extends \MailPoetTest {
       'body' => '{"content": "changed"}',
       'thumbnail_data' => 'data:image/gif;base64,R0lGO==',
     ]);
-    expect($updatedTemplate->getName())->equals('Another template updated');
-    expect($updatedTemplate->getBody())->equals(['content' => 'changed']);
-    expect($updatedTemplate->getThumbnailData())->equals('data:image/gif;base64,R0lGO==');
+    verify($updatedTemplate->getName())->equals('Another template updated');
+    verify($updatedTemplate->getBody())->equals(['content' => 'changed']);
+    verify($updatedTemplate->getThumbnailData())->equals('data:image/gif;base64,R0lGO==');
   }
 
   public function testItCleansRecentlySent() {
@@ -49,8 +49,8 @@ class NewsletterTemplatesRepositoryTest extends \MailPoetTest {
       ['categories' => NewsletterTemplatesRepository::RECENTLY_SENT_CATEGORIES],
       ['id' => 'ASC']
     );
-    expect(count($templates))->equals(NewsletterTemplatesRepository::RECENTLY_SENT_COUNT);
-    expect($templates[0]->getName())->equals('Testing template 5');
+    verify(count($templates))->equals(NewsletterTemplatesRepository::RECENTLY_SENT_COUNT);
+    verify($templates[0]->getName())->equals('Testing template 5');
   }
 
   public function testItCanCreateFromOldDataFormat() {
@@ -59,8 +59,8 @@ class NewsletterTemplatesRepositoryTest extends \MailPoetTest {
       'body' => '{"content": {}, "globalStyles": {}}',
       'thumbnail' => 'data:image/gif;base64,R0lGODlhAQABAAAAACw=',
     ]);
-    expect($createdTemplate->getName())->equals('Another template');
-    expect($createdTemplate->getBody())->equals(['content' => [], 'globalStyles' => []]);
-    expect($createdTemplate->getThumbnailData())->equals('data:image/gif;base64,R0lGODlhAQABAAAAACw=');
+    verify($createdTemplate->getName())->equals('Another template');
+    verify($createdTemplate->getBody())->equals(['content' => [], 'globalStyles' => []]);
+    verify($createdTemplate->getThumbnailData())->equals('data:image/gif;base64,R0lGODlhAQABAAAAACw=');
   }
 }
diff --git a/mailpoet/tests/integration/PostEditorBlocks/WooCommerceBlocksIntegrationTest.php b/mailpoet/tests/integration/PostEditorBlocks/WooCommerceBlocksIntegrationTest.php
index 8d9332453b..d382c7f0bc 100644
--- a/mailpoet/tests/integration/PostEditorBlocks/WooCommerceBlocksIntegrationTest.php
+++ b/mailpoet/tests/integration/PostEditorBlocks/WooCommerceBlocksIntegrationTest.php
@@ -57,7 +57,7 @@ class WooCommerceBlocksIntegrationTest extends \MailPoetTest {
     $subscriber = $this->entityManager->getRepository(SubscriberEntity::class)->findOneBy(['email' => $email]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
     $this->entityManager->refresh($subscriber);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED);
   }
 
   public function testItDoesNotChangeStatusForGuestCustomer() {
@@ -72,7 +72,7 @@ class WooCommerceBlocksIntegrationTest extends \MailPoetTest {
     $subscriber = $this->entityManager->getRepository(SubscriberEntity::class)->findOneBy(['email' => $email]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
     $this->entityManager->refresh($subscriber);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED);
   }
 
   public function testItHandlesOptinForExistingUnsubscribedCustomer() {
@@ -87,7 +87,7 @@ class WooCommerceBlocksIntegrationTest extends \MailPoetTest {
     $subscriber = $this->entityManager->getRepository(SubscriberEntity::class)->findOneBy(['email' => $email]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
     $this->entityManager->refresh($subscriber);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED);
   }
 
   public function testItHandlesOptinForExistingSubscribedCustomer() {
@@ -102,7 +102,7 @@ class WooCommerceBlocksIntegrationTest extends \MailPoetTest {
     $subscriber = $this->entityManager->getRepository(SubscriberEntity::class)->findOneBy(['email' => $email]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
     $this->entityManager->refresh($subscriber);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
   }
 
   public function testItDoesNotChangeStatusForExistingSubscribedCustomer() {
@@ -117,7 +117,7 @@ class WooCommerceBlocksIntegrationTest extends \MailPoetTest {
     $subscriber = $this->entityManager->getRepository(SubscriberEntity::class)->findOneBy(['email' => $email]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
     $this->entityManager->refresh($subscriber);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
   }
 
   private function setupSyncGuestUserMock(string $email) {
diff --git a/mailpoet/tests/integration/REST/Automation/Automations/AutomationsCreateFromTemplateTest.php b/mailpoet/tests/integration/REST/Automation/Automations/AutomationsCreateFromTemplateTest.php
index 4bb97876c5..257077798f 100644
--- a/mailpoet/tests/integration/REST/Automation/Automations/AutomationsCreateFromTemplateTest.php
+++ b/mailpoet/tests/integration/REST/Automation/Automations/AutomationsCreateFromTemplateTest.php
@@ -28,7 +28,7 @@ class AutomationsCreateFromTemplateTest extends AutomationTest {
       ],
     ]);
     $countAfter = count($this->automationStorage->getAutomations());
-    expect($countAfter)->equals($countBefore + 1);
+    verify($countAfter)->equals($countBefore + 1);
   }
 
   public function testEditorIsAllowed(): void {
diff --git a/mailpoet/tests/integration/Referrals/UrlDecoratorTest.php b/mailpoet/tests/integration/Referrals/UrlDecoratorTest.php
index 563a590134..62fdb4d1e9 100644
--- a/mailpoet/tests/integration/Referrals/UrlDecoratorTest.php
+++ b/mailpoet/tests/integration/Referrals/UrlDecoratorTest.php
@@ -23,16 +23,16 @@ class UrlDecoratorTest extends \MailPoetTest {
   public function testItDoesntDoAnythingWhenNoReferralId() {
     $this->settings->set(ReferralDetector::REFERRAL_SETTING_NAME, null);
     $url = 'http://example.com';
-    expect($this->urlDecorator->decorate($url))->equals($url);
+    verify($this->urlDecorator->decorate($url))->equals($url);
   }
 
   public function testItCorrectlyAddsReferralId() {
     $this->settings->set(ReferralDetector::REFERRAL_SETTING_NAME, 'abcdefgh');
-    expect($this->urlDecorator->decorate('http://example.com/'))
+    verify($this->urlDecorator->decorate('http://example.com/'))
       ->equals('http://example.com/?ref=abcdefgh');
-    expect($this->urlDecorator->decorate('http://example.com/?param=value'))
+    verify($this->urlDecorator->decorate('http://example.com/?param=value'))
       ->equals('http://example.com/?param=value&ref=abcdefgh');
-    expect($this->urlDecorator->decorate('http://example.com/?param=value#hash/?param=val'))
+    verify($this->urlDecorator->decorate('http://example.com/?param=value#hash/?param=val'))
       ->equals('http://example.com/?param=value&ref=abcdefgh#hash/?param=val');
   }
 }
diff --git a/mailpoet/tests/integration/Router/Endpoints/TrackTest.php b/mailpoet/tests/integration/Router/Endpoints/TrackTest.php
index 74a48175f6..e6028d052d 100644
--- a/mailpoet/tests/integration/Router/Endpoints/TrackTest.php
+++ b/mailpoet/tests/integration/Router/Endpoints/TrackTest.php
@@ -108,7 +108,7 @@ class TrackTest extends \MailPoetTest {
       'sendingQueuesRepository' => $this->diContainer->get(SendingQueuesRepository::class),
       'linkTokens' => $this->linkTokens,
       'terminate' => function($code) {
-        expect($code)->equals(403);
+        verify($code)->equals(403);
       },
     ]);
     $track->_validateTrackData($data);
@@ -147,7 +147,7 @@ class TrackTest extends \MailPoetTest {
     $this->subscriber->setWpUserId(99);
     $this->entityManager->flush();
     $data->preview = true;
-    expect($this->track->_validateTrackData($data))->equals($data);
+    verify($this->track->_validateTrackData($data))->equals($data);
   }
 
   public function testItRequiresValidQueueToGetNewsletter() {
@@ -162,15 +162,15 @@ class TrackTest extends \MailPoetTest {
     $data = $this->trackData;
     $data['newsletter_id'] = false;
     $processedData = $this->track->_processTrackData($data);
-    expect($processedData->newsletter->getId())->equals($this->newsletter->getId());
+    verify($processedData->newsletter->getId())->equals($this->newsletter->getId());
   }
 
   public function testItProcessesTrackData() {
     $processedData = $this->track->_processTrackData($this->trackData);
-    expect($processedData->queue->getId())->equals($this->queue->getId());
-    expect($processedData->subscriber->getId())->equals($this->subscriber->getId());
-    expect($processedData->newsletter->getId())->equals($this->newsletter->getId());
-    expect($processedData->link->getId())->equals($this->link->getId());
+    verify($processedData->queue->getId())->equals($this->queue->getId());
+    verify($processedData->subscriber->getId())->equals($this->subscriber->getId());
+    verify($processedData->newsletter->getId())->equals($this->newsletter->getId());
+    verify($processedData->link->getId())->equals($this->link->getId());
   }
 
   public function testItGetsProperHashWhenDuplicateHashesExist() {
@@ -210,6 +210,6 @@ class TrackTest extends \MailPoetTest {
 
     // assert that the fetched link ID belong to the newly created link
     $processedData = $this->track->_processTrackData($trackData);
-    expect($processedData->link->getId())->equals($link->getId());
+    verify($processedData->link->getId())->equals($link->getId());
   }
 }
diff --git a/mailpoet/tests/integration/Router/RouterTest.php b/mailpoet/tests/integration/Router/RouterTest.php
index aa1ec7e89b..448a85eed9 100644
--- a/mailpoet/tests/integration/Router/RouterTest.php
+++ b/mailpoet/tests/integration/Router/RouterTest.php
@@ -42,10 +42,10 @@ class RouterTest extends \MailPoetTest {
       . base64_encode((string)json_encode($data));
     parse_str((string)parse_url($url, PHP_URL_QUERY), $_GET);
     $router = new Router($this->accessControl, $this->container);
-    expect($router->apiRequest)->equals(true);
-    expect($router->endpoint)->equals('viewInBrowser');
-    expect($router->endpointAction)->equals('view');
-    expect($router->data)->equals($data);
+    verify($router->apiRequest)->equals(true);
+    verify($router->endpoint)->equals('viewInBrowser');
+    verify($router->endpointAction)->equals('view');
+    verify($router->data)->equals($data);
   }
 
   public function testItContinuesExecutionWhenAPIRequestNotDetected() {
@@ -75,7 +75,7 @@ class RouterTest extends \MailPoetTest {
       ]
     );
     $result = $router->init();
-    expect($result)->equals(
+    verify($result)->equals(
       [
         404,
         'Invalid router endpoint',
@@ -99,7 +99,7 @@ class RouterTest extends \MailPoetTest {
       ]
     );
     $result = $router->init();
-    expect($result)->equals(
+    verify($result)->equals(
       [
         404,
         'Invalid router endpoint action',
@@ -117,7 +117,7 @@ class RouterTest extends \MailPoetTest {
       new AccessControl(),
       [
         'validatePermission' => Expected::once(function($cap) {
-          expect($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
+          verify($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
           return false;
         }),
       ]
@@ -129,7 +129,7 @@ class RouterTest extends \MailPoetTest {
       new AccessControl(),
       [
         'validatePermission' => Expected::once(function($cap) {
-          expect($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
+          verify($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
           return true;
         }),
       ]
@@ -152,7 +152,7 @@ class RouterTest extends \MailPoetTest {
       new AccessControl(),
       [
         'validatePermission' => Expected::once(function($cap) {
-          expect($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
+          verify($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
           return false;
         }),
       ]
@@ -164,7 +164,7 @@ class RouterTest extends \MailPoetTest {
       new AccessControl(),
       [
         'validatePermission' => Expected::once(function($cap) {
-          expect($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
+          verify($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
           return true;
         }),
       ]
@@ -179,8 +179,8 @@ class RouterTest extends \MailPoetTest {
       [$this->accessControl, $this->container, $this->routerData],
       [
         'validatePermissions' => function($action, $permissions) {
-          expect($action)->equals($this->routerData['action']);
-          expect($permissions)->equals(
+          verify($action)->equals($this->routerData['action']);
+          verify($permissions)->equals(
             [
               'global' => AccessControl::NO_ACCESS_RESTRICTION,
             ]
@@ -190,7 +190,7 @@ class RouterTest extends \MailPoetTest {
       ]
     );
     $result = $router->init();
-    expect($result)->equals(
+    verify($result)->equals(
       ['data' => 'dummy data']
     );
   }
@@ -210,7 +210,7 @@ class RouterTest extends \MailPoetTest {
       ]
     );
     $result = $router->init();
-    expect($result)->equals(
+    verify($result)->equals(
       [
         403,
         'You do not have the required permissions.',
@@ -221,7 +221,7 @@ class RouterTest extends \MailPoetTest {
   public function testItCallsEndpointAction() {
     $data = ['data' => 'dummy data'];
     $result = $this->router->init();
-    expect($result)->equals($data);
+    verify($result)->equals($data);
   }
 
   public function testItExecutesUrlParameterConflictResolverAction() {
@@ -232,7 +232,7 @@ class RouterTest extends \MailPoetTest {
   public function testItCanEncodeRequestData() {
     $data = ['data' => 'dummy data'];
     $result = Router::encodeRequestData($data);
-    expect($result)->equals(
+    verify($result)->equals(
       rtrim(base64_encode((string)json_encode($data)), '=')
     );
   }
@@ -240,21 +240,21 @@ class RouterTest extends \MailPoetTest {
   public function testItReturnsEmptyArrayWhenRequestDataIsAString() {
     $encodedData = 'test';
     $result = Router::decodeRequestData($encodedData);
-    expect($result)->equals([]);
+    verify($result)->equals([]);
   }
 
   public function testItCanDecodeRequestData() {
     $data = ['data' => 'dummy data'];
     $encodedData = rtrim(base64_encode((string)json_encode($data)), '=');
     $result = Router::decodeRequestData($encodedData);
-    expect($result)->equals($data);
+    verify($result)->equals($data);
   }
 
   public function testItCanConvertInvalidRequestDataToArray() {
     $result = Router::decodeRequestData('some_invalid_data');
-    expect($result)->equals([]);
+    verify($result)->equals([]);
     $result = Router::decodeRequestData(['key' => 'some_invalid_data']);
-    expect($result)->equals([]);
+    verify($result)->equals([]);
   }
 
   public function testItCanBuildRequest() {
diff --git a/mailpoet/tests/integration/Segments/DynamicSegments/DynamicSegmentFilterRepositoryTest.php b/mailpoet/tests/integration/Segments/DynamicSegments/DynamicSegmentFilterRepositoryTest.php
index b94d9cc198..f2cc497a67 100644
--- a/mailpoet/tests/integration/Segments/DynamicSegments/DynamicSegmentFilterRepositoryTest.php
+++ b/mailpoet/tests/integration/Segments/DynamicSegments/DynamicSegmentFilterRepositoryTest.php
@@ -31,8 +31,8 @@ class DynamicSegmentFilterRepositoryTest extends \MailPoetTest {
       WooCommerceTotalSpent::ACTION_TOTAL_SPENT
     );
     $this->assertInstanceOf(DynamicSegmentFilterEntity::class, $dynamicFilter);
-    expect($dynamicFilter->getFilterData()->getFilterType())->equals(DynamicSegmentFilterData::TYPE_WOOCOMMERCE);
-    expect($dynamicFilter->getFilterData()->getAction())->equals(WooCommerceTotalSpent::ACTION_TOTAL_SPENT);
+    verify($dynamicFilter->getFilterData()->getFilterType())->equals(DynamicSegmentFilterData::TYPE_WOOCOMMERCE);
+    verify($dynamicFilter->getFilterData()->getAction())->equals(WooCommerceTotalSpent::ACTION_TOTAL_SPENT);
 
     $dynamicFilter = $this->dynamicSegmentFilterRepository->findOnyByFilterTypeAndAction(
       DynamicSegmentFilterData::TYPE_USER_ROLE,
diff --git a/mailpoet/tests/integration/Segments/DynamicSegments/FilterDataMapperTest.php b/mailpoet/tests/integration/Segments/DynamicSegments/FilterDataMapperTest.php
index d98e0e45b2..e50be6b464 100644
--- a/mailpoet/tests/integration/Segments/DynamicSegments/FilterDataMapperTest.php
+++ b/mailpoet/tests/integration/Segments/DynamicSegments/FilterDataMapperTest.php
@@ -67,9 +67,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_EMAIL);
-    expect($filter->getAction())->equals(EmailAction::ACTION_OPENED);
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_EMAIL);
+    verify($filter->getAction())->equals(EmailAction::ACTION_OPENED);
+    verify($filter->getData())->equals([
       'newsletters' => [1],
       'operator' => DynamicSegmentFilterData::OPERATOR_ANY,
       'connect' => DynamicSegmentFilterData::CONNECT_TYPE_AND,
@@ -89,9 +89,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_EMAIL);
-    expect($filter->getAction())->equals(EmailAction::ACTION_CLICKED);
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_EMAIL);
+    verify($filter->getAction())->equals(EmailAction::ACTION_CLICKED);
+    verify($filter->getData())->equals([
       'newsletter_id' => 1,
       'operator' => DynamicSegmentFilterData::OPERATOR_ANY,
       'connect' => DynamicSegmentFilterData::CONNECT_TYPE_AND,
@@ -113,9 +113,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_EMAIL);
-    expect($filter->getAction())->equals(EmailAction::ACTION_CLICKED);
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_EMAIL);
+    verify($filter->getAction())->equals(EmailAction::ACTION_CLICKED);
+    verify($filter->getData())->equals([
       'newsletter_id' => 1,
       'link_ids' => [2, 3],
       'operator' => DynamicSegmentFilterData::OPERATOR_ANY,
@@ -180,9 +180,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
-    expect($filter->getAction())->equals('userRole');
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
+    verify($filter->getAction())->equals('userRole');
+    verify($filter->getData())->equals([
       'wordpressRole' => ['editor'],
       'operator' => DynamicSegmentFilterData::OPERATOR_ANY,
       'connect' => DynamicSegmentFilterData::CONNECT_TYPE_AND,
@@ -212,9 +212,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_WOOCOMMERCE);
-    expect($filter->getAction())->equals(WooCommerceCategory::ACTION_CATEGORY);
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_WOOCOMMERCE);
+    verify($filter->getAction())->equals(WooCommerceCategory::ACTION_CATEGORY);
+    verify($filter->getData())->equals([
       'category_ids' => ['1', '3'],
       'operator' => DynamicSegmentFilterData::OPERATOR_ANY,
       'connect' => DynamicSegmentFilterData::CONNECT_TYPE_AND,
@@ -268,9 +268,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_WOOCOMMERCE);
-    expect($filter->getAction())->equals(WooCommerceProduct::ACTION_PRODUCT);
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_WOOCOMMERCE);
+    verify($filter->getAction())->equals(WooCommerceProduct::ACTION_PRODUCT);
+    verify($filter->getData())->equals([
       'product_ids' => ['10', '11'],
       'operator' => DynamicSegmentFilterData::OPERATOR_ANY,
       'connect' => DynamicSegmentFilterData::CONNECT_TYPE_AND,
@@ -300,9 +300,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_EMAIL);
-    expect($filter->getAction())->equals(EmailOpensAbsoluteCountAction::TYPE);
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_EMAIL);
+    verify($filter->getAction())->equals(EmailOpensAbsoluteCountAction::TYPE);
+    verify($filter->getData())->equals([
       'opens' => 5,
       'days' => 3,
       'timeframe' => DynamicSegmentFilterData::TIMEFRAME_IN_THE_LAST,
@@ -323,9 +323,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_EMAIL);
-    expect($filter->getAction())->equals(EmailActionClickAny::TYPE);
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_EMAIL);
+    verify($filter->getAction())->equals(EmailActionClickAny::TYPE);
+    verify($filter->getData())->equals([
       'connect' => DynamicSegmentFilterData::CONNECT_TYPE_AND,
     ]);
   }
@@ -344,9 +344,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_EMAIL);
-    expect($filter->getAction())->equals(EmailOpensAbsoluteCountAction::TYPE);
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_EMAIL);
+    verify($filter->getAction())->equals(EmailOpensAbsoluteCountAction::TYPE);
+    verify($filter->getData())->equals([
       'opens' => 5,
       'days' => 3,
       'timeframe' => DynamicSegmentFilterData::TIMEFRAME_IN_THE_LAST,
@@ -398,9 +398,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $expectedResult['connect'] = DynamicSegmentFilterData::CONNECT_TYPE_AND;
 
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_WOOCOMMERCE);
-    expect($filter->getAction())->equals(WooCommerceNumberOfOrders::ACTION_NUMBER_OF_ORDERS);
-    expect($filter->getData())->equals($expectedResult);
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_WOOCOMMERCE);
+    verify($filter->getAction())->equals(WooCommerceNumberOfOrders::ACTION_NUMBER_OF_ORDERS);
+    verify($filter->getData())->equals($expectedResult);
   }
 
   public function testItRaisesExceptionWhenMappingWooCommerceNumberOfOrders(): void {
@@ -438,9 +438,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $expectedResult['connect'] = DynamicSegmentFilterData::CONNECT_TYPE_AND;
 
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_WOOCOMMERCE);
-    expect($filter->getAction())->equals(WooCommerceSingleOrderValue::ACTION_SINGLE_ORDER_VALUE);
-    expect($filter->getData())->equals($expectedResult);
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_WOOCOMMERCE);
+    verify($filter->getAction())->equals(WooCommerceSingleOrderValue::ACTION_SINGLE_ORDER_VALUE);
+    verify($filter->getData())->equals($expectedResult);
   }
 
   public function testItRaisesExceptionWhenMappingWooCommerceSingleOrderValue(): void {
@@ -470,9 +470,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_WOOCOMMERCE_SUBSCRIPTION);
-    expect($filter->getAction())->equals(WooCommerceSubscription::ACTION_HAS_ACTIVE);
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_WOOCOMMERCE_SUBSCRIPTION);
+    verify($filter->getAction())->equals(WooCommerceSubscription::ACTION_HAS_ACTIVE);
+    verify($filter->getData())->equals([
       'product_ids' => ['10'],
       'operator' => DynamicSegmentFilterData::OPERATOR_ANY,
       'connect' => DynamicSegmentFilterData::CONNECT_TYPE_AND,
@@ -527,9 +527,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_WOOCOMMERCE);
-    expect($filter->getAction())->equals(WooCommerceCountry::ACTION_CUSTOMER_COUNTRY);
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_WOOCOMMERCE);
+    verify($filter->getAction())->equals(WooCommerceCountry::ACTION_CUSTOMER_COUNTRY);
+    verify($filter->getData())->equals([
       'country_code' => ['UK'],
       'operator' => DynamicSegmentFilterData::OPERATOR_ANY,
       'connect' => DynamicSegmentFilterData::CONNECT_TYPE_AND,
@@ -569,9 +569,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
-    expect($filter->getAction())->equals(SubscriberScore::TYPE);
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
+    verify($filter->getAction())->equals(SubscriberScore::TYPE);
+    verify($filter->getData())->equals([
       'value' => 2,
       'operator' => SubscriberScore::HIGHER_THAN,
       'connect' => DynamicSegmentFilterData::CONNECT_TYPE_AND,
@@ -601,9 +601,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
-    expect($filter->getAction())->equals(SubscriberSegment::TYPE);
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
+    verify($filter->getAction())->equals(SubscriberSegment::TYPE);
+    verify($filter->getData())->equals([
       'segments' => [1, 5],
       'operator' => DynamicSegmentFilterData::OPERATOR_NONE,
       'connect' => DynamicSegmentFilterData::CONNECT_TYPE_AND,
@@ -658,9 +658,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
-    expect($filter->getAction())->equals(MailPoetCustomFields::TYPE);
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
+    verify($filter->getAction())->equals(MailPoetCustomFields::TYPE);
+    verify($filter->getData())->equals([
       'custom_field_id' => 123,
       'custom_field_type' => CustomFieldEntity::TYPE_TEXT,
       'value' => 4,
@@ -695,9 +695,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
-    expect($filter->getAction())->equals(SubscriberTag::TYPE);
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
+    verify($filter->getAction())->equals(SubscriberTag::TYPE);
+    verify($filter->getData())->equals([
       'tags' => ['12'],
       'operator' => DynamicSegmentFilterData::OPERATOR_ANY,
       'connect' => DynamicSegmentFilterData::CONNECT_TYPE_AND,
@@ -718,9 +718,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
-    expect($filter->getAction())->equals(SubscriberTextField::FIRST_NAME);
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
+    verify($filter->getAction())->equals(SubscriberTextField::FIRST_NAME);
+    verify($filter->getData())->equals([
       'value' => 'some value',
       'operator' => 'contains',
       'action' => 'subscriberFirstName',
@@ -752,9 +752,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
-    expect($filter->getAction())->equals(SubscriberSubscribedViaForm::TYPE);
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
+    verify($filter->getAction())->equals(SubscriberSubscribedViaForm::TYPE);
+    verify($filter->getData())->equals([
       'form_ids' => [1, 2],
       'operator' => DynamicSegmentFilterData::OPERATOR_ANY,
       'connect' => DynamicSegmentFilterData::CONNECT_TYPE_AND,
@@ -798,9 +798,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_AUTOMATIONS);
-    expect($filter->getAction())->equals('enteredAutomation');
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_AUTOMATIONS);
+    verify($filter->getAction())->equals('enteredAutomation');
+    verify($filter->getData())->equals([
       'action' => 'enteredAutomation',
       'operator' => 'any',
       'automation_ids' => ['1', '2'],
@@ -821,9 +821,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_AUTOMATIONS);
-    expect($filter->getAction())->equals('exitedAutomation');
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_AUTOMATIONS);
+    verify($filter->getAction())->equals('exitedAutomation');
+    verify($filter->getData())->equals([
       'action' => 'exitedAutomation',
       'operator' => 'all',
       'automation_ids' => ['1', '2'],
@@ -893,9 +893,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_WOOCOMMERCE);
-    expect($filter->getAction())->equals('numberOfReviews');
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_WOOCOMMERCE);
+    verify($filter->getAction())->equals('numberOfReviews');
+    verify($filter->getData())->equals([
       'connect' => 'and',
       'days' => '10',
       'count_type' => '!=',
@@ -920,9 +920,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_WOOCOMMERCE);
-    expect($filter->getAction())->equals('usedCouponCode');
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_WOOCOMMERCE);
+    verify($filter->getAction())->equals('usedCouponCode');
+    verify($filter->getData())->equals([
       'connect' => 'and',
       'operator' => 'all',
       'days' => '10',
@@ -947,9 +947,9 @@ class FilterDataMapperTest extends \MailPoetTest {
     $filter = reset($filters);
     $this->assertInstanceOf(DynamicSegmentFilterData::class, $filter);
     expect($filter)->isInstanceOf(DynamicSegmentFilterData::class);
-    expect($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
-    expect($filter->getAction())->equals($action);
-    expect($filter->getData())->equals([
+    verify($filter->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
+    verify($filter->getAction())->equals($action);
+    verify($filter->getData())->equals([
       'value' => '2023-07-01',
       'operator' => 'on',
       'connect' => DynamicSegmentFilterData::CONNECT_TYPE_AND,
diff --git a/mailpoet/tests/integration/Segments/DynamicSegments/FilterHandlerTest.php b/mailpoet/tests/integration/Segments/DynamicSegments/FilterHandlerTest.php
index 50e4183998..750dececf6 100644
--- a/mailpoet/tests/integration/Segments/DynamicSegments/FilterHandlerTest.php
+++ b/mailpoet/tests/integration/Segments/DynamicSegments/FilterHandlerTest.php
@@ -54,8 +54,8 @@ class FilterHandlerTest extends \MailPoetTest {
     $this->assertIsArray($result[1]);
     $subscriber2 = $this->entityManager->find(SubscriberEntity::class, $result[1]['id']);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber2);
-    expect($subscriber1->getEmail())->equals('user-role-test1@example.com');
-    expect($subscriber2->getEmail())->equals('user-role-test3@example.com');
+    verify($subscriber1->getEmail())->equals('user-role-test1@example.com');
+    verify($subscriber2->getEmail())->equals('user-role-test3@example.com');
   }
 
   private function getSegment(string $role): SegmentEntity {
diff --git a/mailpoet/tests/integration/Segments/DynamicSegments/Filters/EmailActionClickAnyTest.php b/mailpoet/tests/integration/Segments/DynamicSegments/Filters/EmailActionClickAnyTest.php
index 323be44860..5c743590f5 100644
--- a/mailpoet/tests/integration/Segments/DynamicSegments/Filters/EmailActionClickAnyTest.php
+++ b/mailpoet/tests/integration/Segments/DynamicSegments/Filters/EmailActionClickAnyTest.php
@@ -70,7 +70,7 @@ class EmailActionClickAnyTest extends \MailPoetTest {
     $data = $this->getSegmentFilterData(EmailActionClickAny::TYPE);
     $emails = $this->tester->getSubscriberEmailsMatchingDynamicFilter($data, $this->emailAction);
     expect($emails)->count(1);
-    expect($emails[0])->equals('opened_clicked@example.com');
+    verify($emails[0])->equals('opened_clicked@example.com');
   }
 
   private function getSegmentFilterData(string $action, int $newsletterId = null, int $linkId = null): DynamicSegmentFilterData {
diff --git a/mailpoet/tests/integration/Segments/DynamicSegments/Filters/FilterHelperTest.php b/mailpoet/tests/integration/Segments/DynamicSegments/Filters/FilterHelperTest.php
index 1feb06ddde..5e17326efc 100644
--- a/mailpoet/tests/integration/Segments/DynamicSegments/Filters/FilterHelperTest.php
+++ b/mailpoet/tests/integration/Segments/DynamicSegments/Filters/FilterHelperTest.php
@@ -23,22 +23,22 @@ class FilterHelperTest extends \MailPoetTest {
   public function testItCanReturnSQLThatDoesNotIncludeParams(): void {
     $queryBuilder = $this->getSubscribersQueryBuilder();
     $defaultResult = $queryBuilder->getSQL();
-    expect($defaultResult)->equals("SELECT id FROM $this->subscribersTable");
-    expect($this->filterHelper->getInterpolatedSQL($queryBuilder))->equals($defaultResult);
+    verify($defaultResult)->equals("SELECT id FROM $this->subscribersTable");
+    verify($this->filterHelper->getInterpolatedSQL($queryBuilder))->equals($defaultResult);
   }
 
   public function testItCanReturnInterpolatedSQL(): void {
     $queryBuilder = $this->getSubscribersQueryBuilder();
     $queryBuilder->where("$this->subscribersTable.created_at < :date");
     $queryBuilder->setParameter('date', '2023-03-09');
-    expect($this->filterHelper->getInterpolatedSQL($queryBuilder))->equals("SELECT id FROM $this->subscribersTable WHERE $this->subscribersTable.created_at < '2023-03-09'");
+    verify($this->filterHelper->getInterpolatedSQL($queryBuilder))->equals("SELECT id FROM $this->subscribersTable WHERE $this->subscribersTable.created_at < '2023-03-09'");
   }
 
   public function testItProperlyInterpolatesArrayValues(): void {
     $queryBuilder = $this->getSubscribersQueryBuilder();
     $queryBuilder->where("$this->subscribersTable.status IN (:statuses)");
     $queryBuilder->setParameter('statuses', ['subscribed', 'inactive']);
-    expect($this->filterHelper->getInterpolatedSQL($queryBuilder))->equals("SELECT id FROM $this->subscribersTable WHERE $this->subscribersTable.status IN ('subscribed','inactive')");
+    verify($this->filterHelper->getInterpolatedSQL($queryBuilder))->equals("SELECT id FROM $this->subscribersTable WHERE $this->subscribersTable.status IN ('subscribed','inactive')");
   }
 
   private function getSubscribersQueryBuilder(): QueryBuilder {
diff --git a/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommercePurchaseDateTest.php b/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommercePurchaseDateTest.php
index 4c467cd77e..14db06eb1c 100644
--- a/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommercePurchaseDateTest.php
+++ b/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommercePurchaseDateTest.php
@@ -25,8 +25,8 @@ class WooCommercePurchaseDateTest extends \MailPoetTest {
     $this->createOrder($customerId1, new Carbon('2023-02-20'));
     $this->createOrder($customerId2, new Carbon('2023-02-22'));
     $emails = $this->getSubscriberEmailsMatchingFilter('before', '2023-02-21');
-    expect(count($emails))->equals(1);
-    expect($emails)->equals(['c1@example.com']);
+    verify(count($emails))->equals(1);
+    verify($emails)->equals(['c1@example.com']);
   }
 
   public function testGetSubscribersWithOrderAfterDate(): void {
@@ -38,7 +38,7 @@ class WooCommercePurchaseDateTest extends \MailPoetTest {
     $this->createOrder($customerId3, new Carbon('1993-01-01'));
     $emails = $this->getSubscriberEmailsMatchingFilter('after', '2023-02-01');
     expect($emails)->count(1);
-    expect($emails)->equals(['c1@example.com']);
+    verify($emails)->equals(['c1@example.com']);
   }
 
   public function testInTheLast(): void {
@@ -49,7 +49,7 @@ class WooCommercePurchaseDateTest extends \MailPoetTest {
     $this->createOrder($customerId2, Carbon::now()->subDays(4));
     $this->createOrder($customerId3, Carbon::now()->subDays(5));
     $emails = $this->getSubscriberEmailsMatchingFilter(DynamicSegmentFilterData::TIMEFRAME_IN_THE_LAST, '5');
-    expect(count($emails))->equals(2);
+    verify(count($emails))->equals(2);
     $this->assertEqualsCanonicalizing(['c1@example.com', 'c2@example.com'], $emails);
   }
 
@@ -61,8 +61,8 @@ class WooCommercePurchaseDateTest extends \MailPoetTest {
     $this->createOrder($customerId2, Carbon::now()->subDays(4));
     $this->createOrder($customerId3, Carbon::now()->subDays(5));
     $emails = $this->getSubscriberEmailsMatchingFilter('notInTheLast', '5');
-    expect(count($emails))->equals(1);
-    expect($emails)->equals(['c3@example.com']);
+    verify(count($emails))->equals(1);
+    verify($emails)->equals(['c3@example.com']);
   }
 
   public function testNotInTheLastIncludesNonCustomers(): void {
@@ -82,8 +82,8 @@ class WooCommercePurchaseDateTest extends \MailPoetTest {
     $this->createOrder($customerId2, new Carbon('2023-01-02'));
     $this->createOrder($customerId3, new Carbon('2023-01-03'));
     $emails = $this->getSubscriberEmailsMatchingFilter('on', '2023-01-02');
-    expect(count($emails))->equals(1);
-    expect($emails)->equals(['c2@example.com']);
+    verify(count($emails))->equals(1);
+    verify($emails)->equals(['c2@example.com']);
   }
 
   public function testOnOrAfterDate(): void {
@@ -94,8 +94,8 @@ class WooCommercePurchaseDateTest extends \MailPoetTest {
     $this->createOrder($customerId2, new Carbon('2023-01-02'));
     $this->createOrder($customerId3, new Carbon('2023-01-03'));
     $emails = $this->getSubscriberEmailsMatchingFilter('onOrAfter', '2023-01-02');
-    expect(count($emails))->equals(2);
-    expect($emails)->equals(['c2@example.com', 'c3@example.com']);
+    verify(count($emails))->equals(2);
+    verify($emails)->equals(['c2@example.com', 'c3@example.com']);
   }
 
   public function testOnOrBeforeDate(): void {
@@ -106,8 +106,8 @@ class WooCommercePurchaseDateTest extends \MailPoetTest {
     $this->createOrder($customerId2, new Carbon('2023-01-02'));
     $this->createOrder($customerId3, new Carbon('2023-01-03'));
     $emails = $this->getSubscriberEmailsMatchingFilter('onOrBefore', '2023-01-02');
-    expect(count($emails))->equals(2);
-    expect($emails)->equals(['c1@example.com', 'c2@example.com']);
+    verify(count($emails))->equals(2);
+    verify($emails)->equals(['c1@example.com', 'c2@example.com']);
   }
 
   public function testNotOn(): void {
@@ -118,7 +118,7 @@ class WooCommercePurchaseDateTest extends \MailPoetTest {
     $this->createOrder($customerId2, new Carbon('2023-01-02'));
     $this->createOrder($customerId3, new Carbon('2023-01-03'));
     $emails = $this->getSubscriberEmailsMatchingFilter('notOn', '2023-01-02');
-    expect(count($emails))->equals(2);
+    verify(count($emails))->equals(2);
     $this->assertEqualsCanonicalizing(['c1@example.com', 'c3@example.com'], $emails);
   }
 
diff --git a/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommerceSingleOrderValueTest.php b/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommerceSingleOrderValueTest.php
index 1a48cc2eba..d00e0c1c4e 100644
--- a/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommerceSingleOrderValueTest.php
+++ b/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommerceSingleOrderValueTest.php
@@ -30,13 +30,13 @@ class WooCommerceSingleOrderValueTest extends \MailPoetTest {
   public function testItGetsCustomersThatSpentFifteenInAnOrderInTheLastDay(): void {
     $segmentFilterData = $this->getSegmentFilterData('=', 15, 1);
     $emails = $this->tester->getSubscriberEmailsMatchingDynamicFilter($segmentFilterData, $this->singleOrderValue);
-    expect($emails)->equals(['customer2@example.com']);
+    verify($emails)->equals(['customer2@example.com']);
   }
 
   public function testItGetsCustomersThatSpentFifteenInAnOrderInTheLastWeek(): void {
     $segmentFilterData = $this->getSegmentFilterData('=', 15, 7);
     $emails = $this->tester->getSubscriberEmailsMatchingDynamicFilter($segmentFilterData, $this->singleOrderValue);
-    expect($emails)->equals(['customer2@example.com']);
+    verify($emails)->equals(['customer2@example.com']);
   }
 
   public function testItGetsCustomersThatDidNotSpendFifteenInAnOrderInTheLastDay(): void {
@@ -48,13 +48,13 @@ class WooCommerceSingleOrderValueTest extends \MailPoetTest {
   public function testItGetsCustomersThatSpentMoreThanTwentyInAnOrderInTheLastDay(): void {
     $segmentFilterData = $this->getSegmentFilterData('>', 20, 1);
     $emails = $this->tester->getSubscriberEmailsMatchingDynamicFilter($segmentFilterData, $this->singleOrderValue);
-    expect($emails)->equals(['customer3@example.com']);
+    verify($emails)->equals(['customer3@example.com']);
   }
 
   public function testItGetsCustomersThatSpentLessThanTenInAnOrderInTheLastDay(): void {
     $segmentFilterData = $this->getSegmentFilterData('<', 10, 1);
     $emails = $this->tester->getSubscriberEmailsMatchingDynamicFilter($segmentFilterData, $this->singleOrderValue);
-    expect($emails)->equals(['customer1@example.com']);
+    verify($emails)->equals(['customer1@example.com']);
   }
 
   public function testItGetsCustomersThatSpentMoreThanTenInAnOrderInTheLastWeek(): void {
diff --git a/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommerceUsedShippingMethodTest.php b/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommerceUsedShippingMethodTest.php
index 61102addd0..bb5a37cbc4 100644
--- a/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommerceUsedShippingMethodTest.php
+++ b/mailpoet/tests/integration/Segments/DynamicSegments/Filters/WooCommerceUsedShippingMethodTest.php
@@ -171,7 +171,7 @@ class WooCommerceUsedShippingMethodTest extends \MailPoetTest {
       'timeframe' => 'inTheLast',
     ]);
     $lookupData = $this->filter->getLookupData($filterData);
-    expect($lookupData)->equals(['shippingMethods' => []]);
+    verify($lookupData)->equals(['shippingMethods' => []]);
   }
 
   private function assertFilterReturnsEmails(string $operator, array $shippingMethodStrings, int $days, string $timeframe, array $expectedEmails): void {
diff --git a/mailpoet/tests/integration/Segments/DynamicSegments/SegmentSaveControllerTest.php b/mailpoet/tests/integration/Segments/DynamicSegments/SegmentSaveControllerTest.php
index f7eefc820a..3ad6984540 100644
--- a/mailpoet/tests/integration/Segments/DynamicSegments/SegmentSaveControllerTest.php
+++ b/mailpoet/tests/integration/Segments/DynamicSegments/SegmentSaveControllerTest.php
@@ -30,15 +30,15 @@ class SegmentSaveControllerTest extends \MailPoetTest {
     ];
 
     $segment = $this->saveController->save($segmentData);
-    expect($segment->getName())->equals('Test Segment');
-    expect($segment->getDescription())->equals('Description');
-    expect($segment->getDynamicFilters()->count())->equals(1);
-    expect($segment->getType())->equals(SegmentEntity::TYPE_DYNAMIC);
+    verify($segment->getName())->equals('Test Segment');
+    verify($segment->getDescription())->equals('Description');
+    verify($segment->getDynamicFilters()->count())->equals(1);
+    verify($segment->getType())->equals(SegmentEntity::TYPE_DYNAMIC);
     $filter = $segment->getDynamicFilters()->first();
     $this->assertInstanceOf(DynamicSegmentFilterEntity::class, $filter);
-    expect($filter->getFilterData()->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
-    expect($filter->getFilterData()->getAction())->equals(UserRole::TYPE);
-    expect($filter->getFilterData()->getData())->equals([
+    verify($filter->getFilterData()->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
+    verify($filter->getFilterData()->getAction())->equals(UserRole::TYPE);
+    verify($filter->getFilterData()->getData())->equals([
       'wordpressRole' => 'editor',
       'operator' => DynamicSegmentFilterData::OPERATOR_ANY,
       'connect' => DynamicSegmentFilterData::CONNECT_TYPE_AND,
@@ -64,15 +64,15 @@ class SegmentSaveControllerTest extends \MailPoetTest {
     ];
 
     $segment = $this->saveController->save($segmentData);
-    expect($segment->getName())->equals('Test Segment Edited');
-    expect($segment->getDescription())->equals('Description Edited');
-    expect($segment->getDynamicFilters()->count())->equals(1);
-    expect($segment->getType())->equals(SegmentEntity::TYPE_DYNAMIC);
+    verify($segment->getName())->equals('Test Segment Edited');
+    verify($segment->getDescription())->equals('Description Edited');
+    verify($segment->getDynamicFilters()->count())->equals(1);
+    verify($segment->getType())->equals(SegmentEntity::TYPE_DYNAMIC);
     $filter = $segment->getDynamicFilters()->first();
     $this->assertInstanceOf(DynamicSegmentFilterEntity::class, $filter);
-    expect($filter->getFilterData()->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
-    expect($filter->getFilterData()->getAction())->equals(UserRole::TYPE);
-    expect($filter->getFilterData()->getData())->equals([
+    verify($filter->getFilterData()->getFilterType())->equals(DynamicSegmentFilterData::TYPE_USER_ROLE);
+    verify($filter->getFilterData()->getAction())->equals(UserRole::TYPE);
+    verify($filter->getFilterData()->getData())->equals([
       'wordpressRole' => ['subscriber'],
       'operator' => DynamicSegmentFilterData::OPERATOR_ANY,
       'connect' => DynamicSegmentFilterData::CONNECT_TYPE_OR,
@@ -129,9 +129,9 @@ class SegmentSaveControllerTest extends \MailPoetTest {
     $this->assertInstanceOf(DynamicSegmentFilterEntity::class, $duplicateFilter1);
 
     expect($originalFilter1->getId())->notEquals($duplicateFilter1->getId());
-    expect($duplicateFilter1->getFilterData()->getAction())->equals(UserRole::TYPE);
-    expect($duplicateFilter1->getFilterData()->getParam('wordpressRole'))->equals(['administrator']);
-    expect($duplicateFilter1->getFilterData()->getParam('connect'))->equals(DynamicSegmentFilterData::CONNECT_TYPE_AND);
+    verify($duplicateFilter1->getFilterData()->getAction())->equals(UserRole::TYPE);
+    verify($duplicateFilter1->getFilterData()->getParam('wordpressRole'))->equals(['administrator']);
+    verify($duplicateFilter1->getFilterData()->getParam('connect'))->equals(DynamicSegmentFilterData::CONNECT_TYPE_AND);
 
     $originalFilter2 = $segment->getDynamicFilters()->get(1);
     $duplicateFilter2 = $duplicate->getDynamicFilters()->get(1);
@@ -140,9 +140,9 @@ class SegmentSaveControllerTest extends \MailPoetTest {
     $this->assertInstanceOf(DynamicSegmentFilterEntity::class, $duplicateFilter2);
 
     expect($originalFilter2->getId())->notEquals($duplicateFilter2->getId());
-    expect($duplicateFilter2->getFilterData()->getAction())->equals(UserRole::TYPE);
-    expect($duplicateFilter2->getFilterData()->getParam('wordpressRole'))->equals(['editor']);
-    expect($duplicateFilter2->getFilterData()->getParam('connect'))->equals(DynamicSegmentFilterData::CONNECT_TYPE_AND);
+    verify($duplicateFilter2->getFilterData()->getAction())->equals(UserRole::TYPE);
+    verify($duplicateFilter2->getFilterData()->getParam('wordpressRole'))->equals(['editor']);
+    verify($duplicateFilter2->getFilterData()->getParam('connect'))->equals(DynamicSegmentFilterData::CONNECT_TYPE_AND);
   }
 
   private function createSegment(string $name): SegmentEntity {
diff --git a/mailpoet/tests/integration/Segments/SegmentDependencyValidatorTest.php b/mailpoet/tests/integration/Segments/SegmentDependencyValidatorTest.php
index 7692cf949b..588ac5976d 100644
--- a/mailpoet/tests/integration/Segments/SegmentDependencyValidatorTest.php
+++ b/mailpoet/tests/integration/Segments/SegmentDependencyValidatorTest.php
@@ -22,12 +22,12 @@ class SegmentDependencyValidatorTest extends \MailPoetTest {
     // Plugin is not active
     $validator = $this->createValidator(false);
     $missingPlugins = $validator->getMissingPluginsBySegment($dynamicSegment);
-    expect($missingPlugins)->equals(['WooCommerce']);
+    verify($missingPlugins)->equals(['WooCommerce']);
 
     // Plugin is active
     $validator = $this->createValidator(true);
     $missingPlugins = $validator->getMissingPluginsBySegment($dynamicSegment);
-    expect($missingPlugins)->equals([]);
+    verify($missingPlugins)->equals([]);
   }
 
   private function createSegment(string $filterType, string $action, array $filterData): SegmentEntity {
diff --git a/mailpoet/tests/integration/Segments/SegmentSaveControllerTest.php b/mailpoet/tests/integration/Segments/SegmentSaveControllerTest.php
index 962798e9d7..db948006d3 100644
--- a/mailpoet/tests/integration/Segments/SegmentSaveControllerTest.php
+++ b/mailpoet/tests/integration/Segments/SegmentSaveControllerTest.php
@@ -28,9 +28,9 @@ class SegmentSaveControllerTest extends \MailPoetTest {
     ];
 
     $segment = $this->saveController->save($segmentData);
-    expect($segment->getName())->equals('Segment one');
-    expect($segment->getDescription())->equals('Description');
-    expect($segment->getType())->equals(SegmentEntity::TYPE_DEFAULT);
+    verify($segment->getName())->equals('Segment one');
+    verify($segment->getDescription())->equals('Description');
+    verify($segment->getType())->equals(SegmentEntity::TYPE_DEFAULT);
   }
 
   public function testItDuplicatesSegment(): void {
@@ -46,12 +46,12 @@ class SegmentSaveControllerTest extends \MailPoetTest {
     $subscriberDuplicate2 = $this->subscriberSegmentRepository->findOneBy(['segment' => $duplicate, 'subscriber' => $subscriber2]);
     $this->assertInstanceOf(SubscriberSegmentEntity::class, $subscriberDuplicate1);
     $this->assertInstanceOf(SubscriberSegmentEntity::class, $subscriberDuplicate2);
-    expect($duplicate->getName())->equals('Copy of ' . $segment->getName());
-    expect($duplicate->getDescription())->equals($segment->getDescription());
-    expect($duplicate->getType())->equals($segment->getType());
+    verify($duplicate->getName())->equals('Copy of ' . $segment->getName());
+    verify($duplicate->getDescription())->equals($segment->getDescription());
+    verify($duplicate->getType())->equals($segment->getType());
     expect($subscriberSegments)->count(2);
-    expect($subscriberDuplicate1->getStatus())->equals($subscriberSegment1->getStatus());
-    expect($subscriberDuplicate2->getStatus())->equals($subscriberSegment2->getStatus());
+    verify($subscriberDuplicate1->getStatus())->equals($subscriberSegment1->getStatus());
+    verify($subscriberDuplicate2->getStatus())->equals($subscriberSegment2->getStatus());
   }
 
   public function testItCheckDuplicateSegment(): void {
diff --git a/mailpoet/tests/integration/Segments/SegmentSubscribersRepositoryTest.php b/mailpoet/tests/integration/Segments/SegmentSubscribersRepositoryTest.php
index 5530ef47d0..aa19d21eb9 100644
--- a/mailpoet/tests/integration/Segments/SegmentSubscribersRepositoryTest.php
+++ b/mailpoet/tests/integration/Segments/SegmentSubscribersRepositoryTest.php
@@ -53,15 +53,15 @@ class SegmentSubscribersRepositoryTest extends \MailPoetTest {
     $this->entityManager->flush();
 
     $count = $this->repository->getSubscribersCount((int)$segment->getId());
-    expect($count)->equals(3);
+    verify($count)->equals(3);
     $count = $this->repository->getSubscribersCount((int)$segment->getId(), SubscriberEntity::STATUS_SUBSCRIBED);
-    expect($count)->equals(1);
+    verify($count)->equals(1);
     $ids = $this->repository->getSubscriberIdsInSegment((int)$segment->getId());
-    expect($ids)->equals([$subscriberInSegment->getId()]);
+    verify($ids)->equals([$subscriberInSegment->getId()]);
     $filteredIds = $this->repository->findSubscribersIdsInSegment((int)$segment->getId(), [$subscriberInSegment->getId(), 20, 30]);
-    expect($filteredIds)->equals([$subscriberInSegment->getId()]);
+    verify($filteredIds)->equals([$subscriberInSegment->getId()]);
     $filteredIds = $this->repository->findSubscribersIdsInSegment((int)$segment->getId(), [$globallyUnsubscribedSubscriberInSegment->getId()]);
-    expect($filteredIds)->equals([]);
+    verify($filteredIds)->equals([]);
   }
 
   public function testItReturnsSubscribersInDynamicSegments() {
@@ -80,17 +80,17 @@ class SegmentSubscribersRepositoryTest extends \MailPoetTest {
     $this->entityManager->flush();
 
     $count = $this->repository->getSubscribersCount((int)$segment->getId());
-    expect($count)->equals(1);
+    verify($count)->equals(1);
     $count = $this->repository->getSubscribersCount((int)$segment->getId(), SubscriberEntity::STATUS_UNSUBSCRIBED);
-    expect($count)->equals(0);
+    verify($count)->equals(0);
     $count = $this->repository->getSubscribersCount((int)$segment->getId(), SubscriberEntity::STATUS_SUBSCRIBED);
-    expect($count)->equals(1);
+    verify($count)->equals(1);
     $ids = $this->repository->getSubscriberIdsInSegment((int)$segment->getId());
-    expect($ids)->equals([$wpUserSubscriber->getId()]);
+    verify($ids)->equals([$wpUserSubscriber->getId()]);
     $filteredIds = $this->repository->findSubscribersIdsInSegment((int)$segment->getId(), [$wpUserSubscriber->getId(), 20, 30]);
-    expect($filteredIds)->equals([$wpUserSubscriber->getId()]);
+    verify($filteredIds)->equals([$wpUserSubscriber->getId()]);
     $filteredIds = $this->repository->findSubscribersIdsInSegment((int)$segment->getId(), [$subscriberNoList->getId()]);
-    expect($filteredIds)->equals([]);
+    verify($filteredIds)->equals([]);
 
     $this->tester->deleteWordPressUser($wpUserEmail);
   }
@@ -117,10 +117,10 @@ class SegmentSubscribersRepositoryTest extends \MailPoetTest {
     $this->entityManager->flush();
 
     $subscribersCount = $this->repository->getSubscribersStatisticsCount($segment);
-    expect($subscribersCount[SubscriberEntity::STATUS_SUBSCRIBED])->equals(1);
-    expect($subscribersCount[SubscriberEntity::STATUS_UNSUBSCRIBED])->equals(1);
-    expect($subscribersCount[SubscriberEntity::STATUS_UNCONFIRMED])->equals(1);
-    expect($subscribersCount[SubscriberEntity::STATUS_BOUNCED])->equals(1);
+    verify($subscribersCount[SubscriberEntity::STATUS_SUBSCRIBED])->equals(1);
+    verify($subscribersCount[SubscriberEntity::STATUS_UNSUBSCRIBED])->equals(1);
+    verify($subscribersCount[SubscriberEntity::STATUS_UNCONFIRMED])->equals(1);
+    verify($subscribersCount[SubscriberEntity::STATUS_BOUNCED])->equals(1);
 
     // unsubscribed from this particular segment
     foreach ($subscriberSegments as $subscriberSegment) {
@@ -130,10 +130,10 @@ class SegmentSubscribersRepositoryTest extends \MailPoetTest {
 
     $this->clearSubscribersCountCache();
     $subscribersCount = $this->repository->getSubscribersStatisticsCount($segment);
-    expect($subscribersCount[SubscriberEntity::STATUS_SUBSCRIBED])->equals(0);
-    expect($subscribersCount[SubscriberEntity::STATUS_UNSUBSCRIBED])->equals(4);
-    expect($subscribersCount[SubscriberEntity::STATUS_UNCONFIRMED])->equals(0);
-    expect($subscribersCount[SubscriberEntity::STATUS_BOUNCED])->equals(0);
+    verify($subscribersCount[SubscriberEntity::STATUS_SUBSCRIBED])->equals(0);
+    verify($subscribersCount[SubscriberEntity::STATUS_UNSUBSCRIBED])->equals(4);
+    verify($subscribersCount[SubscriberEntity::STATUS_UNCONFIRMED])->equals(0);
+    verify($subscribersCount[SubscriberEntity::STATUS_BOUNCED])->equals(0);
 
     // trashed subscribers
     foreach ($subscriberSegments as $subscriberSegment) {
@@ -146,10 +146,10 @@ class SegmentSubscribersRepositoryTest extends \MailPoetTest {
 
     $this->clearSubscribersCountCache();
     $subscribersCount = $this->repository->getSubscribersStatisticsCount($segment);
-    expect($subscribersCount[SubscriberEntity::STATUS_SUBSCRIBED])->equals(0);
-    expect($subscribersCount[SubscriberEntity::STATUS_UNSUBSCRIBED])->equals(0);
-    expect($subscribersCount[SubscriberEntity::STATUS_UNCONFIRMED])->equals(0);
-    expect($subscribersCount[SubscriberEntity::STATUS_BOUNCED])->equals(0);
+    verify($subscribersCount[SubscriberEntity::STATUS_SUBSCRIBED])->equals(0);
+    verify($subscribersCount[SubscriberEntity::STATUS_UNSUBSCRIBED])->equals(0);
+    verify($subscribersCount[SubscriberEntity::STATUS_UNCONFIRMED])->equals(0);
+    verify($subscribersCount[SubscriberEntity::STATUS_BOUNCED])->equals(0);
   }
 
   public function testGetSubscribersCountBySegmentIds(): void {
@@ -167,7 +167,7 @@ class SegmentSubscribersRepositoryTest extends \MailPoetTest {
 
     // two static segments
     $count = $this->repository->getSubscribersCountBySegmentIds([$segmentOne->getId(), $segmentTwo->getId()]);
-    expect($count)->equals(3);
+    verify($count)->equals(3);
 
     $dynamicSegmentOne = $this->createDynamicSegmentEntity();
     $this->entityManager->flush();
@@ -186,7 +186,7 @@ class SegmentSubscribersRepositoryTest extends \MailPoetTest {
       $segmentTwo->getId(),
       $dynamicSegmentOne->getId(),
     ]);
-    expect($count)->equals(5);
+    verify($count)->equals(5);
 
     $dynamicSegmentTwo = $this->createDynamicSegmentEntity('author');
     $this->entityManager->flush();
@@ -200,7 +200,7 @@ class SegmentSubscribersRepositoryTest extends \MailPoetTest {
       $dynamicSegmentOne->getId(),
       $dynamicSegmentTwo->getId(),
     ]);
-    expect($count)->equals(3);
+    verify($count)->equals(3);
 
     // all four segments
     $count = $this->repository->getSubscribersCountBySegmentIds([
@@ -209,7 +209,7 @@ class SegmentSubscribersRepositoryTest extends \MailPoetTest {
       $dynamicSegmentOne->getId(),
       $dynamicSegmentTwo->getId(),
     ]);
-    expect($count)->equals(6);
+    verify($count)->equals(6);
   }
 
   public function testSubscriberCountCanBeFilteredByDynamicSegment(): void {
@@ -223,10 +223,10 @@ class SegmentSubscribersRepositoryTest extends \MailPoetTest {
     $this->assertIsInt($segment->getId());
 
     $countWithoutFilter = $this->repository->getSubscribersCountBySegmentIds([$segment->getId()]);
-    expect($countWithoutFilter)->equals(3);
+    verify($countWithoutFilter)->equals(3);
 
     $countWithFilter = $this->repository->getSubscribersCountBySegmentIds([$segment->getId()], null, $filterSegment->getId());
-    expect($countWithFilter)->equals(2);
+    verify($countWithFilter)->equals(2);
   }
 
   public function _after() {
diff --git a/mailpoet/tests/integration/Segments/SegmentsRepositoryTest.php b/mailpoet/tests/integration/Segments/SegmentsRepositoryTest.php
index b1cd1e1788..3dbd1f7145 100644
--- a/mailpoet/tests/integration/Segments/SegmentsRepositoryTest.php
+++ b/mailpoet/tests/integration/Segments/SegmentsRepositoryTest.php
@@ -32,7 +32,7 @@ class SegmentsRepositoryTest extends \MailPoetTest {
     $result = $this->segmentsRepository->bulkTrash([$segment1->getId(), $segment2->getId()]);
     $this->entityManager->refresh($segment1);
     $this->entityManager->refresh($segment2);
-    expect($result)->equals(2);
+    verify($result)->equals(2);
     expect($segment1->getDeletedAt())->isInstanceOf(\DateTimeInterface::class);
     expect($segment2->getDeletedAt())->isInstanceOf(\DateTimeInterface::class);
   }
@@ -44,7 +44,7 @@ class SegmentsRepositoryTest extends \MailPoetTest {
     $result = $this->segmentsRepository->bulkTrash([$segment1->getId(), $segment2->getId()], SegmentEntity::TYPE_DYNAMIC);
     $this->entityManager->refresh($segment1);
     $this->entityManager->refresh($segment2);
-    expect($result)->equals(2);
+    verify($result)->equals(2);
     expect($segment1->getDeletedAt())->isInstanceOf(\DateTimeInterface::class);
     expect($segment2->getDeletedAt())->isInstanceOf(\DateTimeInterface::class);
   }
@@ -57,7 +57,7 @@ class SegmentsRepositoryTest extends \MailPoetTest {
     $result = $this->segmentsRepository->bulkTrash([$segment1->getId(), $segment2->getId()]);
     $this->entityManager->refresh($segment1);
     $this->entityManager->refresh($segment2);
-    expect($result)->equals(1);
+    verify($result)->equals(1);
     expect($segment1->getDeletedAt())->null();
     expect($segment2->getDeletedAt())->isInstanceOf(\DateTimeInterface::class);
   }
@@ -70,7 +70,7 @@ class SegmentsRepositoryTest extends \MailPoetTest {
     $result = $this->segmentsRepository->bulkTrash([$segment1->getId(), $segment2->getId()], SegmentEntity::TYPE_DYNAMIC);
     $this->entityManager->refresh($segment1);
     $this->entityManager->refresh($segment2);
-    expect($result)->equals(1);
+    verify($result)->equals(1);
     expect($segment1->getDeletedAt())->isInstanceOf(\DateTimeInterface::class);
     expect($segment2->getDeletedAt())->null();
   }
@@ -78,13 +78,13 @@ class SegmentsRepositoryTest extends \MailPoetTest {
   public function testItReturnsCountsOfSegmentsWithMultipleFilters(): void {
     // No Segments
     $count = $this->segmentsRepository->getSegmentCountWithMultipleFilters();
-    expect($count)->equals(0);
+    verify($count)->equals(0);
 
     // Two segments with one filter each
     $segment1 = $this->createDynamicSegmentEntityForEditorUsers();
     $segment2 = $this->createDynamicSegmentEntityForEditorUsers();
     $count = $this->segmentsRepository->getSegmentCountWithMultipleFilters();
-    expect($count)->equals(0);
+    verify($count)->equals(0);
 
     // One segment with multiple filters
     $filterData = new DynamicSegmentFilterData(
@@ -97,7 +97,7 @@ class SegmentsRepositoryTest extends \MailPoetTest {
     $segment1->addDynamicFilter($dynamicFilter);
     $this->segmentsRepository->flush();
     $count = $this->segmentsRepository->getSegmentCountWithMultipleFilters();
-    expect($count)->equals(1);
+    verify($count)->equals(1);
 
     // Both segments with multiple filters
     $filterData = new DynamicSegmentFilterData(
@@ -110,7 +110,7 @@ class SegmentsRepositoryTest extends \MailPoetTest {
     $segment1->addDynamicFilter($dynamicFilter);
     $this->segmentsRepository->flush();
     $count = $this->segmentsRepository->getSegmentCountWithMultipleFilters();
-    expect($count)->equals(2);
+    verify($count)->equals(2);
   }
 
   public function testItCanCheckForUniqueNames(): void {
diff --git a/mailpoet/tests/integration/Segments/SegmentsSimpleListRepositoryTest.php b/mailpoet/tests/integration/Segments/SegmentsSimpleListRepositoryTest.php
index ccc0e20f4c..134a1541e7 100644
--- a/mailpoet/tests/integration/Segments/SegmentsSimpleListRepositoryTest.php
+++ b/mailpoet/tests/integration/Segments/SegmentsSimpleListRepositoryTest.php
@@ -62,63 +62,63 @@ class SegmentsSimpleListRepositoryTest extends \MailPoetTest {
     $segments = $this->segmentsListRepository->getListWithSubscribedSubscribersCounts();
     expect($segments)->count(5);
     // Default 1
-    expect($segments[0]['type'])->equals(SegmentEntity::TYPE_DEFAULT);
-    expect($segments[0]['subscribers'])->equals(1);
+    verify($segments[0]['type'])->equals(SegmentEntity::TYPE_DEFAULT);
+    verify($segments[0]['subscribers'])->equals(1);
     // Default 2
-    expect($segments[1]['type'])->equals(SegmentEntity::TYPE_DEFAULT);
-    expect($segments[1]['subscribers'])->equals(0);
+    verify($segments[1]['type'])->equals(SegmentEntity::TYPE_DEFAULT);
+    verify($segments[1]['subscribers'])->equals(0);
     // Dynamic
-    expect($segments[2]['type'])->equals(SegmentEntity::TYPE_DYNAMIC);
-    expect($segments[2]['subscribers'])->equals(1);
+    verify($segments[2]['type'])->equals(SegmentEntity::TYPE_DYNAMIC);
+    verify($segments[2]['subscribers'])->equals(1);
     // WooCommerce Users Segment
-    expect($segments[3]['type'])->equals(SegmentEntity::TYPE_WC_USERS);
-    expect($segments[3]['subscribers'])->equals(0);
+    verify($segments[3]['type'])->equals(SegmentEntity::TYPE_WC_USERS);
+    verify($segments[3]['subscribers'])->equals(0);
     // WordPress Users
-    expect($segments[4]['type'])->equals(SegmentEntity::TYPE_WP_USERS);
-    expect($segments[4]['subscribers'])->equals(1);
+    verify($segments[4]['type'])->equals(SegmentEntity::TYPE_WP_USERS);
+    verify($segments[4]['subscribers'])->equals(1);
   }
 
   public function testItReturnsSegmentsWithSubscribedSubscribersCountFilteredBySegmentType(): void {
     $segments = $this->segmentsListRepository->getListWithSubscribedSubscribersCounts([SegmentEntity::TYPE_DEFAULT, SegmentEntity::TYPE_WP_USERS]);
     expect($segments)->count(3);
     // Default 1
-    expect($segments[0]['type'])->equals(SegmentEntity::TYPE_DEFAULT);
-    expect($segments[0]['subscribers'])->equals(1);
+    verify($segments[0]['type'])->equals(SegmentEntity::TYPE_DEFAULT);
+    verify($segments[0]['subscribers'])->equals(1);
     // Default 2
-    expect($segments[1]['type'])->equals(SegmentEntity::TYPE_DEFAULT);
-    expect($segments[1]['subscribers'])->equals(0);
+    verify($segments[1]['type'])->equals(SegmentEntity::TYPE_DEFAULT);
+    verify($segments[1]['subscribers'])->equals(0);
     // WordPress Users
-    expect($segments[2]['type'])->equals(SegmentEntity::TYPE_WP_USERS);
-    expect($segments[2]['subscribers'])->equals(1);
+    verify($segments[2]['type'])->equals(SegmentEntity::TYPE_WP_USERS);
+    verify($segments[2]['subscribers'])->equals(1);
   }
 
   public function testItReturnsSegmentsWithAssociatedSubscribersCount(): void {
     $segments = $this->segmentsListRepository->getListWithAssociatedSubscribersCounts();
     expect($segments)->count(5);
     // Default 1
-    expect($segments[0]['type'])->equals(SegmentEntity::TYPE_DEFAULT);
-    expect($segments[0]['subscribers'])->equals(2);
+    verify($segments[0]['type'])->equals(SegmentEntity::TYPE_DEFAULT);
+    verify($segments[0]['subscribers'])->equals(2);
     // Default 2
-    expect($segments[1]['type'])->equals(SegmentEntity::TYPE_DEFAULT);
-    expect($segments[1]['subscribers'])->equals(0);
+    verify($segments[1]['type'])->equals(SegmentEntity::TYPE_DEFAULT);
+    verify($segments[1]['subscribers'])->equals(0);
     // Dynamic
-    expect($segments[2]['type'])->equals(SegmentEntity::TYPE_DYNAMIC);
-    expect($segments[2]['subscribers'])->equals(1);
+    verify($segments[2]['type'])->equals(SegmentEntity::TYPE_DYNAMIC);
+    verify($segments[2]['subscribers'])->equals(1);
     // WooCommerce Users Segment
-    expect($segments[3]['type'])->equals(SegmentEntity::TYPE_WC_USERS);
-    expect($segments[3]['subscribers'])->equals(0);
+    verify($segments[3]['type'])->equals(SegmentEntity::TYPE_WC_USERS);
+    verify($segments[3]['subscribers'])->equals(0);
     // WordPress Users
-    expect($segments[4]['type'])->equals(SegmentEntity::TYPE_WP_USERS);
-    expect($segments[4]['subscribers'])->equals(1);
+    verify($segments[4]['type'])->equals(SegmentEntity::TYPE_WP_USERS);
+    verify($segments[4]['subscribers'])->equals(1);
   }
 
   public function testItCanAddSegmentForSubscribersWithoutList(): void {
     $segments = $this->segmentsListRepository->getListWithAssociatedSubscribersCounts();
     $segments = $this->segmentsListRepository->addVirtualSubscribersWithoutListSegment($segments);
     expect($segments)->count(6);
-    expect($segments[5]['type'])->equals(SegmentEntity::TYPE_WITHOUT_LIST);
-    expect($segments[5]['id'])->equals('0');
-    expect($segments[5]['subscribers'])->equals(1);
+    verify($segments[5]['type'])->equals(SegmentEntity::TYPE_WITHOUT_LIST);
+    verify($segments[5]['id'])->equals('0');
+    verify($segments[5]['subscribers'])->equals(1);
   }
 
   private function createSubscriberEntity(): SubscriberEntity {
diff --git a/mailpoet/tests/integration/Segments/SubscribersFinderTest.php b/mailpoet/tests/integration/Segments/SubscribersFinderTest.php
index 1fdeaec00d..258bc79530 100644
--- a/mailpoet/tests/integration/Segments/SubscribersFinderTest.php
+++ b/mailpoet/tests/integration/Segments/SubscribersFinderTest.php
@@ -65,7 +65,7 @@ class SubscribersFinderTest extends \MailPoetTest {
     $deletedSegmentId = 1000; // non-existent segment
     $subscribers = $this->subscribersFinder->findSubscribersInSegments([$this->subscriber2->getId()], [$this->segment1->getId(), $deletedSegmentId]);
     expect($subscribers)->count(1);
-    expect($subscribers[$this->subscriber2->getId()])->equals($this->subscriber2->getId());
+    verify($subscribers[$this->subscriber2->getId()])->equals($this->subscriber2->getId());
   }
 
   public function testFindSubscribersInSegmentUsingFinder() {
@@ -103,9 +103,9 @@ class SubscribersFinderTest extends \MailPoetTest {
         $this->segment2->getId(),
       ]
     );
-    expect($subscribersCount)->equals(1);
+    verify($subscribersCount)->equals(1);
     $subscribersIds = $this->getScheduledTasksSubscribers($this->scheduledTask->getId());
-    expect($subscribersIds)->equals([$this->subscriber2->getId()]);
+    verify($subscribersIds)->equals([$this->subscriber2->getId()]);
   }
 
   public function testItDoesNotAddSubscribersToTaskFromNoSegment() {
@@ -116,7 +116,7 @@ class SubscribersFinderTest extends \MailPoetTest {
         $this->segment3->getId(),
       ]
     );
-    expect($subscribersCount)->equals(0);
+    verify($subscribersCount)->equals(0);
   }
 
   public function testItAddsSubscribersToTaskFromDynamicSegments() {
@@ -135,9 +135,9 @@ class SubscribersFinderTest extends \MailPoetTest {
         $this->segment2->getId(),
       ]
     );
-    expect($subscribersCount)->equals(1);
+    verify($subscribersCount)->equals(1);
     $subscribersIds = $this->getScheduledTasksSubscribers($this->scheduledTask->getId());
-    expect($subscribersIds)->equals([$this->subscriber1->getId()]);
+    verify($subscribersIds)->equals([$this->subscriber1->getId()]);
   }
 
   public function testItAddsSubscribersToTaskFromStaticAndDynamicSegments() {
@@ -159,9 +159,9 @@ class SubscribersFinderTest extends \MailPoetTest {
       ]
     );
 
-    expect($subscribersCount)->equals(1);
+    verify($subscribersCount)->equals(1);
     $subscribersIds = $this->getScheduledTasksSubscribers($this->scheduledTask->getId());
-    expect($subscribersIds)->equals([$this->subscriber2->getId()]);
+    verify($subscribersIds)->equals([$this->subscriber2->getId()]);
   }
 
   public function testItDoesNotAddSubscribersToTaskIfFilteredOutByFilterSegment(): void {
@@ -180,20 +180,20 @@ class SubscribersFinderTest extends \MailPoetTest {
     // Without filtering
     $task = (new ScheduledTaskFactory())->create(SendingTask::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, new Carbon());
     $staticCount = $this->subscribersFinder->addSubscribersToTaskFromSegments($task, [$staticSegment->getId()]);
-    expect($staticCount)->equals(2);
+    verify($staticCount)->equals(2);
 
     $task = (new ScheduledTaskFactory())->create(SendingTask::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, new Carbon());
     $dynamicCount = $this->subscribersFinder->addSubscribersToTaskFromSegments($task, [$dynamicSegment->getId()]);
-    expect($dynamicCount)->equals(4);
+    verify($dynamicCount)->equals(4);
 
     // With filtering
     $task = (new ScheduledTaskFactory())->create(SendingTask::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, new Carbon());
     $staticCount = $this->subscribersFinder->addSubscribersToTaskFromSegments($task, [$staticSegment->getId()], $filterSegment->getId());
-    expect($staticCount)->equals(1);
+    verify($staticCount)->equals(1);
 
     $task = (new ScheduledTaskFactory())->create(SendingTask::TASK_TYPE, ScheduledTaskEntity::STATUS_SCHEDULED, new Carbon());
     $dynamicCount = $this->subscribersFinder->addSubscribersToTaskFromSegments($task, [$dynamicSegment->getId()], $filterSegment->getId());
-    expect($dynamicCount)->equals(2);
+    verify($dynamicCount)->equals(2);
   }
 
   public function testItCanFilterSubscribersBasedOnDynamicSegment(): void {
diff --git a/mailpoet/tests/integration/Segments/WPTest.php b/mailpoet/tests/integration/Segments/WPTest.php
index 4aae0d69fe..5ed5aad363 100644
--- a/mailpoet/tests/integration/Segments/WPTest.php
+++ b/mailpoet/tests/integration/Segments/WPTest.php
@@ -49,7 +49,7 @@ class WPTest extends \MailPoetTest {
     ]);
     $this->wpSegment->synchronizeUser($id);
     $dbSubscriber = Subscriber::findOne($subscriber->id);
-    expect($dbSubscriber->status)->equals(Subscriber::STATUS_SUBSCRIBED);
+    verify($dbSubscriber->status)->equals(Subscriber::STATUS_SUBSCRIBED);
   }
 
   public function testSynchronizeUserKeepsStatusOfOldSubscriber(): void {
@@ -62,7 +62,7 @@ class WPTest extends \MailPoetTest {
     $id = $this->insertUser($randomNumber);
     $this->wpSegment->synchronizeUser($id);
     $dbSubscriber = Subscriber::where('wp_user_id', $id)->findOne();
-    expect($dbSubscriber->status)->equals($subscriber->status);
+    verify($dbSubscriber->status)->equals($subscriber->status);
   }
 
   public function testSynchronizeUserStatusIsSubscribedForNewUserWithSignUpConfirmationDisabled(): void {
@@ -71,7 +71,7 @@ class WPTest extends \MailPoetTest {
     $id = $this->insertUser($randomNumber);
     $this->wpSegment->synchronizeUser($id);
     $wpSubscriber = Segment::getWPSegment()->subscribers()->where('wp_user_id', $id)->findOne();
-    expect($wpSubscriber->status)->equals(Subscriber::STATUS_SUBSCRIBED);
+    verify($wpSubscriber->status)->equals(Subscriber::STATUS_SUBSCRIBED);
   }
 
   public function testSynchronizeUserStatusIsUnconfirmedForNewUserWithSignUpConfirmationEnabled(): void {
@@ -80,7 +80,7 @@ class WPTest extends \MailPoetTest {
     $id = $this->insertUser($randomNumber);
     $this->wpSegment->synchronizeUser($id);
     $wpSubscriber = Segment::getWPSegment()->subscribers()->where('wp_user_id', $id)->findOne();
-    expect($wpSubscriber->status)->equals(Subscriber::STATUS_UNCONFIRMED);
+    verify($wpSubscriber->status)->equals(Subscriber::STATUS_UNCONFIRMED);
   }
 
   public function testSynchronizeUsersStatusIsSubscribedForNewUsersWithSignUpConfirmationDisabled(): void {
@@ -89,9 +89,9 @@ class WPTest extends \MailPoetTest {
     $this->insertUser();
     $this->wpSegment->synchronizeUsers();
     $subscribers = Subscriber::whereLike("email", "user-sync-test%")->findMany();
-    expect(count($subscribers))->equals(2);
-    expect($subscribers[0]->status)->equals(Subscriber::STATUS_SUBSCRIBED);
-    expect($subscribers[1]->status)->equals(Subscriber::STATUS_SUBSCRIBED);
+    verify(count($subscribers))->equals(2);
+    verify($subscribers[0]->status)->equals(Subscriber::STATUS_SUBSCRIBED);
+    verify($subscribers[1]->status)->equals(Subscriber::STATUS_SUBSCRIBED);
   }
 
   public function testSynchronizeUsersStatusIsUnconfirmedForNewUsersWithSignUpConfirmationEnabled(): void {
@@ -100,9 +100,9 @@ class WPTest extends \MailPoetTest {
     $this->insertUser();
     $this->wpSegment->synchronizeUsers();
     $subscribers = Subscriber::whereLike("email", "user-sync-test%")->findMany();
-    expect(count($subscribers))->equals(2);
-    expect($subscribers[0]->status)->equals(Subscriber::STATUS_UNCONFIRMED);
-    expect($subscribers[1]->status)->equals(Subscriber::STATUS_UNCONFIRMED);
+    verify(count($subscribers))->equals(2);
+    verify($subscribers[0]->status)->equals(Subscriber::STATUS_UNCONFIRMED);
+    verify($subscribers[1]->status)->equals(Subscriber::STATUS_UNCONFIRMED);
   }
 
   public function testItSendsConfirmationEmailWhenSignupConfirmationAndSubscribeOnRegisterEnabled(): void {
@@ -125,8 +125,8 @@ class WPTest extends \MailPoetTest {
     $registration->onRegister([], $user['user_login'], $user['user_email']);
     $this->wpSegment->synchronizeUser($id);
     $wpSubscriber = Segment::getWPSegment()->subscribers()->where('wp_user_id', $id)->findOne();
-    expect($wpSubscriber->countConfirmations)->equals(1);
-    expect($wpSubscriber->status)->equals(SubscriberEntity::STATUS_UNCONFIRMED);
+    verify($wpSubscriber->countConfirmations)->equals(1);
+    verify($wpSubscriber->status)->equals(SubscriberEntity::STATUS_UNCONFIRMED);
     unset($_POST['mailpoet']);
 
     // signup confirmation enabled, subscribe on-register enabled, checkbox in form is unchecked
@@ -139,8 +139,8 @@ class WPTest extends \MailPoetTest {
     $registration->onRegister([], $user['user_login'], $user['user_email']);
     $this->wpSegment->synchronizeUser($id);
     $wpSubscriber = Segment::getWPSegment()->subscribers()->where('wp_user_id', $id)->findOne();
-    expect($wpSubscriber->countConfirmations)->equals(0);
-    expect($wpSubscriber->status)->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
+    verify($wpSubscriber->countConfirmations)->equals(0);
+    verify($wpSubscriber->status)->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
     unset($_POST['mailpoet']);
 
     // signup confirmation disabled, subscribe on-register enabled
@@ -152,8 +152,8 @@ class WPTest extends \MailPoetTest {
     $user = $this->getUser((int)$id);
     $registration->onRegister([], $user['user_login'], $user['user_email']);
     $wpSubscriber = Segment::getWPSegment()->subscribers()->where('wp_user_id', $id)->findOne();
-    expect($wpSubscriber->countConfirmations)->equals(0);
-    expect($wpSubscriber->status)->equals(Subscriber::STATUS_SUBSCRIBED);
+    verify($wpSubscriber->countConfirmations)->equals(0);
+    verify($wpSubscriber->status)->equals(Subscriber::STATUS_SUBSCRIBED);
 
     // signup confirmation enabled, subscribe on-register disabled
     $this->settings->set('signup_confirmation.enabled', '1');
@@ -162,8 +162,8 @@ class WPTest extends \MailPoetTest {
     $id = $this->insertUser($randomNumber);
     $this->wpSegment->synchronizeUser($id);
     $wpSubscriber = Segment::getWPSegment()->subscribers()->where('wp_user_id', $id)->findOne();
-    expect($wpSubscriber->countConfirmations)->equals(0);
-    expect($wpSubscriber->status)->equals(Subscriber::STATUS_UNCONFIRMED);
+    verify($wpSubscriber->countConfirmations)->equals(0);
+    verify($wpSubscriber->status)->equals(Subscriber::STATUS_UNCONFIRMED);
   }
 
   public function testItSynchronizeNewUsers(): void {
@@ -173,7 +173,7 @@ class WPTest extends \MailPoetTest {
     $this->insertUser();
     $this->wpSegment->synchronizeUsers();
     $subscribersCount = $this->getSubscribersCount();
-    expect($subscribersCount)->equals(3);
+    verify($subscribersCount)->equals(3);
   }
 
   public function testItSynchronizesPresubscribedUsers(): void {
@@ -186,8 +186,8 @@ class WPTest extends \MailPoetTest {
     $this->wpSegment->synchronizeUsers();
     $wpSubscriber = Segment::getWPSegment()->subscribers()->where('wp_user_id', $id)->findOne();
     expect($wpSubscriber)->notEmpty();
-    expect($wpSubscriber->id)->equals($subscriber->id);
-    expect($wpSubscriber->status)->equals(Subscriber::STATUS_SUBSCRIBED);
+    verify($wpSubscriber->id)->equals($subscriber->id);
+    verify($wpSubscriber->status)->equals(Subscriber::STATUS_SUBSCRIBED);
   }
 
   public function testItSynchronizeEmails(): void {
@@ -196,7 +196,7 @@ class WPTest extends \MailPoetTest {
     $this->updateWPUserEmail($id, 'user-sync-test-xx@email.com');
     $this->wpSegment->synchronizeUsers();
     $subscriber = Subscriber::where('wp_user_id', $id)->findOne();
-    expect($subscriber->email)->equals('user-sync-test-xx@email.com');
+    verify($subscriber->email)->equals('user-sync-test-xx@email.com');
   }
 
   public function testRemovesUsersWithEmptyEmailsFromSunscribersDuringSynchronization(): void {
@@ -204,7 +204,7 @@ class WPTest extends \MailPoetTest {
     $this->wpSegment->synchronizeUsers();
     $this->updateWPUserEmail($id, '');
     $this->wpSegment->synchronizeUsers();
-    expect(Subscriber::where('wp_user_id', $id)->count())->equals(0);
+    verify(Subscriber::where('wp_user_id', $id)->count())->equals(0);
     $this->deleteWPUser($id);
   }
 
@@ -213,7 +213,7 @@ class WPTest extends \MailPoetTest {
     $this->wpSegment->synchronizeUsers();
     $this->updateWPUserEmail($id, 'ivalid.@email.com');
     $this->wpSegment->synchronizeUsers();
-    expect(Subscriber::where('wp_user_id', $id)->count())->equals(0);
+    verify(Subscriber::where('wp_user_id', $id)->count())->equals(0);
     $this->deleteWPUser($id);
   }
 
@@ -235,7 +235,7 @@ class WPTest extends \MailPoetTest {
     update_user_meta((int)$id, 'first_name', $firstName);
     $this->wpSegment->synchronizeUsers();
     $subscriber = Subscriber::where('wp_user_id', $id)->findOne();
-    expect($subscriber->firstName)->equals($trucantedFirstName);
+    verify($subscriber->firstName)->equals($trucantedFirstName);
   }
 
   public function testItSynchronizeLastNames(): void {
@@ -247,7 +247,7 @@ class WPTest extends \MailPoetTest {
     update_user_meta((int)$id, 'last_name', $lastName);
     $this->wpSegment->synchronizeUsers();
     $subscriber = Subscriber::where('wp_user_id', $id)->findOne();
-    expect($subscriber->lastName)->equals($trucantedLastName);
+    verify($subscriber->lastName)->equals($trucantedLastName);
   }
 
   public function testItSynchronizeFirstNamesUsingDisplayName(): void {
@@ -256,7 +256,7 @@ class WPTest extends \MailPoetTest {
     $this->updateWPUserDisplayName($id, 'First name');
     $this->wpSegment->synchronizeUsers();
     $subscriber = Subscriber::where('wp_user_id', $id)->findOne();
-    expect($subscriber->firstName)->equals('First name');
+    verify($subscriber->firstName)->equals('First name');
   }
 
   public function testItSynchronizeFirstNamesFromMetaNotDisplayName(): void {
@@ -265,7 +265,7 @@ class WPTest extends \MailPoetTest {
     $this->updateWPUserDisplayName($id, 'display_name');
     $this->wpSegment->synchronizeUsers();
     $subscriber = Subscriber::where('wp_user_id', $id)->findOne();
-    expect($subscriber->firstName)->equals('First name');
+    verify($subscriber->firstName)->equals('First name');
   }
 
   public function testItSynchronizeSegment(): void {
@@ -274,7 +274,7 @@ class WPTest extends \MailPoetTest {
     $this->insertUser();
     $this->wpSegment->synchronizeUsers();
     $subscribers = Segment::getWPSegment()->subscribers()->whereIn('wp_user_id', $this->userIds);
-    expect($subscribers->count())->equals(3);
+    verify($subscribers->count())->equals(3);
   }
 
   public function testItDoesntRemoveUsersFromTrash(): void {
@@ -293,10 +293,10 @@ class WPTest extends \MailPoetTest {
     $this->insertUser();
     $this->wpSegment->synchronizeUsers();
     $subscribersCount = $this->getSubscribersCount();
-    expect($subscribersCount)->equals(2);
+    verify($subscribersCount)->equals(2);
     wp_delete_user((int)$id);
     $subscribersCount = $this->getSubscribersCount();
-    expect($subscribersCount)->equals(1);
+    verify($subscribersCount)->equals(1);
   }
 
   public function testItSynchronizesNewUsersToDisabledWPSegmentAsUnconfirmedAndTrashed(): void {
@@ -306,17 +306,17 @@ class WPTest extends \MailPoetTest {
     $id2 = $this->insertUser();
     $this->wpSegment->synchronizeUsers();
     $subscribersCount = $this->getSubscribersCount();
-    expect($subscribersCount)->equals(2);
+    verify($subscribersCount)->equals(2);
     $subscriber1 = Subscriber::where("wp_user_id", $id)->findOne();
     $deletedAt1 = Carbon::createFromFormat('Y-m-d H:i:s', $subscriber1->deletedAt);
     $this->assertInstanceOf(Carbon::class, $deletedAt1);
-    expect($subscriber1->status)->equals(SubscriberEntity::STATUS_UNCONFIRMED);
-    expect($deletedAt1->timestamp)->equals(Carbon::now()->timestamp, 1);
+    verify($subscriber1->status)->equals(SubscriberEntity::STATUS_UNCONFIRMED);
+    verify($deletedAt1->timestamp)->equals(Carbon::now()->timestamp, 1);
     $subscriber2 = Subscriber::where("wp_user_id", $id2)->findOne();
     $deletedAt2 = Carbon::createFromFormat('Y-m-d H:i:s', $subscriber2->deletedAt);
     $this->assertInstanceOf(Carbon::class, $deletedAt2);
-    expect($subscriber2->status)->equals(SubscriberEntity::STATUS_UNCONFIRMED);
-    expect($deletedAt2->timestamp)->equals(Carbon::now()->timestamp, 1);
+    verify($subscriber2->status)->equals(SubscriberEntity::STATUS_UNCONFIRMED);
+    verify($deletedAt2->timestamp)->equals(Carbon::now()->timestamp, 1);
   }
 
   public function testItRemovesOrphanedSubscribers(): void {
@@ -326,7 +326,7 @@ class WPTest extends \MailPoetTest {
     $this->deleteWPUser($id);
     $this->wpSegment->synchronizeUsers();
     $subscribers = Segment::getWPSegment()->subscribers()->whereIn('wp_user_id', $this->userIds);
-    expect($subscribers->count())->equals(1);
+    verify($subscribers->count())->equals(1);
   }
 
   public function testItDoesntDeleteNonWPData(): void {
@@ -362,7 +362,7 @@ class WPTest extends \MailPoetTest {
     $this->clearEmail($subscriber3);
     $this->wpSegment->synchronizeUsers();
     $subscribersCount = $this->getSubscribersCount();
-    expect($subscribersCount)->equals(3);
+    verify($subscribersCount)->equals(3);
     $dbSubscriber = Subscriber::findOne($subscriber3->id);
     expect($dbSubscriber)->notEmpty();
     $subscriber3->delete();
@@ -384,10 +384,10 @@ class WPTest extends \MailPoetTest {
     $association->segmentId = $wpSegment->id;
     $association->save();
     $subscribersCount = $this->getSubscribersCount();
-    expect($subscribersCount)->equals(1);
+    verify($subscribersCount)->equals(1);
     $this->wpSegment->synchronizeUsers();
     $subscribersCount = $this->getSubscribersCount();
-    expect($subscribersCount)->equals(0);
+    verify($subscribersCount)->equals(0);
   }
 
   public function testItRemovesSubscribersInWPSegmentWithoutEmail(): void {
@@ -430,8 +430,8 @@ class WPTest extends \MailPoetTest {
     $subscriber = Subscriber::where("wp_user_id", $id)->findOne();
     $deletedAt = Carbon::createFromFormat('Y-m-d H:i:s', $subscriber->deletedAt);
     $this->assertInstanceOf(Carbon::class, $deletedAt);
-    expect($subscriber->status)->equals(SubscriberEntity::STATUS_UNCONFIRMED);
-    expect($deletedAt->timestamp)->equals(Carbon::now()->timestamp, 1);
+    verify($subscriber->status)->equals(SubscriberEntity::STATUS_UNCONFIRMED);
+    verify($deletedAt->timestamp)->equals(Carbon::now()->timestamp, 1);
   }
 
   public function testItAddsNewUserWhoUncheckedOptInOnCheckoutPageAsUnconfirmed(): void {
@@ -447,7 +447,7 @@ class WPTest extends \MailPoetTest {
     $_POST[Subscription::CHECKOUT_OPTIN_PRESENCE_CHECK_INPUT_NAME] = 1;
     $wpSegment->synchronizeUser($id);
     $subscriber = Subscriber::where("wp_user_id", $id)->findOne();
-    expect($subscriber->status)->equals(SubscriberEntity::STATUS_UNCONFIRMED);
+    verify($subscriber->status)->equals(SubscriberEntity::STATUS_UNCONFIRMED);
   }
 
   public function testItDoesNotSendConfirmationEmailForNewUserWhenWPSegmentIsDisabledOnRegisterEnabled(): void {
@@ -471,7 +471,7 @@ class WPTest extends \MailPoetTest {
     $wpSegment = $this->getServiceWithOverrides(WP::class, ['wp' => $wp]);
     $wpSegment->synchronizeUser($id);
     $wpSubscriber = Segment::getWPSegment()->subscribers()->where('wp_user_id', $id)->findOne();
-    expect($wpSubscriber->countConfirmations)->equals(0);
+    verify($wpSubscriber->countConfirmations)->equals(0);
   }
 
   public function testItDecodesHtmlEntitesInFirstAndLastName(): void {
@@ -543,7 +543,7 @@ class WPTest extends \MailPoetTest {
     $wpSegment = $this->getServiceWithOverrides(WP::class, ['wp' => $wp]);
     $wpSegment->synchronizeUser($id);
     $subscriber1 = Subscriber::where("wp_user_id", $id)->findOne();
-    expect($subscriber1->status)->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber1->status)->equals(SubscriberEntity::STATUS_SUBSCRIBED);
     expect($subscriber1->deletedAt)->null();
   }
 
@@ -576,7 +576,7 @@ class WPTest extends \MailPoetTest {
     ]);
     $wpSegment->synchronizeUser($id);
     $subscriber1 = Subscriber::where("wp_user_id", $id)->findOne();
-    expect($subscriber1->status)->equals(SubscriberEntity::STATUS_UNCONFIRMED);
+    verify($subscriber1->status)->equals(SubscriberEntity::STATUS_UNCONFIRMED);
     expect($subscriber1->deletedAt)->null();
     remove_role('customer');
   }
diff --git a/mailpoet/tests/integration/Segments/WooCommerceTest.php b/mailpoet/tests/integration/Segments/WooCommerceTest.php
index 8834811666..aa17183ab0 100644
--- a/mailpoet/tests/integration/Segments/WooCommerceTest.php
+++ b/mailpoet/tests/integration/Segments/WooCommerceTest.php
@@ -69,12 +69,12 @@ class WooCommerceTest extends \MailPoetTest {
     $subscriber = $this->findWCSubscriberByWpUserId($user->ID);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
     expect($subscriber)->notEmpty();
-    expect($subscriber->getEmail())->equals($user->user_email); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($subscriber->getFirstName())->equals($firstName);
-    expect($subscriber->getLastName())->equals($lastName);
-    expect($subscriber->getIsWoocommerceUser())->equals(true);
-    expect($subscriber->getSource())->equals(Source::WOOCOMMERCE_USER);
-    expect($subscriber->getDeletedAt())->equals(null);
+    verify($subscriber->getEmail())->equals($user->user_email); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($subscriber->getFirstName())->equals($firstName);
+    verify($subscriber->getLastName())->equals($lastName);
+    verify($subscriber->getIsWoocommerceUser())->equals(true);
+    verify($subscriber->getSource())->equals(Source::WOOCOMMERCE_USER);
+    verify($subscriber->getDeletedAt())->equals(null);
   }
 
   public function testItSynchronizesUpdatedRegisteredCustomer(): void {
@@ -94,12 +94,12 @@ class WooCommerceTest extends \MailPoetTest {
     $subscriber = $this->findWCSubscriberByWpUserId($user->ID);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
     expect($subscriber)->notEmpty();
-    expect($subscriber->getEmail())->equals($user->user_email); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
-    expect($subscriber->getFirstName())->equals($firstName);
-    expect($subscriber->getLastName())->equals($lastName);
-    expect($subscriber->getIsWoocommerceUser())->equals(true);
-    expect($subscriber->getSource())->equals(Source::WORDPRESS_USER); // no overriding
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED); // no overriding
+    verify($subscriber->getEmail())->equals($user->user_email); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($subscriber->getFirstName())->equals($firstName);
+    verify($subscriber->getLastName())->equals($lastName);
+    verify($subscriber->getIsWoocommerceUser())->equals(true);
+    verify($subscriber->getSource())->equals(Source::WORDPRESS_USER); // no overriding
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED); // no overriding
   }
 
   public function testItSynchronizesDeletedRegisteredCustomer(): void {
@@ -129,10 +129,10 @@ class WooCommerceTest extends \MailPoetTest {
     expect($subscribers)->isEmpty();
     $subscriber = $this->subscribersRepository->findOneBy(['email' => $guest['email']]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($subscriber->getFirstName())->equals($guest['first_name']);
-    expect($subscriber->getLastName())->equals($guest['last_name']);
-    expect($subscriber->getIsWoocommerceUser())->equals(true);
-    expect($subscriber->getSource())->equals(Source::WOOCOMMERCE_USER);
+    verify($subscriber->getFirstName())->equals($guest['first_name']);
+    verify($subscriber->getLastName())->equals($guest['last_name']);
+    verify($subscriber->getIsWoocommerceUser())->equals(true);
+    verify($subscriber->getSource())->equals(Source::WOOCOMMERCE_USER);
   }
 
   public function testItSynchronizesNewGuestCustomerWithDoubleOptinDisabled(): void {
@@ -145,10 +145,10 @@ class WooCommerceTest extends \MailPoetTest {
     expect($subscribers)->isEmpty();
     $subscriber = $this->subscribersRepository->findOneBy(['email' => $guest['email']]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($subscriber->getFirstName())->equals($guest['first_name']);
-    expect($subscriber->getLastName())->equals($guest['last_name']);
-    expect($subscriber->getIsWoocommerceUser())->equals(true);
-    expect($subscriber->getSource())->equals(Source::WOOCOMMERCE_USER);
+    verify($subscriber->getFirstName())->equals($guest['first_name']);
+    verify($subscriber->getLastName())->equals($guest['last_name']);
+    verify($subscriber->getIsWoocommerceUser())->equals(true);
+    verify($subscriber->getSource())->equals(Source::WOOCOMMERCE_USER);
   }
 
   public function testItSynchronizesNewGuestCustomerWithOptinCheckoutEnabled(): void {
@@ -161,10 +161,10 @@ class WooCommerceTest extends \MailPoetTest {
     expect($subscribers)->isEmpty();
     $subscriber = $this->subscribersRepository->findOneBy(['email' => $guest['email']]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($subscriber->getFirstName())->equals($guest['first_name']);
-    expect($subscriber->getLastName())->equals($guest['last_name']);
-    expect($subscriber->getIsWoocommerceUser())->equals(true);
-    expect($subscriber->getSource())->equals(Source::WOOCOMMERCE_USER);
+    verify($subscriber->getFirstName())->equals($guest['first_name']);
+    verify($subscriber->getLastName())->equals($guest['last_name']);
+    verify($subscriber->getIsWoocommerceUser())->equals(true);
+    verify($subscriber->getSource())->equals(Source::WOOCOMMERCE_USER);
   }
 
   public function testItSynchronizesCustomers(): void {
@@ -174,16 +174,16 @@ class WooCommerceTest extends \MailPoetTest {
     $guest = $this->insertGuestCustomer();
     $this->synchronizeAllCustomers();
     $subscribersCount = $this->getSubscribersCount();
-    expect($subscribersCount)->equals(2);
+    verify($subscribersCount)->equals(2);
 
     $subscriber = $this->subscribersRepository->findOneBy(['email' => $user->user_email]); // phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED);
-    expect($subscriber->getSource())->equals(Source::WOOCOMMERCE_USER);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED);
+    verify($subscriber->getSource())->equals(Source::WOOCOMMERCE_USER);
     $subscriber = $this->subscribersRepository->findOneBy(['email' => $guest['email']]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
-    expect($subscriber->getSource())->equals(Source::WOOCOMMERCE_USER);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber->getSource())->equals(Source::WOOCOMMERCE_USER);
   }
 
   public function testItSynchronizesCustomersInBatches(): void {
@@ -200,17 +200,17 @@ class WooCommerceTest extends \MailPoetTest {
     // Check if empty batch run returns the highest order ID to an avoid infinite loop
     $lastOrderId = $this->wooCommerceSegment->synchronizeCustomers($lowestOrderId - 2, $highestOrderId, 1);
     $subscribersCount = $this->getSubscribersCount();
-    expect($subscribersCount)->equals(0);
+    verify($subscribersCount)->equals(0);
     // Check regular subscriber sync
     $lastOrderId = $this->wooCommerceSegment->synchronizeCustomers($lastOrderId, $highestOrderId, 1);
     $subscribersCount = $this->getSubscribersCount();
-    expect($subscribersCount)->equals(1);
+    verify($subscribersCount)->equals(1);
     $lastOrderId = $this->wooCommerceSegment->synchronizeCustomers($lastOrderId, $highestOrderId, 1);
     $subscribersCount = $this->getSubscribersCount();
-    expect($subscribersCount)->equals(2);
+    verify($subscribersCount)->equals(2);
     $this->wooCommerceSegment->synchronizeCustomers($lastOrderId, $highestOrderId, 1);
     $subscribersCount = $this->getSubscribersCount();
-    expect($subscribersCount)->equals(3);
+    verify($subscribersCount)->equals(3);
   }
 
   public function testItSynchronizesNewCustomers(): void {
@@ -221,7 +221,7 @@ class WooCommerceTest extends \MailPoetTest {
     $this->insertGuestCustomer();
     $this->synchronizeAllCustomers();
     $subscribersCount = $this->getSubscribersCount();
-    expect($subscribersCount)->equals(4);
+    verify($subscribersCount)->equals(4);
   }
 
   public function testItSynchronizesPresubscribedRegisteredCustomers(): void {
@@ -241,8 +241,8 @@ class WooCommerceTest extends \MailPoetTest {
     ]);
     $this->assertInstanceOf(SubscriberEntity::class, $wpSubscriber);
     expect($wpSubscriber)->notEmpty();
-    expect($wpSubscriber->getId())->equals($subscriber->getId());
-    expect($wpSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
+    verify($wpSubscriber->getId())->equals($subscriber->getId());
+    verify($wpSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
   }
 
   public function testItSynchronizesPresubscribedGuestCustomers(): void {
@@ -262,8 +262,8 @@ class WooCommerceTest extends \MailPoetTest {
     ]);
     $this->assertInstanceOf(SubscriberEntity::class, $wpSubscriber);
     expect($wpSubscriber)->notEmpty();
-    expect($wpSubscriber->getEmail())->equals($subscriber->getEmail());
-    expect($wpSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
+    verify($wpSubscriber->getEmail())->equals($subscriber->getEmail());
+    verify($wpSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
   }
 
   public function testItDoesNotSynchronizeEmptyEmailsForNewUsers(): void {
@@ -293,7 +293,7 @@ class WooCommerceTest extends \MailPoetTest {
     $this->synchronizeAllCustomers();
     $subscriber = $this->subscribersRepository->findOneBy(['wpUserId' => $user->ID]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($subscriber->getFirstName())->equals('First name (newer)');
+    verify($subscriber->getFirstName())->equals('First name (newer)');
   }
 
   public function testItSynchronizesLastNamesForRegisteredCustomers(): void {
@@ -304,7 +304,7 @@ class WooCommerceTest extends \MailPoetTest {
     $this->synchronizeAllCustomers();
     $subscriber = $this->subscribersRepository->findOneBy(['wpUserId' => $user->ID]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($subscriber->getLastName())->equals('Last name (newer)');
+    verify($subscriber->getLastName())->equals('Last name (newer)');
   }
 
   public function testItSynchronizesFirstNamesForGuestCustomers(): void {
@@ -315,7 +315,7 @@ class WooCommerceTest extends \MailPoetTest {
     $this->synchronizeAllCustomers();
     $subscriber = $this->subscribersRepository->findOneBy(['email' => $guest['email']]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($subscriber->getFirstName())->equals('First name (newer)');
+    verify($subscriber->getFirstName())->equals('First name (newer)');
   }
 
   public function testItSynchronizesLastNamesForGuestCustomers(): void {
@@ -326,7 +326,7 @@ class WooCommerceTest extends \MailPoetTest {
     $this->synchronizeAllCustomers();
     $subscriber = $this->subscribersRepository->findOneBy(['email' => $guest['email']]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($subscriber->getLastName())->equals('Last name (newer)');
+    verify($subscriber->getLastName())->equals('Last name (newer)');
   }
 
   public function testItSynchronizesSegment(): void {
@@ -421,7 +421,7 @@ class WooCommerceTest extends \MailPoetTest {
     $this->clearEmail($subscriber3);
     $this->synchronizeAllCustomers();
     $subscribersCount = $this->getSubscribersCount();
-    expect($subscribersCount)->equals(4);
+    verify($subscribersCount)->equals(4);
     $this->entityManager->clear();
     $dbSubscriber = $this->subscribersRepository->findOneById($subscriber3->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $dbSubscriber);
@@ -480,7 +480,7 @@ class WooCommerceTest extends \MailPoetTest {
     $this->entityManager->clear();
     $subscriberAfterUpdate = $this->subscribersRepository->findOneBy(['email' => $subscriber->getEmail()]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriberAfterUpdate);
-    expect($subscriberAfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
+    verify($subscriberAfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
   }
 
   public function testItDoesntSetGlobalStatusUnsubscribedIfUserHasMoreLists(): void {
@@ -509,7 +509,7 @@ class WooCommerceTest extends \MailPoetTest {
     $this->entityManager->clear();
     $subscriberAfterUpdate = $this->subscribersRepository->findOneBy(['email' => $subscriber->getEmail()]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriberAfterUpdate);
-    expect($subscriberAfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriberAfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
   }
 
   public function testItSubscribesSubscribersToWCListWhenSettingIsEnabled(): void {
@@ -547,15 +547,15 @@ class WooCommerceTest extends \MailPoetTest {
     $subscriber2AfterUpdate = $this->subscribersRepository->findOneBy(['email' => $subscriber2->getEmail()]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber1AfterUpdate);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber2AfterUpdate);
-    expect($subscriber1AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
-    expect($subscriber2AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
+    verify($subscriber1AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
+    verify($subscriber2AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
 
     $association1AfterUpdate = $this->subscriberSegmentsRepository->findOneById($association1->getId());
     $association2AfterUpdate = $this->subscriberSegmentsRepository->findOneById($association2->getId());
     $this->assertInstanceOf(SubscriberSegmentEntity::class, $association1AfterUpdate);
     $this->assertInstanceOf(SubscriberSegmentEntity::class, $association2AfterUpdate);
-    expect($association1AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
-    expect($association2AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
+    verify($association1AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($association2AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
   }
 
   public function testItUnsubscribesSubscribersFromWCListWhenSettingIsDisabled(): void {
@@ -592,15 +592,15 @@ class WooCommerceTest extends \MailPoetTest {
     $subscriber2AfterUpdate = $this->subscribersRepository->findOneBy(['email' => $subscriber2->getEmail()]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber1AfterUpdate);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber2AfterUpdate);
-    expect($subscriber1AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
-    expect($subscriber2AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber1AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber2AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
 
     $association1AfterUpdate = $this->subscriberSegmentsRepository->findOneById($association1->getId());
     $association2AfterUpdate = $this->subscriberSegmentsRepository->findOneById($association2->getId());
     $this->assertInstanceOf(SubscriberSegmentEntity::class, $association1AfterUpdate);
     $this->assertInstanceOf(SubscriberSegmentEntity::class, $association2AfterUpdate);
-    expect($association1AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
-    expect($association2AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($association1AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
+    verify($association2AfterUpdate->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
   }
 
   public function _after(): void {
diff --git a/mailpoet/tests/integration/Services/AuthorizedEmailsControllerTest.php b/mailpoet/tests/integration/Services/AuthorizedEmailsControllerTest.php
index b9fcf30b87..15566fff31 100644
--- a/mailpoet/tests/integration/Services/AuthorizedEmailsControllerTest.php
+++ b/mailpoet/tests/integration/Services/AuthorizedEmailsControllerTest.php
@@ -44,7 +44,7 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
     $this->setMailPoetSendingMethod();
     $controller = $this->getController($authorizedEmailsFromApi = ['auth@email.com']);
     $controller->checkAuthorizedEmailAddresses();
-    expect($this->settings->get(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING))->equals(['invalid_sender_address' => 'invalid@email.com']);
+    verify($this->settings->get(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING))->equals(['invalid_sender_address' => 'invalid@email.com']);
   }
 
   public function testItSetsProperErrorForInvalidDefaultSender() {
@@ -53,7 +53,7 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
     $this->setMailPoetSendingMethod();
     $controller = $this->getController($authorizedEmailsFromApi = ['auth@email.com']);
     $controller->checkAuthorizedEmailAddresses();
-    expect($this->settings->get(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING))->equals(['invalid_sender_address' => 'invalid@email.com']);
+    verify($this->settings->get(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING))->equals(['invalid_sender_address' => 'invalid@email.com']);
   }
 
   public function testItSetEmptyErrorWhenDefaultSenderAddressIsCorrect() {
@@ -175,7 +175,7 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
     $error = MailerLog::getError();
     expect(is_array($error));
     if (is_array($error)) {
-      expect($error['operation'])->equals(MailerError::OPERATION_SEND);
+      verify($error['operation'])->equals(MailerError::OPERATION_SEND);
     }
   }
 
@@ -190,7 +190,7 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
     $error = MailerLog::getError();
     expect(is_array($error));
     if (is_array($error)) {
-      expect($error['operation'])->equals(MailerError::OPERATION_AUTHORIZATION);
+      verify($error['operation'])->equals(MailerError::OPERATION_AUTHORIZATION);
     }
   }
 
@@ -208,10 +208,10 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
     $controller = $this->getController($authorizedEmailsFromApi = ['auth@email.com']);
     $controller->checkAuthorizedEmailAddresses();
     $error = $this->settings->get(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING);
-    expect(count($error['invalid_senders_in_newsletters']))->equals(1);
-    expect($error['invalid_senders_in_newsletters'][0]['newsletter_id'])->equals($newsletter->getId());
-    expect($error['invalid_senders_in_newsletters'][0]['sender_address'])->equals('invalid@email.com');
-    expect($error['invalid_senders_in_newsletters'][0]['subject'])->equals('Subject');
+    verify(count($error['invalid_senders_in_newsletters']))->equals(1);
+    verify($error['invalid_senders_in_newsletters'][0]['newsletter_id'])->equals($newsletter->getId());
+    verify($error['invalid_senders_in_newsletters'][0]['sender_address'])->equals('invalid@email.com');
+    verify($error['invalid_senders_in_newsletters'][0]['subject'])->equals('Subject');
   }
 
   public function testItSetsFromAddressInSettings() {
@@ -340,7 +340,7 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
     ];
     $controller = $this->getControllerWithCustomMocks($mocks);
     $result = $controller->createAuthorizedEmailAddress('new-authorized@email.com');
-    expect($result)->equals($response);
+    verify($result)->equals($response);
   }
 
   public function testItThrowsAnExceptionForReturnedArrayForCreateNewAuthorizedEmailAddress() {
@@ -367,20 +367,20 @@ class AuthorizedEmailsControllerTest extends \MailPoetTest {
     $array = ['authorized@email.com'];
     $controller = $this->getController($array);
     $result = $controller->isEmailAddressAuthorized('authorized@email.com');
-    expect($result)->equals(true);
+    verify($result)->equals(true);
   }
 
   public function testItReturnsFalseWhenNotAuthorizedForIsEmailAddressAuthorized() {
     $array = ['authorized@email.com'];
     $controller = $this->getController($array);
     $result = $controller->isEmailAddressAuthorized('pending@email.com');
-    expect($result)->equals(false);
+    verify($result)->equals(false);
   }
 
   public function testItReturnsFalseWhenNoArrayForIsEmailAddressAuthorized() {
     $controller = $this->getController([]);
     $result = $controller->isEmailAddressAuthorized('pending@email.com');
-    expect($result)->equals(false);
+    verify($result)->equals(false);
   }
 
   private function setMailPoetSendingMethod() {
diff --git a/mailpoet/tests/integration/Services/BridgeApiTest.php b/mailpoet/tests/integration/Services/BridgeApiTest.php
index 5b80bcc476..20f7be1764 100644
--- a/mailpoet/tests/integration/Services/BridgeApiTest.php
+++ b/mailpoet/tests/integration/Services/BridgeApiTest.php
@@ -56,7 +56,7 @@ class BridgeApiTest extends \MailPoetTest {
     expect($logs)->count(1);
     $errorLog = $logs[0];
     $this->assertInstanceOf(LogEntity::class, $errorLog);
-    expect($errorLog->getLevel())->equals(Logger::ERROR);
+    verify($errorLog->getLevel())->equals(Logger::ERROR);
     expect($errorLog->getMessage())->stringContainsString('www.home-example.com');
     expect($errorLog->getMessage())->stringContainsString('key-validation.failed');
     expect($errorLog->getMessage())->stringContainsString('"key_type":"premium"');
@@ -90,7 +90,7 @@ class BridgeApiTest extends \MailPoetTest {
     expect($logs)->count(1);
     $errorLog = $logs[0];
     $this->assertInstanceOf(LogEntity::class, $errorLog);
-    expect($errorLog->getLevel())->equals(Logger::ERROR);
+    verify($errorLog->getLevel())->equals(Logger::ERROR);
     expect($errorLog->getMessage())->stringContainsString('www.home-example.com');
     expect($errorLog->getMessage())->stringContainsString('key-validation.failed');
     expect($errorLog->getMessage())->stringContainsString('"key_type":"mss"');
@@ -108,7 +108,7 @@ class BridgeApiTest extends \MailPoetTest {
       ->method('wpRemoteRetrieveBody')
       ->willReturn(json_encode([$domainResult]));
     $result = $this->api->getAuthorizedSenderDomains();
-    expect($result)->equals([$domainResult]);
+    verify($result)->equals([$domainResult]);
   }
 
   public function testItReturnsNullIfCantGetSenderDomains() {
@@ -134,7 +134,7 @@ class BridgeApiTest extends \MailPoetTest {
     expect($logs)->count(1);
     $errorLog = $logs[0];
     $this->assertInstanceOf(LogEntity::class, $errorLog);
-    expect($errorLog->getLevel())->equals(Logger::ERROR);
+    verify($errorLog->getLevel())->equals(Logger::ERROR);
     expect($errorLog->getMessage())->stringContainsString('getAuthorizedSenderDomains API response was not in expected format.');
     expect($errorLog->getMessage())->stringContainsString('trololo');
   }
@@ -149,7 +149,7 @@ class BridgeApiTest extends \MailPoetTest {
       ->method('wpRemoteRetrieveBody')
       ->willReturn(json_encode(BridgeTestMockAPI::VERIFIED_DOMAIN_RESPONSE));
     $result = $this->api->createAuthorizedSenderDomain('mailpoet.com');
-    expect($result)->equals(BridgeTestMockAPI::VERIFIED_DOMAIN_RESPONSE);
+    verify($result)->equals(BridgeTestMockAPI::VERIFIED_DOMAIN_RESPONSE);
   }
 
   public function testCreateDomainLogsErrorWhenResponseHasUnexpectedFormat() {
@@ -162,12 +162,12 @@ class BridgeApiTest extends \MailPoetTest {
       ->method('wpRemoteRetrieveBody')
       ->willReturn('trololo');
     $result = $this->api->createAuthorizedSenderDomain('mailpoet.com');
-    expect($result)->equals([]);
+    verify($result)->equals([]);
     $logs = $this->logRepository->findAll();
     expect($logs)->count(1);
     $errorLog = $logs[0];
     $this->assertInstanceOf(LogEntity::class, $errorLog);
-    expect($errorLog->getLevel())->equals(Logger::ERROR);
+    verify($errorLog->getLevel())->equals(Logger::ERROR);
     expect($errorLog->getMessage())->stringContainsString('createAuthorizedSenderDomain API response was not in expected format.');
     expect($errorLog->getMessage())->stringContainsString('trololo');
   }
@@ -182,8 +182,8 @@ class BridgeApiTest extends \MailPoetTest {
       ->method('wpRemoteRetrieveBody')
       ->willReturn(json_encode(['error' => 'This domain was already added to the list.']));
     $result = $this->api->createAuthorizedSenderDomain('existing.com');
-    expect($result['status'])->equals(API::RESPONSE_STATUS_ERROR);
-    expect($result['error'])->equals('This domain was already added to the list.');
+    verify($result['status'])->equals(API::RESPONSE_STATUS_ERROR);
+    verify($result['error'])->equals('This domain was already added to the list.');
   }
 
   public function testVerifyDomainLogsErrorWhenResponseHasUnexpectedFormat() {
@@ -196,12 +196,12 @@ class BridgeApiTest extends \MailPoetTest {
       ->method('wpRemoteRetrieveBody')
       ->willReturn('trololo');
     $result = $this->api->verifyAuthorizedSenderDomain('mailpoet.com');
-    expect($result)->equals([]);
+    verify($result)->equals([]);
     $logs = $this->logRepository->findAll();
     expect($logs)->count(1);
     $errorLog = $logs[0];
     $this->assertInstanceOf(LogEntity::class, $errorLog);
-    expect($errorLog->getLevel())->equals(Logger::ERROR);
+    verify($errorLog->getLevel())->equals(Logger::ERROR);
     expect($errorLog->getMessage())->stringContainsString('verifyAuthorizedSenderDomain API response was not in expected format.');
     expect($errorLog->getMessage())->stringContainsString('trololo');
   }
diff --git a/mailpoet/tests/integration/Services/BridgeTest.php b/mailpoet/tests/integration/Services/BridgeTest.php
index 46e10ab71f..d0f99e5cb7 100644
--- a/mailpoet/tests/integration/Services/BridgeTest.php
+++ b/mailpoet/tests/integration/Services/BridgeTest.php
@@ -70,32 +70,32 @@ class BridgeTest extends \MailPoetTest {
   public function testItChecksValidMSSKey() {
     $result = $this->bridge->checkMSSKey($this->validKey);
     expect($result)->notEmpty();
-    expect($result['state'])->equals(Bridge::KEY_VALID);
+    verify($result['state'])->equals(Bridge::KEY_VALID);
   }
 
   public function testItChecksInvalidMSSKey() {
     $result = $this->bridge->checkMSSKey($this->invalidKey);
     expect($result)->notEmpty();
-    expect($result['state'])->equals(Bridge::KEY_INVALID);
+    verify($result['state'])->equals(Bridge::KEY_INVALID);
   }
 
   public function testItChecksExpiringMSSKey() {
     $result = $this->bridge->checkMSSKey($this->expiringKey);
     expect($result)->notEmpty();
-    expect($result['state'])->equals(Bridge::KEY_EXPIRING);
+    verify($result['state'])->equals(Bridge::KEY_EXPIRING);
     expect($result['data']['expire_at'])->notEmpty();
   }
 
   public function testItChecksAlreadyUsed() {
     $result = $this->bridge->checkMSSKey($this->usedKey);
     expect($result)->notEmpty();
-    expect($result['state'])->equals(Bridge::KEY_ALREADY_USED);
+    verify($result['state'])->equals(Bridge::KEY_ALREADY_USED);
   }
 
   public function testItChecksForbiddenEndpointMSSKey() {
     $result = $this->bridge->checkMSSKey($this->underPrivilegedKey);
     expect($result)->notEmpty();
-    expect($result['state'])->equals(Bridge::KEY_VALID_UNDERPRIVILEGED);
+    verify($result['state'])->equals(Bridge::KEY_VALID_UNDERPRIVILEGED);
   }
 
   public function testItReturnsErrorStateOnEmptyAPIResponseCodeDuringMSSCheck() {
@@ -103,7 +103,7 @@ class BridgeTest extends \MailPoetTest {
     $this->bridge->api = $api;
     $result = $this->bridge->checkMSSKey($this->validKey);
     expect($result)->notEmpty();
-    expect($result['state'])->equals(Bridge::KEY_CHECK_ERROR);
+    verify($result['state'])->equals(Bridge::KEY_CHECK_ERROR);
   }
 
   public function testItStoresExpectedMSSKeyStates() {
@@ -118,8 +118,8 @@ class BridgeTest extends \MailPoetTest {
     foreach ($states as $state => $key) {
       $state = ['state' => $state];
       $this->bridge->storeMSSKeyAndState($key, $state);
-      expect($this->getMSSKey())->equals($key);
-      expect($this->getMSSKeyState())->equals($state);
+      verify($this->getMSSKey())->equals($key);
+      verify($this->getMSSKeyState())->equals($state);
     }
   }
 
@@ -138,31 +138,31 @@ class BridgeTest extends \MailPoetTest {
   public function testItChecksValidPremiumKey() {
     $result = $this->bridge->checkPremiumKey($this->validKey);
     expect($result)->notEmpty();
-    expect($result['state'])->equals(Bridge::KEY_VALID);
+    verify($result['state'])->equals(Bridge::KEY_VALID);
   }
 
   public function testItChecksInvalidPremiumKey() {
     $result = $this->bridge->checkPremiumKey($this->invalidKey);
     expect($result)->notEmpty();
-    expect($result['state'])->equals(Bridge::KEY_INVALID);
+    verify($result['state'])->equals(Bridge::KEY_INVALID);
   }
 
   public function testItChecksAlreadyUsedPremiumKey() {
     $result = $this->bridge->checkPremiumKey($this->usedPremiumKey);
     expect($result)->notEmpty();
-    expect($result['state'])->equals(Bridge::KEY_ALREADY_USED);
+    verify($result['state'])->equals(Bridge::KEY_ALREADY_USED);
   }
 
   public function testItChecksForbiddenEndpointPremiumKey() {
     $result = $this->bridge->checkPremiumKey($this->underPrivilegedKey);
     expect($result)->notEmpty();
-    expect($result['state'])->equals(Bridge::KEY_VALID_UNDERPRIVILEGED);
+    verify($result['state'])->equals(Bridge::KEY_VALID_UNDERPRIVILEGED);
   }
 
   public function testItChecksExpiringPremiumKey() {
     $result = $this->bridge->checkPremiumKey($this->expiringPremiumKey);
     expect($result)->notEmpty();
-    expect($result['state'])->equals(Bridge::KEY_EXPIRING);
+    verify($result['state'])->equals(Bridge::KEY_EXPIRING);
     expect($result['data']['expire_at'])->notEmpty();
   }
 
@@ -171,7 +171,7 @@ class BridgeTest extends \MailPoetTest {
     $this->bridge->api = $api;
     $result = $this->bridge->checkPremiumKey($this->validKey);
     expect($result)->notEmpty();
-    expect($result['state'])->equals(Bridge::KEY_CHECK_ERROR);
+    verify($result['state'])->equals(Bridge::KEY_CHECK_ERROR);
   }
 
   public function testItStoresExpectedPremiumKeyStates() {
@@ -184,8 +184,8 @@ class BridgeTest extends \MailPoetTest {
     foreach ($states as $state => $key) {
       $state = ['state' => $state];
       $this->bridge->storePremiumKeyAndState($key, $state);
-      expect($this->getPremiumKey())->equals($key);
-      expect($this->getPremiumKeyState())->equals($state);
+      verify($this->getPremiumKey())->equals($key);
+      verify($this->getPremiumKeyState())->equals($state);
     }
   }
 
@@ -204,13 +204,13 @@ class BridgeTest extends \MailPoetTest {
   public function testItStoresSubscriptionTypeOnPremiumCheck() {
     $state = ['state' => Bridge::KEY_VALID, 'data' => ['subscription_type' => Bridge::WPCOM_SUBSCRIPTION_TYPE]];
     $this->bridge->storePremiumKeyAndState($this->validKey, $state);
-    expect($this->getSubscriptionType())->equals(Bridge::WPCOM_SUBSCRIPTION_TYPE);
+    verify($this->getSubscriptionType())->equals(Bridge::WPCOM_SUBSCRIPTION_TYPE);
   }
 
   public function testItStoresSubscriptionTypeOnMSSCheck() {
     $state = ['state' => Bridge::KEY_VALID, 'data' => ['subscription_type' => Bridge::WCCOM_SUBSCRIPTION_TYPE]];
     $this->bridge->storeMSSKeyAndState($this->validKey, $state);
-    expect($this->getSubscriptionType())->equals(Bridge::WCCOM_SUBSCRIPTION_TYPE);
+    verify($this->getSubscriptionType())->equals(Bridge::WCCOM_SUBSCRIPTION_TYPE);
   }
 
   public function testItDoesNotStoreInvalidSubscriptionType() {
@@ -224,10 +224,10 @@ class BridgeTest extends \MailPoetTest {
   public function testItInvalidatesMSSKey() {
     $this->bridge->storeMSSKeyAndState($this->validKey, ['state' => Bridge::KEY_VALID]);
     $storedState = $this->getMssKeyState() ?? [];
-    expect($storedState['state'])->equals(Bridge::KEY_VALID);
+    verify($storedState['state'])->equals(Bridge::KEY_VALID);
     $this->bridge->invalidateMssKey();
     $storedState = $this->getMssKeyState() ?? [];
-    expect($storedState['state'])->equals(Bridge::KEY_INVALID);
+    verify($storedState['state'])->equals(Bridge::KEY_INVALID);
   }
 
   public function testItPingsBridge() {
@@ -246,7 +246,7 @@ class BridgeTest extends \MailPoetTest {
 
     // test default request value
     $api->sendMessages('test');
-    expect($wpRemotePostArgs[1]['timeout'])->equals(API::REQUEST_TIMEOUT);
+    verify($wpRemotePostArgs[1]['timeout'])->equals(API::REQUEST_TIMEOUT);
 
     // test custom request value
     $customRequestValue = 20;
@@ -256,7 +256,7 @@ class BridgeTest extends \MailPoetTest {
     $wp = new WPFunctions;
     $wp->addFilter('mailpoet_bridge_api_request_timeout', $filter);
     $api->sendMessages('test');
-    expect($wpRemotePostArgs[1]['timeout'])->equals($customRequestValue);
+    verify($wpRemotePostArgs[1]['timeout'])->equals($customRequestValue);
     $wp->removeFilter('mailpoet_bridge_api_request_timeout', $filter);
   }
 
@@ -379,30 +379,30 @@ class BridgeTest extends \MailPoetTest {
     $result = $this->bridge->createAuthorizedSenderDomain('mailpoet.com');
     expect($result)->notEmpty();
     expect(isset($result['error']))->false();
-    expect($result[0]['host'])->equals('mailpoet1._domainkey.example.com');
+    verify($result[0]['host'])->equals('mailpoet1._domainkey.example.com');
   }
 
   public function testItDoesntCreateSenderDomainThatExists() {
     $result = $this->bridge->createAuthorizedSenderDomain('existing.com');
     expect($result)->notEmpty();
-    expect($result['error'])->equals('This domain was already added to the list.');
-    expect($result['status'])->equals(false);
+    verify($result['error'])->equals('This domain was already added to the list.');
+    verify($result['status'])->equals(false);
   }
 
   public function testTheSenderDomainApiReturnsValidDataType() {
     $result = $this->bridge->getAuthorizedSenderDomains('mailpoet.com');
     expect($result)->notEmpty();
-    expect($result[0]['host'])->equals('mailpoet1._domainkey.example.com');
-    expect($result[0]['value'])->equals('dkim1.sendingservice.net');
-    expect($result[0]['type'])->equals('CNAME');
-    expect($result[0]['status'])->equals('valid');
-    expect($result[0]['message'])->equals('');
+    verify($result[0]['host'])->equals('mailpoet1._domainkey.example.com');
+    verify($result[0]['value'])->equals('dkim1.sendingservice.net');
+    verify($result[0]['type'])->equals('CNAME');
+    verify($result[0]['status'])->equals('valid');
+    verify($result[0]['message'])->equals('');
   }
 
   public function testItCanVerifySenderDomain() {
     $result = $this->bridge->verifyAuthorizedSenderDomain('mailpoet.com');
     expect($result)->notEmpty();
-    expect($result['ok'])->equals(true); // verified
+    verify($result['ok'])->equals(true); // verified
   }
 
   public function testItPreservesMSSKeyStateDataIfSubsequentCheckFails() {
@@ -428,14 +428,14 @@ class BridgeTest extends \MailPoetTest {
     $result = $this->bridge->checkMSSKey('abc');
     $this->bridge->storeMSSKeyAndState('abc', $result);
     $state = $this->getMssKeyState() ?? [];
-    expect($state['state'])->equals(Bridge::KEY_VALID);
-    expect($state['data'])->equals($data);
+    verify($state['state'])->equals(Bridge::KEY_VALID);
+    verify($state['data'])->equals($data);
     // Second check fails with 403 insufficient privileges simulating that key lost access to MSS
     $result = $this->bridge->checkMSSKey('abc');
     $this->bridge->storeMSSKeyAndState('abc', $result);
     $state = $this->getMssKeyState() ?? [];
-    expect($state['state'])->equals(Bridge::KEY_VALID_UNDERPRIVILEGED);
-    expect($state['data'])->equals($data);
+    verify($state['state'])->equals(Bridge::KEY_VALID_UNDERPRIVILEGED);
+    verify($state['data'])->equals($data);
   }
 
   public function testItResetsMSSKeyStateDataIfSubsequentCheckFailForADiffrentKey() {
@@ -461,13 +461,13 @@ class BridgeTest extends \MailPoetTest {
     $result = $this->bridge->checkMSSKey('abc');
     $this->bridge->storeMSSKeyAndState('abc', $result);
     $state = $this->getMssKeyState() ?? [];
-    expect($state['state'])->equals(Bridge::KEY_VALID);
-    expect($state['data'])->equals($data);
+    verify($state['state'])->equals(Bridge::KEY_VALID);
+    verify($state['data'])->equals($data);
     // Second check fails with 403 insufficient privileges simulating that key lost access to MSS
     $result = $this->bridge->checkMSSKey('cba');
     $this->bridge->storeMSSKeyAndState('cba', $result);
     $state = $this->getMssKeyState() ?? [];
-    expect($state['state'])->equals(Bridge::KEY_VALID_UNDERPRIVILEGED);
+    verify($state['state'])->equals(Bridge::KEY_VALID_UNDERPRIVILEGED);
     expect($state['data'])->null();
   }
 
@@ -494,14 +494,14 @@ class BridgeTest extends \MailPoetTest {
     $result = $this->bridge->checkPremiumKey('abc');
     $this->bridge->storePremiumKeyAndState('abc', $result);
     $state = $this->getPremiumKeyState() ?? [];
-    expect($state['state'])->equals(Bridge::KEY_VALID);
-    expect($state['data'])->equals($data);
+    verify($state['state'])->equals(Bridge::KEY_VALID);
+    verify($state['data'])->equals($data);
     // Second check fails with 403 insufficient privileges simulating that key lost access to MSS
     $result = $this->bridge->checkPremiumKey('abc');
     $this->bridge->storePremiumKeyAndState('abc', $result);
     $state = $this->getPremiumKeyState() ?? [];
-    expect($state['state'])->equals(Bridge::KEY_VALID_UNDERPRIVILEGED);
-    expect($state['data'])->equals($data);
+    verify($state['state'])->equals(Bridge::KEY_VALID_UNDERPRIVILEGED);
+    verify($state['data'])->equals($data);
   }
 
   public function testItResetsPremiumKeyStateDataIfSubsequentCheckFailForADiffrentKey() {
@@ -527,13 +527,13 @@ class BridgeTest extends \MailPoetTest {
     $result = $this->bridge->checkPremiumKey('abc');
     $this->bridge->storePremiumKeyAndState('abc', $result);
     $state = $this->getPremiumKeyState() ?? [];
-    expect($state['state'])->equals(Bridge::KEY_VALID);
-    expect($state['data'])->equals($data);
+    verify($state['state'])->equals(Bridge::KEY_VALID);
+    verify($state['data'])->equals($data);
     // Second check fails with 403 insufficient privileges simulating that key lost access to MSS
     $result = $this->bridge->checkPremiumKey('cba');
     $this->bridge->storePremiumKeyAndState('cba', $result);
     $state = $this->getPremiumKeyState() ?? [];
-    expect($state['state'])->equals(Bridge::KEY_VALID_UNDERPRIVILEGED);
+    verify($state['state'])->equals(Bridge::KEY_VALID_UNDERPRIVILEGED);
     expect($state['data'])->null();
   }
 
@@ -609,7 +609,7 @@ class BridgeTest extends \MailPoetTest {
     $result = $this->bridge->$method('abc');
     expect($result)->notEmpty();
     expect($result['data'])->null();
-    expect($result['access_restriction'])->equals($expectedAccessRestriction);
+    verify($result['access_restriction'])->equals($expectedAccessRestriction);
   }
 
   private function setMailPoetSendingMethod() {
diff --git a/mailpoet/tests/integration/Settings/SettingsChangeHandlerTest.php b/mailpoet/tests/integration/Settings/SettingsChangeHandlerTest.php
index e2ab03a229..b13b591428 100644
--- a/mailpoet/tests/integration/Settings/SettingsChangeHandlerTest.php
+++ b/mailpoet/tests/integration/Settings/SettingsChangeHandlerTest.php
@@ -39,7 +39,7 @@ class SettingsChangeHandlerTest extends \MailPoetTest {
     $expectedScheduledAt = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'));
     $expectedScheduledAt->subMinute();
     $this->tester->assertEqualDateTimes($task->getScheduledAt(), $expectedScheduledAt, 1);
-    expect($newTask->getId())->equals($task->getId());
+    verify($newTask->getId())->equals($task->getId());
   }
 
   public function testItCreatesScheduledTaskForWoocommerceSync(): void {
@@ -62,7 +62,7 @@ class SettingsChangeHandlerTest extends \MailPoetTest {
     $expectedScheduledAt = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp'));
     $expectedScheduledAt->subMinute();
     $this->tester->assertEqualDateTimes($task->getScheduledAt(), $expectedScheduledAt, 1);
-    expect($newTask->getId())->equals($task->getId());
+    verify($newTask->getId())->equals($task->getId());
   }
 
   public function testItCreatesScheduledTaskForInactiveSubscribers(): void {
diff --git a/mailpoet/tests/integration/Settings/UserFlagsControllerTest.php b/mailpoet/tests/integration/Settings/UserFlagsControllerTest.php
index 430900896f..fd021b32ec 100644
--- a/mailpoet/tests/integration/Settings/UserFlagsControllerTest.php
+++ b/mailpoet/tests/integration/Settings/UserFlagsControllerTest.php
@@ -46,9 +46,9 @@ class UserFlagsControllerTest extends \MailPoetTest {
   }
 
   public function testItGetsFlagsOfCurrentUser() {
-    expect($this->userFlags->get('flag_1'))->equals('value_1');
-    expect($this->userFlags->get('flag_2'))->equals('default_value_2');
-    expect($this->userFlags->getAll())->equals([
+    verify($this->userFlags->get('flag_1'))->equals('value_1');
+    verify($this->userFlags->get('flag_2'))->equals('default_value_2');
+    verify($this->userFlags->getAll())->equals([
       'flag_1' => 'value_1',
       'flag_2' => 'default_value_2',
       'flag_3' => 'value_3',
@@ -57,27 +57,27 @@ class UserFlagsControllerTest extends \MailPoetTest {
 
   public function testItLoadsDataOnlyOnceWhenNeeded() {
     $this->updateUserFlag($this->currentUserId, 'flag_1', 'new_value_1');
-    expect($this->userFlags->get('flag_1'))->equals('new_value_1');
+    verify($this->userFlags->get('flag_1'))->equals('new_value_1');
     $this->updateUserFlag($this->currentUserId, 'flag_1', 'newer_value_1');
-    expect($this->userFlags->get('flag_1'))->equals('new_value_1');
+    verify($this->userFlags->get('flag_1'))->equals('new_value_1');
   }
 
   public function testItSetsNewFlagValue() {
-    expect($this->userFlags->get('flag_1'))->equals('value_1');
+    verify($this->userFlags->get('flag_1'))->equals('value_1');
     $this->userFlags->set('flag_1', 'updated_value');
-    expect($this->userFlags->get('flag_1'))->equals('updated_value');
+    verify($this->userFlags->get('flag_1'))->equals('updated_value');
     $flag = $this->userFlagsRepository->findOneBy([
       'userId' => $this->currentUserId,
       'name' => 'flag_1',
     ]);
     $this->assertInstanceOf(UserFlagEntity::class, $flag);
-    expect($flag->getValue())->equals('updated_value');
+    verify($flag->getValue())->equals('updated_value');
   }
 
   public function testItDeletesAFlag() {
-    expect($this->userFlags->get('flag_1'))->equals('value_1');
+    verify($this->userFlags->get('flag_1'))->equals('value_1');
     $this->userFlags->delete('flag_1');
-    expect($this->userFlags->get('flag_1'))->equals('default_value_1');
+    verify($this->userFlags->get('flag_1'))->equals('default_value_1');
     $flag = $this->userFlagsRepository->findOneBy([
       'userId' => $this->currentUserId,
       'name' => 'flag_1',
diff --git a/mailpoet/tests/integration/Statistics/GATrackingTest.php b/mailpoet/tests/integration/Statistics/GATrackingTest.php
index 5f776edde2..4bb668c0d5 100644
--- a/mailpoet/tests/integration/Statistics/GATrackingTest.php
+++ b/mailpoet/tests/integration/Statistics/GATrackingTest.php
@@ -41,7 +41,7 @@ class GATrackingTest extends \MailPoetTest {
     // No process (empty GA campaign)
     $newsletter = (new NewsletterFactory())->create();
     $result = $this->tracking->applyGATracking($this->renderedNewsletter, $newsletter, $this->internalHost);
-    expect($result)->equals($this->renderedNewsletter);
+    verify($result)->equals($this->renderedNewsletter);
 
     // Process (filled GA campaign)
     $result = $this->tracking->applyGATracking($this->renderedNewsletter, $this->newsletter, $this->internalHost);
diff --git a/mailpoet/tests/integration/Statistics/StatisticsFormsRepositoryTest.php b/mailpoet/tests/integration/Statistics/StatisticsFormsRepositoryTest.php
index a6d9220621..80df5f5792 100644
--- a/mailpoet/tests/integration/Statistics/StatisticsFormsRepositoryTest.php
+++ b/mailpoet/tests/integration/Statistics/StatisticsFormsRepositoryTest.php
@@ -20,8 +20,8 @@ class StatisticsFormsRepositoryTest extends \MailPoetTest {
     $subscriber = $this->createSubscriber();
     $record = $this->repository->record($form, $subscriber);
     $this->assertInstanceOf(StatisticsFormEntity::class, $record);
-    expect($record->getForm())->equals($form);
-    expect($record->getSubscriber())->equals($subscriber);
+    verify($record->getForm())->equals($form);
+    verify($record->getSubscriber())->equals($subscriber);
     expect($this->repository->findOneBy(['form' => $form, 'subscriber' => $subscriber]))->isInstanceOf(StatisticsFormEntity::class);
   }
 
@@ -30,8 +30,8 @@ class StatisticsFormsRepositoryTest extends \MailPoetTest {
     $subscriber = $this->createSubscriber();
     $record = $this->repository->record($form, $subscriber);
     $this->assertInstanceOf(StatisticsFormEntity::class, $record);
-    expect($record->getForm())->equals($form);
-    expect($record->getSubscriber())->equals($subscriber);
+    verify($record->getForm())->equals($form);
+    verify($record->getSubscriber())->equals($subscriber);
 
     $this->repository->record($form, $subscriber);
     expect($this->repository->findAll())->count(1);
@@ -60,8 +60,8 @@ class StatisticsFormsRepositoryTest extends \MailPoetTest {
     // simulate 1 signup for form #2
     $this->repository->record($form2, $subscriber2);
 
-    expect($this->repository->getTotalSignups((int)$form1->getId()))->equals(2);
-    expect($this->repository->getTotalSignups((int)$form2->getId()))->equals(1);
+    verify($this->repository->getTotalSignups((int)$form1->getId()))->equals(2);
+    verify($this->repository->getTotalSignups((int)$form2->getId()))->equals(1);
     expect($this->repository->findAll())->count(3);
   }
 
diff --git a/mailpoet/tests/integration/Statistics/StatisticsOpensRepositoryTest.php b/mailpoet/tests/integration/Statistics/StatisticsOpensRepositoryTest.php
index 9696f094bd..30ee86a25b 100644
--- a/mailpoet/tests/integration/Statistics/StatisticsOpensRepositoryTest.php
+++ b/mailpoet/tests/integration/Statistics/StatisticsOpensRepositoryTest.php
@@ -85,7 +85,7 @@ class StatisticsOpensRepositoryTest extends \MailPoetTest {
     $subscriber->setEngagementScore(5);
     $this->entityManager->flush();
     $this->entityManager->refresh($subscriber);
-    expect($subscriber->getEngagementScore())->equals(5);
+    verify($subscriber->getEngagementScore())->equals(5);
     $this->repository->recalculateSubscriberScore($subscriber);
     $this->entityManager->refresh($subscriber);
     expect($subscriber->getEngagementScore())->null();
@@ -112,7 +112,7 @@ class StatisticsOpensRepositoryTest extends \MailPoetTest {
 
     $newSubscriber = $this->subscribersRepository->findOneById($subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $newSubscriber);
-    expect($newSubscriber->getEngagementScore())->equals(33, 1);
+    verify($newSubscriber->getEngagementScore())->equals(33, 1);
     expect($newSubscriber->getEngagementScoreUpdatedAt())->notNull();
     $updated = $newSubscriber->getEngagementScoreUpdatedAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $updated);
@@ -121,7 +121,7 @@ class StatisticsOpensRepositoryTest extends \MailPoetTest {
 
     $newSegment = $this->segmentsRepository->findOneById($segment->getId());
     $this->assertInstanceOf(SegmentEntity::class, $newSegment);
-    expect($newSegment->getAverageEngagementScore())->equals(33, 1);
+    verify($newSegment->getAverageEngagementScore())->equals(33, 1);
     expect($newSegment->getAverageEngagementScoreUpdatedAt())->notNull();
     $updated = $newSegment->getAverageEngagementScoreUpdatedAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $updated);
@@ -168,7 +168,7 @@ class StatisticsOpensRepositoryTest extends \MailPoetTest {
 
     $newSubscriber = $this->subscribersRepository->findOneById($subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $newSubscriber);
-    expect($newSubscriber->getEngagementScore())->equals(0.0);
+    verify($newSubscriber->getEngagementScore())->equals(0.0);
     expect($newSubscriber->getEngagementScoreUpdatedAt())->notNull();
     $updated = $newSubscriber->getEngagementScoreUpdatedAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $updated);
@@ -177,7 +177,7 @@ class StatisticsOpensRepositoryTest extends \MailPoetTest {
 
     $newSubscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $newSubscriber2);
-    expect($newSubscriber2->getEngagementScore())->equals(33, 1);
+    verify($newSubscriber2->getEngagementScore())->equals(33, 1);
     expect($newSubscriber2->getEngagementScoreUpdatedAt())->notNull();
     $updated = $newSubscriber2->getEngagementScoreUpdatedAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $updated);
@@ -186,7 +186,7 @@ class StatisticsOpensRepositoryTest extends \MailPoetTest {
 
     $newSegment = $this->segmentsRepository->findOneById($segment->getId());
     $this->assertInstanceOf(SegmentEntity::class, $newSegment);
-    expect($newSegment->getAverageEngagementScore())->equals(16.6, 0.1);
+    verify($newSegment->getAverageEngagementScore())->equals(16.6, 0.1);
     expect($newSegment->getAverageEngagementScoreUpdatedAt())->notNull();
     $updated = $newSegment->getAverageEngagementScoreUpdatedAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $updated);
@@ -212,7 +212,7 @@ class StatisticsOpensRepositoryTest extends \MailPoetTest {
 
     $newSubscriber = $this->subscribersRepository->findOneById($subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $newSubscriber);
-    expect($newSubscriber->getEngagementScore())->equals(33, 1);
+    verify($newSubscriber->getEngagementScore())->equals(33, 1);
     expect($newSubscriber->getEngagementScoreUpdatedAt())->notNull();
     $updated = $newSubscriber->getEngagementScoreUpdatedAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $updated);
diff --git a/mailpoet/tests/integration/Statistics/Track/ClicksTest.php b/mailpoet/tests/integration/Statistics/Track/ClicksTest.php
index 8154197db1..a2beff5fed 100644
--- a/mailpoet/tests/integration/Statistics/Track/ClicksTest.php
+++ b/mailpoet/tests/integration/Statistics/Track/ClicksTest.php
@@ -199,7 +199,7 @@ class ClicksTest extends \MailPoetTest {
     $click = $trackedClicks[0];
     $userAgent = $click->getUserAgent();
     $this->assertInstanceOf(UserAgentEntity::class, $userAgent);
-    expect($userAgent->getUserAgent())->equals('User Agent');
+    verify($userAgent->getUserAgent())->equals('User Agent');
   }
 
   public function testItUpdateUserAgent(): void {
@@ -225,7 +225,7 @@ class ClicksTest extends \MailPoetTest {
     $click = $trackedClicks[0];
     $userAgent = $click->getUserAgent();
     $this->assertInstanceOf(UserAgentEntity::class, $userAgent);
-    expect($userAgent->getUserAgent())->equals('User Agent');
+    verify($userAgent->getUserAgent())->equals('User Agent');
     $data->userAgent = 'User Agent 2';
     $clicks->track($data);
     $trackedClicks = $clicksRepository->findAll();
@@ -233,7 +233,7 @@ class ClicksTest extends \MailPoetTest {
     $click = $trackedClicks[0];
     $userAgent = $click->getUserAgent();
     $this->assertInstanceOf(UserAgentEntity::class, $userAgent);
-    expect($userAgent->getUserAgent())->equals('User Agent 2');
+    verify($userAgent->getUserAgent())->equals('User Agent 2');
   }
 
   public function testItDoesNotOverrideHumanUserAgentWithMachine(): void {
@@ -261,9 +261,9 @@ class ClicksTest extends \MailPoetTest {
     $click = $trackedClicks[0];
     $userAgent = $click->getUserAgent();
     $this->assertInstanceOf(UserAgentEntity::class, $userAgent);
-    expect($userAgent->getUserAgent())->equals($humanUserAgentName);
-    expect($userAgent->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
-    expect($click->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($userAgent->getUserAgent())->equals($humanUserAgentName);
+    verify($userAgent->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($click->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
     // Track Machine User Agent
     $machineUserAgentName = UserAgentEntity::MACHINE_USER_AGENTS[0];
     $data->userAgent = $machineUserAgentName;
@@ -273,9 +273,9 @@ class ClicksTest extends \MailPoetTest {
     $click = $trackedClicks[0];
     $userAgent = $click->getUserAgent();
     $this->assertInstanceOf(UserAgentEntity::class, $userAgent);
-    expect($userAgent->getUserAgent())->equals($humanUserAgentName);
-    expect($userAgent->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
-    expect($click->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($userAgent->getUserAgent())->equals($humanUserAgentName);
+    verify($userAgent->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($click->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
   }
 
   public function testItOverridesMachineUserAgentWithHuman(): void {
@@ -303,9 +303,9 @@ class ClicksTest extends \MailPoetTest {
     $click = $trackedClicks[0];
     $userAgent = $click->getUserAgent();
     $this->assertInstanceOf(UserAgentEntity::class, $userAgent);
-    expect($userAgent->getUserAgent())->equals($machineUserAgentName);
-    expect($userAgent->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_MACHINE);
-    expect($click->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_MACHINE);
+    verify($userAgent->getUserAgent())->equals($machineUserAgentName);
+    verify($userAgent->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_MACHINE);
+    verify($click->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_MACHINE);
     // Track Human User Agent
     $humanUserAgentName = 'Human user Agent';
     $data->userAgent = $humanUserAgentName;
@@ -315,9 +315,9 @@ class ClicksTest extends \MailPoetTest {
     $click = $trackedClicks[0];
     $userAgent = $click->getUserAgent();
     $this->assertInstanceOf(UserAgentEntity::class, $userAgent);
-    expect($userAgent->getUserAgent())->equals($humanUserAgentName);
-    expect($userAgent->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
-    expect($click->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($userAgent->getUserAgent())->equals($humanUserAgentName);
+    verify($userAgent->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($click->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
   }
 
   public function testItDoesNotOverrideUnknownUserAgentWithMachine(): void {
@@ -343,7 +343,7 @@ class ClicksTest extends \MailPoetTest {
     expect($trackedClicks)->count(1);
     $click = $trackedClicks[0];
     expect($click->getUserAgent())->null();
-    expect($click->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($click->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
     // Track Machine User Agent
     $machineUserAgentName = UserAgentEntity::MACHINE_USER_AGENTS[0];
     $data->userAgent = $machineUserAgentName;
@@ -352,7 +352,7 @@ class ClicksTest extends \MailPoetTest {
     expect($trackedClicks)->count(1);
     $click = $trackedClicks[0];
     expect($click->getUserAgent())->null();
-    expect($click->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($click->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
   }
 
   public function testItOverridesUnknownUserAgentWithHuman(): void {
@@ -378,7 +378,7 @@ class ClicksTest extends \MailPoetTest {
     expect($trackedClicks)->count(1);
     $click = $trackedClicks[0];
     expect($click->getUserAgent())->null();
-    expect($click->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($click->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
     // Track Machine User Agent
     $humanUserAgentName = 'User Agent';
     $data->userAgent = $humanUserAgentName;
@@ -388,9 +388,9 @@ class ClicksTest extends \MailPoetTest {
     $click = $trackedClicks[0];
     $userAgent = $click->getUserAgent();
     $this->assertInstanceOf(UserAgentEntity::class, $userAgent);
-    expect($userAgent->getUserAgent())->equals($humanUserAgentName);
-    expect($userAgent->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
-    expect($click->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($userAgent->getUserAgent())->equals($humanUserAgentName);
+    verify($userAgent->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($click->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
   }
 
   public function testItRedirectsToUrlAfterTracking() {
@@ -426,9 +426,9 @@ class ClicksTest extends \MailPoetTest {
     ], $this);
     $clicks->track($this->trackData);
 
-    expect($this->statisticsClicksRepository->findAll()[0]->getCount())->equals(1);
+    verify($this->statisticsClicksRepository->findAll()[0]->getCount())->equals(1);
     $clicks->track($this->trackData);
-    expect($this->statisticsClicksRepository->findAll()[0]->getCount())->equals(2);
+    verify($this->statisticsClicksRepository->findAll()[0]->getCount())->equals(2);
   }
 
   public function testItConvertsShortcodesToUrl() {
@@ -474,7 +474,7 @@ class ClicksTest extends \MailPoetTest {
       $this->queue,
       $preview = false
     );
-    expect($link)->equals('[link:unknown_shortcode]');
+    verify($link)->equals('[link:unknown_shortcode]');
   }
 
   public function testItDoesNotConvertRegularUrls() {
@@ -485,7 +485,7 @@ class ClicksTest extends \MailPoetTest {
       $this->queue,
       $preview = false
     );
-    expect($link)->equals('http://example.com');
+    verify($link)->equals('http://example.com');
   }
 
   public function testItProcessesShortcodesInRegularUrls() {
@@ -496,7 +496,7 @@ class ClicksTest extends \MailPoetTest {
       $this->queue,
       $preview = false
     );
-    expect($link)->equals('http://example.com/?email=test@example.com&newsletter_subject=Subject');
+    verify($link)->equals('http://example.com/?email=test@example.com&newsletter_subject=Subject');
   }
 
   public function testItUpdatesSubscriberTimestampsForHumanAgent() {
@@ -534,8 +534,8 @@ class ClicksTest extends \MailPoetTest {
     $savedClickTime = $this->subscriber->getLastClickAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $savedEngagementTime);
     $this->assertInstanceOf(\DateTimeInterface::class, $savedClickTime);
-    expect($savedEngagementTime->getTimestamp())->equals($now->getTimestamp());
-    expect($savedClickTime->getTimestamp())->equals($now->getTimestamp());
+    verify($savedEngagementTime->getTimestamp())->equals($now->getTimestamp());
+    verify($savedClickTime->getTimestamp())->equals($now->getTimestamp());
   }
 
   public function testItUpdatesSubscriberEngagementForUnknownAgent() {
@@ -572,8 +572,8 @@ class ClicksTest extends \MailPoetTest {
     $savedClickTime = $this->subscriber->getLastClickAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $savedEngagementTime);
     $this->assertInstanceOf(\DateTimeInterface::class, $savedClickTime);
-    expect($savedEngagementTime->getTimestamp())->equals($now->getTimestamp());
-    expect($savedClickTime->getTimestamp())->equals($now->getTimestamp());
+    verify($savedEngagementTime->getTimestamp())->equals($now->getTimestamp());
+    verify($savedClickTime->getTimestamp())->equals($now->getTimestamp());
   }
 
   public function testItUpdatesSubscriberEngagementForMachineAgent() {
@@ -610,8 +610,8 @@ class ClicksTest extends \MailPoetTest {
     $savedClickTime = $this->subscriber->getLastClickAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $savedEngagementTime);
     $this->assertInstanceOf(\DateTimeInterface::class, $savedClickTime);
-    expect($savedEngagementTime->getTimestamp())->equals($now->getTimestamp());
-    expect($savedClickTime->getTimestamp())->equals($now->getTimestamp());
+    verify($savedEngagementTime->getTimestamp())->equals($now->getTimestamp());
+    verify($savedClickTime->getTimestamp())->equals($now->getTimestamp());
   }
 
   public function testItWontUpdateSubscriberThatWasRecentlyUpdated() {
@@ -634,6 +634,6 @@ class ClicksTest extends \MailPoetTest {
       'redirectToUrl' => null,
     ], $this);
     $clicks->track($data);
-    expect($this->subscriber->getLastClickAt())->equals($lastClickTime);
+    verify($this->subscriber->getLastClickAt())->equals($lastClickTime);
   }
 }
diff --git a/mailpoet/tests/integration/Statistics/Track/OpensTest.php b/mailpoet/tests/integration/Statistics/Track/OpensTest.php
index df3ab21824..b96c0236b4 100644
--- a/mailpoet/tests/integration/Statistics/Track/OpensTest.php
+++ b/mailpoet/tests/integration/Statistics/Track/OpensTest.php
@@ -142,7 +142,7 @@ class OpensTest extends \MailPoetTest {
     for ($count = 0; $count <= 2; $count++) {
       $opens->track($this->trackData);
     }
-    expect(count($this->statisticsOpensRepository->findAll()))->equals(1);
+    verify(count($this->statisticsOpensRepository->findAll()))->equals(1);
   }
 
   public function testItReturnsImageAfterTracking() {
@@ -207,13 +207,13 @@ class OpensTest extends \MailPoetTest {
     $opens->track($this->trackData);
     $this->trackData->userAgent = 'User agent3';
     $opens->track($this->trackData);
-    expect(count($this->statisticsOpensRepository->findAll()))->equals(1);
+    verify(count($this->statisticsOpensRepository->findAll()))->equals(1);
     $opens = $this->statisticsOpensRepository->findAll();
     expect($opens)->count(1);
     $open = $opens[0];
     $userAgent = $open->getUserAgent();
     $this->assertInstanceOf(UserAgentEntity::class, $userAgent);
-    expect($userAgent->getUserAgent())->equals('User agent3');
+    verify($userAgent->getUserAgent())->equals('User agent3');
   }
 
   public function testItDoesNotOverrideHumanUserAgentWithMachine(): void {
@@ -228,30 +228,30 @@ class OpensTest extends \MailPoetTest {
     $humanUserAgentName = 'Human User Agent';
     $this->trackData->userAgent = $humanUserAgentName;
     $opens->track($this->trackData);
-    expect(count($this->statisticsOpensRepository->findAll()))->equals(1);
+    verify(count($this->statisticsOpensRepository->findAll()))->equals(1);
     $openEntities = $this->statisticsOpensRepository->findAll();
     expect($openEntities)->count(1);
     $openEntity = reset($openEntities);
     $this->assertInstanceOf(StatisticsOpenEntity::class, $openEntity);
     $userAgent = $openEntity->getUserAgent();
     $this->assertInstanceOf(UserAgentEntity::class, $userAgent);
-    expect($userAgent->getUserAgent())->equals($humanUserAgentName);
-    expect($userAgent->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
-    expect($openEntity->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($userAgent->getUserAgent())->equals($humanUserAgentName);
+    verify($userAgent->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($openEntity->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
     // Track Machine User Agent
     $machineUserAgentName = UserAgentEntity::MACHINE_USER_AGENTS[0];
     $this->trackData->userAgent = $machineUserAgentName;
     $opens->track($this->trackData);
-    expect(count($this->statisticsOpensRepository->findAll()))->equals(1);
+    verify(count($this->statisticsOpensRepository->findAll()))->equals(1);
     $openEntities = $this->statisticsOpensRepository->findAll();
     expect($openEntities)->count(1);
     $openEntity = reset($openEntities);
     $this->assertInstanceOf(StatisticsOpenEntity::class, $openEntity);
     $userAgent = $openEntity->getUserAgent();
     $this->assertInstanceOf(UserAgentEntity::class, $userAgent);
-    expect($userAgent->getUserAgent())->equals($humanUserAgentName);
-    expect($userAgent->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
-    expect($openEntity->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($userAgent->getUserAgent())->equals($humanUserAgentName);
+    verify($userAgent->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($openEntity->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
   }
 
   public function testItOverridesMachineUserAgentWithHuman(): void {
@@ -266,30 +266,30 @@ class OpensTest extends \MailPoetTest {
     $machineUserAgentName = UserAgentEntity::MACHINE_USER_AGENTS[0];
     $this->trackData->userAgent = $machineUserAgentName;
     $opens->track($this->trackData);
-    expect(count($this->statisticsOpensRepository->findAll()))->equals(1);
+    verify(count($this->statisticsOpensRepository->findAll()))->equals(1);
     $openEntities = $this->statisticsOpensRepository->findAll();
     expect($openEntities)->count(1);
     $openEntity = reset($openEntities);
     $this->assertInstanceOf(StatisticsOpenEntity::class, $openEntity);
     $userAgent = $openEntity->getUserAgent();
     $this->assertInstanceOf(UserAgentEntity::class, $userAgent);
-    expect($userAgent->getUserAgent())->equals($machineUserAgentName);
-    expect($userAgent->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_MACHINE);
-    expect($openEntity->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_MACHINE);
+    verify($userAgent->getUserAgent())->equals($machineUserAgentName);
+    verify($userAgent->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_MACHINE);
+    verify($openEntity->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_MACHINE);
     // Track Human User Agent
     $humanUserAgentName = 'Human User Agent';
     $this->trackData->userAgent = $humanUserAgentName;
     $opens->track($this->trackData);
-    expect(count($this->statisticsOpensRepository->findAll()))->equals(1);
+    verify(count($this->statisticsOpensRepository->findAll()))->equals(1);
     $openEntities = $this->statisticsOpensRepository->findAll();
     expect($openEntities)->count(1);
     $openEntity = reset($openEntities);
     $this->assertInstanceOf(StatisticsOpenEntity::class, $openEntity);
     $userAgent = $openEntity->getUserAgent();
     $this->assertInstanceOf(UserAgentEntity::class, $userAgent);
-    expect($userAgent->getUserAgent())->equals($humanUserAgentName);
-    expect($userAgent->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
-    expect($openEntity->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($userAgent->getUserAgent())->equals($humanUserAgentName);
+    verify($userAgent->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($openEntity->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
   }
 
   public function testItDoesNotOverrideUnknownUserAgentWithMachine(): void {
@@ -303,24 +303,24 @@ class OpensTest extends \MailPoetTest {
     // Track Unknown User Agent
     $this->trackData->userAgent = null;
     $opens->track($this->trackData);
-    expect(count($this->statisticsOpensRepository->findAll()))->equals(1);
+    verify(count($this->statisticsOpensRepository->findAll()))->equals(1);
     $openEntities = $this->statisticsOpensRepository->findAll();
     expect($openEntities)->count(1);
     $openEntity = reset($openEntities);
     $this->assertInstanceOf(StatisticsOpenEntity::class, $openEntity);
     expect($openEntity->getUserAgent())->null();
-    expect($openEntity->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($openEntity->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
     // Track Machine User Agent
     $machineUserAgentName = UserAgentEntity::MACHINE_USER_AGENTS[0];
     $this->trackData->userAgent = $machineUserAgentName;
     $opens->track($this->trackData);
-    expect(count($this->statisticsOpensRepository->findAll()))->equals(1);
+    verify(count($this->statisticsOpensRepository->findAll()))->equals(1);
     $openEntities = $this->statisticsOpensRepository->findAll();
     expect($openEntities)->count(1);
     $openEntity = reset($openEntities);
     $this->assertInstanceOf(StatisticsOpenEntity::class, $openEntity);
     expect($openEntity->getUserAgent())->null();
-    expect($openEntity->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($openEntity->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
   }
 
   public function testItOverridesUnknownUserAgentWithHuman(): void {
@@ -334,27 +334,27 @@ class OpensTest extends \MailPoetTest {
     // Track Unknown User Agent
     $this->trackData->userAgent = null;
     $opens->track($this->trackData);
-    expect(count($this->statisticsOpensRepository->findAll()))->equals(1);
+    verify(count($this->statisticsOpensRepository->findAll()))->equals(1);
     $openEntities = $this->statisticsOpensRepository->findAll();
     expect($openEntities)->count(1);
     $openEntity = reset($openEntities);
     $this->assertInstanceOf(StatisticsOpenEntity::class, $openEntity);
     expect($openEntity->getUserAgent())->null();
-    expect($openEntity->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($openEntity->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
     // Track Human User Agent
     $humanUserAgentName = 'User Agent';
     $this->trackData->userAgent = $humanUserAgentName;
     $opens->track($this->trackData);
-    expect(count($this->statisticsOpensRepository->findAll()))->equals(1);
+    verify(count($this->statisticsOpensRepository->findAll()))->equals(1);
     $openEntities = $this->statisticsOpensRepository->findAll();
     expect($openEntities)->count(1);
     $openEntity = reset($openEntities);
     $this->assertInstanceOf(StatisticsOpenEntity::class, $openEntity);
     $userAgent = $openEntity->getUserAgent();
     $this->assertInstanceOf(UserAgentEntity::class, $userAgent);
-    expect($userAgent->getUserAgent())->equals($humanUserAgentName);
-    expect($userAgent->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
-    expect($openEntity->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($userAgent->getUserAgent())->equals($humanUserAgentName);
+    verify($userAgent->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
+    verify($openEntity->getUserAgentType())->equals(UserAgentEntity::USER_AGENT_TYPE_HUMAN);
   }
 
   public function testItUpdatesSubscriberEngagementForHumanAgent() {
@@ -377,8 +377,8 @@ class OpensTest extends \MailPoetTest {
     $savedOpenTime = $this->subscriber->getLastOpenAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $savedEngagementTime);
     $this->assertInstanceOf(\DateTimeInterface::class, $savedOpenTime);
-    expect($savedEngagementTime->getTimestamp())->equals($now->getTimestamp());
-    expect($savedOpenTime->getTimestamp())->equals($now->getTimestamp());
+    verify($savedEngagementTime->getTimestamp())->equals($now->getTimestamp());
+    verify($savedOpenTime->getTimestamp())->equals($now->getTimestamp());
   }
 
   public function testItUpdatesSubscriberEngagementForUnknownAgent() {
@@ -401,8 +401,8 @@ class OpensTest extends \MailPoetTest {
     $savedOpenTime = $this->subscriber->getLastOpenAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $savedEngagementTime);
     $this->assertInstanceOf(\DateTimeInterface::class, $savedOpenTime);
-    expect($savedEngagementTime->getTimestamp())->equals($now->getTimestamp());
-    expect($savedOpenTime->getTimestamp())->equals($now->getTimestamp());
+    verify($savedEngagementTime->getTimestamp())->equals($now->getTimestamp());
+    verify($savedOpenTime->getTimestamp())->equals($now->getTimestamp());
   }
 
   public function testItUpdatesSubscriberTimestampsForMachineAgent() {
@@ -425,7 +425,7 @@ class OpensTest extends \MailPoetTest {
     $savedOpenTime = $this->subscriber->getLastOpenAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $savedEngagementTime);
     $this->assertInstanceOf(\DateTimeInterface::class, $savedOpenTime);
-    expect($savedEngagementTime->getTimestamp())->equals($now->getTimestamp());
-    expect($savedOpenTime->getTimestamp())->equals($now->getTimestamp());
+    verify($savedEngagementTime->getTimestamp())->equals($now->getTimestamp());
+    verify($savedOpenTime->getTimestamp())->equals($now->getTimestamp());
   }
 }
diff --git a/mailpoet/tests/integration/Statistics/Track/UnsubscribesTest.php b/mailpoet/tests/integration/Statistics/Track/UnsubscribesTest.php
index 3ff668cdc5..95450f53fd 100644
--- a/mailpoet/tests/integration/Statistics/Track/UnsubscribesTest.php
+++ b/mailpoet/tests/integration/Statistics/Track/UnsubscribesTest.php
@@ -59,8 +59,8 @@ class UnsubscribesTest extends \MailPoetTest {
       StatisticsUnsubscribeEntity::METHOD_ONE_CLICK
     );
     $allStats = $this->statisticsUnsubscribesRepository->findAll();
-    expect(count($allStats))->equals(1);
-    expect($allStats[0]->getMethod())->equals(StatisticsUnsubscribeEntity::METHOD_ONE_CLICK);
+    verify(count($allStats))->equals(1);
+    verify($allStats[0]->getMethod())->equals(StatisticsUnsubscribeEntity::METHOD_ONE_CLICK);
   }
 
   public function testItDoesNotTrackRepeatedUnsubscribeEvents() {
@@ -74,6 +74,6 @@ class UnsubscribesTest extends \MailPoetTest {
         (int)$this->queue->id
       );
     }
-    expect(count($this->statisticsUnsubscribesRepository->findAll()))->equals(1);
+    verify(count($this->statisticsUnsubscribesRepository->findAll()))->equals(1);
   }
 }
diff --git a/mailpoet/tests/integration/Statistics/Track/WooCommercePurchasesTest.php b/mailpoet/tests/integration/Statistics/Track/WooCommercePurchasesTest.php
index aa6af79b75..b5b01fff7e 100644
--- a/mailpoet/tests/integration/Statistics/Track/WooCommercePurchasesTest.php
+++ b/mailpoet/tests/integration/Statistics/Track/WooCommercePurchasesTest.php
@@ -123,10 +123,10 @@ class WooCommercePurchasesTest extends \MailPoetTest {
     );
     $woocommercePurchases->trackPurchase($orderMock->get_id());
     $purchaseStats = $this->statisticsWooCommercePurchasesRepository->findBy([]);
-    expect(count($purchaseStats))->equals(1);
+    verify(count($purchaseStats))->equals(1);
     $click = $purchaseStats[0]->getClick();
     $this->assertInstanceOf(StatisticsClickEntity::class, $click);
-    expect($click->getId())->equals($click->getId());
+    verify($click->getId())->equals($click->getId());
   }
 
   public function testItTracksPayment() {
@@ -143,22 +143,22 @@ class WooCommercePurchasesTest extends \MailPoetTest {
     );
     $woocommercePurchases->trackPurchase($orderMock->get_id());
     $purchaseStats = $this->statisticsWooCommercePurchasesRepository->findBy([]);
-    expect(count($purchaseStats))->equals(1);
+    verify(count($purchaseStats))->equals(1);
     $newsletter = $purchaseStats[0]->getNewsletter();
     $subscriber = $purchaseStats[0]->getSubscriber();
     $queue = $purchaseStats[0]->getQueue();
     $this->assertInstanceOf(NewsletterEntity::class, $newsletter);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
     $this->assertInstanceOf(SendingQueueEntity::class, $queue);
-    expect($newsletter->getId())->equals($this->newsletter->getId());
-    expect($subscriber->getId())->equals($this->subscriber->getId());
-    expect($queue->getId())->equals($this->queue->getId());
+    verify($newsletter->getId())->equals($this->newsletter->getId());
+    verify($subscriber->getId())->equals($this->subscriber->getId());
+    verify($queue->getId())->equals($this->queue->getId());
     $click = $purchaseStats[0]->getClick();
     $this->assertInstanceOf(StatisticsClickEntity::class, $click);
-    expect($click->getId())->equals($click->getId());
-    expect($purchaseStats[0]->getOrderId())->equals($orderMock->get_id());
-    expect($purchaseStats[0]->getOrderCurrency())->equals($orderMock->get_currency());
-    expect($purchaseStats[0]->getOrderPriceTotal())->equals($orderMock->get_remaining_refund_amount());
+    verify($click->getId())->equals($click->getId());
+    verify($purchaseStats[0]->getOrderId())->equals($orderMock->get_id());
+    verify($purchaseStats[0]->getOrderCurrency())->equals($orderMock->get_currency());
+    verify($purchaseStats[0]->getOrderPriceTotal())->equals($orderMock->get_remaining_refund_amount());
   }
 
   public function testItTracksPaymentForMultipleNewsletters() {
@@ -182,7 +182,7 @@ class WooCommercePurchasesTest extends \MailPoetTest {
     );
     $woocommercePurchases->trackPurchase($orderMock->get_id());
     $purchaseStats = $this->statisticsWooCommercePurchasesRepository->findBy([]);
-    expect(count($purchaseStats))->equals(2);
+    verify(count($purchaseStats))->equals(2);
 
     $stats1 = $this->statisticsWooCommercePurchasesRepository->findOneBy(['newsletter' => $this->newsletter]);
     $this->assertInstanceOf(StatisticsWooCommercePurchaseEntity::class, $stats1);
@@ -192,9 +192,9 @@ class WooCommercePurchasesTest extends \MailPoetTest {
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
     $this->assertInstanceOf(SendingQueueEntity::class, $queue);
     $this->assertInstanceOf(StatisticsClickEntity::class, $click);
-    expect($click->getId())->equals($click1->getId());
-    expect($subscriber->getId())->equals($this->subscriber->getId());
-    expect($queue->getId())->equals($this->queue->getId());
+    verify($click->getId())->equals($click1->getId());
+    verify($subscriber->getId())->equals($this->subscriber->getId());
+    verify($queue->getId())->equals($this->queue->getId());
 
     $stats2 = $this->statisticsWooCommercePurchasesRepository->findOneBy(['newsletter' => $newsletter]);
     $this->assertInstanceOf(StatisticsWooCommercePurchaseEntity::class, $stats2);
@@ -204,9 +204,9 @@ class WooCommercePurchasesTest extends \MailPoetTest {
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
     $this->assertInstanceOf(SendingQueueEntity::class, $queue);
     $this->assertInstanceOf(StatisticsClickEntity::class, $click);
-    expect($click->getId())->equals($click2->getId());
-    expect($subscriber->getId())->equals($this->subscriber->getId());
-    expect($queue->getId())->equals($queue->getId());
+    verify($click->getId())->equals($click2->getId());
+    verify($subscriber->getId())->equals($this->subscriber->getId());
+    verify($queue->getId())->equals($queue->getId());
   }
 
   public function testItTracksPaymentForMultipleOrders() {
@@ -237,7 +237,7 @@ class WooCommercePurchasesTest extends \MailPoetTest {
     );
     $woocommercePurchases->trackPurchase($orderMock->get_id());
 
-    expect(count($this->statisticsWooCommercePurchasesRepository->findBy([])))->equals(2);
+    verify(count($this->statisticsWooCommercePurchasesRepository->findBy([])))->equals(2);
   }
 
   public function testItTracksPaymentOnlyForLatestClick() {
@@ -257,10 +257,10 @@ class WooCommercePurchasesTest extends \MailPoetTest {
     $woocommercePurchases->trackPurchase($orderMock->get_id());
 
     $purchaseStats = $this->statisticsWooCommercePurchasesRepository->findBy([], ['createdAt' => 'desc']);
-    expect(count($purchaseStats))->equals(1);
+    verify(count($purchaseStats))->equals(1);
     $click = $purchaseStats[0]->getClick();
     $this->assertInstanceOf(StatisticsClickEntity::class, $click);
-    expect($click->getId())->equals($latestClick->getId());
+    verify($click->getId())->equals($latestClick->getId());
   }
 
   public function testItTracksPaymentOnlyOnce() {
@@ -277,7 +277,7 @@ class WooCommercePurchasesTest extends \MailPoetTest {
     );
     $woocommercePurchases->trackPurchase($orderMock->get_id());
     $woocommercePurchases->trackPurchase($orderMock->get_id());
-    expect(count($this->statisticsWooCommercePurchasesRepository->findBy([])))->equals(1);
+    verify(count($this->statisticsWooCommercePurchasesRepository->findBy([])))->equals(1);
   }
 
   public function testItTracksPaymentOnlyOnceWhenNewClickAppears() {
@@ -297,7 +297,7 @@ class WooCommercePurchasesTest extends \MailPoetTest {
     $this->createClick($this->link, $this->subscriber, 1);
     $this->entityManager->flush();
     $woocommercePurchases->trackPurchase($orderMock->get_id());
-    expect(count($this->statisticsWooCommercePurchasesRepository->findBy([])))->equals(1);
+    verify(count($this->statisticsWooCommercePurchasesRepository->findBy([])))->equals(1);
   }
 
   public function testItDoesNotTrackPaymentWhenClickTooOld() {
@@ -313,7 +313,7 @@ class WooCommercePurchasesTest extends \MailPoetTest {
       $this->diContainer->get(SubscriberHandler::class)
     );
     $woocommercePurchases->trackPurchase($orderMock->get_id());
-    expect(count($this->statisticsWooCommercePurchasesRepository->findBy([])))->equals(0);
+    verify(count($this->statisticsWooCommercePurchasesRepository->findBy([])))->equals(0);
   }
 
   public function testItDoesNotTrackPaymentForDifferentEmail() {
@@ -329,7 +329,7 @@ class WooCommercePurchasesTest extends \MailPoetTest {
       $this->diContainer->get(SubscriberHandler::class)
     );
     $woocommercePurchases->trackPurchase($orderMock->get_id());
-    expect(count($this->statisticsWooCommercePurchasesRepository->findBy([])))->equals(0);
+    verify(count($this->statisticsWooCommercePurchasesRepository->findBy([])))->equals(0);
   }
 
   public function testItDoesNotTrackPaymentWhenClickNewerThanOrder() {
@@ -345,7 +345,7 @@ class WooCommercePurchasesTest extends \MailPoetTest {
       $this->diContainer->get(SubscriberHandler::class)
     );
     $woocommercePurchases->trackPurchase($orderMock->get_id());
-    expect(count($this->statisticsWooCommercePurchasesRepository->findBy([])))->equals(0);
+    verify(count($this->statisticsWooCommercePurchasesRepository->findBy([])))->equals(0);
   }
 
   public function testItTracksPaymentForCorrectClickWhenClickNewerThanOrderExists() {
@@ -367,7 +367,7 @@ class WooCommercePurchasesTest extends \MailPoetTest {
     expect($purchaseStats)->count(1);
     $click = $purchaseStats[0]->getClick();
     $this->assertInstanceOf(StatisticsClickEntity::class, $click);
-    expect($click->getId())->equals($click->getId());
+    verify($click->getId())->equals($click->getId());
   }
 
   public function testItTracksByCookie() {
@@ -394,10 +394,10 @@ class WooCommercePurchasesTest extends \MailPoetTest {
     );
     $woocommercePurchases->trackPurchase($orderMock->get_id());
     $purchaseStats = $this->statisticsWooCommercePurchasesRepository->findBy([]);
-    expect(count($purchaseStats))->equals(1);
+    verify(count($purchaseStats))->equals(1);
     $click = $purchaseStats[0]->getClick();
     $this->assertInstanceOf(StatisticsClickEntity::class, $click);
-    expect($click->getId())->equals($click->getId());
+    verify($click->getId())->equals($click->getId());
   }
 
   public function testItDoesNotTrackByCookieWhenTrackedByOrder() {
@@ -427,10 +427,10 @@ class WooCommercePurchasesTest extends \MailPoetTest {
     );
     $woocommercePurchases->trackPurchase($orderMock->get_id());
     $purchaseStats = $this->statisticsWooCommercePurchasesRepository->findBy([]);
-    expect(count($purchaseStats))->equals(1);
+    verify(count($purchaseStats))->equals(1);
     $click = $purchaseStats[0]->getClick();
     $this->assertInstanceOf(StatisticsClickEntity::class, $click);
-    expect($click->getId())->equals($orderEmailClick->getId());
+    verify($click->getId())->equals($orderEmailClick->getId());
   }
 
   public function testItTracksByBothOrderAndCookieForDifferentNewsletters() {
@@ -465,17 +465,17 @@ class WooCommercePurchasesTest extends \MailPoetTest {
     );
     $woocommercePurchases->trackPurchase($orderMock->get_id());
     $purchaseStats = $this->statisticsWooCommercePurchasesRepository->findBy([]);
-    expect(count($purchaseStats))->equals(2);
+    verify(count($purchaseStats))->equals(2);
     foreach ($purchaseStats as $stats) {
       $click = $stats->getClick();
       $this->assertInstanceOf(StatisticsClickEntity::class, $click);
       $statsNewsletter = $stats->getNewsletter();
       $this->assertInstanceOf(NewsletterEntity::class, $statsNewsletter);
       if ($click->getId() === $orderEmailClick->getId()) {
-        expect($statsNewsletter->getId())->equals($this->newsletter->getId());
+        verify($statsNewsletter->getId())->equals($this->newsletter->getId());
       } else {
-        expect($click->getId())->equals($cookieEmailClick->getId());
-        expect($statsNewsletter->getId())->equals($newsletter->getId());
+        verify($click->getId())->equals($cookieEmailClick->getId());
+        verify($statsNewsletter->getId())->equals($newsletter->getId());
       }
     }
   }
diff --git a/mailpoet/tests/integration/Subscribers/ConfirmationEmailCustomizerTest.php b/mailpoet/tests/integration/Subscribers/ConfirmationEmailCustomizerTest.php
index 6e0c35c83c..f6fd82ab4f 100644
--- a/mailpoet/tests/integration/Subscribers/ConfirmationEmailCustomizerTest.php
+++ b/mailpoet/tests/integration/Subscribers/ConfirmationEmailCustomizerTest.php
@@ -25,7 +25,7 @@ class ConfirmationEmailCustomizerTest extends \MailPoetTest {
   public function testItGeneratesNewsletterOnInit() {
     $controller = $this->generateController();
 
-    expect($this->settings->get(ConfirmationEmailCustomizer::SETTING_EMAIL_ID, false))->equals(false);
+    verify($this->settings->get(ConfirmationEmailCustomizer::SETTING_EMAIL_ID, false))->equals(false);
     $controller->init();
 
     expect($this->settings->get(ConfirmationEmailCustomizer::SETTING_EMAIL_ID, false))->notEquals(false);
@@ -34,7 +34,7 @@ class ConfirmationEmailCustomizerTest extends \MailPoetTest {
   public function testItGenerateNewsletterIfNoneExist() {
     $controller = $this->generateController();
 
-    expect($this->settings->get(ConfirmationEmailCustomizer::SETTING_EMAIL_ID, false))->equals(false);
+    verify($this->settings->get(ConfirmationEmailCustomizer::SETTING_EMAIL_ID, false))->equals(false);
     $newsletter = $controller->getNewsletter();
 
     expect($newsletter)->isInstanceOf(NewsletterEntity::class);
@@ -52,14 +52,14 @@ class ConfirmationEmailCustomizerTest extends \MailPoetTest {
 
     expect($newsletter->getId())->notEquals(5);
 
-    expect($this->settings->get(ConfirmationEmailCustomizer::SETTING_EMAIL_ID, false))->equals($newsletter->getId());
+    verify($this->settings->get(ConfirmationEmailCustomizer::SETTING_EMAIL_ID, false))->equals($newsletter->getId());
   }
 
   public function testItGenerateNewsletterOfTypeConfirmationEmail() {
     $controller = $this->generateController();
     $newsletter = $controller->getNewsletter();
 
-    expect($newsletter->getType())->equals(NewsletterEntity::TYPE_CONFIRMATION_EMAIL_CUSTOMIZER);
+    verify($newsletter->getType())->equals(NewsletterEntity::TYPE_CONFIRMATION_EMAIL_CUSTOMIZER);
   }
 
   public function testItFetchAlreadyCreatedNewsletter() {
@@ -73,7 +73,7 @@ class ConfirmationEmailCustomizerTest extends \MailPoetTest {
     $controller = $this->generateController();
     $newNewsletter = $controller->getNewsletter();
 
-    expect($newNewsletter->getId())->equals($newsletter->getId());
+    verify($newNewsletter->getId())->equals($newsletter->getId());
   }
 
   public function testItFetchesConfirmationEmailTemplate() {
diff --git a/mailpoet/tests/integration/Subscribers/ConfirmationEmailMailerTest.php b/mailpoet/tests/integration/Subscribers/ConfirmationEmailMailerTest.php
index f6ff7c83eb..1492b0d027 100644
--- a/mailpoet/tests/integration/Subscribers/ConfirmationEmailMailerTest.php
+++ b/mailpoet/tests/integration/Subscribers/ConfirmationEmailMailerTest.php
@@ -70,7 +70,7 @@ class ConfirmationEmailMailerTest extends \MailPoetTest {
         Stub\Expected::once(function($email, $subscriber, $extraParams) {
           expect($email['body']['html'])->stringContainsString('<strong>Test segment</strong>');
           expect($email['body']['html'])->stringContainsString('<a target="_blank" href="http://example.com">Click here to confirm your subscription.</a>');
-          expect($extraParams['meta'])->equals([
+          verify($extraParams['meta'])->equals([
             'email_type' => 'confirmation',
             'subscriber_status' => 'unconfirmed',
             'subscriber_source' => 'api',
@@ -95,11 +95,11 @@ class ConfirmationEmailMailerTest extends \MailPoetTest {
 
     $result = $sender->sendConfirmationEmail($this->subscriber);
     expect($result)->true();
-    expect($this->subscriber->getConfirmationsCount())->equals(1);
+    verify($this->subscriber->getConfirmationsCount())->equals(1);
 
     $sender->sendConfirmationEmailOnce($this->subscriber);
     $this->subscribersRepository->refresh($this->subscriber);
-    expect($this->subscriber->getConfirmationsCount())->equals(1);
+    verify($this->subscriber->getConfirmationsCount())->equals(1);
   }
 
   public function testItThrowsExceptionWhenConfirmationEmailCannotBeSent() {
@@ -148,11 +148,11 @@ class ConfirmationEmailMailerTest extends \MailPoetTest {
     } catch (\Exception $e) {
       $exceptionMessage = $e->getMessage();
     }
-    expect($exceptionMessage)->equals(__('There was an error when sending a confirmation email for your subscription. Please contact the website owner.', 'mailpoet'));
+    verify($exceptionMessage)->equals(__('There was an error when sending a confirmation email for your subscription. Please contact the website owner.', 'mailpoet'));
     $mailerLogError = MailerLog::getError();
     $this->assertIsArray($mailerLogError);
-    expect($mailerLogError['operation'])->equals(MailerError::OPERATION_SEND);
-    expect($mailerLogError['error_message'])->equals('Error message');
+    verify($mailerLogError['operation'])->equals(MailerError::OPERATION_SEND);
+    verify($mailerLogError['error_message'])->equals('Error message');
   }
 
   public function testSendConfirmationEmailThrowsAndIgnoresSoftErrorWhenSendReturnsFalse() {
@@ -177,7 +177,7 @@ class ConfirmationEmailMailerTest extends \MailPoetTest {
     } catch (\Exception $e) {
       $exceptionMessage = $e->getMessage();
     }
-    expect($exceptionMessage)->equals(__('There was an error when sending a confirmation email for your subscription. Please contact the website owner.', 'mailpoet'));
+    verify($exceptionMessage)->equals(__('There was an error when sending a confirmation email for your subscription. Please contact the website owner.', 'mailpoet'));
     expect(MailerLog::getError())->null();
   }
 
@@ -201,7 +201,7 @@ class ConfirmationEmailMailerTest extends \MailPoetTest {
     );
 
     $result = $sender->sendConfirmationEmail($this->subscriber);
-    expect($result)->equals(false);
+    verify($result)->equals(false);
     $settings->set(AuthorizedEmailsController::AUTHORIZED_EMAIL_ADDRESSES_ERROR_SETTING, null);
   }
 
@@ -226,9 +226,9 @@ class ConfirmationEmailMailerTest extends \MailPoetTest {
     );
 
     for ($i = 0; $i < $sender::MAX_CONFIRMATION_EMAILS; $i++) {
-      expect($sender->sendConfirmationEmail($this->subscriber))->equals(true);
+      verify($sender->sendConfirmationEmail($this->subscriber))->equals(true);
     }
-    expect($sender->sendConfirmationEmail($this->subscriber))->equals(false);
+    verify($sender->sendConfirmationEmail($this->subscriber))->equals(false);
   }
 
   public function testItDoesNotLimitNumberOfConfirmationEmailsForLoggedInUser() {
@@ -252,9 +252,9 @@ class ConfirmationEmailMailerTest extends \MailPoetTest {
     );
 
     for ($i = 0; $i < $sender::MAX_CONFIRMATION_EMAILS; $i++) {
-      expect($sender->sendConfirmationEmail($this->subscriber))->equals(true);
+      verify($sender->sendConfirmationEmail($this->subscriber))->equals(true);
     }
-    expect($sender->sendConfirmationEmail($this->subscriber))->equals(true);
+    verify($sender->sendConfirmationEmail($this->subscriber))->equals(true);
   }
 
   public function testGetMailBodyWithCustomizerReplacesActivationShortcode() {
@@ -315,7 +315,7 @@ class ConfirmationEmailMailerTest extends \MailPoetTest {
     );
 
     $confirmationNewsletter = $confirmationEmailCustomizer->getNewsletter();
-    expect($confirmationNewsletter->getId())->equals($newsletter->getId());
+    verify($confirmationNewsletter->getId())->equals($newsletter->getId());
     $confirmationMailBody = $sender->getMailBodyWithCustomizer($this->subscriber, ['test_segment']);
     expect($confirmationMailBody['body']['html'])->stringContainsString('<a class="mailpoet_button" href="https://example.com"');
 
@@ -351,7 +351,7 @@ class ConfirmationEmailMailerTest extends \MailPoetTest {
     $newsletterRepository->flush();
 
     $confirmationNewsletter = $confirmationEmailCustomizer->getNewsletter();
-    expect($confirmationNewsletter->getId())->equals($newsletter->getId());
+    verify($confirmationNewsletter->getId())->equals($newsletter->getId());
     $confirmationMailBody = $sender->getMailBodyWithCustomizer($this->subscriber, ['test_segment']);
     expect($confirmationMailBody['body']['html'])->stringContainsString('<a class="mailpoet_button" href="https://example.com"');
 
diff --git a/mailpoet/tests/integration/Subscribers/EngagementDataBackfillerTest.php b/mailpoet/tests/integration/Subscribers/EngagementDataBackfillerTest.php
index 5a4fec0cc4..9a5a002474 100644
--- a/mailpoet/tests/integration/Subscribers/EngagementDataBackfillerTest.php
+++ b/mailpoet/tests/integration/Subscribers/EngagementDataBackfillerTest.php
@@ -54,8 +54,8 @@ class EngagementDataBackfillerTest extends \MailPoetTest {
     $data = $this->backfiller->getPurchaseDataForBatch($subscriberIds);
     $this->assertInstanceOf(SubscriberEntity::class, $sub1);
     $this->assertInstanceOf(SubscriberEntity::class, $sub2);
-    expect($data[$sub1->getId()]['last_purchase_at'])->equals( (string)$newer);
-    expect($data[$sub2->getId()]['last_purchase_at'])->equals((string)$newer2);
+    verify($data[$sub1->getId()]['last_purchase_at'])->equals( (string)$newer);
+    verify($data[$sub2->getId()]['last_purchase_at'])->equals((string)$newer2);
     expect(!isset($data[$customerId3]))->true();
   }
 
@@ -91,8 +91,8 @@ class EngagementDataBackfillerTest extends \MailPoetTest {
 
     $this->assertInstanceOf(DateTimeInterface::class, $sub1->getLastPurchaseAt());
     $this->assertInstanceOf(DateTimeInterface::class, $sub2->getLastPurchaseAt());
-    expect($sub1->getLastPurchaseAt()->getTimestamp())->equals($newer->getTimestamp());
-    expect($sub2->getLastPurchaseAt()->getTimestamp())->equals($newer2->getTimestamp());
+    verify($sub1->getLastPurchaseAt()->getTimestamp())->equals($newer->getTimestamp());
+    verify($sub2->getLastPurchaseAt()->getTimestamp())->equals($newer2->getTimestamp());
   }
 
   public function testItRetrievesOpensData(): void {
@@ -125,9 +125,9 @@ class EngagementDataBackfillerTest extends \MailPoetTest {
     $this->entityManager->flush();
     $openData = $this->backfiller->getOpenDataForBatch([$sub1->getId(), $sub2->getId(), $sub3->getId(), $sub4->getId()]);
     expect($openData)->count(3);
-    expect($openData[$sub1->getId()]['last_open_at'])->equals((string)$newer);
-    expect($openData[$sub2->getId()]['last_open_at'])->equals((string)$sub2date);
-    expect($openData[$sub3->getId()]['last_open_at'])->equals((string)$sub3date);
+    verify($openData[$sub1->getId()]['last_open_at'])->equals((string)$newer);
+    verify($openData[$sub2->getId()]['last_open_at'])->equals((string)$sub2date);
+    verify($openData[$sub3->getId()]['last_open_at'])->equals((string)$sub3date);
     expect(!isset($openData[$sub4->getId()]))->true();
   }
 
@@ -176,9 +176,9 @@ class EngagementDataBackfillerTest extends \MailPoetTest {
     $this->assertInstanceOf(DateTimeInterface::class, $sub2->getLastOpenAt());
     $this->assertInstanceOf(DateTimeInterface::class, $sub3->getLastOpenAt());
 
-    expect($sub1->getLastOpenAt()->getTimestamp())->equals($newer->getTimestamp());
-    expect($sub2->getLastOpenAt()->getTimestamp())->equals($sub2date->getTimestamp());
-    expect($sub3->getLastOpenAt()->getTimestamp())->equals($sub3date->getTimestamp());
+    verify($sub1->getLastOpenAt()->getTimestamp())->equals($newer->getTimestamp());
+    verify($sub2->getLastOpenAt()->getTimestamp())->equals($sub2date->getTimestamp());
+    verify($sub3->getLastOpenAt()->getTimestamp())->equals($sub3date->getTimestamp());
     expect($sub4->getLastOpenAt())->null();
   }
 
@@ -213,9 +213,9 @@ class EngagementDataBackfillerTest extends \MailPoetTest {
     $this->entityManager->flush();
     $clickData = $this->backfiller->getClickDataForBatch([$sub1->getId(), $sub2->getId(), $sub3->getId(), $sub4->getId()]);
     expect($clickData)->count(3);
-    expect($clickData[$sub1->getId()]['last_click_at'])->equals((string)$newer);
-    expect($clickData[$sub2->getId()]['last_click_at'])->equals((string)$sub2date);
-    expect($clickData[$sub3->getId()]['last_click_at'])->equals((string)$sub3date);
+    verify($clickData[$sub1->getId()]['last_click_at'])->equals((string)$newer);
+    verify($clickData[$sub2->getId()]['last_click_at'])->equals((string)$sub2date);
+    verify($clickData[$sub3->getId()]['last_click_at'])->equals((string)$sub3date);
     expect(!isset($clickData[$sub4->getId()]))->true();
   }
 
@@ -266,9 +266,9 @@ class EngagementDataBackfillerTest extends \MailPoetTest {
     $this->assertInstanceOf(DateTimeInterface::class, $sub3->getLastClickAt());
 
 
-    expect($sub1->getLastClickAt()->getTimestamp())->equals($newer->getTimestamp());
-    expect($sub2->getLastClickAt()->getTimestamp())->equals($sub2date->getTimestamp());
-    expect($sub3->getLastClickAt()->getTimestamp())->equals($sub3date->getTimestamp());
+    verify($sub1->getLastClickAt()->getTimestamp())->equals($newer->getTimestamp());
+    verify($sub2->getLastClickAt()->getTimestamp())->equals($sub2date->getTimestamp());
+    verify($sub3->getLastClickAt()->getTimestamp())->equals($sub3date->getTimestamp());
     expect($sub4->getLastOpenAt())->null();
   }
 
@@ -303,9 +303,9 @@ class EngagementDataBackfillerTest extends \MailPoetTest {
     $this->entityManager->flush();
     $clickData = $this->backfiller->getSendingDataForBatch([$sub1->getId(), $sub2->getId(), $sub3->getId(), $sub4->getId()]);
     expect($clickData)->count(3);
-    expect($clickData[$sub1->getId()]['last_sending_at'])->equals((string)$newer);
-    expect($clickData[$sub2->getId()]['last_sending_at'])->equals((string)$sub2date);
-    expect($clickData[$sub3->getId()]['last_sending_at'])->equals((string)$sub3date);
+    verify($clickData[$sub1->getId()]['last_sending_at'])->equals((string)$newer);
+    verify($clickData[$sub2->getId()]['last_sending_at'])->equals((string)$sub2date);
+    verify($clickData[$sub3->getId()]['last_sending_at'])->equals((string)$sub3date);
     expect(!isset($clickData[$sub4->getId()]))->true();
   }
 
@@ -355,9 +355,9 @@ class EngagementDataBackfillerTest extends \MailPoetTest {
     $this->assertInstanceOf(DateTimeInterface::class, $sub2->getLastSendingAt());
     $this->assertInstanceOf(DateTimeInterface::class, $sub3->getLastSendingAt());
 
-    expect($sub1->getLastSendingAt()->getTimestamp())->equals($newer->getTimestamp());
-    expect($sub2->getLastSendingAt()->getTimestamp())->equals($sub2date->getTimestamp());
-    expect($sub3->getLastSendingAt()->getTimestamp())->equals($sub3date->getTimestamp());
+    verify($sub1->getLastSendingAt()->getTimestamp())->equals($newer->getTimestamp());
+    verify($sub2->getLastSendingAt()->getTimestamp())->equals($sub2date->getTimestamp());
+    verify($sub3->getLastSendingAt()->getTimestamp())->equals($sub3date->getTimestamp());
     expect($sub4->getLastSendingAt())->null();
   }
 
diff --git a/mailpoet/tests/integration/Subscribers/ImportExport/Export/ExportTest.php b/mailpoet/tests/integration/Subscribers/ImportExport/Export/ExportTest.php
index 725d6c0cc5..68fa5f1ad0 100644
--- a/mailpoet/tests/integration/Subscribers/ImportExport/Export/ExportTest.php
+++ b/mailpoet/tests/integration/Subscribers/ImportExport/Export/ExportTest.php
@@ -146,9 +146,9 @@ class ExportTest extends \MailPoetTest {
   }
 
   public function testItCanConstruct() {
-    expect($this->export->exportFormatOption)
+    verify($this->export->exportFormatOption)
       ->equals('csv');
-    expect($this->export->subscriberFields)
+    verify($this->export->subscriberFields)
       ->equals(
         [
           'email',
@@ -156,30 +156,30 @@ class ExportTest extends \MailPoetTest {
           $this->customField->getId(),
         ]
       );
-    expect($this->export->subscriberCustomFields)
+    verify($this->export->subscriberCustomFields)
       ->equals($this->export->getSubscriberCustomFields());
-    expect($this->export->formattedSubscriberFields)
+    verify($this->export->formattedSubscriberFields)
       ->equals(
         $this->export->formatSubscriberFields(
           $this->export->subscriberFields,
           $this->export->subscriberCustomFields
         )
       );
-    expect($this->export->formattedSubscriberFieldsWithList)
+    verify($this->export->formattedSubscriberFieldsWithList)
       ->equals(
         \array_merge(
           $this->export->formattedSubscriberFields,
           [__('List', 'mailpoet')]
         )
       );
-    expect(
+    verify(
       preg_match(
         '|' .
         preg_quote(Env::$tempPath, '|') . '/MailPoet_export_[a-z0-9]{15}.' .
         $this->export->exportFormatOption .
         '|', $this->export->exportFile)
     )->equals(1);
-    expect(
+    verify(
       preg_match(
         '|' .
         preg_quote(Env::$tempUrl, '|') . '/' .
@@ -192,7 +192,7 @@ class ExportTest extends \MailPoetTest {
     $source = $this->customFieldsRepository->findOneBy(['name' => 'Country']);
     $this->assertInstanceOf(CustomFieldEntity::class, $source);
     $target = $this->export->getSubscriberCustomFields();
-    expect($target)->equals([$source->getId() => $source->getName()]);
+    verify($target)->equals([$source->getId() => $source->getName()]);
   }
 
   public function testItCanFormatSubscriberFields() {
@@ -200,7 +200,7 @@ class ExportTest extends \MailPoetTest {
       array_keys($this->subscriberFields),
       $this->export->getSubscriberCustomFields()
     );
-    expect($formattedSubscriberFields)
+    verify($formattedSubscriberFields)
       ->equals(array_values($this->subscriberFields));
   }
 
@@ -208,7 +208,7 @@ class ExportTest extends \MailPoetTest {
     $subscribers = $this->export->getSubscribers() ?? [];
     foreach ($subscribers as $subscriber) {
       if ($subscriber['email'] === $this->subscribersData[1]) {
-        expect($subscriber['Country'])
+        verify($subscriber['Country'])
           ->equals($this->subscribersData[1][$this->customField->getId()]);
       }
     }
@@ -233,7 +233,7 @@ class ExportTest extends \MailPoetTest {
     $export = $this->createExport($jsonData);
     $subscribers = $export->getSubscribers() ?? [];
     expect($subscribers)->count(1);
-    expect($subscribers[0]['segment_name'])->equals('Not In Segment');
+    verify($subscribers[0]['segment_name'])->equals('Not In Segment');
   }
 
   public function testItRequiresWritableExportFile() {
@@ -242,7 +242,7 @@ class ExportTest extends \MailPoetTest {
       $this->export->process();
       $this->fail('Export did not throw an exception');
     } catch (\Exception $e) {
-      expect($e->getMessage())
+      verify($e->getMessage())
         ->equals("The export file could not be saved on the server.");
     }
   }
@@ -255,7 +255,7 @@ class ExportTest extends \MailPoetTest {
     } catch (\Exception $e) {
       $this->fail('Export to .csv process threw an exception');
     }
-    expect($result['totalExported'])->equals(4);
+    verify($result['totalExported'])->equals(4);
     expect($result['exportFileURL'])->notEmpty();
 
     try {
@@ -265,7 +265,7 @@ class ExportTest extends \MailPoetTest {
     } catch (\Exception $e) {
       $this->fail('Export to .xlsx process threw an exception');
     }
-    expect($result['totalExported'])->equals(4);
+    verify($result['totalExported'])->equals(4);
     expect($result['exportFileURL'])->notEmpty();
   }
 
diff --git a/mailpoet/tests/integration/Subscribers/ImportExport/Import/ImportTest.php b/mailpoet/tests/integration/Subscribers/ImportExport/Import/ImportTest.php
index 49de446cbe..53192bb8e1 100644
--- a/mailpoet/tests/integration/Subscribers/ImportExport/Import/ImportTest.php
+++ b/mailpoet/tests/integration/Subscribers/ImportExport/Import/ImportTest.php
@@ -156,10 +156,10 @@ class ImportTest extends \MailPoetTest {
 
   public function testItConstructs(): void {
     expect(is_array($this->import->subscribersData))->true();
-    expect($this->import->segmentsIds)->equals($this->testData['segments']);
+    verify($this->import->segmentsIds)->equals($this->testData['segments']);
     expect(is_array($this->import->subscribersFields))->true();
     expect(is_array($this->import->subscribersCustomFields))->true();
-    expect($this->import->subscribersCount)->equals(2);
+    verify($this->import->subscribersCount)->equals(2);
     expect($this->import->createdAt)->notEmpty();
     expect($this->import->updatedAt)->notEmpty();
   }
@@ -172,7 +172,7 @@ class ImportTest extends \MailPoetTest {
       $this->import->validateImportData($data);
       self::fail('Missing or invalid data exception not thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('Missing or invalid import data.');
+      verify($e->getMessage())->equals('Missing or invalid import data.');
     }
     // exception should not be thrown when all fields exist
     $this->import->validateImportData($this->testData);
@@ -185,7 +185,7 @@ class ImportTest extends \MailPoetTest {
       $this->import->validateImportData($data);
       self::fail('Missing or invalid data exception not thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('Missing or invalid import data.');
+      verify($e->getMessage())->equals('Missing or invalid import data.');
     }
   }
 
@@ -198,7 +198,7 @@ class ImportTest extends \MailPoetTest {
     $result = $this->import->validateSubscribersData($data);
     $this->assertIsArray($result);
     expect($result['email'])->count(1);
-    expect($result['email'][0])->equals('jane@doe.com');
+    verify($result['email'][0])->equals('jane@doe.com');
 
     // valid email passes validation
     $data['email'] = [
@@ -206,7 +206,7 @@ class ImportTest extends \MailPoetTest {
       'jane@doe.com',
     ];
     $result = $this->import->validateSubscribersData($data);
-    expect($result)->equals($data);
+    verify($result)->equals($data);
   }
 
   public function testItValidatesSubscribersConfirmedAt(): void {
@@ -223,7 +223,7 @@ class ImportTest extends \MailPoetTest {
     $result = $this->import->validateSubscribersData($data);
     $this->assertIsArray($result);
     expect($result['confirmed_at'])->count(1);
-    expect($result['confirmed_at'][0])->equals('2019-05-31 18:42:35');
+    verify($result['confirmed_at'][0])->equals('2019-05-31 18:42:35');
 
     // normalize confirmed_at
     $data['confirmed_at'] = [
@@ -232,7 +232,7 @@ class ImportTest extends \MailPoetTest {
     ];
     $result = $this->import->validateSubscribersData($data);
     $this->assertIsArray($result);
-    expect($result['confirmed_at'])->equals([
+    verify($result['confirmed_at'])->equals([
       '2020-09-17 11:11:11',
       '2015-10-13 16:19:20',
     ]);
@@ -253,7 +253,7 @@ class ImportTest extends \MailPoetTest {
     $this->assertIsArray($result);
     expect($result['confirmed_ip'])->count(2);
     expect($result['confirmed_ip'][0])->isEmpty();
-    expect($result['confirmed_ip'][1])->equals('192.68.69.32');
+    verify($result['confirmed_ip'][1])->equals('192.68.69.32');
 
     // invalid IPv4 confirmed_ip is empty in the data object
     $data['confirmed_ip'] = [
@@ -264,7 +264,7 @@ class ImportTest extends \MailPoetTest {
     $this->assertIsArray($result);
     expect($result['confirmed_ip'])->count(2);
     expect($result['confirmed_ip'][0])->isEmpty();
-    expect($result['confirmed_ip'][1])->equals('192.68.69.32');
+    verify($result['confirmed_ip'][1])->equals('192.68.69.32');
 
     // Empty confirmed_ip is empty in the data object
     $data['confirmed_ip'] = [
@@ -275,7 +275,7 @@ class ImportTest extends \MailPoetTest {
     $this->assertIsArray($result);
     expect($result['confirmed_ip'])->count(2);
     expect($result['confirmed_ip'][0])->isEmpty();
-    expect($result['confirmed_ip'][1])->equals('192.68.69.32');
+    verify($result['confirmed_ip'][1])->equals('192.68.69.32');
 
     // normalize confirmed_at
     $data['confirmed_ip'] = [
@@ -284,7 +284,7 @@ class ImportTest extends \MailPoetTest {
     ];
     $result = $this->import->validateSubscribersData($data);
     $this->assertIsArray($result);
-    expect($result['confirmed_ip'])->equals($data['confirmed_ip']);
+    verify($result['confirmed_ip'])->equals($data['confirmed_ip']);
   }
 
   public function testItThrowsErrorWhenNoValidSubscribersAreFoundDuringImport(): void {
@@ -314,19 +314,19 @@ class ImportTest extends \MailPoetTest {
       $import->process();
       self::fail('No valid subscribers found exception not thrown.');
     } catch (\Exception $e) {
-      expect($e->getMessage())->equals('No valid subscribers were found.');
+      verify($e->getMessage())->equals('No valid subscribers were found.');
     }
   }
 
   public function testItTransformsSubscribers(): void {
     $customField = $this->subscribersCustomFields[0];
-    expect($this->import->subscribersData['first_name'][0])
+    verify($this->import->subscribersData['first_name'][0])
       ->equals($this->testData['subscribers'][0][0]);
-    expect($this->import->subscribersData['last_name'][0])
+    verify($this->import->subscribersData['last_name'][0])
       ->equals($this->testData['subscribers'][0][1]);
-    expect($this->import->subscribersData['email'][0])
+    verify($this->import->subscribersData['email'][0])
       ->equals($this->testData['subscribers'][0][2]);
-    expect($this->import->subscribersData[$customField][0])
+    verify($this->import->subscribersData[$customField][0])
       ->equals($this->testData['subscribers'][0][3]);
   }
 
@@ -378,12 +378,12 @@ class ImportTest extends \MailPoetTest {
       $subscribersData
     );
     $this->assertIsArray($existingSubscribers);
-    expect($existingSubscribers['email'][0])->equals($subscribersData['email'][2]);
-    expect($existingSubscribers['email'][1])->equals($subscribersData['email'][3]);
+    verify($existingSubscribers['email'][0])->equals($subscribersData['email'][2]);
+    verify($existingSubscribers['email'][1])->equals($subscribersData['email'][3]);
     foreach ($newSubscribers as $field => $value) {
-      expect($value[0])->equals($subscribersData[$field][0]);
+      verify($value[0])->equals($subscribersData[$field][0]);
     }
-    expect($wpUsers)->equals([$subscribersDataExisting[0]['wp_user_id']]);
+    verify($wpUsers)->equals([$subscribersDataExisting[0]['wp_user_id']]);
   }
 
   public function testItAddsMissingRequiredFieldsToSubscribersObject(): void {
@@ -416,17 +416,17 @@ class ImportTest extends \MailPoetTest {
     );
     // "created_at", "status", "first_name" and "last_name" fields are added and populated with default values
     expect(in_array('status', $result['fields']))->true();
-    expect(count($result['data']['status']))->equals($import->subscribersCount);
-    expect($result['data']['status'][0])->equals($import->requiredSubscribersFields['status']);
+    verify(count($result['data']['status']))->equals($import->subscribersCount);
+    verify($result['data']['status'][0])->equals($import->requiredSubscribersFields['status']);
     expect(in_array('first_name', $result['fields']))->true();
-    expect(count($result['data']['first_name']))->equals($import->subscribersCount);
-    expect($result['data']['first_name'][0])->equals($import->requiredSubscribersFields['first_name']);
+    verify(count($result['data']['first_name']))->equals($import->subscribersCount);
+    verify($result['data']['first_name'][0])->equals($import->requiredSubscribersFields['first_name']);
     expect(in_array('last_name', $result['fields']))->true();
-    expect(count($result['data']['last_name']))->equals($import->subscribersCount);
-    expect($result['data']['last_name'][0])->equals($import->requiredSubscribersFields['last_name']);
+    verify(count($result['data']['last_name']))->equals($import->subscribersCount);
+    verify($result['data']['last_name'][0])->equals($import->requiredSubscribersFields['last_name']);
     expect(in_array('created_at', $result['fields']))->true();
-    expect(count($result['data']['created_at']))->equals($import->subscribersCount);
-    expect($result['data']['created_at'][0])->equals($import->createdAt);
+    verify(count($result['data']['created_at']))->equals($import->subscribersCount);
+    verify($result['data']['created_at'][0])->equals($import->createdAt);
   }
 
   public function testItGetsSubscriberFields(): void {
@@ -436,7 +436,7 @@ class ImportTest extends \MailPoetTest {
       39,
     ];
     $fields = $this->import->getSubscribersFields($data);
-    expect($fields)->equals(
+    verify($fields)->equals(
       [
         'one',
         'two',
@@ -450,7 +450,7 @@ class ImportTest extends \MailPoetTest {
       39,
     ];
     $fields = $this->import->getCustomSubscribersFields($data);
-    expect($fields)->equals([39]);
+    verify($fields)->equals([39]);
   }
 
   public function testItAddsOrUpdatesSubscribers(): void {
@@ -463,8 +463,8 @@ class ImportTest extends \MailPoetTest {
       $subscribersData
     );
     $subscribers = $this->subscriberRepository->findAll();
-    expect(count($subscribers))->equals(2);
-    expect($subscribers[0]->getEmail())
+    verify(count($subscribers))->equals(2);
+    verify($subscribers[0]->getEmail())
       ->equals($subscribersData['data']['email'][0]);
     $subscribersData['data']['first_name'][1] = 'MaryJane';
     $this->import->createOrUpdateSubscribers(
@@ -473,7 +473,7 @@ class ImportTest extends \MailPoetTest {
     );
     $this->entityManager->clear();
     $subscribers = $this->subscriberRepository->findAll();
-    expect($subscribers[1]->getFirstName())
+    verify($subscribers[1]->getFirstName())
       ->equals($subscribersData['data']['first_name'][1]);
   }
 
@@ -494,20 +494,20 @@ class ImportTest extends \MailPoetTest {
     $dbSubscribers = array_map(function (SubscriberEntity $subscriber): int {
       return (int)$subscriber->getId();
     }, $this->subscriberRepository->findAll());
-    expect(count($dbSubscribers))->equals(2);
+    verify(count($dbSubscribers))->equals(2);
     $this->import->addSubscribersToSegments(
       $dbSubscribers,
       [$this->segment1->getId(), $this->segment2->getId()]
     );
     $subscribersSegments = $this->subscriberSegmentRepository->findAll();
-    expect(count($subscribersSegments))->equals(4);
+    verify(count($subscribersSegments))->equals(4);
     $this->import->deleteExistingTrashedSubscribers(
       $subscribersData['data']
     );
     $subscribersSegments = $this->subscriberSegmentRepository->findAll();
     $dbSubscribers = $this->subscriberRepository->findAll();
-    expect(count($subscribersSegments))->equals(2);
-    expect(count($dbSubscribers))->equals(1);
+    verify(count($subscribersSegments))->equals(2);
+    verify(count($dbSubscribers))->equals(1);
   }
 
   public function testItCreatesOrUpdatesCustomFields(): void {
@@ -534,8 +534,8 @@ class ImportTest extends \MailPoetTest {
       $this->subscribersCustomFields
     );
     $subscribersCustomFields = $this->subscriberCustomFieldRepository->findAll();
-    expect(count($subscribersCustomFields))->equals(2);
-    expect($subscribersCustomFields[0]->getValue())
+    verify(count($subscribersCustomFields))->equals(2);
+    verify($subscribersCustomFields[0]->getValue())
       ->equals($subscribersData['data'][$customField][0]);
     $subscribersData[$customField][1] = 'Rio';
     $this->import->createOrUpdateCustomFields(
@@ -545,7 +545,7 @@ class ImportTest extends \MailPoetTest {
       $this->subscribersCustomFields
     );
     $subscribersCustomFields = $this->subscriberCustomFieldRepository->findAll();
-    expect($subscribersCustomFields[1]->getValue())
+    verify($subscribersCustomFields[1]->getValue())
       ->equals($subscribersData['data'][$customField][1]);
   }
 
@@ -634,12 +634,12 @@ class ImportTest extends \MailPoetTest {
 
   public function testItUpdatesSubscribers(): void {
     $result = $this->import->process();
-    expect($result['updated'])->equals(0);
+    verify($result['updated'])->equals(0);
     $result = $this->import->process();
-    expect($result['updated'])->equals(2);
+    verify($result['updated'])->equals(2);
     $this->import->updateSubscribers = false;
     $result = $this->import->process();
-    expect($result['updated'])->equals(0);
+    verify($result['updated'])->equals(0);
   }
 
   public function testItDoesNotUpdateExistingSubscribersStatusWhenStatusColumnIsNotPresent(): void {
@@ -653,7 +653,7 @@ class ImportTest extends \MailPoetTest {
 
     $updatedSubscriber = $this->subscriberRepository->findOneBy(['email' => $subscriber->getEmail()]);
     $this->assertInstanceOf(SubscriberEntity::class, $updatedSubscriber);
-    expect($updatedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
+    verify($updatedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
   }
 
   public function testItImportsNewsSubscribersWithAllAdditionalParameters(): void {
@@ -669,18 +669,18 @@ class ImportTest extends \MailPoetTest {
       $data['subscribers'][1][2],
     ]]);
     expect($newSubscribers)->count(2);
-    expect($newSubscribers[0]->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
-    expect($newSubscribers[1]->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
-    expect($newSubscribers[0]->getSource())->equals('imported');
-    expect($newSubscribers[1]->getSource())->equals('imported');
-    expect(strlen((string)$newSubscribers[0]->getLinkToken()))->equals(SubscriberEntity::LINK_TOKEN_LENGTH);
-    expect(strlen((string)$newSubscribers[1]->getLinkToken()))->equals(SubscriberEntity::LINK_TOKEN_LENGTH);
+    verify($newSubscribers[0]->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($newSubscribers[1]->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($newSubscribers[0]->getSource())->equals('imported');
+    verify($newSubscribers[1]->getSource())->equals('imported');
+    verify(strlen((string)$newSubscribers[0]->getLinkToken()))->equals(SubscriberEntity::LINK_TOKEN_LENGTH);
+    verify(strlen((string)$newSubscribers[1]->getLinkToken()))->equals(SubscriberEntity::LINK_TOKEN_LENGTH);
     $lastSubscribed1 = $newSubscribers[0]->getLastSubscribedAt();
     $lastSubscribed2 = $newSubscribers[1]->getLastSubscribedAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $lastSubscribed1);
     $this->assertInstanceOf(\DateTimeInterface::class, $lastSubscribed2);
-    expect($lastSubscribed1->getTimestamp())->equals($this->testData['timestamp'], 1);
-    expect($lastSubscribed2->getTimestamp())->equals($this->testData['timestamp'], 1);
+    verify($lastSubscribed1->getTimestamp())->equals($this->testData['timestamp'], 1);
+    verify($lastSubscribed2->getTimestamp())->equals($this->testData['timestamp'], 1);
   }
 
   public function testItDoesNotUpdateExistingSubscribersLastSubscribedAtWhenItIsPresent(): void {
@@ -702,7 +702,7 @@ class ImportTest extends \MailPoetTest {
 
     $updatedSubscriber = $this->subscriberRepository->findOneBy(['email' => $existingSubscriber->getEmail()]);
     $this->assertInstanceOf(SubscriberEntity::class, $updatedSubscriber);
-    expect($updatedSubscriber->getLastSubscribedAt())->equals(Carbon::createFromFormat('Y-m-d H:i:s', '2017-12-12 12:12:00'));
+    verify($updatedSubscriber->getLastSubscribedAt())->equals(Carbon::createFromFormat('Y-m-d H:i:s', '2017-12-12 12:12:00'));
   }
 
   public function testItSynchronizesWpUsers(): void {
@@ -716,7 +716,7 @@ class ImportTest extends \MailPoetTest {
     $this->entityManager->clear();
     $imported = $this->subscriberRepository->findOneBy(['email' => 'mary@jane.com']);
     $this->assertInstanceOf(SubscriberEntity::class, $imported);
-    expect($imported->getFirstName())->equals($beforeImport->getFirstName()); // Subscriber name was synchronized from WP
+    verify($imported->getFirstName())->equals($beforeImport->getFirstName()); // Subscriber name was synchronized from WP
     expect($imported->getFirstName())->notEquals('Mary');
     $this->tester->deleteWordPressUser('mary@jane.com');
   }
@@ -739,7 +739,7 @@ class ImportTest extends \MailPoetTest {
     $this->entityManager->clear();
     $updatedSubscriber = $this->subscriberRepository->findOneBy(['email' => $existingSubscriber->getEmail()]);
     $this->assertInstanceOf(SubscriberEntity::class, $updatedSubscriber);
-    expect($updatedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($updatedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
   }
 
   public function testItDoesStatusNewSubscriberWhenNewSubscribersStatusIsSet(): void {
@@ -749,15 +749,15 @@ class ImportTest extends \MailPoetTest {
     $import->process();
     $newSubscriber = $this->subscriberRepository->findOneBy(['email' => 'Adam@Smith.com']);
     $this->assertInstanceOf(SubscriberEntity::class, $newSubscriber);
-    expect($newSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
+    verify($newSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
     $newSubscriber = $this->subscriberRepository->findOneBy(['email' => 'mary@jane.com']);
     $this->assertInstanceOf(SubscriberEntity::class, $newSubscriber);
-    expect($newSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
+    verify($newSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
   }
 
   public function testItRunsImport(): void {
     $result = $this->import->process();
-    expect($result['created'])->equals(2);
+    verify($result['created'])->equals(2);
     $subscriber = $this->subscriberRepository->findOneBy(['email' => 'mary@jane.com']);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
     $this->subscriberRepository->remove($subscriber);
@@ -766,7 +766,7 @@ class ImportTest extends \MailPoetTest {
     $this->import->updatedAt = Carbon::createFromTimestamp(WPFunctions::get()->currentTime('timestamp') + 1);
     $this->import->requiredSubscribersFields['created_at'] = $this->import->createdAt;
     $result = $this->import->process();
-    expect($result['created'])->equals(1);
+    verify($result['created'])->equals(1);
     $dbSubscribers = array_map(function (SubscriberEntity $subscriber): int {
       return (int)$subscriber->getId();
     }, $this->subscriberRepository->findAll());
@@ -826,7 +826,7 @@ class ImportTest extends \MailPoetTest {
       $data['subscribers'][1][2],
     ]]);
     expect($newSubscribers)->count(1);
-    expect($newSubscribers[0]->getEmail())->equals('correctdateformat2@yopmail.com');
+    verify($newSubscribers[0]->getEmail())->equals('correctdateformat2@yopmail.com');
   }
 
   private function createImportInstance(array $data): Import {
diff --git a/mailpoet/tests/integration/Subscribers/ImportExport/Import/MailChimpTest.php b/mailpoet/tests/integration/Subscribers/ImportExport/Import/MailChimpTest.php
index 416b98eaa3..f41a364a08 100644
--- a/mailpoet/tests/integration/Subscribers/ImportExport/Import/MailChimpTest.php
+++ b/mailpoet/tests/integration/Subscribers/ImportExport/Import/MailChimpTest.php
@@ -45,14 +45,14 @@ class MailChimpTest extends \MailPoetTest {
       ->false();
     expect($this->mailchimp->getAPIKey('12345678901234567890123456789012-1'))
       ->false();
-    expect($this->mailchimp->getAPIKey($validApiKeyFormat))
+    verify($this->mailchimp->getAPIKey($validApiKeyFormat))
       ->equals($validApiKeyFormat);
   }
 
   public function testItCanGetDatacenter(): void {
     $validApiKeyFormat = '12345678901234567890123456789012-ab1';
     $dataCenter = 'ab1';
-    expect($this->mailchimp->getDataCenter($validApiKeyFormat))
+    verify($this->mailchimp->getDataCenter($validApiKeyFormat))
       ->equals($dataCenter);
   }
 
@@ -112,7 +112,7 @@ class MailChimpTest extends \MailPoetTest {
     expect($subscribers)->hasKey('duplicate');
     expect($subscribers['header'])->notEmpty();
     expect($subscribers['subscribers'])->count(1);
-    expect($subscribers['subscribersCount'])->equals(1);
+    verify($subscribers['subscribersCount'])->equals(1);
   }
 
   public function testItFailsWhenSubscribersDataTooLarge(): void {
diff --git a/mailpoet/tests/integration/Subscribers/ImportExport/ImportExportFactoryTest.php b/mailpoet/tests/integration/Subscribers/ImportExport/ImportExportFactoryTest.php
index 9177d58b84..c537b5cab3 100644
--- a/mailpoet/tests/integration/Subscribers/ImportExport/ImportExportFactoryTest.php
+++ b/mailpoet/tests/integration/Subscribers/ImportExport/ImportExportFactoryTest.php
@@ -60,17 +60,17 @@ class ImportExportFactoryTest extends \MailPoetTest {
 
   public function testItCanGetSegmentsWithSubscriberCount() {
     $segments = $this->importFactory->getSegments();
-    expect(count($segments))->equals(2);
-    expect($segments[0]['name'])->equals('Confirmed Segment');
-    expect($segments[0]['count'])->equals(1);
-    expect($segments[1]['name'])->equals('Unconfirmed Segment');
-    expect($segments[1]['count'])->equals(0);
+    verify(count($segments))->equals(2);
+    verify($segments[0]['name'])->equals('Confirmed Segment');
+    verify($segments[0]['count'])->equals(1);
+    verify($segments[1]['name'])->equals('Unconfirmed Segment');
+    verify($segments[1]['count'])->equals(0);
   }
 
   public function testItCanGetPublicSegmentsForImport() {
     $segments = $this->importFactory->getSegments();
-    expect($segments[0]['count'])->equals(1);
-    expect($segments[1]['count'])->equals(0);
+    verify($segments[0]['count'])->equals(1);
+    verify($segments[1]['count'])->equals(0);
 
     $subscriber = $this->subscribersRepository->findOneBy(['email' => 'mike@mailpoet.com']);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
@@ -83,13 +83,13 @@ class ImportExportFactoryTest extends \MailPoetTest {
 
     $this->clearSubscribersCountCache();
     $segments = $this->importFactory->getSegments();
-    expect($segments[0]['count'])->equals(0);
-    expect($segments[1]['count'])->equals(0);
+    verify($segments[0]['count'])->equals(0);
+    verify($segments[1]['count'])->equals(0);
   }
 
   public function testItCanGetPublicSegmentsForExport() {
     $segments = $this->exportFactory->getSegments();
-    expect(count($segments))->equals(2);
+    verify(count($segments))->equals(2);
 
     $subscriber = $this->subscribersRepository->findOneBy(['email' => 'john@mailpoet.com']);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
@@ -99,17 +99,17 @@ class ImportExportFactoryTest extends \MailPoetTest {
 
     $this->clearSubscribersCountCache();
     $segments = $this->exportFactory->getSegments();
-    expect(count($segments))->equals(1);
+    verify(count($segments))->equals(1);
   }
 
   public function testItCanGetSegmentsForExport() {
     $segments = $this->exportFactory->getSegments();
-    expect(count($segments))->equals(2);
+    verify(count($segments))->equals(2);
 
-    expect($segments[0]['name'])->equals('Confirmed Segment');
-    expect($segments[0]['count'])->equals(1);
-    expect($segments[1]['name'])->equals('Unconfirmed Segment');
-    expect($segments[1]['count'])->equals(1);
+    verify($segments[0]['name'])->equals('Confirmed Segment');
+    verify($segments[0]['count'])->equals(1);
+    verify($segments[1]['name'])->equals('Unconfirmed Segment');
+    verify($segments[1]['count'])->equals(1);
   }
 
   public function testItCanGetSubscriberFields() {
@@ -160,7 +160,7 @@ class ImportExportFactoryTest extends \MailPoetTest {
     $subscriberCustomFields =
       $this->importFactory
         ->getSubscriberCustomFields();
-    expect($subscriberCustomFields[0]['type'])
+    verify($subscriberCustomFields[0]['type'])
       ->equals('date');
   }
 
@@ -224,12 +224,12 @@ class ImportExportFactoryTest extends \MailPoetTest {
       $importExportFactory->getSubscriberFields(),
       $importExportFactory->getSubscriberCustomFields()
     );
-    expect($formattedFieldsForSelect2)->equals($select2FieldsWithCustomFields);
+    verify($formattedFieldsForSelect2)->equals($select2FieldsWithCustomFields);
     $formattedFieldsForSelect2 = $importExportFactory->formatFieldsForSelect2(
       $importExportFactory->getSubscriberFields(),
       []
     );
-    expect($formattedFieldsForSelect2)->equals($select2FieldsWithoutCustomFields);
+    verify($formattedFieldsForSelect2)->equals($select2FieldsWithoutCustomFields);
   }
 
   public function testItCanFormatFieldsForSelect2Export() {
@@ -274,27 +274,27 @@ class ImportExportFactoryTest extends \MailPoetTest {
       $importExportFactory->getSubscriberFields(),
       $importExportFactory->getSubscriberCustomFields()
     );
-    expect($formattedFieldsForSelect2)->equals($select2FieldsWithCustomFields);
+    verify($formattedFieldsForSelect2)->equals($select2FieldsWithCustomFields);
     $formattedFieldsForSelect2 = $importExportFactory->formatFieldsForSelect2(
       $importExportFactory->getSubscriberFields(),
       []
     );
-    expect($formattedFieldsForSelect2)->equals($select2FieldsWithoutCustomFields);
+    verify($formattedFieldsForSelect2)->equals($select2FieldsWithoutCustomFields);
   }
 
   public function testItCanBootStrapImport() {
     $import = clone($this->importFactory);
     $importMenu = $import->bootstrap();
-    expect(count((array)json_decode($importMenu['segments'], true)))
+    verify(count((array)json_decode($importMenu['segments'], true)))
       ->equals(2);
     // email, first_name, last_name, subscribed_ip, created_at, confirmed_ip, confirmed_at + 1 custom field
-    expect(count((array)json_decode($importMenu['subscriberFields'], true)))
+    verify(count((array)json_decode($importMenu['subscriberFields'], true)))
       ->equals(8);
     // action, system fields, user fields
-    expect(count((array)json_decode($importMenu['subscriberFieldsSelect2'], true)))
+    verify(count((array)json_decode($importMenu['subscriberFieldsSelect2'], true)))
       ->equals(3);
-    expect($importMenu['maxPostSize'])->equals(ini_get('post_max_size'));
-    expect($importMenu['maxPostSizeBytes'])->equals(
+    verify($importMenu['maxPostSize'])->equals(ini_get('post_max_size'));
+    verify($importMenu['maxPostSizeBytes'])->equals(
       (int)ini_get('post_max_size') * 1048576
     );
   }
@@ -302,10 +302,10 @@ class ImportExportFactoryTest extends \MailPoetTest {
   public function testItCanBootStrapExport() {
     $export = clone($this->importFactory);
     $exportMenu = $export->bootstrap();
-    expect(count((array)json_decode($exportMenu['segments'], true)))
+    verify(count((array)json_decode($exportMenu['segments'], true)))
       ->equals(2);
     // action, system fields, user fields
-    expect(count((array)json_decode($exportMenu['subscriberFieldsSelect2'], true)))
+    verify(count((array)json_decode($exportMenu['subscriberFieldsSelect2'], true)))
       ->equals(3);
   }
 
diff --git a/mailpoet/tests/integration/Subscribers/ImportExport/ImportExportRepositoryTest.php b/mailpoet/tests/integration/Subscribers/ImportExport/ImportExportRepositoryTest.php
index c3223b0bd2..029c421238 100644
--- a/mailpoet/tests/integration/Subscribers/ImportExport/ImportExportRepositoryTest.php
+++ b/mailpoet/tests/integration/Subscribers/ImportExport/ImportExportRepositoryTest.php
@@ -59,19 +59,19 @@ class ImportExportRepositoryTest extends \MailPoetTest {
       $data
     );
 
-    expect($count)->equals(2);
+    verify($count)->equals(2);
     $subscribers = $this->subscribersRepository->findAll();
     expect($subscribers)->count(2);
     $user1 = $subscribers[0];
     $this->assertInstanceOf(SubscriberEntity::class, $user1);
-    expect($user1->getEmail())->equals('user1@export-test.com');
-    expect($user1->getFirstName())->equals('One');
-    expect($user1->getLastName())->equals('User');
+    verify($user1->getEmail())->equals('user1@export-test.com');
+    verify($user1->getFirstName())->equals('One');
+    verify($user1->getLastName())->equals('User');
     $user2 = $subscribers[1];
     $this->assertInstanceOf(SubscriberEntity::class, $user2);
-    expect($user2->getEmail())->equals('user2@export-test.com');
-    expect($user2->getFirstName())->equals('Two');
-    expect($user2->getLastName())->equals('User');
+    verify($user2->getEmail())->equals('user2@export-test.com');
+    verify($user2->getFirstName())->equals('Two');
+    verify($user2->getLastName())->equals('User');
   }
 
   public function testItUpdateMultipleSubscribers(): void {
@@ -94,22 +94,22 @@ class ImportExportRepositoryTest extends \MailPoetTest {
       $updatedAt
     );
 
-    expect($count)->equals(2);
+    verify($count)->equals(2);
     $this->entityManager->clear();
     $subscribers = $this->subscribersRepository->findAll();
     expect($subscribers)->count(2);
     $user1 = $subscribers[0];
     $this->assertInstanceOf(SubscriberEntity::class, $user1);
-    expect($user1->getEmail())->equals('user1@export-test.com');
-    expect($user1->getFirstName())->equals('OneOne');
-    expect($user1->getLastName())->equals('UserOne');
-    expect($user1->getUpdatedAt())->equals($updatedAt);
+    verify($user1->getEmail())->equals('user1@export-test.com');
+    verify($user1->getFirstName())->equals('OneOne');
+    verify($user1->getLastName())->equals('UserOne');
+    verify($user1->getUpdatedAt())->equals($updatedAt);
     $user2 = $subscribers[1];
     $this->assertInstanceOf(SubscriberEntity::class, $user2);
-    expect($user2->getEmail())->equals('user2@export-test.com');
-    expect($user2->getFirstName())->equals('TwoTwo');
-    expect($user2->getLastName())->equals('UserTwo');
-    expect($user2->getUpdatedAt())->equals($updatedAt);
+    verify($user2->getEmail())->equals('user2@export-test.com');
+    verify($user2->getFirstName())->equals('TwoTwo');
+    verify($user2->getLastName())->equals('UserTwo');
+    verify($user2->getUpdatedAt())->equals($updatedAt);
   }
 
   public function testItInsertMultipleSubscriberCustomFields(): void {
@@ -131,19 +131,19 @@ class ImportExportRepositoryTest extends \MailPoetTest {
       $data
     );
 
-    expect($count)->equals(2);
+    verify($count)->equals(2);
     $customFields = $this->subscriberCustomFieldRepository->findAll();
     expect($customFields)->count(2);
     $subscriberCustomField1 = $customFields[0];
     $this->assertInstanceOf(SubscriberCustomFieldEntity::class, $subscriberCustomField1);
-    expect($subscriberCustomField1->getSubscriber())->equals($subscriber1);
-    expect($subscriberCustomField1->getCustomField())->equals($customField);
-    expect($subscriberCustomField1->getValue())->equals('20');
+    verify($subscriberCustomField1->getSubscriber())->equals($subscriber1);
+    verify($subscriberCustomField1->getCustomField())->equals($customField);
+    verify($subscriberCustomField1->getValue())->equals('20');
     $subscriberCustomField2 = $customFields[1];
     $this->assertInstanceOf(SubscriberCustomFieldEntity::class, $subscriberCustomField2);
-    expect($subscriberCustomField2->getSubscriber())->equals($subscriber2);
-    expect($subscriberCustomField2->getCustomField())->equals($customField);
-    expect($subscriberCustomField2->getValue())->equals('25');
+    verify($subscriberCustomField2->getSubscriber())->equals($subscriber2);
+    verify($subscriberCustomField2->getCustomField())->equals($customField);
+    verify($subscriberCustomField2->getValue())->equals('25');
   }
 
   public function testItUpdateMultipleSubscriberCustomFields(): void {
@@ -170,7 +170,7 @@ class ImportExportRepositoryTest extends \MailPoetTest {
       $updatedAt
     );
 
-    expect($count)->equals(2);
+    verify($count)->equals(2);
     $this->entityManager->clear();
     $this->subscribersRepository->findAll();
     $this->customFieldsRepository->findAll();
@@ -179,16 +179,16 @@ class ImportExportRepositoryTest extends \MailPoetTest {
     $this->assertInstanceOf(SubscriberCustomFieldEntity::class, $subscriberCustomField1);
     $resultSubscriber1 = $subscriberCustomField1->getSubscriber();
     $this->assertInstanceOf(SubscriberEntity::class, $resultSubscriber1);
-    expect($resultSubscriber1->getId())->equals($subscriber1->getId());
-    expect($subscriberCustomField1->getCustomField())->equals($customField);
-    expect($subscriberCustomField1->getValue())->equals('20');
+    verify($resultSubscriber1->getId())->equals($subscriber1->getId());
+    verify($subscriberCustomField1->getCustomField())->equals($customField);
+    verify($subscriberCustomField1->getValue())->equals('20');
     $subscriberCustomField2 = $subscriberCustomFields[1];
     $this->assertInstanceOf(SubscriberCustomFieldEntity::class, $subscriberCustomField2);
     $resultSubscriber2 = $subscriberCustomField2->getSubscriber();
     $this->assertInstanceOf(SubscriberEntity::class, $resultSubscriber2);
-    expect($resultSubscriber2->getId())->equals($subscriber2->getId());
-    expect($subscriberCustomField2->getCustomField())->equals($customField);
-    expect($subscriberCustomField2->getValue())->equals('25');
+    verify($resultSubscriber2->getId())->equals($subscriber2->getId());
+    verify($subscriberCustomField2->getCustomField())->equals($customField);
+    verify($subscriberCustomField2->getValue())->equals('25');
   }
 
   public function testItGetSubscribersByDefaultSegment(): void {
@@ -210,18 +210,18 @@ class ImportExportRepositoryTest extends \MailPoetTest {
 
     $exported = $this->repository->getSubscribersBatchBySegment($segment1, 100);
     expect($exported)->count(2);
-    expect($exported[0]['first_name'])->equals('One');
-    expect($exported[0]['last_name'])->equals('User');
-    expect($exported[0]['email'])->equals('user1@export-test.com');
-    expect($exported[0]['segment_name'])->equals('First');
-    expect($exported[0]['confirmed_at'])->equals($confirmedAt);
-    expect($exported[0]['created_at'])->equals($user1->getCreatedAt());
-    expect($exported[0]['confirmed_ip'])->equals($confirmedIp);
-    expect($exported[0]['subscribed_ip'])->equals($subscribedIp);
-    expect($exported[1]['first_name'])->equals('Two');
-    expect($exported[1]['last_name'])->equals('User');
-    expect($exported[1]['email'])->equals('user2@export-test.com');
-    expect($exported[1]['segment_name'])->equals('First');
+    verify($exported[0]['first_name'])->equals('One');
+    verify($exported[0]['last_name'])->equals('User');
+    verify($exported[0]['email'])->equals('user1@export-test.com');
+    verify($exported[0]['segment_name'])->equals('First');
+    verify($exported[0]['confirmed_at'])->equals($confirmedAt);
+    verify($exported[0]['created_at'])->equals($user1->getCreatedAt());
+    verify($exported[0]['confirmed_ip'])->equals($confirmedIp);
+    verify($exported[0]['subscribed_ip'])->equals($subscribedIp);
+    verify($exported[1]['first_name'])->equals('Two');
+    verify($exported[1]['last_name'])->equals('User');
+    verify($exported[1]['email'])->equals('user2@export-test.com');
+    verify($exported[1]['segment_name'])->equals('First');
   }
 
   public function testItGetOnlyNodDeletedSubscribersByDefaultSegment(): void {
@@ -238,10 +238,10 @@ class ImportExportRepositoryTest extends \MailPoetTest {
 
     $exported = $this->repository->getSubscribersBatchBySegment($segment1, 100);
     expect($exported)->count(1);
-    expect($exported[0]['first_name'])->equals('One');
-    expect($exported[0]['last_name'])->equals('User');
-    expect($exported[0]['email'])->equals('user1@export-test.com');
-    expect($exported[0]['segment_name'])->equals('First');
+    verify($exported[0]['first_name'])->equals('One');
+    verify($exported[0]['last_name'])->equals('User');
+    verify($exported[0]['email'])->equals('user1@export-test.com');
+    verify($exported[0]['segment_name'])->equals('First');
   }
 
   public function testItGetSubscribersWithoutSegment(): void {
@@ -268,18 +268,18 @@ class ImportExportRepositoryTest extends \MailPoetTest {
 
     $exported = $this->repository->getSubscribersBatchBySegment(null, 100);
     expect($exported)->count(3);
-    expect($exported[0]['first_name'])->equals('Two');
-    expect($exported[0]['last_name'])->equals('User');
-    expect($exported[0]['email'])->equals('user2@export-test.com');
-    expect($exported[0]['segment_name'])->equals('Not In Segment');
-    expect($exported[1]['first_name'])->equals('Four');
-    expect($exported[1]['last_name'])->equals('User');
-    expect($exported[1]['email'])->equals('user4@export-test.com');
-    expect($exported[1]['segment_name'])->equals('Not In Segment');
-    expect($exported[2]['first_name'])->equals('Five');
-    expect($exported[2]['last_name'])->equals('User');
-    expect($exported[2]['email'])->equals('user5@export-test.com');
-    expect($exported[2]['segment_name'])->equals('Not In Segment');
+    verify($exported[0]['first_name'])->equals('Two');
+    verify($exported[0]['last_name'])->equals('User');
+    verify($exported[0]['email'])->equals('user2@export-test.com');
+    verify($exported[0]['segment_name'])->equals('Not In Segment');
+    verify($exported[1]['first_name'])->equals('Four');
+    verify($exported[1]['last_name'])->equals('User');
+    verify($exported[1]['email'])->equals('user4@export-test.com');
+    verify($exported[1]['segment_name'])->equals('Not In Segment');
+    verify($exported[2]['first_name'])->equals('Five');
+    verify($exported[2]['last_name'])->equals('User');
+    verify($exported[2]['email'])->equals('user5@export-test.com');
+    verify($exported[2]['segment_name'])->equals('Not In Segment');
   }
 
   public function testItGetSubscribersByDynamicSegment(): void {
@@ -304,10 +304,10 @@ class ImportExportRepositoryTest extends \MailPoetTest {
     $this->assertInstanceOf(SegmentEntity::class, $segment2);
     $exported = $this->repository->getSubscribersBatchBySegment($segment2, 100);
     expect($exported)->count(2);
-    expect($exported[0]['email'])->equals('user2@export-test.com');
-    expect($exported[0]['segment_name'])->equals('Dynamic Segment');
-    expect($exported[1]['email'])->equals('user3@export-test.com');
-    expect($exported[1]['segment_name'])->equals('Dynamic Segment');
+    verify($exported[0]['email'])->equals('user2@export-test.com');
+    verify($exported[0]['segment_name'])->equals('Dynamic Segment');
+    verify($exported[1]['email'])->equals('user3@export-test.com');
+    verify($exported[1]['segment_name'])->equals('Dynamic Segment');
   }
 
   /**
@@ -353,8 +353,8 @@ class ImportExportRepositoryTest extends \MailPoetTest {
       $exported = $this->repository->getSubscribersBatchBySegment($segment2, 1, $offset);
       $offset += count($exported);
       expect($exported)->count(1);
-      expect($exported[0]['email'])->equals("user{$i}@export-test.com");
-      expect($exported[0]['segment_name'])->equals('Two');
+      verify($exported[0]['email'])->equals("user{$i}@export-test.com");
+      verify($exported[0]['segment_name'])->equals('Two');
     }
   }
 
diff --git a/mailpoet/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewsletterClicksExporterTest.php b/mailpoet/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewsletterClicksExporterTest.php
index 54a3cf9999..47186635aa 100644
--- a/mailpoet/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewsletterClicksExporterTest.php
+++ b/mailpoet/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewsletterClicksExporterTest.php
@@ -25,9 +25,9 @@ class NewsletterClicksExporterTest extends \MailPoetTest {
     $result = $this->exporter->export('email.that@doesnt.exists');
     expect($result)->array();
     expect($result)->hasKey('data');
-    expect($result['data'])->equals([]);
+    verify($result['data'])->equals([]);
     expect($result)->hasKey('done');
-    expect($result['done'])->equals(true);
+    verify($result['done'])->equals(true);
   }
 
   public function testExportWorksForSubscriberWithNoNewsletters() {
@@ -39,9 +39,9 @@ class NewsletterClicksExporterTest extends \MailPoetTest {
     $result = $this->exporter->export('email.that@has.no.newsletters');
     expect($result)->array();
     expect($result)->hasKey('data');
-    expect($result['data'])->equals([]);
+    verify($result['data'])->equals([]);
     expect($result)->hasKey('done');
-    expect($result['done'])->equals(true);
+    verify($result['done'])->equals(true);
   }
 
   public function testExportReturnsData() {
@@ -52,7 +52,7 @@ class NewsletterClicksExporterTest extends \MailPoetTest {
     $result = $this->exporter->export($userEmail);
     expect($result['data'])->array();
     expect($result['data'])->count(1);
-    expect($result['done'])->equals(true);
+    verify($result['done'])->equals(true);
     expect($result['data'][0])->hasKey('group_id');
     expect($result['data'][0])->hasKey('group_label');
     expect($result['data'][0])->hasKey('item_id');
diff --git a/mailpoet/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporterTest.php b/mailpoet/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporterTest.php
index 0c73c54b04..d7b91d8fd1 100644
--- a/mailpoet/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporterTest.php
+++ b/mailpoet/tests/integration/Subscribers/ImportExport/PersonalDataExporters/NewslettersExporterTest.php
@@ -39,9 +39,9 @@ class NewslettersExporterTest extends \MailPoetTest {
     $result = $this->exporter->export('email.that@doesnt.exists');
     expect($result)->array();
     expect($result)->hasKey('data');
-    expect($result['data'])->equals([]);
+    verify($result['data'])->equals([]);
     expect($result)->hasKey('done');
-    expect($result['done'])->equals(true);
+    verify($result['done'])->equals(true);
   }
 
   public function testExportWorksForSubscriberWithNoNewsletters() {
@@ -49,9 +49,9 @@ class NewslettersExporterTest extends \MailPoetTest {
     $result = $this->exporter->export('email.that@has.no.newsletters');
     expect($result)->array();
     expect($result)->hasKey('data');
-    expect($result['data'])->equals([]);
+    verify($result['data'])->equals([]);
     expect($result)->hasKey('done');
-    expect($result['done'])->equals(true);
+    verify($result['done'])->equals(true);
   }
 
   public function testExportReturnsRenderedSubjects() {
@@ -86,7 +86,7 @@ class NewslettersExporterTest extends \MailPoetTest {
     $result = $this->exporter->export('user@with.newsletters');
     expect($result['data'])->array();
     expect($result['data'])->count(1);
-    expect($result['done'])->equals(true);
+    verify($result['done'])->equals(true);
     expect($result['data'][0])->hasKey('group_id');
     expect($result['data'][0])->hasKey('group_label');
     expect($result['data'][0])->hasKey('item_id');
@@ -124,7 +124,7 @@ class NewslettersExporterTest extends \MailPoetTest {
     $this->entityManager->flush();
 
     $result = $this->exporter->export('user1@with.newsletters');
-    expect($result['data'][0]['data'][3]['name'])->equals('Email preview');
+    verify($result['data'][0]['data'][3]['name'])->equals('Email preview');
     expect($result['data'][0]['data'][3]['value'])->stringContainsString('mailpoet_router&endpoint=view_in_browser&action=view&data=');
   }
 
@@ -202,7 +202,7 @@ class NewslettersExporterTest extends \MailPoetTest {
     (new StatisticsOpensFactory($newsletter1Entity, $subscriber2Entity))->create();
 
     $result = $this->exporter->export('user21@with.newsletters');
-    expect(count($result['data']))->equals(2);
+    verify(count($result['data']))->equals(2);
     expect($result['data'][0]['data'])->contains(['name' => 'Opened', 'value' => 'Yes']);
     expect($result['data'][0]['data'])->contains(['name' => 'Opened at', 'value' => '2017-01-02 12:23:45']);
     expect($result['data'][1]['data'])->contains(['name' => 'Opened', 'value' => 'No']);
diff --git a/mailpoet/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporterTest.php b/mailpoet/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporterTest.php
index da97e275a1..5a679a042f 100644
--- a/mailpoet/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporterTest.php
+++ b/mailpoet/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SegmentsExporterTest.php
@@ -25,9 +25,9 @@ class SegmentsExporterTest extends \MailPoetTest {
     $result = $this->exporter->export('email.that@doesnt.exists');
     expect($result)->array();
     expect($result)->hasKey('data');
-    expect($result['data'])->equals([]);
+    verify($result['data'])->equals([]);
     expect($result)->hasKey('done');
-    expect($result['done'])->equals(true);
+    verify($result['done'])->equals(true);
   }
 
   public function testExportWorksForSubscriberWithNoSegments() {
@@ -35,9 +35,9 @@ class SegmentsExporterTest extends \MailPoetTest {
     $result = $this->exporter->export('email.that@has.no.segments');
     expect($result)->array();
     expect($result)->hasKey('data');
-    expect($result['data'])->equals([]);
+    verify($result['data'])->equals([]);
     expect($result)->hasKey('done');
-    expect($result['done'])->equals(true);
+    verify($result['done'])->equals(true);
   }
 
   public function testExportWorksForSubscriberWithSegments() {
@@ -93,7 +93,7 @@ class SegmentsExporterTest extends \MailPoetTest {
     ];
     expect($result['data'])->array();
     expect($result['data'])->count(2);
-    expect($result['done'])->equals(true);
+    verify($result['done'])->equals(true);
     expect($result['data'][0])->hasKey('group_id');
     expect($result['data'][0])->hasKey('group_label');
     expect($result['data'][0])->hasKey('item_id');
@@ -102,6 +102,6 @@ class SegmentsExporterTest extends \MailPoetTest {
     expect($result['data'][1])->hasKey('group_label');
     expect($result['data'][1])->hasKey('item_id');
     expect($result['data'][1])->hasKey('data');
-    expect($result['data'])->equals($expected);
+    verify($result['data'])->equals($expected);
   }
 }
diff --git a/mailpoet/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SubscriberExporterTest.php b/mailpoet/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SubscriberExporterTest.php
index 8a4d824bc1..fdac356d05 100644
--- a/mailpoet/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SubscriberExporterTest.php
+++ b/mailpoet/tests/integration/Subscribers/ImportExport/PersonalDataExporters/SubscriberExporterTest.php
@@ -32,9 +32,9 @@ class SubscriberExporterTest extends \MailPoetTest {
     $result = $this->exporter->export('email.that@doesnt.exists');
     expect($result)->array();
     expect($result)->hasKey('data');
-    expect($result['data'])->equals([]);
+    verify($result['data'])->equals([]);
     expect($result)->hasKey('done');
-    expect($result['done'])->equals(true);
+    verify($result['done'])->equals(true);
   }
 
   public function testExportSubscriberWithoutCustomFields() {
@@ -53,7 +53,7 @@ class SubscriberExporterTest extends \MailPoetTest {
     expect($result)->hasKey('done');
     expect($result['data'])->array();
     expect($result['data'])->count(1);
-    expect($result['done'])->equals(true);
+    verify($result['done'])->equals(true);
     expect($result['data'][0])->hasKey('group_id');
     expect($result['data'][0])->hasKey('group_label');
     expect($result['data'][0])->hasKey('item_id');
@@ -66,7 +66,7 @@ class SubscriberExporterTest extends \MailPoetTest {
       ['name' => 'Created at', 'value' => '2018-05-03 10:30:08'],
       ['name' => "Subscriber's subscription source", 'value' => 'Unknown'],
     ];
-    expect($result['data'][0]['data'])->equals($expected);
+    verify($result['data'][0]['data'])->equals($expected);
   }
 
   public function testExportSubscriberWithSource() {
diff --git a/mailpoet/tests/integration/Subscribers/InactiveSubscribersControllerTest.php b/mailpoet/tests/integration/Subscribers/InactiveSubscribersControllerTest.php
index d53033f35c..ec84107bf4 100644
--- a/mailpoet/tests/integration/Subscribers/InactiveSubscribersControllerTest.php
+++ b/mailpoet/tests/integration/Subscribers/InactiveSubscribersControllerTest.php
@@ -51,14 +51,14 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
     $this->createCompletedSendingTasksForSubscriber($subscriber2, self::UNOPENED_EMAILS_THRESHOLD - 1, 3);
 
     $result = $this->controller->markInactiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, self::PROCESS_BATCH_SIZE);
-    expect($result)->equals(1);
+    verify($result)->equals(1);
     $this->entityManager->clear();
     $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId());
     $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber1);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber2);
-    expect($subscriber1->getStatus())->equals(SubscriberEntity::STATUS_INACTIVE);
-    expect($subscriber2->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber1->getStatus())->equals(SubscriberEntity::STATUS_INACTIVE);
+    verify($subscriber2->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
   }
 
   public function testItDeactivatesLimitedAmountOfSubscribers(): void {
@@ -70,7 +70,7 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
 
     $result = $this->controller->markInactiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, $batchSize, $subscriber1->getId());
     $this->entityManager->clear();
-    expect($result)->equals(1);
+    verify($result)->equals(1);
     $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId());
     $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber1);
@@ -80,13 +80,13 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
 
     $result = $this->controller->markInactiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, $batchSize, $subscriber2->getId(), self::UNOPENED_EMAILS_THRESHOLD);
     $this->entityManager->clear();
-    expect($result)->equals(1);
+    verify($result)->equals(1);
     $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId());
     $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber1);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber2);
-    expect($subscriber1->getStatus())->equals(SubscriberEntity::STATUS_INACTIVE);
-    expect($subscriber2->getStatus())->equals(SubscriberEntity::STATUS_INACTIVE);
+    verify($subscriber1->getStatus())->equals(SubscriberEntity::STATUS_INACTIVE);
+    verify($subscriber2->getStatus())->equals(SubscriberEntity::STATUS_INACTIVE);
   }
 
   public function testItDoesNotDeactivateNewSubscriberWithUnopenedEmail(): void {
@@ -94,10 +94,10 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
     $this->createCompletedSendingTasksForSubscriber($subscriber, self::UNOPENED_EMAILS_THRESHOLD, 3);
 
     $result = $this->controller->markInactiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, self::PROCESS_BATCH_SIZE);
-    expect($result)->equals(0);
+    verify($result)->equals(0);
     $subscriber = $this->subscribersRepository->findOneById($subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
   }
 
   public function testItDoesNotDeactivateNewlyResubscribedSubscriberWithUnopenedEmail(): void {
@@ -108,20 +108,20 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
     $this->createCompletedSendingTasksForSubscriber($subscriber, self::UNOPENED_EMAILS_THRESHOLD, 3);
 
     $result = $this->controller->markInactiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, self::PROCESS_BATCH_SIZE);
-    expect($result)->equals(0);
+    verify($result)->equals(0);
     $subscriber = $this->subscribersRepository->findOneById($subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
   }
 
   public function testItDoesNotDeactivateSubscriberWithoutSentEmail(): void {
     $this->createCompletedSendingTask(3);
     $subscriber = $this->createSubscriber('s1@email.com', 10);
     $result = $this->controller->markInactiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, self::PROCESS_BATCH_SIZE);
-    expect($result)->equals(0);
+    verify($result)->equals(0);
     $subscriber = $this->subscribersRepository->findOneById($subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
   }
 
   public function testItDoesNotDeactivateSubscriberWhoRecentlyOpenedEmail(): void {
@@ -131,20 +131,20 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
     $this->addEmailOpenedRecord($subscriber, $queue, 2);
     $this->createCompletedSendingTasksForSubscriber($subscriber, self::UNOPENED_EMAILS_THRESHOLD, 3);
     $result = $this->controller->markInactiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, self::PROCESS_BATCH_SIZE);
-    expect($result)->equals(0);
+    verify($result)->equals(0);
     $subscriber = $this->subscribersRepository->findOneById($subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
   }
 
   public function testItDoesNotDeactivateSubscriberWhoReceivedEmailRecently(): void {
     $subscriber = $this->createSubscriber('s1@email.com', 10);
     $this->createCompletedSendingTasksForSubscriber($subscriber, self::UNOPENED_EMAILS_THRESHOLD, 0);
     $result = $this->controller->markInactiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, self::PROCESS_BATCH_SIZE);
-    expect($result)->equals(0);
+    verify($result)->equals(0);
     $subscriber = $this->subscribersRepository->findOneById($subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
   }
 
   public function testItDoesNotDeactivateSubscriberWithLessEmailsCountThanThreshold(): void {
@@ -152,12 +152,12 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
     $this->createCompletedSendingTasksForSubscriber($subscriber1, self::UNOPENED_EMAILS_THRESHOLD, 3);
 
     $result = $this->controller->markInactiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, self::PROCESS_BATCH_SIZE);
-    expect($result)->equals(0);
+    verify($result)->equals(0);
     $this->entityManager->clear();
 
     $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber1);
-    expect($subscriber1->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber1->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
   }
 
   public function testItActivatesSubscriberWhoRecentlyOpenedEmail(): void {
@@ -167,10 +167,10 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
     $this->addEmailOpenedRecord($subscriber, $queue, 2);
     $result = $this->controller->markActiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, self::PROCESS_BATCH_SIZE);
     $this->entityManager->clear();
-    expect($result)->equals(1);
+    verify($result)->equals(1);
     $subscriber = $this->subscribersRepository->findOneById($subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
   }
 
   public function testItActivatesLimitedNumberOfSubscribers(): void {
@@ -185,7 +185,7 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
 
     $result = $this->controller->markActiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, $batchSize);
     $this->entityManager->clear();
-    expect($result)->equals(1);
+    verify($result)->equals(1);
     $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId());
     $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber1);
@@ -195,13 +195,13 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
 
     $result = $this->controller->markActiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, $batchSize);
     $this->entityManager->clear();
-    expect($result)->equals(1);
+    verify($result)->equals(1);
     $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId());
     $subscriber2 = $this->subscribersRepository->findOneById($subscriber2->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber1);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber2);
-    expect($subscriber1->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
-    expect($subscriber2->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber1->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber2->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
   }
 
   public function testItDoesNotActivateOldSubscribersWithUnopenedEmail(): void {
@@ -210,10 +210,10 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
     $this->addSubscriberToTask($subscriber, $task);
     $result = $this->controller->markActiveSubscribers(self::INACTIVITY_DAYS_THRESHOLD, self::PROCESS_BATCH_SIZE);
     $this->entityManager->clear();
-    expect($result)->equals(0);
+    verify($result)->equals(0);
     $subscriber = $this->subscribersRepository->findOneById($subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_INACTIVE);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_INACTIVE);
   }
 
   public function testItDoesReactivateInactiveSubscribers(): void {
@@ -224,7 +224,7 @@ class InactiveSubscribersControllerTest extends \MailPoetTest {
     $this->entityManager->clear();
     $subscriber = $this->subscribersRepository->findOneById($subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
   }
 
   private function createSubscriber(
diff --git a/mailpoet/tests/integration/Subscribers/LinkTokensTest.php b/mailpoet/tests/integration/Subscribers/LinkTokensTest.php
index 9fe6502298..278f998c77 100644
--- a/mailpoet/tests/integration/Subscribers/LinkTokensTest.php
+++ b/mailpoet/tests/integration/Subscribers/LinkTokensTest.php
@@ -23,16 +23,16 @@ class LinkTokensTest extends \MailPoetTest {
     $subscriber2 = $this->createSubscriber('demo2@fake.loc');
     $token1 = $this->linkTokens->getToken($subscriber1);
     $token2 = $this->linkTokens->getToken($subscriber2);
-    expect(strlen($token1))->equals(6);
-    expect(strlen($token2))->equals(6);
-    expect($token1 != $token2)->equals(true);
+    verify(strlen($token1))->equals(6);
+    verify(strlen($token2))->equals(6);
+    verify($token1 != $token2)->equals(true);
   }
 
   public function testItGetsSubscriberToken() {
     $subscriber1 = $this->createSubscriber('demo1@fake.loc', 'already-existing-token');
     $subscriber2 = $this->createSubscriber('demo2@fake.loc');
-    expect($this->linkTokens->getToken($subscriber1))->equals('already-existing-token');
-    expect(strlen($this->linkTokens->getToken($subscriber2)))->equals(6);
+    verify($this->linkTokens->getToken($subscriber1))->equals('already-existing-token');
+    verify(strlen($this->linkTokens->getToken($subscriber2)))->equals(6);
   }
 
   public function testItVerifiesSubscriberToken() {
diff --git a/mailpoet/tests/integration/Subscribers/NewSubscriberNotificationMailerTest.php b/mailpoet/tests/integration/Subscribers/NewSubscriberNotificationMailerTest.php
index d4481f4975..b279283429 100644
--- a/mailpoet/tests/integration/Subscribers/NewSubscriberNotificationMailerTest.php
+++ b/mailpoet/tests/integration/Subscribers/NewSubscriberNotificationMailerTest.php
@@ -75,17 +75,17 @@ class NewSubscriberNotificationMailerTest extends \MailPoetTest {
     $mailer = Stub::makeEmpty(Mailer::class, [
       'send' =>
         Expected::once(function($newsletter, $subscriber, $extraParams) {
-          expect($subscriber)->equals('a@b.c');
+          verify($subscriber)->equals('a@b.c');
           expect($newsletter)->hasKey('subject');
           expect($newsletter)->hasKey('body');
           expect($newsletter)->count(2);
-          expect($newsletter['subject'])->equals('New subscriber to List1, List2');
+          verify($newsletter['subject'])->equals('New subscriber to List1, List2');
           expect($newsletter['body'])->hasKey('html');
           expect($newsletter['body'])->hasKey('text');
           expect($newsletter['body'])->count(2);
           expect($newsletter['body']['text'])->stringContainsString('subscriber@example.com');
           expect($newsletter['body']['html'])->stringContainsString('subscriber@example.com');
-          expect($extraParams['meta'])->equals([
+          verify($extraParams['meta'])->equals([
             'email_type' => 'new_subscriber_notification',
             'subscriber_status' => 'unknown',
             'subscriber_source' => 'administrator',
@@ -105,7 +105,7 @@ class NewSubscriberNotificationMailerTest extends \MailPoetTest {
     $mailer = Stub::makeEmpty(Mailer::class, [
       'send' =>
         Expected::once(function($newsletter, $subscriber, $extraParams) {
-          expect($subscriber)->equals('a@b.c');
+          verify($subscriber)->equals('a@b.c');
           expect($newsletter)->hasKey('subject');
           expect($newsletter)->hasKey('body');
           expect($newsletter)->count(2);
@@ -115,7 +115,7 @@ class NewSubscriberNotificationMailerTest extends \MailPoetTest {
           expect($newsletter['body'])->count(2);
           expect($newsletter['body']['text'])->stringContainsString('subscriber@example.com');
           expect($newsletter['body']['html'])->stringContainsString('subscriber@example.com');
-          expect($extraParams['meta'])->equals([
+          verify($extraParams['meta'])->equals([
             'email_type' => 'new_subscriber_notification',
             'subscriber_status' => 'unknown',
             'subscriber_source' => 'administrator',
diff --git a/mailpoet/tests/integration/Subscribers/SubscriberActionsTest.php b/mailpoet/tests/integration/Subscribers/SubscriberActionsTest.php
index 9c65b2666e..4e304cb7d2 100644
--- a/mailpoet/tests/integration/Subscribers/SubscriberActionsTest.php
+++ b/mailpoet/tests/integration/Subscribers/SubscriberActionsTest.php
@@ -58,14 +58,14 @@ class SubscriberActionsTest extends \MailPoetTest {
       [$segment->getId(), $segment2->getId()]
     );
 
-    expect($subscriber->getId() > 0)->equals(true);
-    expect($subscriber->getSegments()->count())->equals(2);
-    expect($subscriber->getEmail())->equals($this->testData['email']);
-    expect($subscriber->getFirstName())->equals($this->testData['first_name']);
-    expect($subscriber->getLastName())->equals($this->testData['last_name']);
+    verify($subscriber->getId() > 0)->equals(true);
+    verify($subscriber->getSegments()->count())->equals(2);
+    verify($subscriber->getEmail())->equals($this->testData['email']);
+    verify($subscriber->getFirstName())->equals($this->testData['first_name']);
+    verify($subscriber->getLastName())->equals($this->testData['last_name']);
     // signup confirmation is enabled by default
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED);
-    expect($subscriber->getDeletedAt())->equals(null);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED);
+    verify($subscriber->getDeletedAt())->equals(null);
   }
 
   public function testItSchedulesWelcomeNotificationUponSubscriptionWhenSubscriptionConfirmationIsDisabled() {
@@ -85,7 +85,7 @@ class SubscriberActionsTest extends \MailPoetTest {
 
     $this->settings->set('signup_confirmation.enabled', false);
     [$subscriber] = $this->subscriberActions->subscribe($this->testData, [$segment->getId()]);
-    expect($subscriber->getId() > 0)->equals(true);
+    verify($subscriber->getId() > 0)->equals(true);
     expect($subscriber->getSegments())->count(1);
 
     $scheduledNotification = $this->sendingQueuesRepository->findOneByNewsletterAndTaskStatus(
@@ -112,7 +112,7 @@ class SubscriberActionsTest extends \MailPoetTest {
 
     $this->settings->set('signup_confirmation.enabled', true);
     [$subscriber] = $this->subscriberActions->subscribe($this->testData, [$segment->getId()]);
-    expect($subscriber->getId() > 0)->equals(true);
+    verify($subscriber->getId() > 0)->equals(true);
     expect($subscriber->getSegments())->count(1);
     $scheduledNotification = $this->sendingQueuesRepository->findOneByNewsletterAndTaskStatus(
       $newsletter,
@@ -141,21 +141,21 @@ class SubscriberActionsTest extends \MailPoetTest {
       [$segment->getId()]
     );
 
-    expect($subscriber->getId() > 0)->equals(true);
+    verify($subscriber->getId() > 0)->equals(true);
     expect($subscriber->getId())->notEquals(1337);
     expect($subscriber->getSegments())->count(1);
-    expect($subscriber->getEmail())->equals('donald@mailpoet.com');
-    expect($subscriber->getFirstName())->equals('Donald');
-    expect($subscriber->getLastName())->equals('Trump');
+    verify($subscriber->getEmail())->equals('donald@mailpoet.com');
+    verify($subscriber->getFirstName())->equals('Donald');
+    verify($subscriber->getLastName())->equals('Trump');
 
     $createdAt = $subscriber->getCreatedAt();
     $this->assertInstanceOf(\DateTimeInterface::class, $createdAt);
     expect($subscriber->getWpUserId())->null();
-    expect($subscriber->getIsWoocommerceUser())->equals(0);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED);
+    verify($subscriber->getIsWoocommerceUser())->equals(0);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED);
     expect($createdAt->format('Y-m-d H:i:s'))->notEquals('1984-03-09 00:00:01');
     expect($subscriber->getUpdatedAt()->format('Y-m-d H:i:s'))->notEquals('1984-03-09 00:00:02');
-    expect($createdAt->getTimestamp())->equals($subscriber->getUpdatedAt()->getTimestamp(), 2);
+    verify($createdAt->getTimestamp())->equals($subscriber->getUpdatedAt()->getTimestamp(), 2);
     expect($subscriber->getDeletedAt())->null();
   }
 
@@ -177,11 +177,11 @@ class SubscriberActionsTest extends \MailPoetTest {
       [$segment->getId()]
     );
 
-    expect($subscriber->getId() > 0)->equals(true);
+    verify($subscriber->getId() > 0)->equals(true);
     expect($subscriber->getSegments())->count(1);
-    expect($subscriber->getEmail())->equals($data['email']);
-    expect($subscriber->getFirstName())->equals($data['first_name']);
-    expect($subscriber->getLastName())->equals($data['last_name']);
+    verify($subscriber->getEmail())->equals($data['email']);
+    verify($subscriber->getFirstName())->equals($data['first_name']);
+    verify($subscriber->getLastName())->equals($data['last_name']);
 
     $data2 = $data;
     $data2['first_name'] = 'Aaa';
@@ -192,11 +192,11 @@ class SubscriberActionsTest extends \MailPoetTest {
       [$segment->getId(), $segment2->getId()]
     );
 
-    expect($subscriber->getId() > 0)->equals(true);
+    verify($subscriber->getId() > 0)->equals(true);
     expect($subscriber->getSegments())->count(2);
-    expect($subscriber->getEmail())->equals($data2['email']);
-    expect($subscriber->getFirstName())->equals($data2['first_name']);
-    expect($subscriber->getLastName())->equals($data2['last_name']);
+    verify($subscriber->getEmail())->equals($data2['email']);
+    verify($subscriber->getFirstName())->equals($data2['first_name']);
+    verify($subscriber->getLastName())->equals($data2['last_name']);
 
     $this->settings->set('signup_confirmation.enabled', $originalSettingValue);
   }
@@ -222,15 +222,15 @@ class SubscriberActionsTest extends \MailPoetTest {
       [$segment->getId()]
     );
 
-    expect($subscriber->getId() > 0)->equals(true);
+    verify($subscriber->getId() > 0)->equals(true);
     expect($subscriber->getSegments())->count(1);
-    expect($subscriber->getEmail())->equals($data['email']);
-    expect($subscriber->getFirstName())->equals($data['first_name']);
-    expect($subscriber->getLastName())->equals($data['last_name']);
+    verify($subscriber->getEmail())->equals($data['email']);
+    verify($subscriber->getFirstName())->equals($data['first_name']);
+    verify($subscriber->getLastName())->equals($data['last_name']);
     codecept_debug($subscriber->getSubscriberCustomFields()->count());
     $subscriberCustomField = $subscriber->getSubscriberCustomField($customField);
     $this->assertInstanceOf(SubscriberCustomFieldEntity::class, $subscriberCustomField);
-    expect($subscriberCustomField->getValue())->equals($data['cf_' . $customField->getId()]);
+    verify($subscriberCustomField->getValue())->equals($data['cf_' . $customField->getId()]);
 
     expect($subscriber->getUnconfirmedData())->isEmpty();
 
@@ -244,18 +244,18 @@ class SubscriberActionsTest extends \MailPoetTest {
       [$segment->getId(), $segment2->getId()]
     );
 
-    expect($subscriber->getId() > 0)->equals(true);
+    verify($subscriber->getId() > 0)->equals(true);
     expect($subscriber->getSegments())->count(2);
     // fields should be left intact
-    expect($subscriber->getEmail())->equals($data['email']);
-    expect($subscriber->getFirstName())->equals($data['first_name']);
-    expect($subscriber->getLastName())->equals($data['last_name']);
+    verify($subscriber->getEmail())->equals($data['email']);
+    verify($subscriber->getFirstName())->equals($data['first_name']);
+    verify($subscriber->getLastName())->equals($data['last_name']);
     $subscriberCustomField = $subscriber->getSubscriberCustomField($customField);
     $this->assertInstanceOf(SubscriberCustomFieldEntity::class, $subscriberCustomField);
-    expect($subscriberCustomField->getValue())->equals($data['cf_' . $customField->getId()]);
+    verify($subscriberCustomField->getValue())->equals($data['cf_' . $customField->getId()]);
 
     expect($subscriber->getUnconfirmedData())->notEmpty();
-    expect($subscriber->getUnconfirmedData())->equals(json_encode($data2));
+    verify($subscriber->getUnconfirmedData())->equals(json_encode($data2));
 
     // Unconfirmed data should be wiped after any direct update
     // during confirmation, manual admin editing
diff --git a/mailpoet/tests/integration/Subscribers/SubscriberListingRepositoryTest.php b/mailpoet/tests/integration/Subscribers/SubscriberListingRepositoryTest.php
index b22b2b9085..085720420a 100644
--- a/mailpoet/tests/integration/Subscribers/SubscriberListingRepositoryTest.php
+++ b/mailpoet/tests/integration/Subscribers/SubscriberListingRepositoryTest.php
@@ -79,12 +79,12 @@ class SubscriberListingRepositoryTest extends \MailPoetTest {
 
     $filters = $this->repository->getFilters($this->getListingDefinition());
     expect($filters['segment'])->count(3);
-    expect($filters['segment'][0]['label'])->equals('All Lists');
-    expect($filters['segment'][1]['label'])->equals('Subscribers without a list (3)');
-    expect($filters['segment'][2]['label'])->equals('Segment 2 (2)');
+    verify($filters['segment'][0]['label'])->equals('All Lists');
+    verify($filters['segment'][1]['label'])->equals('Subscribers without a list (3)');
+    verify($filters['segment'][2]['label'])->equals('Segment 2 (2)');
     expect($filters['tag'])->count(2);
-    expect($filters['tag'][0]['label'])->equals('All Tags');
-    expect($filters['tag'][1]['label'])->equals('My Tag (1)');
+    verify($filters['tag'][0]['label'])->equals('All Tags');
+    verify($filters['tag'][1]['label'])->equals('My Tag (1)');
   }
 
   public function testItBuildsGroups() {
@@ -119,26 +119,26 @@ class SubscriberListingRepositoryTest extends \MailPoetTest {
     $this->entityManager->flush();
 
     $groups = $this->repository->getGroups($this->getListingDefinition());
-    expect($groups['0']['name'])->equals('all');
-    expect($groups['0']['count'])->equals(7); // bounced + inactive + unconfirmed + unsubscribed + regular + unsub from a list + without a list
+    verify($groups['0']['name'])->equals('all');
+    verify($groups['0']['count'])->equals(7); // bounced + inactive + unconfirmed + unsubscribed + regular + unsub from a list + without a list
 
-    expect($groups['1']['name'])->equals('subscribed');
-    expect($groups['1']['count'])->equals(3);// without a list + unsub form a list + regular
+    verify($groups['1']['name'])->equals('subscribed');
+    verify($groups['1']['count'])->equals(3);// without a list + unsub form a list + regular
 
-    expect($groups['2']['name'])->equals('unconfirmed');
-    expect($groups['2']['count'])->equals(1);
+    verify($groups['2']['name'])->equals('unconfirmed');
+    verify($groups['2']['count'])->equals(1);
 
-    expect($groups['3']['name'])->equals('unsubscribed');
-    expect($groups['3']['count'])->equals(1);
+    verify($groups['3']['name'])->equals('unsubscribed');
+    verify($groups['3']['count'])->equals(1);
 
-    expect($groups['4']['name'])->equals('inactive');
-    expect($groups['4']['count'])->equals(1);
+    verify($groups['4']['name'])->equals('inactive');
+    verify($groups['4']['count'])->equals(1);
 
-    expect($groups['5']['name'])->equals('bounced');
-    expect($groups['5']['count'])->equals(1);
+    verify($groups['5']['name'])->equals('bounced');
+    verify($groups['5']['count'])->equals(1);
 
-    expect($groups['6']['name'])->equals('trash');
-    expect($groups['6']['count'])->equals(1);
+    verify($groups['6']['name'])->equals('trash');
+    verify($groups['6']['count'])->equals(1);
   }
 
   public function testLoadAllSubscribers() {
@@ -168,7 +168,7 @@ class SubscriberListingRepositoryTest extends \MailPoetTest {
     $this->entityManager->flush();
 
     $data = $this->repository->getData($this->getListingDefinition());
-    expect(count($data))->equals(7);
+    verify(count($data))->equals(7);
   }
 
   public function testLoadSubscribersInDefaultSegment() {
@@ -188,9 +188,9 @@ class SubscriberListingRepositoryTest extends \MailPoetTest {
     $this->listingData['filter'] = ['segment' => $list->getId()];
     $this->listingData['sort_by'] = 'id';
     $data = $this->repository->getData($this->getListingDefinition());
-    expect(count($data))->equals(2);
-    expect($data[0]->getEmail())->equals($subscriberUnsubscribedFromAList->getEmail());
-    expect($data[1]->getEmail())->equals($regularSubscriber->getEmail());
+    verify(count($data))->equals(2);
+    verify($data[0]->getEmail())->equals($subscriberUnsubscribedFromAList->getEmail());
+    verify($data[1]->getEmail())->equals($regularSubscriber->getEmail());
     $this->listingData['sort_by'] = '';
   }
 
@@ -205,8 +205,8 @@ class SubscriberListingRepositoryTest extends \MailPoetTest {
 
     $this->listingData['filter'] = ['segment' => $list->getId()];
     $data = $this->repository->getData($this->getListingDefinition());
-    expect(count($data))->equals(1);
-    expect($data[0]->getEmail())->equals($wpUserEmail);
+    verify(count($data))->equals(1);
+    verify($data[0]->getEmail())->equals($wpUserEmail);
     $this->tester->deleteWordPressUser($wpUserEmail);
   }
 
@@ -228,10 +228,10 @@ class SubscriberListingRepositoryTest extends \MailPoetTest {
     $this->listingData['offset'] = 2;
     $this->listingData['sort_by'] = 'id';
     $data = $this->repository->getData($this->getListingDefinition());
-    expect(count($data))->equals(1);
-    expect($data[0]->getEmail())->equals($wpUserEmail3);
+    verify(count($data))->equals(1);
+    verify($data[0]->getEmail())->equals($wpUserEmail3);
     $count = $this->repository->getCount($this->getListingDefinition());
-    expect($count)->equals(3);
+    verify($count)->equals(3);
     $this->tester->deleteWordPressUser($wpUserEmail1);
     $this->tester->deleteWordPressUser($wpUserEmail2);
     $this->tester->deleteWordPressUser($wpUserEmail3);
@@ -252,10 +252,10 @@ class SubscriberListingRepositoryTest extends \MailPoetTest {
     $this->listingData['filter'] = ['segment' => $list->getId()];
     $this->listingData['search'] = 'user-role-test2';
     $data = $this->repository->getData($this->getListingDefinition());
-    expect(count($data))->equals(1);
-    expect($data[0]->getEmail())->equals($wpUserEmail2);
+    verify(count($data))->equals(1);
+    verify($data[0]->getEmail())->equals($wpUserEmail2);
     $count = $this->repository->getCount($this->getListingDefinition());
-    expect($count)->equals(1); // Count should be affected by search
+    verify($count)->equals(1); // Count should be affected by search
     $this->tester->deleteWordPressUser($wpUserEmail1);
     $this->tester->deleteWordPressUser($wpUserEmail2);
     $this->listingData['search'] = '';
@@ -285,9 +285,9 @@ class SubscriberListingRepositoryTest extends \MailPoetTest {
     $this->listingData['filter'] = ['segment' => SubscriberListingRepository::FILTER_WITHOUT_LIST];
     $this->listingData['sort_by'] = 'id';
     $data = $this->repository->getData($this->getListingDefinition());
-    expect(count($data))->equals(2);
-    expect($data[0]->getEmail())->equals($subscriberOnDeletedList->getEmail());
-    expect($data[1]->getEmail())->equals($subscriberWithoutList->getEmail());
+    verify(count($data))->equals(2);
+    verify($data[0]->getEmail())->equals($subscriberOnDeletedList->getEmail());
+    verify($data[1]->getEmail())->equals($subscriberWithoutList->getEmail());
     $this->listingData['sort_by'] = '';
   }
 
@@ -305,9 +305,9 @@ class SubscriberListingRepositoryTest extends \MailPoetTest {
     $this->listingData['filter'] = ['minUpdatedAt' => new Carbon('2022-10-11 12:00:00')];
     $this->listingData['sort_by'] = 'id';
     $data = $this->repository->getData($this->getListingDefinition());
-    expect(count($data))->equals(2);
-    expect($data[0]->getEmail())->equals($subscriber2->getEmail());
-    expect($data[1]->getEmail())->equals($subscriber3->getEmail());
+    verify(count($data))->equals(2);
+    verify($data[0]->getEmail())->equals($subscriber2->getEmail());
+    verify($data[1]->getEmail())->equals($subscriber3->getEmail());
   }
 
   public function testLoadSubscribersInDefaultSegmentConsideringSubscriberStatusPerSegmentAndNotGlobally() {
@@ -328,12 +328,12 @@ class SubscriberListingRepositoryTest extends \MailPoetTest {
     $this->listingData['sort_by'] = 'id';
     $this->listingData['group'] = SubscriberEntity::STATUS_SUBSCRIBED;
     $data = $this->repository->getData($this->getListingDefinition());
-    expect(count($data))->equals(1);
-    expect($data[0]->getEmail())->equals($regularSubscriber->getEmail());
+    verify(count($data))->equals(1);
+    verify($data[0]->getEmail())->equals($regularSubscriber->getEmail());
     $this->listingData['group'] = SubscriberEntity::STATUS_UNSUBSCRIBED;
     $data = $this->repository->getData($this->getListingDefinition());
-    expect(count($data))->equals(1);
-    expect($data[0]->getEmail())->equals($subscriberUnsubscribedFromAList->getEmail());
+    verify(count($data))->equals(1);
+    verify($data[0]->getEmail())->equals($subscriberUnsubscribedFromAList->getEmail());
     $this->listingData['sort_by'] = '';
     $this->listingData['group'] = '';
   }
diff --git a/mailpoet/tests/integration/Subscribers/SubscriberPersonalDataEraserTest.php b/mailpoet/tests/integration/Subscribers/SubscriberPersonalDataEraserTest.php
index 169dab1a1f..5b2f8002e3 100644
--- a/mailpoet/tests/integration/Subscribers/SubscriberPersonalDataEraserTest.php
+++ b/mailpoet/tests/integration/Subscribers/SubscriberPersonalDataEraserTest.php
@@ -30,9 +30,9 @@ class SubscriberPersonalDataEraserTest extends \MailPoetTest {
     $result = $this->eraser->erase('email.that@doesnt.exists');
     expect($result)->array();
     expect($result)->hasKey('items_removed');
-    expect($result['items_removed'])->equals(0);
+    verify($result['items_removed'])->equals(0);
     expect($result)->hasKey('done');
-    expect($result['done'])->equals(true);
+    verify($result['done'])->equals(true);
   }
 
   public function testItDeletesCustomFields() {
@@ -62,8 +62,8 @@ class SubscriberPersonalDataEraserTest extends \MailPoetTest {
     $subscriberCustomFieldRepository = $this->diContainer->get(SubscriberCustomFieldRepository::class);
     $subscriberCustomFields = $subscriberCustomFieldRepository->findBy(['subscriber' => $subscriber]);
     expect($subscriberCustomFields)->count(2);
-    expect($subscriberCustomFields[0]->getValue())->equals('');
-    expect($subscriberCustomFields[1]->getValue())->equals('');
+    verify($subscriberCustomFields[0]->getValue())->equals('');
+    verify($subscriberCustomFields[1]->getValue())->equals('');
   }
 
   public function testItDeletesSubscriberData() {
@@ -80,12 +80,12 @@ class SubscriberPersonalDataEraserTest extends \MailPoetTest {
     $this->eraser->erase('subscriber@for.anon.test');
     $subscriberAfter = $this->subscribersRepository->findOneById($subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriberAfter);
-    expect($subscriberAfter->getFirstName())->equals('Anonymous');
-    expect($subscriberAfter->getLastName())->equals('Anonymous');
-    expect($subscriberAfter->getStatus())->equals('unsubscribed');
-    expect($subscriberAfter->getSubscribedIp())->equals('0.0.0.0');
-    expect($subscriberAfter->getConfirmedIp())->equals('0.0.0.0');
-    expect($subscriberAfter->getUnconfirmedData())->equals('');
+    verify($subscriberAfter->getFirstName())->equals('Anonymous');
+    verify($subscriberAfter->getLastName())->equals('Anonymous');
+    verify($subscriberAfter->getStatus())->equals('unsubscribed');
+    verify($subscriberAfter->getSubscribedIp())->equals('0.0.0.0');
+    verify($subscriberAfter->getConfirmedIp())->equals('0.0.0.0');
+    verify($subscriberAfter->getUnconfirmedData())->equals('');
   }
 
   public function testItDeletesSubscriberEmailAddress() {
diff --git a/mailpoet/tests/integration/Subscribers/SubscriberSaveControllerTest.php b/mailpoet/tests/integration/Subscribers/SubscriberSaveControllerTest.php
index 1cf6478583..f5cf3b6d1f 100644
--- a/mailpoet/tests/integration/Subscribers/SubscriberSaveControllerTest.php
+++ b/mailpoet/tests/integration/Subscribers/SubscriberSaveControllerTest.php
@@ -51,15 +51,15 @@ class SubscriberSaveControllerTest extends \MailPoetTest {
     ];
 
     $subscriber = $this->saveController->save($data);
-    expect($subscriber->getEmail())->equals($data['email']);
-    expect($subscriber->getStatus())->equals($data['status']);
-    expect($subscriber->getFirstName())->equals($data['first_name']);
-    expect($subscriber->getLastName())->equals($data['last_name']);
-    expect($subscriber->getCreatedAt())->equals(Carbon::createFromFormat('Y-m-d H:i:s', $data['created_at']));
-    expect($subscriber->getConfirmedAt())->equals(Carbon::createFromFormat('Y-m-d H:i:s', $data['confirmed_at']));
-    expect($subscriber->getConfirmedIp())->equals($data['confirmed_ip']);
-    expect($subscriber->getSubscribedIp())->equals($data['subscribed_ip']);
-    expect($subscriber->getWpUserId())->equals($data['wp_user_id']);
+    verify($subscriber->getEmail())->equals($data['email']);
+    verify($subscriber->getStatus())->equals($data['status']);
+    verify($subscriber->getFirstName())->equals($data['first_name']);
+    verify($subscriber->getLastName())->equals($data['last_name']);
+    verify($subscriber->getCreatedAt())->equals(Carbon::createFromFormat('Y-m-d H:i:s', $data['created_at']));
+    verify($subscriber->getConfirmedAt())->equals(Carbon::createFromFormat('Y-m-d H:i:s', $data['confirmed_at']));
+    verify($subscriber->getConfirmedIp())->equals($data['confirmed_ip']);
+    verify($subscriber->getSubscribedIp())->equals($data['subscribed_ip']);
+    verify($subscriber->getWpUserId())->equals($data['wp_user_id']);
     expect($subscriber->getUnsubscribeToken())->notNull();
     expect($subscriber->getLinkToken())->notNull();
     expect($subscriber->getId())->notNull();
@@ -87,10 +87,10 @@ class SubscriberSaveControllerTest extends \MailPoetTest {
 
     $this->entityManager->clear();
     $subscriber = $this->saveController->save($data);
-    expect($subscriber->getEmail())->equals('second@test.com');
-    expect($subscriber->getStatus())->equals($data['status']);
-    expect($subscriber->getFirstName())->equals($data['first_name']);
-    expect($subscriber->getLastName())->equals($data['last_name']);
+    verify($subscriber->getEmail())->equals('second@test.com');
+    verify($subscriber->getStatus())->equals($data['status']);
+    verify($subscriber->getFirstName())->equals($data['first_name']);
+    verify($subscriber->getLastName())->equals($data['last_name']);
     expect($subscriber->getLastSubscribedAt())->notNull();
     expect($subscriber->getSegments())->count(1);
     expect($subscriber->getSubscriberSegments())->count(1);
@@ -99,7 +99,7 @@ class SubscriberSaveControllerTest extends \MailPoetTest {
     $tagNames = array_values(array_map(function (SubscriberTagEntity $subscriberTag): string {
       return ($tag = $subscriberTag->getTag()) ? $tag->getName() : '';
     }, $subscriber->getSubscriberTags()->toArray()));
-    expect($data['tags'])->equals($tagNames);
+    verify($data['tags'])->equals($tagNames);
 
     // Test updating tags
     $data['tags'] = [
@@ -111,7 +111,7 @@ class SubscriberSaveControllerTest extends \MailPoetTest {
     $tagNames = array_values(array_map(function (SubscriberTagEntity $subscriberTag): string {
       return ($tag = $subscriberTag->getTag()) ? $tag->getName() : '';
     }, $subscriber->getSubscriberTags()->toArray()));
-    expect($data['tags'])->equals($tagNames);
+    verify($data['tags'])->equals($tagNames);
   }
 
   public function testItThrowsExceptionWhenUpdatingSubscriberEmailIfNotUnique(): void {
diff --git a/mailpoet/tests/integration/Subscribers/SubscriberStatisticsRepositoryTest.php b/mailpoet/tests/integration/Subscribers/SubscriberStatisticsRepositoryTest.php
index 8fdd3df281..fba502e787 100644
--- a/mailpoet/tests/integration/Subscribers/SubscriberStatisticsRepositoryTest.php
+++ b/mailpoet/tests/integration/Subscribers/SubscriberStatisticsRepositoryTest.php
@@ -53,15 +53,15 @@ class SubscriberStatisticsRepositoryTest extends \MailPoetTest {
       ->create();
 
     $lifetimeCount = $this->repository->getStatisticsClickCount($subscriber, null);
-    expect($lifetimeCount)->equals(3);
+    verify($lifetimeCount)->equals(3);
 
     $yearCount = $this->repository->getStatisticsClickCount($subscriber, $yearAgo);
-    expect($yearCount)->equals(2);
+    verify($yearCount)->equals(2);
 
     $monthCount = $this->repository->getStatisticsClickCount($subscriber, $monthAgo);
-    expect($monthCount)->equals(1);
+    verify($monthCount)->equals(1);
 
-    expect($this->repository->getStatisticsClickCount($subscriber, Carbon::now()->subDays(27)))->equals(0);
+    verify($this->repository->getStatisticsClickCount($subscriber, Carbon::now()->subDays(27)))->equals(0);
   }
 
   public function testItFetchesOpenCount(): void {
@@ -71,10 +71,10 @@ class SubscriberStatisticsRepositoryTest extends \MailPoetTest {
     $open = (new StatisticsOpens($newsletter, $subscriber))->withCreatedAt($yearAgo)->create();
     $newsletterSendStat = (new StatisticsNewsletters($newsletter, $subscriber))->withSentAt($yearAgo)->create();
 
-    expect($this->repository->getStatisticsOpenCount($subscriber, null))->equals(1);
-    expect($this->repository->getStatisticsOpenCount($subscriber, $yearAgo))->equals(1);
-    expect($this->repository->getStatisticsOpenCount($subscriber, Carbon::now()->subMonth()))->equals(0);
-    expect($this->repository->getStatisticsMachineOpenCount($subscriber, null))->equals(0);
+    verify($this->repository->getStatisticsOpenCount($subscriber, null))->equals(1);
+    verify($this->repository->getStatisticsOpenCount($subscriber, $yearAgo))->equals(1);
+    verify($this->repository->getStatisticsOpenCount($subscriber, Carbon::now()->subMonth()))->equals(0);
+    verify($this->repository->getStatisticsMachineOpenCount($subscriber, null))->equals(0);
   }
 
   public function testItFetchesMachineOpenCount(): void {
@@ -84,10 +84,10 @@ class SubscriberStatisticsRepositoryTest extends \MailPoetTest {
     $open = (new StatisticsOpens($newsletter, $subscriber))->withMachineUserAgentType()->withCreatedAt($yearAgo)->create();
     $newsletterSendStat = (new StatisticsNewsletters($newsletter, $subscriber))->withSentAt($yearAgo)->create();
 
-    expect($this->repository->getStatisticsMachineOpenCount($subscriber, null))->equals(1);
-    expect($this->repository->getStatisticsMachineOpenCount($subscriber, $yearAgo))->equals(1);
-    expect($this->repository->getStatisticsMachineOpenCount($subscriber, Carbon::now()->subMonth()))->equals(0);
-    expect($this->repository->getStatisticsOpenCount($subscriber, null))->equals(0);
+    verify($this->repository->getStatisticsMachineOpenCount($subscriber, null))->equals(1);
+    verify($this->repository->getStatisticsMachineOpenCount($subscriber, $yearAgo))->equals(1);
+    verify($this->repository->getStatisticsMachineOpenCount($subscriber, Carbon::now()->subMonth()))->equals(0);
+    verify($this->repository->getStatisticsOpenCount($subscriber, null))->equals(0);
   }
 
   public function testItFetchesTotalSentCount(): void {
@@ -103,10 +103,10 @@ class SubscriberStatisticsRepositoryTest extends \MailPoetTest {
     $newsletterSendStat = (new StatisticsNewsletters($newsletter2, $subscriber))->withSentAt($yearAgo)->create();
     $newsletterSendStat = (new StatisticsNewsletters($newsletter3, $subscriber))->withSentAt($monthAgo)->create();
 
-    expect($this->repository->getTotalSentCount($subscriber, $twoYearsAgo))->equals(3);
-    expect($this->repository->getTotalSentCount($subscriber, $yearAgo))->equals(2);
-    expect($this->repository->getTotalSentCount($subscriber, $monthAgo))->equals(1);
-    expect($this->repository->getTotalSentCount($subscriber, Carbon::now()->subDays(27)))->equals(0);
+    verify($this->repository->getTotalSentCount($subscriber, $twoYearsAgo))->equals(3);
+    verify($this->repository->getTotalSentCount($subscriber, $yearAgo))->equals(2);
+    verify($this->repository->getTotalSentCount($subscriber, $monthAgo))->equals(1);
+    verify($this->repository->getTotalSentCount($subscriber, Carbon::now()->subDays(27)))->equals(0);
   }
 
   public function testItFetchesWooCommerceRevenueData(): void {
@@ -138,22 +138,22 @@ class SubscriberStatisticsRepositoryTest extends \MailPoetTest {
 
     $twoYearsAgoResult = $this->repository->getWooCommerceRevenue($subscriber, $twoYearsAgo);
     $this->assertInstanceOf(WooCommerceRevenue::class, $twoYearsAgoResult);
-    expect($twoYearsAgoResult->getOrdersCount())->equals(3);
-    expect($twoYearsAgoResult->getValue())->equals(60.00);
+    verify($twoYearsAgoResult->getOrdersCount())->equals(3);
+    verify($twoYearsAgoResult->getValue())->equals(60.00);
 
     $yearAgoResult = $this->repository->getWooCommerceRevenue($subscriber, $yearAgo);
     $this->assertInstanceOf(WooCommerceRevenue::class, $yearAgoResult);
-    expect($yearAgoResult->getOrdersCount())->equals(2);
-    expect($yearAgoResult->getValue())->equals(50.00);
+    verify($yearAgoResult->getOrdersCount())->equals(2);
+    verify($yearAgoResult->getValue())->equals(50.00);
 
     $monthAgoResult = $this->repository->getWooCommerceRevenue($subscriber, $monthAgo);
     $this->assertInstanceOf(WooCommerceRevenue::class, $monthAgoResult);
-    expect($monthAgoResult->getOrdersCount())->equals(1);
-    expect($monthAgoResult->getValue())->equals(30.00);
+    verify($monthAgoResult->getOrdersCount())->equals(1);
+    verify($monthAgoResult->getValue())->equals(30.00);
 
     $daysAgoResult = $this->repository->getWooCommerceRevenue($subscriber, Carbon::now()->subDays(27));
     $this->assertInstanceOf(WooCommerceRevenue::class, $daysAgoResult);
-    expect($daysAgoResult->getOrdersCount())->equals(0);
-    expect($daysAgoResult->getValue())->equals(0.00);
+    verify($daysAgoResult->getOrdersCount())->equals(0);
+    verify($daysAgoResult->getValue())->equals(0.00);
   }
 }
diff --git a/mailpoet/tests/integration/Subscribers/SubscriberSubscribeControllerTest.php b/mailpoet/tests/integration/Subscribers/SubscriberSubscribeControllerTest.php
index 58d3a33185..8fa65e7a25 100644
--- a/mailpoet/tests/integration/Subscribers/SubscriberSubscribeControllerTest.php
+++ b/mailpoet/tests/integration/Subscribers/SubscriberSubscribeControllerTest.php
@@ -67,7 +67,7 @@ class SubscriberSubscribeControllerTest extends \MailPoetTest {
     $subscriber = $this->subscribersRepository->findOneBy(['email' => $data[$this->obfuscatedEmail]]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
     expect($subscriber)->isInstanceOf(SubscriberEntity::class);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
   }
 
   public function testItCanSubscribeSubscriberWithConfirmation(): void {
@@ -85,7 +85,7 @@ class SubscriberSubscribeControllerTest extends \MailPoetTest {
     $subscriber = $this->subscribersRepository->findOneBy(['email' => $data[$this->obfuscatedEmail]]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
     expect($subscriber)->isInstanceOf(SubscriberEntity::class);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED);
   }
 
   public function testItReturnsInfoAboutErrorWhenConfirmationEmailFails(): void {
@@ -107,7 +107,7 @@ class SubscriberSubscribeControllerTest extends \MailPoetTest {
     $subscriber = $this->subscribersRepository->findOneBy(['email' => $data[$this->obfuscatedEmail]]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
     expect($result)->hasKey('error');
-    expect($result['error'])->equals('Confirmation email error');
+    verify($result['error'])->equals('Confirmation email error');
   }
 
   public function testItCanSubscribeSubscriberWithCustomField(): void {
@@ -127,15 +127,15 @@ class SubscriberSubscribeControllerTest extends \MailPoetTest {
     $subscriber = $this->subscribersRepository->findOneBy(['email' => $data[$this->obfuscatedEmail]]);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
     expect($subscriber)->isInstanceOf(SubscriberEntity::class);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
     $subscriberCustomFields = $this->subscriberCustomFieldRepository->findBy(['subscriber' => $subscriber]);
     expect($subscriberCustomFields)->count(1);
     $subscriberCustomField = reset($subscriberCustomFields);
     $this->assertInstanceOf(SubscriberCustomFieldEntity::class, $subscriberCustomField);
     expect($subscriberCustomField)->isInstanceOf(SubscriberCustomFieldEntity::class);
-    expect($subscriberCustomField->getSubscriber())->equals($subscriber);
-    expect($subscriberCustomField->getCustomField())->equals($customField);
-    expect($subscriberCustomField->getValue())->equals($data['cf_' . $customField->getId()]);
+    verify($subscriberCustomField->getSubscriber())->equals($subscriber);
+    verify($subscriberCustomField->getCustomField())->equals($customField);
+    verify($subscriberCustomField->getValue())->equals($data['cf_' . $customField->getId()]);
   }
 
   public function testItCanSubscribeSubscriberWithTags(): void {
diff --git a/mailpoet/tests/integration/Subscribers/SubscribersEmailCountsControllerTest.php b/mailpoet/tests/integration/Subscribers/SubscribersEmailCountsControllerTest.php
index 4c5cd624f4..853082d6ea 100644
--- a/mailpoet/tests/integration/Subscribers/SubscribersEmailCountsControllerTest.php
+++ b/mailpoet/tests/integration/Subscribers/SubscribersEmailCountsControllerTest.php
@@ -50,7 +50,7 @@ class SubscribersEmailCountsControllerTest extends \MailPoetTest {
     $this->createCompletedSendingTasksForSubscriber($subscriber2, 8, 3);
 
     [$count, $maxSubscriberId] = $this->controller->updateSubscribersEmailCounts(null, 3);
-    expect($count)->equals(3);
+    verify($count)->equals(3);
 
     $this->entityManager->clear();
     $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId());
@@ -60,9 +60,9 @@ class SubscribersEmailCountsControllerTest extends \MailPoetTest {
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber2);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber3);
 
-    expect($subscriber1->getEmailCount())->equals(80);
-    expect($subscriber2->getEmailCount())->equals(8);
-    expect($subscriber3->getEmailCount())->equals(0);
+    verify($subscriber1->getEmailCount())->equals(80);
+    verify($subscriber2->getEmailCount())->equals(8);
+    verify($subscriber3->getEmailCount())->equals(0);
   }
 
   public function testItIncrementsSubscribersEmailCountsWhenDateProvided(): void {
@@ -79,7 +79,7 @@ class SubscribersEmailCountsControllerTest extends \MailPoetTest {
     $dateFrom = $dateFromCarbon->subDays(7)->toDateTime();
 
     [$count, $maxSubscriberId] = $this->controller->updateSubscribersEmailCounts($dateFrom, 3);
-    expect($count)->equals(3);
+    verify($count)->equals(3);
 
     $this->entityManager->clear();
     $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId());
@@ -89,9 +89,9 @@ class SubscribersEmailCountsControllerTest extends \MailPoetTest {
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber2);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber3);
 
-    expect($subscriber1->getEmailCount())->equals(81);
-    expect($subscriber2->getEmailCount())->equals(9);
-    expect($subscriber3->getEmailCount())->equals(1);
+    verify($subscriber1->getEmailCount())->equals(81);
+    verify($subscriber2->getEmailCount())->equals(9);
+    verify($subscriber3->getEmailCount())->equals(1);
 
   }
 
@@ -117,9 +117,9 @@ class SubscribersEmailCountsControllerTest extends \MailPoetTest {
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber2);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber3);
 
-    expect($subscriber1->getEmailCount())->equals(80);
-    expect($subscriber2->getEmailCount())->equals(8);
-    expect($subscriber3->getEmailCount())->equals(1);
+    verify($subscriber1->getEmailCount())->equals(80);
+    verify($subscriber2->getEmailCount())->equals(8);
+    verify($subscriber3->getEmailCount())->equals(1);
   }
 
   public function testItUpdatesOnlySubscribersInBatch() {
@@ -133,7 +133,7 @@ class SubscribersEmailCountsControllerTest extends \MailPoetTest {
 
     // First batch of 1
     [$count, $maxSubscriberId] = $this->controller->updateSubscribersEmailCounts(null, 1);
-    expect($count)->equals(1);
+    verify($count)->equals(1);
     // Second batch of 1
     $this->controller->updateSubscribersEmailCounts(null, 1, $maxSubscriberId + 1);
 
@@ -145,16 +145,16 @@ class SubscribersEmailCountsControllerTest extends \MailPoetTest {
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber2);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber3);
 
-    expect($subscriber1->getEmailCount())->equals(80);
-    expect($subscriber2->getEmailCount())->equals(8);
+    verify($subscriber1->getEmailCount())->equals(80);
+    verify($subscriber2->getEmailCount())->equals(8);
     // Subscriber not in batch should not be updated
-    expect($subscriber3->getEmailCount())->equals(0);
+    verify($subscriber3->getEmailCount())->equals(0);
   }
 
   public function testItDoesNotCountIfThereAreNoSubscribersOrTasksToUpdate() {
     // Subscribers empty table
     [$count, $maxSubscriberId] = $this->controller->updateSubscribersEmailCounts(null, 1);
-    expect($count)->equals(0);
+    verify($count)->equals(0);
 
     $subscriber1 = $this->createSubscriber('s1@email.com', 100);
     $subscriber2 = $this->createSubscriber('s2@email.com', 20);
@@ -164,7 +164,7 @@ class SubscribersEmailCountsControllerTest extends \MailPoetTest {
     $dateFromCarbon = new Carbon();
     $dateFrom = $dateFromCarbon->subDays(7)->toDateTime();
     [$count, $maxSubscriberId] = $this->controller->updateSubscribersEmailCounts($dateFrom, 1);
-    expect($count)->equals(0);
+    verify($count)->equals(0);
 
     $this->createCompletedSendingTasksForSubscriber($subscriber1, 80, 90);
     $this->createCompletedSendingTasksForSubscriber($subscriber2, 8, 3);
@@ -172,7 +172,7 @@ class SubscribersEmailCountsControllerTest extends \MailPoetTest {
 
     // No subscribers to update from startId
     [$count, $maxSubscriberId] = $this->controller->updateSubscribersEmailCounts(null, 1, 4);
-    expect($count)->equals(0);
+    verify($count)->equals(0);
 
     $this->entityManager->clear();
     $subscriber1 = $this->subscribersRepository->findOneById($subscriber1->getId());
@@ -182,9 +182,9 @@ class SubscribersEmailCountsControllerTest extends \MailPoetTest {
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber2);
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber3);
 
-    expect($subscriber1->getEmailCount())->equals(0);
-    expect($subscriber2->getEmailCount())->equals(0);
-    expect($subscriber3->getEmailCount())->equals(0);
+    verify($subscriber1->getEmailCount())->equals(0);
+    verify($subscriber2->getEmailCount())->equals(0);
+    verify($subscriber3->getEmailCount())->equals(0);
   }
 
   private function createCompletedSendingTasksForSubscriber(SubscriberEntity $subscriber, int $numTasks = 1, int $processedDaysAgo = 0): void {
diff --git a/mailpoet/tests/integration/Subscribers/SubscribersRepositoryTest.php b/mailpoet/tests/integration/Subscribers/SubscribersRepositoryTest.php
index 63b485a040..459bb42a89 100644
--- a/mailpoet/tests/integration/Subscribers/SubscribersRepositoryTest.php
+++ b/mailpoet/tests/integration/Subscribers/SubscribersRepositoryTest.php
@@ -99,10 +99,10 @@ class SubscribersRepositoryTest extends \MailPoetTest {
     $this->repository->refresh($subscriberTwo);
     $this->repository->refresh($subscriberThree);
     $this->assertInstanceOf(DateTimeInterface::class, $subscriberOne->getLastSendingAt());
-    expect($subscriberOne->getLastSendingAt()->getTimestamp())->equals($now->getTimestamp());
+    verify($subscriberOne->getLastSendingAt()->getTimestamp())->equals($now->getTimestamp());
     expect($subscriberTwo->getLastSendingAt())->null();
     $this->assertInstanceOf(DateTimeInterface::class, $subscriberThree->getLastSendingAt());
-    expect($subscriberThree->getLastSendingAt()->getTimestamp())->equals($now->getTimestamp());
+    verify($subscriberThree->getLastSendingAt()->getTimestamp())->equals($now->getTimestamp());
   }
 
   public function testItBulkUpdatesEngagementScoreUpdatedAt(): void {
@@ -123,10 +123,10 @@ class SubscribersRepositoryTest extends \MailPoetTest {
     $this->repository->refresh($subscriberTwo);
     $this->repository->refresh($subscriberThree);
     $this->assertInstanceOf(DateTimeInterface::class, $subscriberOne->getEngagementScoreUpdatedAt());
-    expect($subscriberOne->getEngagementScoreUpdatedAt()->getTimestamp())->equals($now->getTimestamp());
+    verify($subscriberOne->getEngagementScoreUpdatedAt()->getTimestamp())->equals($now->getTimestamp());
     expect($subscriberTwo->getEngagementScoreUpdatedAt())->null();
     $this->assertInstanceOf(DateTimeInterface::class, $subscriberThree->getEngagementScoreUpdatedAt());
-    expect($subscriberThree->getEngagementScoreUpdatedAt()->getTimestamp())->equals($now->getTimestamp());
+    verify($subscriberThree->getEngagementScoreUpdatedAt()->getTimestamp())->equals($now->getTimestamp());
   }
 
   public function testBulkUpdatesOfEngagementScoreCanNullifyData(): void {
@@ -254,13 +254,13 @@ class SubscribersRepositoryTest extends \MailPoetTest {
     $unsubscribedSubscriber = $this->repository->findOneById($subscriberOneId);
     expect($unsubscribedSubscriber)->notNull();
     $this->assertInstanceOf(SubscriberEntity::class, $unsubscribedSubscriber);
-    expect($unsubscribedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
+    verify($unsubscribedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
 
     // subscriber still subscribed
     $subscribedSubscriber = $this->repository->findOneById($subscriberTwoId);
     expect($subscribedSubscriber)->notNull();
     $this->assertInstanceOf(SubscriberEntity::class, $subscribedSubscriber);
-    expect($subscribedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscribedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
   }
 
   public function testItBulkRemoveSubscriberFromAllSegments(): void {
@@ -372,7 +372,7 @@ class SubscribersRepositoryTest extends \MailPoetTest {
 
     $count = $this->repository->bulkDelete([$subscriber->getId()]);
 
-    expect($count)->equals(0);
+    verify($count)->equals(0);
     expect($this->repository->findOneById($subscriberId))->notNull();
   }
 
@@ -385,17 +385,17 @@ class SubscribersRepositoryTest extends \MailPoetTest {
 
     $count = $this->repository->bulkDelete([$subscriberId]);
 
-    expect($count)->equals(0);
+    verify($count)->equals(0);
     expect($this->repository->findOneById($subscriberId))->notNull();
   }
 
   public function testItGetsMaxSubscriberId(): void {
     // check if equals to zero when no subscribers
-    expect($this->repository->getMaxSubscriberId())->equals(0);
+    verify($this->repository->getMaxSubscriberId())->equals(0);
     // check if equals to max subscriber id
     $this->createSubscriber('sub1@test.com');
     $subscriberTwo = $this->createSubscriber('sub2@test.com');
-    expect($this->repository->getMaxSubscriberId())->equals($subscriberTwo->getId());
+    verify($this->repository->getMaxSubscriberId())->equals($subscriberTwo->getId());
   }
 
   private function createSubscriber(string $email, ?DateTimeImmutable $deletedAt = null): SubscriberEntity {
diff --git a/mailpoet/tests/integration/Subscription/Captcha/CaptchaRendererTest.php b/mailpoet/tests/integration/Subscription/Captcha/CaptchaRendererTest.php
index 55728919f2..28e24ee6b4 100644
--- a/mailpoet/tests/integration/Subscription/Captcha/CaptchaRendererTest.php
+++ b/mailpoet/tests/integration/Subscription/Captcha/CaptchaRendererTest.php
@@ -80,8 +80,8 @@ class CaptchaRendererTest extends \MailPoetTest {
     $secondAudio = $this->testee->renderAudio($sessionId, true);
     $secondCaptcha = $this->session->getCaptchaHash();
     unset($_SERVER['HTTP_RANGE']);
-    expect($fistAudio)->Equals($secondAudio);
-    expect($firstCaptcha['phrase'])->Equals($secondCaptcha['phrase']);
+    verify($fistAudio)->equals($secondAudio);
+    verify($firstCaptcha['phrase'])->equals($secondCaptcha['phrase']);
   }
 
   /**
@@ -95,12 +95,12 @@ class CaptchaRendererTest extends \MailPoetTest {
     $audioCaptcha = $this->session->getCaptchaHash();
     $this->testee->renderImage(null, null, $sessionId, true);
     $imageCaptcha = $this->session->getCaptchaHash();
-    expect($audioCaptcha['phrase'])->equals($imageCaptcha['phrase']);
+    verify($audioCaptcha['phrase'])->equals($imageCaptcha['phrase']);
 
     $this->testee->renderImage(null, null, $sessionId, true);
     $secondImageCaptcha = $this->session->getCaptchaHash();
     $this->testee->renderAudio($sessionId, true);
     $secondAudioCaptcha = $this->session->getCaptchaHash();
-    expect($secondAudioCaptcha['phrase'])->equals($secondImageCaptcha['phrase']);
+    verify($secondAudioCaptcha['phrase'])->equals($secondImageCaptcha['phrase']);
   }
 }
diff --git a/mailpoet/tests/integration/Subscription/Captcha/CaptchaSessionTest.php b/mailpoet/tests/integration/Subscription/Captcha/CaptchaSessionTest.php
index 582995352c..1b4455ea37 100644
--- a/mailpoet/tests/integration/Subscription/Captcha/CaptchaSessionTest.php
+++ b/mailpoet/tests/integration/Subscription/Captcha/CaptchaSessionTest.php
@@ -19,13 +19,13 @@ class CaptchaSessionTest extends \MailPoetTest {
   public function testItCanStoreAndRetrieveFormData() {
     $formData = ['email' => 'email@example.com'];
     $this->captchaSession->setFormData($formData);
-    expect($this->captchaSession->getFormData())->equals($formData);
+    verify($this->captchaSession->getFormData())->equals($formData);
   }
 
   public function testItCanStoreAndRetrieveCaptchaHash() {
     $hash = '1234';
     $this->captchaSession->setCaptchaHash($hash);
-    expect($this->captchaSession->getCaptchaHash())->equals($hash);
+    verify($this->captchaSession->getCaptchaHash())->equals($hash);
   }
 
   public function testItCanResetSessionData() {
@@ -39,10 +39,10 @@ class CaptchaSessionTest extends \MailPoetTest {
   public function testItAssociatesDataWithSession() {
     $hash = '1234';
     $this->captchaSession->setCaptchaHash($hash);
-    expect($this->captchaSession->getCaptchaHash())->equals($hash);
+    verify($this->captchaSession->getCaptchaHash())->equals($hash);
     $this->captchaSession->init();
     expect($this->captchaSession->getCaptchaHash())->false();
     $this->captchaSession->init(self::SESSION_ID);
-    expect($this->captchaSession->getCaptchaHash())->equals($hash);
+    verify($this->captchaSession->getCaptchaHash())->equals($hash);
   }
 }
diff --git a/mailpoet/tests/integration/Subscription/Captcha/Validator/BuiltInCaptchaValidatorTest.php b/mailpoet/tests/integration/Subscription/Captcha/Validator/BuiltInCaptchaValidatorTest.php
index c3bc156661..6090bd9492 100644
--- a/mailpoet/tests/integration/Subscription/Captcha/Validator/BuiltInCaptchaValidatorTest.php
+++ b/mailpoet/tests/integration/Subscription/Captcha/Validator/BuiltInCaptchaValidatorTest.php
@@ -70,12 +70,12 @@ class BuiltInCaptchaValidatorTest extends \MailPoetTest {
   public function testItRequiresCaptchaForFirstSubscription() {
     $email = 'non-existent-subscriber@example.com';
     $result = $this->testee->isRequired($email);
-    expect($result)->equals(true);
+    verify($result)->equals(true);
   }
 
   public function testItRequiresCaptchaForUnrepeatedIPAddress() {
     $result = $this->testee->isRequired();
-    expect($result)->equals(true);
+    verify($result)->equals(true);
   }
 
   public function testItTakesFilterIntoAccountToDisableCaptcha() {
@@ -87,10 +87,10 @@ class BuiltInCaptchaValidatorTest extends \MailPoetTest {
     $wp->addFilter('mailpoet_subscription_captcha_recipient_limit', $filter);
     $email = 'non-existent-subscriber@example.com';
     $result = $this->testee->isRequired($email);
-    expect($result)->equals(false);
+    verify($result)->equals(false);
 
     $result = $this->testee->isRequired();
-    expect($result)->equals(false);
+    verify($result)->equals(false);
 
     $subscriberFactory = new SubscriberFactory();
     $subscriber = $subscriberFactory
@@ -98,7 +98,7 @@ class BuiltInCaptchaValidatorTest extends \MailPoetTest {
       ->create();
 
     $result = $this->testee->isRequired($subscriber->getEmail());
-    expect($result)->equals(true);
+    verify($result)->equals(true);
 
     $ip = new SubscriberIPEntity('127.0.0.1');
     $ip->setCreatedAt(Carbon::now()->subMinutes(1));
@@ -106,7 +106,7 @@ class BuiltInCaptchaValidatorTest extends \MailPoetTest {
     $this->entityManager->flush();
     $email = 'non-existent-subscriber@example.com';
     $result = $this->testee->isRequired($email);
-    expect($result)->equals(true);
+    verify($result)->equals(true);
 
     unset($_SERVER['REMOTE_ADDR']);
     $wp->removeFilter('mailpoet_subscription_captcha_recipient_limit', $filter);
diff --git a/mailpoet/tests/integration/Subscription/FormTest.php b/mailpoet/tests/integration/Subscription/FormTest.php
index cb654ecc57..4babc80d0c 100644
--- a/mailpoet/tests/integration/Subscription/FormTest.php
+++ b/mailpoet/tests/integration/Subscription/FormTest.php
@@ -83,7 +83,7 @@ class FormTest extends \MailPoetTest {
     $formController = new Form(ContainerWrapper::getInstance()->get(API::class), $urlHelper);
     $result = $formController->onSubmit($this->requestData);
     expect($this->subscribersRepository->findOneBy(['email' => $this->testEmail]))->notEmpty();
-    expect($result['mailpoet_success'])->equals($this->form->getId());
+    verify($result['mailpoet_success'])->equals($this->form->getId());
     expect($result['mailpoet_error'])->null();
   }
 
@@ -121,7 +121,7 @@ class FormTest extends \MailPoetTest {
     $formController = new Form(ContainerWrapper::getInstance()->get(API::class), $urlHelper);
     $result = $formController->onSubmit($requestData);
     expect($this->subscribersRepository->findAll())->isEmpty();
-    expect($result['mailpoet_error'])->equals($this->form->getId());
+    verify($result['mailpoet_error'])->equals($this->form->getId());
     expect($result['mailpoet_success'])->null();
   }
 
@@ -139,7 +139,7 @@ class FormTest extends \MailPoetTest {
     ], $this);
     $formController = new Form($api, $urlHelper);
     $result = $formController->onSubmit($this->requestData);
-    expect($result)->equals($redirectUrl);
+    verify($result)->equals($redirectUrl);
   }
 
   public function _after() {
diff --git a/mailpoet/tests/integration/Subscription/ManageTest.php b/mailpoet/tests/integration/Subscription/ManageTest.php
index 1c6764325d..ac4750e055 100644
--- a/mailpoet/tests/integration/Subscription/ManageTest.php
+++ b/mailpoet/tests/integration/Subscription/ManageTest.php
@@ -77,8 +77,8 @@ class ManageTest extends \MailPoetTest {
     $subscriber = $this->subscribersRepository->findOneById($this->subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
     $subscriptions = $this->createSegmentsMap($subscriber);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
-    expect($subscriptions)->equals([
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriptions)->equals([
       ['segment_id' => $this->segmentA->getId(), 'status' => SubscriberEntity::STATUS_UNSUBSCRIBED],
       ['segment_id' => $this->segmentB->getId(), 'status' => SubscriberEntity::STATUS_SUBSCRIBED],
       ['segment_id' => $this->hiddenSegment->getId(), 'status' => SubscriberEntity::STATUS_SUBSCRIBED],
@@ -91,7 +91,7 @@ class ManageTest extends \MailPoetTest {
     $subscriber = $this->subscribersRepository->findOneById($this->subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
     $subscriptions = $this->createSegmentsMap($subscriber);
-    expect($subscriptions)->equals([
+    verify($subscriptions)->equals([
       ['segment_id' => $this->segmentA->getId(), 'status' => SubscriberEntity::STATUS_SUBSCRIBED],
       ['segment_id' => $this->segmentB->getId(), 'status' => SubscriberEntity::STATUS_UNSUBSCRIBED],
       ['segment_id' => $this->hiddenSegment->getId(), 'status' => SubscriberEntity::STATUS_SUBSCRIBED],
diff --git a/mailpoet/tests/integration/Subscription/PagesTest.php b/mailpoet/tests/integration/Subscription/PagesTest.php
index b034b2ccea..76142dfc64 100644
--- a/mailpoet/tests/integration/Subscription/PagesTest.php
+++ b/mailpoet/tests/integration/Subscription/PagesTest.php
@@ -98,7 +98,7 @@ class PagesTest extends \MailPoetTest {
 
     $confirmedSubscriber = $this->subscribersRepository->findOneById($this->subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $confirmedSubscriber);
-    expect($confirmedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($confirmedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
     $this->assertTrue(Carbon::parse($confirmedSubscriber->getLastSubscribedAt())->isToday());
   }
 
@@ -150,12 +150,12 @@ class PagesTest extends \MailPoetTest {
     $this->entityManager->clear();
     $confirmedSubscriber = $this->subscribersRepository->findOneById($subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $confirmedSubscriber);
-    expect($confirmedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($confirmedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
     expect($confirmedSubscriber->getConfirmedAt())->greaterOrEquals(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->subSecond());
     expect($confirmedSubscriber->getConfirmedAt())->lessOrEquals(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->addSecond());
     expect($confirmedSubscriber->getLastSubscribedAt())->greaterOrEquals(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->subSecond());
     expect($confirmedSubscriber->getLastSubscribedAt())->lessOrEquals(Carbon::createFromTimestamp($this->wp->currentTime('timestamp'))->addSecond());
-    expect($confirmedSubscriber->getFirstName())->equals('First name');
+    verify($confirmedSubscriber->getFirstName())->equals('First name');
   }
 
   public function testItSendsWelcomeNotificationUponConfirmingSubscription() {
@@ -188,12 +188,12 @@ class PagesTest extends \MailPoetTest {
     $newsletterEntity = $newslettersRepository->findOneById($newsletter->getId());
     $this->assertInstanceOf(NewsletterEntity::class, $newsletterEntity);
     $scheduledNotifications = $scheduledTasksRepository->findByNewsletterAndStatus($newsletterEntity, SendingQueueEntity::STATUS_SCHEDULED);
-    expect(count($scheduledNotifications))->equals(1);
+    verify(count($scheduledNotifications))->equals(1);
 
     // Does not schedule another on repeated confirmation
     $subscription->confirm();
     $scheduledNotifications = $scheduledTasksRepository->findByNewsletterAndStatus($newsletterEntity, SendingQueueEntity::STATUS_SCHEDULED);
-    expect(count($scheduledNotifications))->equals(1);
+    verify(count($scheduledNotifications))->equals(1);
   }
 
   public function testItUnsubscribes() {
@@ -205,7 +205,7 @@ class PagesTest extends \MailPoetTest {
 
     $updatedSubscriber = $this->subscribersRepository->findOneById($this->subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $updatedSubscriber);
-    expect($updatedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
+    verify($updatedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
 
     $subscriberSegments = $updatedSubscriber->getSubscriberSegments();
     foreach ($subscriberSegments as $subscriberSegment) {
@@ -254,10 +254,10 @@ class PagesTest extends \MailPoetTest {
     $updatedSubscriber = $this->subscribersRepository->findOneById($subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $updatedSubscriber);
 
-    expect($updatedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
+    verify($updatedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
     $unsubscriptionStat = $this->statisticsUnsubscribesRepository->findOneBy(['subscriber' => $updatedSubscriber->getId()]);
-    expect($unsubscriptionStat->getMethod())->equals( StatisticsUnsubscribeEntity::METHOD_LINK);
-    expect($unsubscriptionStat->getSource())->equals(StatisticsUnsubscribeEntity::SOURCE_NEWSLETTER);
+    verify($unsubscriptionStat->getMethod())->equals( StatisticsUnsubscribeEntity::METHOD_LINK);
+    verify($unsubscriptionStat->getSource())->equals(StatisticsUnsubscribeEntity::SOURCE_NEWSLETTER);
 
     $this->statisticsUnsubscribesRepository->remove($unsubscriptionStat);
     $this->statisticsUnsubscribesRepository->flush();
@@ -274,10 +274,10 @@ class PagesTest extends \MailPoetTest {
     $updatedSubscriber = $this->subscribersRepository->findOneById($subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $updatedSubscriber);
 
-    expect($updatedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
+    verify($updatedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
     $unsubscriptionStat = $this->statisticsUnsubscribesRepository->findOneBy(['subscriber' => $updatedSubscriber->getId()]);
-    expect($unsubscriptionStat->getMethod())->equals(StatisticsUnsubscribeEntity::METHOD_ONE_CLICK);
-    expect($unsubscriptionStat->getSource())->equals(StatisticsUnsubscribeEntity::SOURCE_NEWSLETTER);
+    verify($unsubscriptionStat->getMethod())->equals(StatisticsUnsubscribeEntity::METHOD_ONE_CLICK);
+    verify($unsubscriptionStat->getSource())->equals(StatisticsUnsubscribeEntity::SOURCE_NEWSLETTER);
 
   }
 
@@ -295,7 +295,7 @@ class PagesTest extends \MailPoetTest {
     $updatedSubscriber = $this->subscribersRepository->findOneById($this->subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $updatedSubscriber);
     $clickStat = $this->statisticsClicksRepository->getAllForSubscriber($this->subscriber)->getQuery()->getResult();
-    expect($updatedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
+    verify($updatedSubscriber->getStatus())->equals(SubscriberEntity::STATUS_UNSUBSCRIBED);
     expect($clickStat)->count(1);
   }
 
diff --git a/mailpoet/tests/integration/Subscription/ThrottlingTest.php b/mailpoet/tests/integration/Subscription/ThrottlingTest.php
index 5e686edb90..93a9da5a0a 100644
--- a/mailpoet/tests/integration/Subscription/ThrottlingTest.php
+++ b/mailpoet/tests/integration/Subscription/ThrottlingTest.php
@@ -23,20 +23,20 @@ class ThrottlingTest extends \MailPoetTest {
 
   public function testItProgressivelyThrottlesSubscriptions() {
     $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
-    expect($this->throttling->throttle())->equals(false);
-    expect($this->throttling->throttle())->equals(60);
+    verify($this->throttling->throttle())->equals(false);
+    verify($this->throttling->throttle())->equals(60);
     for ($i = 1; $i <= 10; $i++) {
       $this->createSubscriberIP('127.0.0.1', Carbon::now()->subMinutes($i));
     }
-    expect($this->throttling->throttle())->equals(MINUTE_IN_SECONDS * pow(2, 10));
+    verify($this->throttling->throttle())->equals(MINUTE_IN_SECONDS * pow(2, 10));
   }
 
   public function testItDoesNotThrottleIfDisabledByAHook() {
     $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
     $wp = new WPFunctions;
     $wp->addFilter('mailpoet_subscription_limit_enabled', '__return_false');
-    expect($this->throttling->throttle())->equals(false);
-    expect($this->throttling->throttle())->equals(false);
+    verify($this->throttling->throttle())->equals(false);
+    verify($this->throttling->throttle())->equals(false);
     $wp->removeFilter('mailpoet_subscription_limit_enabled', '__return_false');
     expect($this->throttling->throttle())->greaterThan(0);
   }
@@ -45,8 +45,8 @@ class ThrottlingTest extends \MailPoetTest {
     $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
     $wpUsers = get_users();
     wp_set_current_user($wpUsers[0]->ID);
-    expect($this->throttling->throttle())->equals(false);
-    expect($this->throttling->throttle())->equals(false);
+    verify($this->throttling->throttle())->equals(false);
+    verify($this->throttling->throttle())->equals(false);
     wp_set_current_user(0);
     expect($this->throttling->throttle())->greaterThan(0);
   }
@@ -56,8 +56,8 @@ class ThrottlingTest extends \MailPoetTest {
     $wpUsers = get_users(['role' => 'administrator']);
     $wpUsers[0]->remove_role('administrator');
     wp_set_current_user($wpUsers[0]->ID);
-    expect($this->throttling->throttle())->equals(false);
-    expect($this->throttling->throttle())->equals(60);
+    verify($this->throttling->throttle())->equals(false);
+    verify($this->throttling->throttle())->equals(60);
     $wpUsers[0]->add_role('administrator');
     wp_set_current_user(0);
   }
@@ -66,19 +66,19 @@ class ThrottlingTest extends \MailPoetTest {
     $this->createSubscriberIP('127.0.0.1', Carbon::now());
     $this->createSubscriberIP('127.0.0.1', Carbon::now()->subDays(30)->subSeconds(1));
 
-    expect($this->subscriberIPsRepository->countBy([]))->equals(2);
+    verify($this->subscriberIPsRepository->countBy([]))->equals(2);
     $this->throttling->throttle();
-    expect($this->subscriberIPsRepository->countBy([]))->equals(1);
+    verify($this->subscriberIPsRepository->countBy([]))->equals(1);
   }
 
   public function testItConvertsSecondsToTimeString() {
-    expect($this->throttling->secondsToTimeString(122885))->equals('34 hours 8 minutes 5 seconds');
-    expect($this->throttling->secondsToTimeString(3660))->equals('1 hours 1 minutes');
-    expect($this->throttling->secondsToTimeString(3601))->equals('1 hours 1 seconds');
-    expect($this->throttling->secondsToTimeString(3600))->equals('1 hours');
-    expect($this->throttling->secondsToTimeString(61))->equals('1 minutes 1 seconds');
-    expect($this->throttling->secondsToTimeString(60))->equals('1 minutes');
-    expect($this->throttling->secondsToTimeString(59))->equals('59 seconds');
+    verify($this->throttling->secondsToTimeString(122885))->equals('34 hours 8 minutes 5 seconds');
+    verify($this->throttling->secondsToTimeString(3660))->equals('1 hours 1 minutes');
+    verify($this->throttling->secondsToTimeString(3601))->equals('1 hours 1 seconds');
+    verify($this->throttling->secondsToTimeString(3600))->equals('1 hours');
+    verify($this->throttling->secondsToTimeString(61))->equals('1 minutes 1 seconds');
+    verify($this->throttling->secondsToTimeString(60))->equals('1 minutes');
+    verify($this->throttling->secondsToTimeString(59))->equals('59 seconds');
   }
 
   private function createSubscriberIP(string $ip, Carbon $createdAt): SubscriberIPEntity {
diff --git a/mailpoet/tests/integration/Subscription/UrlTest.php b/mailpoet/tests/integration/Subscription/UrlTest.php
index 7c7cbc267c..18198d26f3 100644
--- a/mailpoet/tests/integration/Subscription/UrlTest.php
+++ b/mailpoet/tests/integration/Subscription/UrlTest.php
@@ -94,7 +94,7 @@ class UrlTest extends \MailPoetTest {
     expect($url)->stringContainsString('action=unsubscribe');
     expect($url)->stringContainsString('endpoint=subscription');
     $data = $this->getUrlData($url);
-    expect($data['preview'])->equals(1);
+    verify($data['preview'])->equals(1);
 
     // actual subscriber
     $subscriber = $this->createSubscriber();
@@ -110,7 +110,7 @@ class UrlTest extends \MailPoetTest {
     expect($url)->stringContainsString('endpoint=subscription');
 
     $data = $this->checkSubscriberData($url);
-    expect($data['queueId'])->equals(10);
+    verify($data['queueId'])->equals(10);
 
     // no subscriber but query id
     $url = $this->url->getUnsubscribeUrl(null, 10);
@@ -119,7 +119,7 @@ class UrlTest extends \MailPoetTest {
 
     $data = $this->getUrlData($url);
     expect(isset($data['data']['queueId']))->false();
-    expect($data['preview'])->equals(1);
+    verify($data['preview'])->equals(1);
   }
 
   public function testItReturnsConfirmUnsubscribeUrl() {
@@ -129,7 +129,7 @@ class UrlTest extends \MailPoetTest {
     expect($url)->stringContainsString('action=confirm_unsubscribe');
     expect($url)->stringContainsString('endpoint=subscription');
     $data = $this->getUrlData($url);
-    expect($data['preview'])->equals(1);
+    verify($data['preview'])->equals(1);
 
     // actual subscriber
     $subscriber = $this->createSubscriber();
@@ -145,7 +145,7 @@ class UrlTest extends \MailPoetTest {
     expect($url)->stringContainsString('endpoint=subscription');
 
     $data = $this->checkSubscriberData($url);
-    expect($data['queueId'])->equals(10);
+    verify($data['queueId'])->equals(10);
 
     // no subscriber but query id
     $url = $this->url->getConfirmUnsubscribeUrl(null, 10);
@@ -154,7 +154,7 @@ class UrlTest extends \MailPoetTest {
 
     $data = $this->getUrlData($url);
     expect(isset($data['data']['queueId']))->false();
-    expect($data['preview'])->equals(1);
+    verify($data['preview'])->equals(1);
   }
 
   private function checkSubscriberData(string $url) {
diff --git a/mailpoet/tests/integration/SystemReport/SystemReportCollectorTest.php b/mailpoet/tests/integration/SystemReport/SystemReportCollectorTest.php
index 525215c576..06cb9b383b 100644
--- a/mailpoet/tests/integration/SystemReport/SystemReportCollectorTest.php
+++ b/mailpoet/tests/integration/SystemReport/SystemReportCollectorTest.php
@@ -38,21 +38,21 @@ class SystemReportCollectorTest extends \MailPoetTest {
   }
 
   public function testItReturnsPhpVersion() {
-    expect($this->systemInfoData['PHP version'])->equals(PHP_VERSION);
+    verify($this->systemInfoData['PHP version'])->equals(PHP_VERSION);
   }
 
   public function testItReturnsMailpoetVersion() {
-    expect($this->systemInfoData['MailPoet Free version'])->equals(MAILPOET_VERSION);
+    verify($this->systemInfoData['MailPoet Free version'])->equals(MAILPOET_VERSION);
   }
 
   public function testItReturnsWordpressVersion() {
-    expect($this->systemInfoData['WordPress version'])->equals(get_bloginfo('version'));
+    verify($this->systemInfoData['WordPress version'])->equals(get_bloginfo('version'));
   }
 
   public function testItReturnsDatabaseVersion() {
     global $wpdb;
     $dbVersion = $wpdb->get_var('SELECT @@VERSION');
-    expect($this->systemInfoData['Database version'])->equals($dbVersion);
+    verify($this->systemInfoData['Database version'])->equals($dbVersion);
   }
 
   public function testItReturnsWpMemoryLimit() {
@@ -88,7 +88,7 @@ class SystemReportCollectorTest extends \MailPoetTest {
   }
 
   public function testItReturnsIfWpIsMultisite() {
-    expect($this->systemInfoData['Multisite environment?'])->equals(is_multisite() ? 'Yes' : 'No');
+    verify($this->systemInfoData['Multisite environment?'])->equals(is_multisite() ? 'Yes' : 'No');
   }
 
   public function testItReturnsCurrentThemeNameAndVersion() {
@@ -105,12 +105,12 @@ class SystemReportCollectorTest extends \MailPoetTest {
   public function testItReturnsActivePlugins() {
     $activePlugins = get_option('active_plugins');
     $this->assertIsArray($activePlugins);
-    expect($this->systemInfoData['Active Plugin names'])->equals(join(", ", $activePlugins));
+    verify($this->systemInfoData['Active Plugin names'])->equals(join(", ", $activePlugins));
   }
 
   public function testItReturnsSendingMethodDetails() {
     $mta = $this->settings->get('mta');
-    expect($this->systemInfoData['Sending Method'])->equals($mta['method']);
+    verify($this->systemInfoData['Sending Method'])->equals($mta['method']);
     expect($this->systemInfoData['Sending Frequency'])->stringContainsString($mta['frequency']['emails'] . ' emails');
     expect($this->systemInfoData['Sending Frequency'])->stringContainsString($mta['frequency']['interval'] . ' minutes');
   }
@@ -120,7 +120,7 @@ class SystemReportCollectorTest extends \MailPoetTest {
     expect($this->systemInfoData['MailPoet sending info'])->stringContainsString('Default FROM address: ' . $this->settings->get('sender.address'));
     expect($this->systemInfoData['MailPoet sending info'])->stringContainsString('Default Reply-To address: ' . $this->settings->get('reply_to.address'));
     expect($this->systemInfoData['MailPoet sending info'])->stringContainsString('Bounce Email Address: ' . $this->settings->get('bounce.address'));
-    expect($this->systemInfoData['Plugin installed at'])->equals($this->settings->get('installed_at'));
+    verify($this->systemInfoData['Plugin installed at'])->equals($this->settings->get('installed_at'));
   }
 
   public function testItReturnsTransactionalEmailSendingMethod() {
@@ -133,17 +133,17 @@ class SystemReportCollectorTest extends \MailPoetTest {
 
   public function testItReturnsTotalNumberOfSubscribers() {
     // unsubscribed users are not taken into account
-    expect($this->systemInfoData['Total number of subscribers'])->equals(2);
+    verify($this->systemInfoData['Total number of subscribers'])->equals(2);
   }
 
   public function testItReturnsWebserverInformation() {
-    expect($this->systemInfoData['Web server'])->equals(
+    verify($this->systemInfoData['Web server'])->equals(
       (!empty($_SERVER["SERVER_SOFTWARE"])) ? sanitize_text_field(wp_unslash($_SERVER["SERVER_SOFTWARE"])) : 'N/A'
     );
   }
 
   public function testItReturnsServerOSInformation() {
-    expect($this->systemInfoData['Server OS'])->equals(php_uname());
+    verify($this->systemInfoData['Server OS'])->equals(php_uname());
   }
 
   public function testItReturnsCronPingUrl() {
@@ -160,13 +160,13 @@ class SystemReportCollectorTest extends \MailPoetTest {
   }
 
   public function testItReturnsPremiumVersion() {
-    expect($this->systemInfoData['MailPoet Premium version'])->equals(
+    verify($this->systemInfoData['MailPoet Premium version'])->equals(
       (defined('MAILPOET_PREMIUM_VERSION')) ? MAILPOET_PREMIUM_VERSION : 'N/A'
     );
   }
 
   public function testItReturnsPremiumKey() {
-    expect($this->systemInfoData['MailPoet Premium/MSS key'])->equals(
+    verify($this->systemInfoData['MailPoet Premium/MSS key'])->equals(
       $this->settings->get(Bridge::PREMIUM_KEY_SETTING_NAME) ?: $this->settings->get(Bridge::API_KEY_SETTING_NAME)
     );
   }
diff --git a/mailpoet/tests/integration/Tasks/SendingTest.php b/mailpoet/tests/integration/Tasks/SendingTest.php
index 39729d9815..646e1554b2 100644
--- a/mailpoet/tests/integration/Tasks/SendingTest.php
+++ b/mailpoet/tests/integration/Tasks/SendingTest.php
@@ -60,7 +60,7 @@ class SendingTest extends \MailPoetTest {
     $sendings = SendingTask::createManyFromTasks([$this->task]);
     expect($sendings)->notEmpty();
     $queue = $sendings[0]->queue();
-    expect($queue->taskId)->equals($this->task->id);
+    verify($queue->taskId)->equals($this->task->id);
   }
 
   public function testItDeletesInvalidTasksWhenCreatingManyFromTasks() {
@@ -69,32 +69,32 @@ class SendingTest extends \MailPoetTest {
     expect($sendings)->isEmpty();
     $task = ScheduledTask::findOne($this->task->id);
     $this->assertInstanceOf(ScheduledTask::class, $task);
-    expect($task->status)->equals(ScheduledTask::STATUS_INVALID);
+    verify($task->status)->equals(ScheduledTask::STATUS_INVALID);
   }
 
   public function testItCanBeCreatedFromScheduledTask() {
     $sending = SendingTask::createFromScheduledTask($this->task);
     $queue = $sending->queue();
-    expect($queue->taskId)->equals($this->task->id);
+    verify($queue->taskId)->equals($this->task->id);
   }
 
   public function testItCanBeCreatedFromQueue() {
     $sending = SendingTask::createFromQueue($this->queue);
     $task = $sending->task();
-    expect($task->id)->equals($this->queue->task_id);
+    verify($task->id)->equals($this->queue->task_id);
   }
 
   public function testItCanBeInitializedByNewsletterId() {
     $sending = SendingTask::getByNewsletterId($this->newsletter->id);
     $queue = $sending->queue();
     $task = $sending->task();
-    expect($task->id)->equals($queue->taskId);
+    verify($task->id)->equals($queue->taskId);
   }
 
   public function testItCanBeConvertedToArray() {
     $sending = $this->sending->asArray();
-    expect($sending['id'])->equals($this->queue->id);
-    expect($sending['task_id'])->equals($this->task->id);
+    verify($sending['id'])->equals($this->queue->id);
+    verify($sending['task_id'])->equals($this->task->id);
   }
 
   public function testItSavesDataForUnderlyingModels() {
@@ -107,55 +107,55 @@ class SendingTest extends \MailPoetTest {
     $queue = SendingQueue::findOne($this->queue->id);
     $this->assertInstanceOf(ScheduledTask::class, $task);
     $this->assertInstanceOf(SendingQueue::class, $queue);
-    expect($task->status)->equals($status);
-    expect($queue->newsletterRenderedSubject)->equals($newsletterRenderedSubject);
+    verify($task->status)->equals($status);
+    verify($queue->newsletterRenderedSubject)->equals($newsletterRenderedSubject);
   }
 
   public function testItDeletesUnderlyingModels() {
     $this->sending->delete();
-    expect(ScheduledTask::findOne($this->task->id))->equals(false);
-    expect(SendingQueue::findOne($this->queue->id))->equals(false);
+    verify(ScheduledTask::findOne($this->task->id))->equals(false);
+    verify(SendingQueue::findOne($this->queue->id))->equals(false);
     expect(ScheduledTaskSubscriber::where('task_id', $this->task->id)->findMany())->isEmpty();
   }
 
   public function testItGetsSubscribers() {
-    expect($this->sending->getSubscribers())->equals([123, 456]);
+    verify($this->sending->getSubscribers())->equals([123, 456]);
   }
 
   public function testItSetsSubscribers() {
     $subscriberIds = [1, 2, 3];
     $this->sending->setSubscribers($subscriberIds);
-    expect($this->sending->getSubscribers())->equals($subscriberIds);
-    expect($this->sending->count_total)->equals(count($subscriberIds));
+    verify($this->sending->getSubscribers())->equals($subscriberIds);
+    verify($this->sending->count_total)->equals(count($subscriberIds));
   }
 
   public function testItRemovesSubscribers() {
     $subscriberIds = [456];
     $this->sending->removeSubscribers($subscriberIds);
-    expect($this->sending->getSubscribers())->equals([123]);
-    expect($this->sending->count_total)->equals(1);
+    verify($this->sending->getSubscribers())->equals([123]);
+    verify($this->sending->count_total)->equals(1);
   }
 
   public function testItRemovesAllSubscribers() {
     $this->sending->removeAllSubscribers();
-    expect($this->sending->getSubscribers())->equals([]);
-    expect($this->sending->count_total)->equals(0);
+    verify($this->sending->getSubscribers())->equals([]);
+    verify($this->sending->count_total)->equals(0);
   }
 
   public function testItUpdatesProcessedSubscribers() {
     $subscriberId = 456;
     $taskSubscriber = $this->getTaskSubscriber($this->task->id, $subscriberId);
-    expect($taskSubscriber->processed)->equals(ScheduledTaskSubscriber::STATUS_UNPROCESSED);
+    verify($taskSubscriber->processed)->equals(ScheduledTaskSubscriber::STATUS_UNPROCESSED);
 
-    expect($this->sending->count_to_process)->equals(2);
-    expect($this->sending->count_processed)->equals(0);
+    verify($this->sending->count_to_process)->equals(2);
+    verify($this->sending->count_processed)->equals(0);
     $subscriberIds = [$subscriberId];
     $this->sending->updateProcessedSubscribers($subscriberIds);
-    expect($this->sending->count_to_process)->equals(1);
-    expect($this->sending->count_processed)->equals(1);
+    verify($this->sending->count_to_process)->equals(1);
+    verify($this->sending->count_processed)->equals(1);
 
     $taskSubscriber = $this->getTaskSubscriber($this->task->id, $subscriberId);
-    expect($taskSubscriber->processed)->equals(ScheduledTaskSubscriber::STATUS_PROCESSED);
+    verify($taskSubscriber->processed)->equals(ScheduledTaskSubscriber::STATUS_PROCESSED);
   }
 
   public function testItGetsScheduledQueues() {
@@ -223,9 +223,9 @@ class SendingTest extends \MailPoetTest {
     $sending3->save();
 
     $tasks = $this->scheduledTaskRepository->findScheduledSendingTasks(3);
-    expect($tasks[0]->getId())->equals($sending1->taskId);
-    expect($tasks[1]->getId())->equals($sending3->taskId);
-    expect($tasks[2]->getId())->equals($sending2->taskId);
+    verify($tasks[0]->getId())->equals($sending1->taskId);
+    verify($tasks[1]->getId())->equals($sending3->taskId);
+    verify($tasks[2]->getId())->equals($sending2->taskId);
   }
 
   public function testItGetsBatchOfScheduledQueuesSortedByUpdatedTime() {
@@ -240,9 +240,9 @@ class SendingTest extends \MailPoetTest {
     $sending3->save();
 
     $tasks = $this->scheduledTaskRepository->findRunningSendingTasks(3);
-    expect($tasks[0]->getId())->equals($sending1->taskId);
-    expect($tasks[1]->getId())->equals($sending3->taskId);
-    expect($tasks[2]->getId())->equals($sending2->taskId);
+    verify($tasks[0]->getId())->equals($sending1->taskId);
+    verify($tasks[1]->getId())->equals($sending3->taskId);
+    verify($tasks[2]->getId())->equals($sending2->taskId);
   }
 
   public function createNewNewsletter() {
diff --git a/mailpoet/tests/integration/Tasks/Subscribers/BatchIteratorTest.php b/mailpoet/tests/integration/Tasks/Subscribers/BatchIteratorTest.php
index 7e1ee3e159..246fd23ab0 100644
--- a/mailpoet/tests/integration/Tasks/Subscribers/BatchIteratorTest.php
+++ b/mailpoet/tests/integration/Tasks/Subscribers/BatchIteratorTest.php
@@ -55,15 +55,15 @@ class BatchIteratorTest extends \MailPoetTest {
       $i++;
 
       if ($i < $iterations) {
-        expect(count($batch))->equals($this->batchSize);
+        verify(count($batch))->equals($this->batchSize);
       } else {
         expect(count($batch))->lessOrEquals($this->batchSize);
       }
     }
-    expect($i)->equals($iterations);
+    verify($i)->equals($iterations);
   }
 
   public function testItCanBeCounted() {
-    expect(count($this->iterator))->equals($this->subscriberCount);
+    verify(count($this->iterator))->equals($this->subscriberCount);
   }
 }
diff --git a/mailpoet/tests/integration/Twig/AssetsTest.php b/mailpoet/tests/integration/Twig/AssetsTest.php
index 14b70e7a6b..664bde2589 100644
--- a/mailpoet/tests/integration/Twig/AssetsTest.php
+++ b/mailpoet/tests/integration/Twig/AssetsTest.php
@@ -26,6 +26,6 @@ class AssetsTest extends \MailPoetTest {
   }
 
   public function testItGeneratesImageUrls() {
-    expect($this->assetsExtension->generateImageUrl('image1.png'))->equals($this->assetsUrl . '/img/image1.png');
+    verify($this->assetsExtension->generateImageUrl('image1.png'))->equals($this->assetsUrl . '/img/image1.png');
   }
 }
diff --git a/mailpoet/tests/integration/Twig/FunctionsTest.php b/mailpoet/tests/integration/Twig/FunctionsTest.php
index 79ba688850..11a912c27a 100644
--- a/mailpoet/tests/integration/Twig/FunctionsTest.php
+++ b/mailpoet/tests/integration/Twig/FunctionsTest.php
@@ -17,7 +17,7 @@ class FunctionsTest extends \MailPoetTest {
 
     $twig->addExtension(new Functions());
     $resultRtl = $twig->render('template');
-    expect($resultRtl)->equals('rtl');
+    verify($resultRtl)->equals('rtl');
     $resultNoRtl = $twig->render('template');
     expect($resultNoRtl)->isEmpty();
   }
diff --git a/mailpoet/tests/integration/Util/DmarcPolicyCheckerTest.php b/mailpoet/tests/integration/Util/DmarcPolicyCheckerTest.php
index f14d48f42e..8898877498 100644
--- a/mailpoet/tests/integration/Util/DmarcPolicyCheckerTest.php
+++ b/mailpoet/tests/integration/Util/DmarcPolicyCheckerTest.php
@@ -15,41 +15,41 @@ class DmarcPolicyCheckerTest extends \MailPoetTest {
   public function testItReturnsNoneWhenDomainDoesNotHaveDmarc() {
     $domain = 'example.com'; // has no TXT records
     $result = $this->dmarcPolicyChecker->getDomainDmarcPolicy($domain);
-    expect($result)->equals(DmarcPolicyChecker::POLICY_NONE);
+    verify($result)->equals(DmarcPolicyChecker::POLICY_NONE);
   }
 
   public function testItReturnsQuarantineStatus() {
     $domain = 'mailpoet.com'; // quarantine
     $result = $this->dmarcPolicyChecker->getDomainDmarcPolicy($domain);
-    expect($result)->equals(DmarcPolicyChecker::POLICY_QUARANTINE);
+    verify($result)->equals(DmarcPolicyChecker::POLICY_QUARANTINE);
   }
 
   public function testItReturnsRejectStatus() {
     $domain = 'google.com'; // reject
     $result = $this->dmarcPolicyChecker->getDomainDmarcPolicy($domain);
-    expect($result)->equals(DmarcPolicyChecker::POLICY_REJECT);
+    verify($result)->equals(DmarcPolicyChecker::POLICY_REJECT);
 
     $domain = 'automattic.com'; // reject
     $result = $this->dmarcPolicyChecker->getDomainDmarcPolicy($domain);
-    expect($result)->equals(DmarcPolicyChecker::POLICY_REJECT);
+    verify($result)->equals(DmarcPolicyChecker::POLICY_REJECT);
   }
 
   public function testItReturnsNoneForInvalidDomain() {
     $domain = 'example'; // not a valid domain name
     $result = $this->dmarcPolicyChecker->getDomainDmarcPolicy($domain);
-    expect($result)->equals(DmarcPolicyChecker::POLICY_NONE);
+    verify($result)->equals(DmarcPolicyChecker::POLICY_NONE);
   }
 
   public function testItReturnsNoneForImproperDmarcSetup() {
     $domain = 'mine.com'; // used to be v=spf1 ip4:185.39.48.22/31 ip6:2a04:7a00:0:3948::22/127 -all
     $result = $this->dmarcPolicyChecker->getDomainDmarcPolicy($domain);
-    expect($result)->equals(DmarcPolicyChecker::POLICY_NONE);
+    verify($result)->equals(DmarcPolicyChecker::POLICY_NONE);
   }
 
   public function testItReturnsSpStatusBeforePStatus() {
     $domain = 'gmail.com'; // used to be v=DMARC1; p=none; sp=quarantine; rua=mailto:mailauth-reports@google.com
     $result = $this->dmarcPolicyChecker->getDomainDmarcPolicy($domain);
-    expect($result)->equals(DmarcPolicyChecker::POLICY_QUARANTINE);
+    verify($result)->equals(DmarcPolicyChecker::POLICY_QUARANTINE);
   }
 
   public function testItThrowsWhenFalsyDomainPassed() {
diff --git a/mailpoet/tests/integration/Util/Notices/DisabledMailFunctionNoticeTest.php b/mailpoet/tests/integration/Util/Notices/DisabledMailFunctionNoticeTest.php
index 8f5ad164ae..3eb274affe 100644
--- a/mailpoet/tests/integration/Util/Notices/DisabledMailFunctionNoticeTest.php
+++ b/mailpoet/tests/integration/Util/Notices/DisabledMailFunctionNoticeTest.php
@@ -61,7 +61,7 @@ class DisabledMailFunctionNoticeTest extends \MailPoetTest {
     $disabledMailFunctionNotice = $this->generateNoticeWithMethodOverride(['isFunctionDisabled' => true]);
     $notice = $disabledMailFunctionNotice->init(true);
 
-    expect($notice)->equals(null);
+    verify($notice)->equals(null);
   }
 
   public function testItDisplaysNoticeForPhpMailSendingMethod() {
@@ -77,21 +77,21 @@ class DisabledMailFunctionNoticeTest extends \MailPoetTest {
     $disabledMailFunctionNotice = $this->generateNoticeWithMethodOverride(['sendTestMail' => true]);
     $notice = $disabledMailFunctionNotice->init(true);
 
-    expect($notice)->equals(null);
+    verify($notice)->equals(null);
   }
 
   public function testItReturnsTrueWhenFunctionDoesNotExist() {
     $disabledMailFunctionNotice = $this->generateRawNotice();
     $result = $disabledMailFunctionNotice->isFunctionDisabled('mp_undefined_function');
 
-    expect($result)->equals(true);
+    verify($result)->equals(true);
   }
 
   public function testItReturnsFalseWhenFunctionExist() {
     $disabledMailFunctionNotice = $this->generateRawNotice();
     $result = $disabledMailFunctionNotice->isFunctionDisabled('in_array');
 
-    expect($result)->equals(false);
+    verify($result)->equals(false);
   }
 
   public function testItResetQueueCheck() {
@@ -99,9 +99,9 @@ class DisabledMailFunctionNoticeTest extends \MailPoetTest {
     $disabledMailFunctionNotice = $this->generateNoticeWithMethodOverride();
     $notice = $disabledMailFunctionNotice->init(true);
 
-    expect($notice)->equals(null);
+    verify($notice)->equals(null);
     $status = $this->settings->get(DisabledMailFunctionNotice::QUEUE_DISABLED_MAIL_FUNCTION_CHECK, false);
-    expect($status)->equals(false);
+    verify($status)->equals(false);
   }
 
   public function testItDisplayNoticeWhenMailIsMisConfigured() {
@@ -111,7 +111,7 @@ class DisabledMailFunctionNoticeTest extends \MailPoetTest {
     expect($notice)->stringContainsString('Get ready to send your first campaign');
 
     $status = $this->settings->get(DisabledMailFunctionNotice::DISABLED_MAIL_FUNCTION_CHECK, false);
-    expect($status)->equals(true);
+    verify($status)->equals(true);
   }
 
   public function testItContinueDisplayingNoticeWhenMailFunctionIsDisabled() {
@@ -124,7 +124,7 @@ class DisabledMailFunctionNoticeTest extends \MailPoetTest {
     expect($notice)->stringContainsString('Get ready to send your first campaign');
 
     $status = $this->settings->get(DisabledMailFunctionNotice::QUEUE_DISABLED_MAIL_FUNCTION_CHECK, false);
-    expect($status)->equals(false);
+    verify($status)->equals(false);
 
     $secondNotice = $disabledMailFunctionNotice->init(true);
     expect($secondNotice)->stringContainsString('Get ready to send your first campaign');
@@ -144,7 +144,7 @@ class DisabledMailFunctionNoticeTest extends \MailPoetTest {
     expect($notice)->stringContainsString('Get ready to send your first campaign');
 
     $status = $this->settings->get(DisabledMailFunctionNotice::QUEUE_DISABLED_MAIL_FUNCTION_CHECK, false);
-    expect($status)->equals(false);
+    verify($status)->equals(false);
 
     $secondNotice = $disabledMailFunctionNotice->init(true);
     expect($secondNotice)->stringContainsString('Get ready to send your first campaign');
@@ -163,7 +163,7 @@ class DisabledMailFunctionNoticeTest extends \MailPoetTest {
     expect($notice)->stringContainsString('Get ready to send your first campaign');
 
     $status = $this->settings->get(DisabledMailFunctionNotice::QUEUE_DISABLED_MAIL_FUNCTION_CHECK, false);
-    expect($status)->equals(false);
+    verify($status)->equals(false);
 
     $secondNotice = $disabledMailFunctionNotice->init(true);
     expect($secondNotice)->stringContainsString('Get ready to send your first campaign');
@@ -175,6 +175,6 @@ class DisabledMailFunctionNoticeTest extends \MailPoetTest {
 
     $fourthNotice = $disabledMailFunctionNotice->init(true);
 
-    expect($fourthNotice)->equals(null);
+    verify($fourthNotice)->equals(null);
   }
 }
diff --git a/mailpoet/tests/integration/WP/EmojiTest.php b/mailpoet/tests/integration/WP/EmojiTest.php
index 90d57c54d8..9c66e1e352 100644
--- a/mailpoet/tests/integration/WP/EmojiTest.php
+++ b/mailpoet/tests/integration/WP/EmojiTest.php
@@ -49,7 +49,7 @@ class EmojiTest extends \MailPoetTest {
     $this->createTable($table, 'utf8');
 
     $result = $this->emoji->encodeForUTF8Column($table, $this->column, $this->dataDecoded);
-    expect($result)->equals($this->dataEncoded);
+    verify($result)->equals($this->dataEncoded);
 
     $this->dropTable($table);
   }
@@ -59,14 +59,14 @@ class EmojiTest extends \MailPoetTest {
     $this->createTable($table, 'utf8mb4');
 
     $result = $this->emoji->encodeForUTF8Column($table, $this->column, $this->dataDecoded);
-    expect($result)->equals($this->dataDecoded);
+    verify($result)->equals($this->dataDecoded);
 
     $this->dropTable($table);
   }
 
   public function testItCanDecodeEntities() {
     $result = $this->emoji->decodeEntities($this->dataEncoded);
-    expect($result)->equals($this->dataDecoded);
+    verify($result)->equals($this->dataDecoded);
   }
 
   private function createTable($table, $charset) {
diff --git a/mailpoet/tests/integration/WP/FunctionsTest.php b/mailpoet/tests/integration/WP/FunctionsTest.php
index bad8a29054..05bb312835 100644
--- a/mailpoet/tests/integration/WP/FunctionsTest.php
+++ b/mailpoet/tests/integration/WP/FunctionsTest.php
@@ -83,7 +83,7 @@ class FunctionsTest extends \MailPoetTest {
     $result = $this->wp->applyFilters($this->filter, $testValue);
 
     expect($called)->true();
-    expect($result)->equals($testValue);
+    verify($result)->equals($testValue);
 
     $called = false;
     $this->wp->removeFilter($this->filter, $callback);
diff --git a/mailpoet/tests/integration/WPCOM/DotcomLicenseProvisionerTest.php b/mailpoet/tests/integration/WPCOM/DotcomLicenseProvisionerTest.php
index 643a7f02e8..38332edbac 100644
--- a/mailpoet/tests/integration/WPCOM/DotcomLicenseProvisionerTest.php
+++ b/mailpoet/tests/integration/WPCOM/DotcomLicenseProvisionerTest.php
@@ -35,14 +35,14 @@ class DotcomLicenseProvisionerTest extends \MailPoetTest {
         $this->make(Services::class),
         $this->make(DotcomHelperFunctions::class, ['isAtomicPlatform' => false]),
       ]);
-    expect($provisioner->provisionLicense($result, $payload, DotcomLicenseProvisioner::EVENT_TYPE_PROVISION_LICENSE))->equals($result);
+    verify($provisioner->provisionLicense($result, $payload, DotcomLicenseProvisioner::EVENT_TYPE_PROVISION_LICENSE))->equals($result);
   }
 
   public function testItReturnsResultIfWrongEvent() {
     $result = false;
     $payload = ['apiKey' => 'some-key'];
     $eventType = 'wrong-event';
-    expect($this->provisioner->provisionLicense($result, $payload, $eventType))->equals($result);
+    verify($this->provisioner->provisionLicense($result, $payload, $eventType))->equals($result);
   }
 
   public function testItReturnsWPErrorIfMissingKey() {
@@ -51,7 +51,7 @@ class DotcomLicenseProvisionerTest extends \MailPoetTest {
     $eventType = DotcomLicenseProvisioner::EVENT_TYPE_PROVISION_LICENSE;
     $error = $this->provisioner->provisionLicense($result, $payload, $eventType);
     $this->assertInstanceOf(\WP_Error::class, $error);
-    expect($error->get_error_message())->equals('Invalid license payload: Missing API key.');
+    verify($error->get_error_message())->equals('Invalid license payload: Missing API key.');
   }
 
   public function testItReturnsWPErrorIfErrorOnSettingUpMSS() {
@@ -68,7 +68,7 @@ class DotcomLicenseProvisionerTest extends \MailPoetTest {
       ]);
     $error = $provisioner->provisionLicense($result, $payload, $eventType);
     $this->assertInstanceOf(\WP_Error::class, $error);
-    expect($error->get_error_message())->equals('some-error ');
+    verify($error->get_error_message())->equals('some-error ');
   }
 
   public function testItReturnsErrorIfCouldNotRefreshKey() {
@@ -85,7 +85,7 @@ class DotcomLicenseProvisionerTest extends \MailPoetTest {
       ]);
     $error = $provisioner->provisionLicense($result, $payload, $eventType);
     $this->assertInstanceOf(\WP_Error::class, $error);
-    expect($error->get_error_message())->equals('some-error ');
+    verify($error->get_error_message())->equals('some-error ');
   }
 
   public function testItReturnsErrorIfCouldNotVerifyPremiumKey() {
@@ -106,7 +106,7 @@ class DotcomLicenseProvisionerTest extends \MailPoetTest {
       ]);
     $error = $provisioner->provisionLicense($result, $payload, $eventType);
     $this->assertInstanceOf(\WP_Error::class, $error);
-    expect($error->get_error_message())->equals('some-error ');
+    verify($error->get_error_message())->equals('some-error ');
   }
 
   public function testItReturnsTrueIfKeyProvidedMSSActivatedAndRefreshed() {
@@ -126,6 +126,6 @@ class DotcomLicenseProvisionerTest extends \MailPoetTest {
         $this->make(DotcomHelperFunctions::class, ['isAtomicPlatform' => true]),
       ]);
     $result = $provisioner->provisionLicense($result, $payload, $eventType);
-    expect($result)->equals(true);
+    verify($result)->equals(true);
   }
 }
diff --git a/mailpoet/tests/integration/WooCommerce/SubscriberEngagementTest.php b/mailpoet/tests/integration/WooCommerce/SubscriberEngagementTest.php
index c6ed910730..3c088e0ae6 100644
--- a/mailpoet/tests/integration/WooCommerce/SubscriberEngagementTest.php
+++ b/mailpoet/tests/integration/WooCommerce/SubscriberEngagementTest.php
@@ -47,7 +47,7 @@ class SubscriberEngagementTest extends \MailPoetTest {
       ->willReturn($order);
     $this->subscriberEngagement->updateSubscriberEngagement(1);
     $this->entityManager->refresh($subscriber);
-    expect($subscriber->getLastEngagementAt())->equals($now);
+    verify($subscriber->getLastEngagementAt())->equals($now);
   }
 
   public function testItDoesntUpdateAnythingForNonExistingOrder() {
@@ -72,7 +72,7 @@ class SubscriberEngagementTest extends \MailPoetTest {
     $purchaseTime = $subscriber->getLastPurchaseAt();
     $this->assertInstanceOf(DateTimeInterface::class, $engagementTime);
     $this->assertInstanceOf(DateTimeInterface::class, $purchaseTime);
-    expect($engagementTime)->equals($purchaseTime);
+    verify($engagementTime)->equals($purchaseTime);
     expect($engagementTime)->greaterThan(Carbon::now()->subMinute());
   }
 
diff --git a/mailpoet/tests/integration/WooCommerce/SubscriptionTest.php b/mailpoet/tests/integration/WooCommerce/SubscriptionTest.php
index 90143bbaa2..4646f503f0 100644
--- a/mailpoet/tests/integration/WooCommerce/SubscriptionTest.php
+++ b/mailpoet/tests/integration/WooCommerce/SubscriptionTest.php
@@ -120,20 +120,20 @@ class SubscriptionTest extends \MailPoetTest {
   public function testItDoesNotTryToSubscribeIfThereIsNoEmailInOrderData() {
     $data = [];
     $subscribed = $this->subscription->subscribeOnCheckout($this->orderId, $data);
-    expect($subscribed)->equals(null);
+    verify($subscribed)->equals(null);
   }
 
   public function testItDoesNotTryToSubscribeIfSubscriberWithTheEmailWasNotSynced() {
     // non-existent
     $data['billing_email'] = 'non-existent-subscriber@example.com';
     $subscribed = $this->subscription->subscribeOnCheckout($this->orderId, $data);
-    expect($subscribed)->equals(null);
+    verify($subscribed)->equals(null);
     // not a WooCommerce user
     $this->subscriber->setIsWoocommerceUser(false);
     $this->subscribersRepository->flush();
     $data['billing_email'] = $this->subscriber->getEmail();
     $subscribed = $this->subscription->subscribeOnCheckout($this->orderId, $data);
-    expect($subscribed)->equals(null);
+    verify($subscribed)->equals(null);
   }
 
   public function testItKeepsSubscribedStatusWhenOptinIsDisabledAndSignUpConfirmationIsEnabled() {
@@ -148,12 +148,12 @@ class SubscriptionTest extends \MailPoetTest {
     $data['billing_email'] = $this->subscriber->getEmail();
 
     $subscribedInWooSegment = $this->subscription->subscribeOnCheckout($this->orderId, $data);
-    expect($subscribedInWooSegment)->equals(false);
+    verify($subscribedInWooSegment)->equals(false);
 
     $this->entityManager->refresh($this->subscriber);
     $subscribedSegments = $this->subscriber->getSegments();
     expect($subscribedSegments)->count(1);
-    expect($this->subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($this->subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
   }
 
   public function testItDoesNotUnsubscribesIfCheckboxIsNotChecked() {
@@ -168,7 +168,7 @@ class SubscriptionTest extends \MailPoetTest {
     $_POST[Subscription::CHECKOUT_OPTIN_PRESENCE_CHECK_INPUT_NAME] = 1;
     $data['billing_email'] = $this->subscriber->getEmail();
     $subscribed = $this->subscription->subscribeOnCheckout($this->orderId, $data);
-    expect($subscribed)->equals(false);
+    verify($subscribed)->equals(false);
 
     $subscribedSegments = $this->subscriber->getSegments();
     expect($subscribedSegments)->count(0);
@@ -176,7 +176,7 @@ class SubscriptionTest extends \MailPoetTest {
     $this->entityManager->clear();
     $subscriber = $this->subscribersRepository->findOneById($this->subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
   }
 
   public function testItSubscribesIfCheckboxIsChecked() {
@@ -204,7 +204,7 @@ class SubscriptionTest extends \MailPoetTest {
 
     $subscribed = $this->subscription->subscribeOnCheckout($this->orderId, $data);
 
-    expect($subscribed)->equals(true);
+    verify($subscribed)->equals(true);
     unset($_POST[Subscription::CHECKOUT_OPTIN_INPUT_NAME]);
 
     $this->entityManager->clear();
@@ -222,8 +222,8 @@ class SubscriptionTest extends \MailPoetTest {
     $this->entityManager->clear();
     $subscriber = $this->subscribersRepository->findOneById($this->subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($subscriber->getSource())->equals(Source::WOOCOMMERCE_CHECKOUT);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
+    verify($subscriber->getSource())->equals(Source::WOOCOMMERCE_CHECKOUT);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_SUBSCRIBED);
     expect($subscriber->getConfirmedIp())->notEmpty();
     expect($subscriber->getConfirmedAt())->notEmpty();
   }
@@ -251,7 +251,7 @@ class SubscriptionTest extends \MailPoetTest {
 
     $subscribed = $this->subscription->subscribeOnCheckout($this->orderId, $data);
 
-    expect($subscribed)->equals(true);
+    verify($subscribed)->equals(true);
     unset($_POST[Subscription::CHECKOUT_OPTIN_INPUT_NAME]);
 
     $this->entityManager->clear();
@@ -262,8 +262,8 @@ class SubscriptionTest extends \MailPoetTest {
 
     $subscriber = $this->subscribersRepository->findOneById($this->subscriber->getId());
     $this->assertInstanceOf(SubscriberEntity::class, $subscriber);
-    expect($subscriber->getSource())->equals(Source::WOOCOMMERCE_CHECKOUT);
-    expect($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED);
+    verify($subscriber->getSource())->equals(Source::WOOCOMMERCE_CHECKOUT);
+    verify($subscriber->getStatus())->equals(SubscriberEntity::STATUS_UNCONFIRMED);
   }
 
   private function subscribeToSegment(SubscriberEntity $subscriber, SegmentEntity $segment): void {
diff --git a/mailpoet/tests/integration/WooCommerce/TrackerTest.php b/mailpoet/tests/integration/WooCommerce/TrackerTest.php
index 026e860c1a..4cc8e10f18 100644
--- a/mailpoet/tests/integration/WooCommerce/TrackerTest.php
+++ b/mailpoet/tests/integration/WooCommerce/TrackerTest.php
@@ -58,7 +58,7 @@ class TrackerTest extends \MailPoetTest {
     $tracker = $this->diContainer->get(Tracker::class);
     $mailPoetData = $tracker->addTrackingData(['extensions' => []])['extensions']['mailpoet'];
 
-    expect($mailPoetData['campaign_' . $newsletter1->getId() . '_event'])->equals(FirstPurchase::SLUG);
+    verify($mailPoetData['campaign_' . $newsletter1->getId() . '_event'])->equals(FirstPurchase::SLUG);
   }
 
   public function testItAddsCampaignRevenuesForStandardNewsletters(): void {
@@ -71,13 +71,13 @@ class TrackerTest extends \MailPoetTest {
     $tracker = $this->diContainer->get(Tracker::class);
     $mailPoetData = $tracker->addTrackingData(['extensions' => []])['extensions']['mailpoet'];
 
-    expect($mailPoetData['campaign_' . $newsletter1->getId() . '_revenue'])->equals(30);
-    expect($mailPoetData['campaign_' . $newsletter1->getId() . '_type'])->equals($newsletter1->getType());
-    expect($mailPoetData['campaign_' . $newsletter1->getId() . '_orders_count'])->equals(2);
+    verify($mailPoetData['campaign_' . $newsletter1->getId() . '_revenue'])->equals(30);
+    verify($mailPoetData['campaign_' . $newsletter1->getId() . '_type'])->equals($newsletter1->getType());
+    verify($mailPoetData['campaign_' . $newsletter1->getId() . '_orders_count'])->equals(2);
 
-    expect($mailPoetData['campaign_' . $newsletter2->getId() . '_revenue'])->equals(20);
-    expect($mailPoetData['campaign_' . $newsletter2->getId() . '_type'])->equals($newsletter2->getType());
-    expect($mailPoetData['campaign_' . $newsletter2->getId() . '_orders_count'])->equals(1);
+    verify($mailPoetData['campaign_' . $newsletter2->getId() . '_revenue'])->equals(20);
+    verify($mailPoetData['campaign_' . $newsletter2->getId() . '_type'])->equals($newsletter2->getType());
+    verify($mailPoetData['campaign_' . $newsletter2->getId() . '_orders_count'])->equals(1);
   }
 
   public function testItAddsOnlyRevenuesFromCompletedOrders(): void {
@@ -88,8 +88,8 @@ class TrackerTest extends \MailPoetTest {
     $tracker = $this->diContainer->get(Tracker::class);
     $mailPoetData = $tracker->addTrackingData(['extensions' => []])['extensions']['mailpoet'];
 
-    expect($mailPoetData['campaign_' . $newsletter1->getId() . '_revenue'])->equals(10);
-    expect($mailPoetData['campaign_' . $newsletter1->getId() . '_orders_count'])->equals(1);
+    verify($mailPoetData['campaign_' . $newsletter1->getId() . '_revenue'])->equals(10);
+    verify($mailPoetData['campaign_' . $newsletter1->getId() . '_orders_count'])->equals(1);
   }
 
   public function testItAddsCampaignRevenuesForAutomaticCampaigns(): void {
@@ -103,17 +103,17 @@ class TrackerTest extends \MailPoetTest {
     $tracker = $this->diContainer->get(Tracker::class);
     $mailPoetData = $tracker->addTrackingData(['extensions' => []])['extensions']['mailpoet'];
 
-    expect($mailPoetData['campaign_' . $newsletter1->getId() . '_revenue'])->equals(10);
-    expect($mailPoetData['campaign_' . $newsletter1->getId() . '_type'])->equals($newsletter1->getType());
-    expect($mailPoetData['campaign_' . $newsletter1->getId() . '_orders_count'])->equals(1);
+    verify($mailPoetData['campaign_' . $newsletter1->getId() . '_revenue'])->equals(10);
+    verify($mailPoetData['campaign_' . $newsletter1->getId() . '_type'])->equals($newsletter1->getType());
+    verify($mailPoetData['campaign_' . $newsletter1->getId() . '_orders_count'])->equals(1);
 
-    expect($mailPoetData['campaign_' . $newsletter2->getId() . '_revenue'])->equals(20);
-    expect($mailPoetData['campaign_' . $newsletter2->getId() . '_type'])->equals($newsletter2->getType());
-    expect($mailPoetData['campaign_' . $newsletter2->getId() . '_orders_count'])->equals(1);
+    verify($mailPoetData['campaign_' . $newsletter2->getId() . '_revenue'])->equals(20);
+    verify($mailPoetData['campaign_' . $newsletter2->getId() . '_type'])->equals($newsletter2->getType());
+    verify($mailPoetData['campaign_' . $newsletter2->getId() . '_orders_count'])->equals(1);
 
-    expect($mailPoetData['campaign_' . $newsletter3->getId() . '_revenue'])->equals(30);
-    expect($mailPoetData['campaign_' . $newsletter3->getId() . '_type'])->equals($newsletter3->getType());
-    expect($mailPoetData['campaign_' . $newsletter3->getId() . '_orders_count'])->equals(1);
+    verify($mailPoetData['campaign_' . $newsletter3->getId() . '_revenue'])->equals(30);
+    verify($mailPoetData['campaign_' . $newsletter3->getId() . '_type'])->equals($newsletter3->getType());
+    verify($mailPoetData['campaign_' . $newsletter3->getId() . '_orders_count'])->equals(1);
   }
 
   public function testItAddsTotalCampaigns(): void {
@@ -129,7 +129,7 @@ class TrackerTest extends \MailPoetTest {
     (new Newsletter())->withSendingQueue()->withType(NewsletterEntity::TYPE_NOTIFICATION_HISTORY)->create();
     $tracker = $this->diContainer->get(Tracker::class);
     $campaignsCount = $tracker->addTrackingData(['extensions' => []])['extensions']['mailpoet']['campaigns_count'];
-    expect($campaignsCount)->equals(6);
+    verify($campaignsCount)->equals(6);
   }
 
   public function testItAddsCampaignRevenuesPostNotificationsUnderTheParentId(): void {
@@ -144,9 +144,9 @@ class TrackerTest extends \MailPoetTest {
     $tracker = $this->diContainer->get(Tracker::class);
     $mailPoetData = $tracker->addTrackingData(['extensions' => []])['extensions']['mailpoet'];
 
-    expect($mailPoetData['campaign_' . $notificationParent->getId() . '_revenue'])->equals(30);
-    expect($mailPoetData['campaign_' . $notificationParent->getId() . '_type'])->equals($notificationParent->getType());
-    expect($mailPoetData['campaign_' . $notificationParent->getId() . '_orders_count'])->equals(2);
+    verify($mailPoetData['campaign_' . $notificationParent->getId() . '_revenue'])->equals(30);
+    verify($mailPoetData['campaign_' . $notificationParent->getId() . '_type'])->equals($notificationParent->getType());
+    verify($mailPoetData['campaign_' . $notificationParent->getId() . '_orders_count'])->equals(2);
 
     expect($mailPoetData)->hasNotKey('campaign_' . $notificationHistory1->getId() . '_revenue');
     expect($mailPoetData)->hasNotKey('campaign_' . $notificationHistory2->getId() . '_revenue');
@@ -160,9 +160,9 @@ class TrackerTest extends \MailPoetTest {
     $tracker = $this->diContainer->get(Tracker::class);
     $mailPoetData = $tracker->addTrackingData(['extensions' => []])['extensions']['mailpoet'];
 
-    expect($mailPoetData['campaign_' . $newsletter1->getId() . '_revenue'])->equals(20);
-    expect($mailPoetData['campaign_' . $newsletter1->getId() . '_type'])->equals($newsletter1->getType());
-    expect($mailPoetData['campaign_' . $newsletter1->getId() . '_orders_count'])->equals(1);
+    verify($mailPoetData['campaign_' . $newsletter1->getId() . '_revenue'])->equals(20);
+    verify($mailPoetData['campaign_' . $newsletter1->getId() . '_type'])->equals($newsletter1->getType());
+    verify($mailPoetData['campaign_' . $newsletter1->getId() . '_orders_count'])->equals(1);
   }
 
   /**
@@ -181,13 +181,13 @@ class TrackerTest extends \MailPoetTest {
     $tracker = $this->diContainer->get(Tracker::class);
     $mailPoetData = $tracker->addTrackingData(['extensions' => []])['extensions']['mailpoet'];
 
-    expect($mailPoetData['campaign_' . $newsletter1->getId() . '_revenue'])->equals(10);
-    expect($mailPoetData['campaign_' . $newsletter1->getId() . '_type'])->equals($newsletter1->getType());
-    expect($mailPoetData['campaign_' . $newsletter1->getId() . '_orders_count'])->equals(1);
+    verify($mailPoetData['campaign_' . $newsletter1->getId() . '_revenue'])->equals(10);
+    verify($mailPoetData['campaign_' . $newsletter1->getId() . '_type'])->equals($newsletter1->getType());
+    verify($mailPoetData['campaign_' . $newsletter1->getId() . '_orders_count'])->equals(1);
 
-    expect($mailPoetData['campaign_' . $newsletter2->getId() . '_revenue'])->equals(15);
-    expect($mailPoetData['campaign_' . $newsletter2->getId() . '_type'])->equals($newsletter2->getType());
-    expect($mailPoetData['campaign_' . $newsletter2->getId() . '_orders_count'])->equals(1);
+    verify($mailPoetData['campaign_' . $newsletter2->getId() . '_revenue'])->equals(15);
+    verify($mailPoetData['campaign_' . $newsletter2->getId() . '_type'])->equals($newsletter2->getType());
+    verify($mailPoetData['campaign_' . $newsletter2->getId() . '_orders_count'])->equals(1);
 
     expect($mailPoetData)->hasNotKey('campaign_' . $newsletter3->getId() . '_revenue');
   }
@@ -206,9 +206,9 @@ class TrackerTest extends \MailPoetTest {
     $tracker = $this->diContainer->get(Tracker::class);
     $mailPoetData = $tracker->addTrackingData(['extensions' => []])['extensions']['mailpoet'];
 
-    expect($mailPoetData['campaign_0_revenue'])->equals(20);
-    expect($mailPoetData['campaign_0_type'])->equals('unknown');
-    expect($mailPoetData['campaign_0_orders_count'])->equals(2);
+    verify($mailPoetData['campaign_0_revenue'])->equals(20);
+    verify($mailPoetData['campaign_0_type'])->equals('unknown');
+    verify($mailPoetData['campaign_0_orders_count'])->equals(2);
   }
 
   /**
diff --git a/mailpoet/tests/integration/WooCommerce/TransactionalEmailHooksTest.php b/mailpoet/tests/integration/WooCommerce/TransactionalEmailHooksTest.php
index ac489ecbeb..94d10998cb 100644
--- a/mailpoet/tests/integration/WooCommerce/TransactionalEmailHooksTest.php
+++ b/mailpoet/tests/integration/WooCommerce/TransactionalEmailHooksTest.php
@@ -107,18 +107,18 @@ class TransactionalEmailHooksTest extends \MailPoetTest {
     $this->wp->updateOption('woocommerce_email_body_background_color', 'blue');
     $this->wp->updateOption('woocommerce_email_text_color', 'black');
 
-    expect($this->wp->getOption('woocommerce_email_background_color'))->equals('white');
-    expect($this->wp->getOption('woocommerce_email_base_color'))->equals('red');
-    expect($this->wp->getOption('woocommerce_email_body_background_color'))->equals('blue');
-    expect($this->wp->getOption('woocommerce_email_text_color'))->equals('black');
+    verify($this->wp->getOption('woocommerce_email_background_color'))->equals('white');
+    verify($this->wp->getOption('woocommerce_email_base_color'))->equals('red');
+    verify($this->wp->getOption('woocommerce_email_body_background_color'))->equals('blue');
+    verify($this->wp->getOption('woocommerce_email_text_color'))->equals('black');
 
     $transactionalEmails = $this->diContainer->get(TransactionalEmailHooks::class);
     $transactionalEmails->overrideStylesForWooEmails();
 
-    expect($this->wp->getOption('woocommerce_email_background_color'))->equals('#777777');
-    expect($this->wp->getOption('woocommerce_email_base_color'))->equals('#888888');
-    expect($this->wp->getOption('woocommerce_email_body_background_color'))->equals('#666666');
-    expect($this->wp->getOption('woocommerce_email_text_color'))->equals('#111111');
+    verify($this->wp->getOption('woocommerce_email_background_color'))->equals('#777777');
+    verify($this->wp->getOption('woocommerce_email_base_color'))->equals('#888888');
+    verify($this->wp->getOption('woocommerce_email_body_background_color'))->equals('#666666');
+    verify($this->wp->getOption('woocommerce_email_text_color'))->equals('#111111');
   }
 
   public function testItDoesntReplaceWoocommerceEmailStylesIfEmailIsNotSet() {
@@ -132,10 +132,10 @@ class TransactionalEmailHooksTest extends \MailPoetTest {
     $transactionalEmails = $this->diContainer->get(TransactionalEmailHooks::class);
     $transactionalEmails->overrideStylesForWooEmails();
 
-    expect($this->wp->getOption('woocommerce_email_background_color'))->equals('white');
-    expect($this->wp->getOption('woocommerce_email_base_color'))->equals('red');
-    expect($this->wp->getOption('woocommerce_email_body_background_color'))->equals('blue');
-    expect($this->wp->getOption('woocommerce_email_text_color'))->equals('black');
+    verify($this->wp->getOption('woocommerce_email_background_color'))->equals('white');
+    verify($this->wp->getOption('woocommerce_email_base_color'))->equals('red');
+    verify($this->wp->getOption('woocommerce_email_body_background_color'))->equals('blue');
+    verify($this->wp->getOption('woocommerce_email_text_color'))->equals('black');
   }
 
   public function testUseTemplateForWCEmails() {
@@ -171,8 +171,8 @@ class TransactionalEmailHooksTest extends \MailPoetTest {
     ]);
     $renderer = Stub::make(Renderer::class, [
       'render' => function(NewsletterEntity $entity, $subject) use(&$newsletter) {
-        expect($entity->getId())->equals($newsletter->getId());
-        expect($subject)->equals('heading text');
+        verify($entity->getId())->equals($newsletter->getId());
+        verify($subject)->equals('heading text');
       },
       'getHTMLBeforeContent' => function() {
         return 'HTML before content.';
@@ -202,13 +202,13 @@ class TransactionalEmailHooksTest extends \MailPoetTest {
     expect($addedActions['woocommerce_email_header'])->callable();
     ob_start();
     $addedActions['woocommerce_email_header']('heading text');
-    expect(ob_get_clean())->equals('HTML before content.');
+    verify(ob_get_clean())->equals('HTML before content.');
     expect($addedActions['woocommerce_email_footer'])->callable();
     ob_start();
     $addedActions['woocommerce_email_footer']();
-    expect(ob_get_clean())->equals('HTML after content');
+    verify(ob_get_clean())->equals('HTML after content');
     expect($addedActions['woocommerce_email_styles'])->callable();
-    expect($addedActions['woocommerce_email_styles']('some css'))->equals('prefixed some css');
+    verify($addedActions['woocommerce_email_styles']('some css'))->equals('prefixed some css');
   }
 
   public function testUseTemplateForWCEmailsWorksWithNoEmail() {
diff --git a/mailpoet/tests/integration/WooCommerce/TransactionalEmailsTest.php b/mailpoet/tests/integration/WooCommerce/TransactionalEmailsTest.php
index a79689033d..1c3e85266f 100644
--- a/mailpoet/tests/integration/WooCommerce/TransactionalEmailsTest.php
+++ b/mailpoet/tests/integration/WooCommerce/TransactionalEmailsTest.php
@@ -65,14 +65,14 @@ class TransactionalEmailsTest extends \MailPoetTest {
     $id = $this->settings->get(TransactionalEmails::SETTING_EMAIL_ID, null);
     expect($email)->notEmpty();
     expect($id)->notNull();
-    expect($email->getId())->equals($id);
+    verify($email->getId())->equals($id);
   }
 
   public function testInitDoesntCreateTransactionalEmailIfSettingAlreadySet() {
     $this->settings->set(TransactionalEmails::SETTING_EMAIL_ID, 1);
     $this->transactionalEmails->init();
     $email = $this->newslettersRepository->findOneBy(['type' => NewsletterEntity::TYPE_WC_TRANSACTIONAL_EMAIL]);
-    expect($email)->equals(null);
+    verify($email)->equals(null);
   }
 
   public function testInitUsesImageFromWCSettings() {
@@ -106,7 +106,7 @@ class TransactionalEmailsTest extends \MailPoetTest {
     $body = $email->getBody();
     $this->assertIsArray($body);
     $footerTextBlock = $body['content']['blocks'][5]['blocks'][0]['blocks'][1];
-    expect($footerTextBlock['text'])->equals('<p style="text-align: center;">Text <a href="http://example.com">Link</a></p>');
+    verify($footerTextBlock['text'])->equals('<p style="text-align: center;">Text <a href="http://example.com">Link</a></p>');
     $this->wp->updateOption('woocommerce_email_footer_text', $optionOriginalValue);
   }
 }
diff --git a/mailpoet/tests/unit/API/JSON/ErrorHandlerTest.php b/mailpoet/tests/unit/API/JSON/ErrorHandlerTest.php
index d34831a028..0ee24d6c43 100644
--- a/mailpoet/tests/unit/API/JSON/ErrorHandlerTest.php
+++ b/mailpoet/tests/unit/API/JSON/ErrorHandlerTest.php
@@ -39,7 +39,7 @@ class ErrorHandlerTest extends \MailPoetUnitTest {
     ]));
 
     expect($response)->isInstanceOf(ErrorResponse::class);
-    expect($response->status)->equals($expectedCode);
-    expect($response->errors)->equals([['error' => 'key', 'message' => 'value']]);
+    verify($response->status)->equals($expectedCode);
+    verify($response->errors)->equals([['error' => 'key', 'message' => 'value']]);
   }
 }
diff --git a/mailpoet/tests/unit/API/JSON/ErrorResponseTest.php b/mailpoet/tests/unit/API/JSON/ErrorResponseTest.php
index fb60d1e8c8..8e86563a77 100644
--- a/mailpoet/tests/unit/API/JSON/ErrorResponseTest.php
+++ b/mailpoet/tests/unit/API/JSON/ErrorResponseTest.php
@@ -19,7 +19,7 @@ class ErrorResponseTest extends \MailPoetUnitTest {
       'another valid error',
     ];
     $errorResponse = new ErrorResponse($errors);
-    expect($errorResponse->getData())->equals(
+    verify($errorResponse->getData())->equals(
       [
         'errors' => [
           [
diff --git a/mailpoet/tests/unit/Cron/CronTriggerTest.php b/mailpoet/tests/unit/Cron/CronTriggerTest.php
index 0ae24e378e..c75534429d 100644
--- a/mailpoet/tests/unit/Cron/CronTriggerTest.php
+++ b/mailpoet/tests/unit/Cron/CronTriggerTest.php
@@ -13,14 +13,14 @@ class CronTriggerTest extends \MailPoetUnitTest {
     expect(CronTrigger::METHOD_LINUX_CRON)->same('Linux Cron');
     expect(CronTrigger::METHOD_WORDPRESS)->same('WordPress');
     expect(CronTrigger::METHOD_ACTION_SCHEDULER)->same('Action Scheduler');
-    expect(CronTrigger::METHODS)->equals([
+    verify(CronTrigger::METHODS)->equals([
       'wordpress' => 'WordPress',
       'linux_cron' => 'Linux Cron',
       'action_scheduler' => 'Action Scheduler',
       'none' => 'Disabled',
     ]);
-    expect(CronTrigger::DEFAULT_METHOD)->equals('Action Scheduler');
-    expect(CronTrigger::SETTING_NAME)->equals('cron_trigger');
+    verify(CronTrigger::DEFAULT_METHOD)->equals('Action Scheduler');
+    verify(CronTrigger::SETTING_NAME)->equals('cron_trigger');
   }
 
   public function testItCanInitializeCronTriggerMethod() {
diff --git a/mailpoet/tests/unit/CustomFields/ApiDataSanitizerTest.php b/mailpoet/tests/unit/CustomFields/ApiDataSanitizerTest.php
index cb2f802bb0..06d526117f 100644
--- a/mailpoet/tests/unit/CustomFields/ApiDataSanitizerTest.php
+++ b/mailpoet/tests/unit/CustomFields/ApiDataSanitizerTest.php
@@ -234,7 +234,7 @@ class ApiDataSanitizerTest extends \MailPoetUnitTest {
       'type' => 'date',
       'params' => ['date_format' => 'MM/DD/YYYY', 'date_type' => 'year_month_day'],
     ]);
-    expect($result['params'])->equals([
+    verify($result['params'])->equals([
       'date_format' => 'MM/DD/YYYY',
       'date_type' => 'year_month_day',
       'label' => 'Name',
diff --git a/mailpoet/tests/unit/EmailEditor/Engine/Renderer/PreprocessorTest.php b/mailpoet/tests/unit/EmailEditor/Engine/Renderer/PreprocessorTest.php
index d940f1e7f8..2a27002769 100644
--- a/mailpoet/tests/unit/EmailEditor/Engine/Renderer/PreprocessorTest.php
+++ b/mailpoet/tests/unit/EmailEditor/Engine/Renderer/PreprocessorTest.php
@@ -31,16 +31,16 @@ class PreprocessorTest extends \MailPoetUnitTest {
   public function testItWrapsSingleTopLevelBlockIntoColumns() {
     $parsedDocument = [$this->paragraphBlock];
     $result = $this->preprocessor->preprocess($parsedDocument);
-    expect($result[0]['blockName'])->equals('core/columns');
-    expect($result[0]['innerBlocks'][0]['blockName'])->equals('core/column');
-    expect($result[0]['innerBlocks'][0]['innerBlocks'][0]['blockName'])->equals('core/paragraph');
-    expect($result[0]['innerBlocks'][0]['innerBlocks'][0]['innerHTML'])->equals('Paragraph content');
+    verify($result[0]['blockName'])->equals('core/columns');
+    verify($result[0]['innerBlocks'][0]['blockName'])->equals('core/column');
+    verify($result[0]['innerBlocks'][0]['innerBlocks'][0]['blockName'])->equals('core/paragraph');
+    verify($result[0]['innerBlocks'][0]['innerBlocks'][0]['innerHTML'])->equals('Paragraph content');
   }
 
   public function testItDoesntWrapColumns() {
     $parsedDocumentWithMultipleColumns = [$this->columnsBlock, $this->columnsBlock];
     $result = $this->preprocessor->preprocess($parsedDocumentWithMultipleColumns);
-    expect($result)->equals($parsedDocumentWithMultipleColumns);
+    verify($result)->equals($parsedDocumentWithMultipleColumns);
   }
 
   public function testItWrapsTopLevelBlocksSpreadBetweenColumns() {
@@ -49,15 +49,15 @@ class PreprocessorTest extends \MailPoetUnitTest {
     $result = $this->preprocessor->preprocess($parsedDocument);
     expect($result)->count(3);
     // First columns contain columns with one paragraph block
-    expect($result[0]['innerBlocks'][0]['blockName'])->equals('core/column');
-    expect($result[0]['innerBlocks'][0]['innerBlocks'][0]['blockName'])->equals('core/paragraph');
+    verify($result[0]['innerBlocks'][0]['blockName'])->equals('core/column');
+    verify($result[0]['innerBlocks'][0]['innerBlocks'][0]['blockName'])->equals('core/paragraph');
     // Second columns remains empty
-    expect($result[1]['innerBlocks'][0]['blockName'])->equals('core/column');
+    verify($result[1]['innerBlocks'][0]['blockName'])->equals('core/column');
     expect($result[1]['innerBlocks'][0]['innerBlocks'])->isEmpty();
     // Third columns contain columns with two paragraph blocks
-    expect($result[2]['innerBlocks'][0]['blockName'])->equals('core/column');
+    verify($result[2]['innerBlocks'][0]['blockName'])->equals('core/column');
     expect($result[2]['innerBlocks'][0]['innerBlocks'])->count(2);
-    expect($result[2]['innerBlocks'][0]['innerBlocks'][0]['blockName'])->equals('core/paragraph');
-    expect($result[2]['innerBlocks'][0]['innerBlocks'][1]['blockName'])->equals('core/paragraph');
+    verify($result[2]['innerBlocks'][0]['innerBlocks'][0]['blockName'])->equals('core/paragraph');
+    verify($result[2]['innerBlocks'][0]['innerBlocks'][1]['blockName'])->equals('core/paragraph');
   }
 }
diff --git a/mailpoet/tests/unit/Entities/FormEntityTest.php b/mailpoet/tests/unit/Entities/FormEntityTest.php
index da28cae463..0b2b334c8f 100644
--- a/mailpoet/tests/unit/Entities/FormEntityTest.php
+++ b/mailpoet/tests/unit/Entities/FormEntityTest.php
@@ -56,13 +56,13 @@ class FormEntityTest extends \MailPoetUnitTest {
     $formEntity->setBody($this->body);
     $paragraphs = $formEntity->getBlocksByTypes([FormEntity::PARAGRAPH_BLOCK_TYPE]);
     expect($paragraphs)->count(3);
-    expect($paragraphs[0]['params']['content'])->equals('Paragraph 1');
-    expect($paragraphs[1]['params']['content'])->equals('Paragraph 2');
-    expect($paragraphs[2]['params']['content'])->equals('Paragraph 3');
+    verify($paragraphs[0]['params']['content'])->equals('Paragraph 1');
+    verify($paragraphs[1]['params']['content'])->equals('Paragraph 2');
+    verify($paragraphs[2]['params']['content'])->equals('Paragraph 3');
 
     $headings = $formEntity->getBlocksByTypes([FormEntity::HEADING_BLOCK_TYPE]);
     expect($headings)->count(1);
-    expect($headings[0]['params']['content'])->equals('Heading 1');
+    verify($headings[0]['params']['content'])->equals('Heading 1');
 
     $columns = $formEntity->getBlocksByTypes([FormEntity::COLUMNS_BLOCK_TYPE]);
     expect($columns)->count(1);
@@ -85,6 +85,6 @@ class FormEntityTest extends \MailPoetUnitTest {
     ];
     $formEntity->setBody($body);
     $segmentIds = $formEntity->getSegmentBlocksSegmentIds();
-    expect($segmentIds)->equals([1, 3]);
+    verify($segmentIds)->equals([1, 3]);
   }
 }
diff --git a/mailpoet/tests/unit/Entities/SubscriberCustomFieldEntityTest.php b/mailpoet/tests/unit/Entities/SubscriberCustomFieldEntityTest.php
index 635b9d6d36..d457c5f836 100644
--- a/mailpoet/tests/unit/Entities/SubscriberCustomFieldEntityTest.php
+++ b/mailpoet/tests/unit/Entities/SubscriberCustomFieldEntityTest.php
@@ -16,7 +16,7 @@ class SubscriberCustomFieldEntityTest extends \MailPoetUnitTest {
       'month' => 7,
       'day' => 10,
     ]);
-    expect($subscriberCustomField->getValue())->equals('2010-07-10 00:00:00');
+    verify($subscriberCustomField->getValue())->equals('2010-07-10 00:00:00');
   }
 
   public function testValueYearMonthIsFormatted(): void {
@@ -31,7 +31,7 @@ class SubscriberCustomFieldEntityTest extends \MailPoetUnitTest {
       'year' => 2010,
       'month' => 2,
     ]);
-    expect($subscriberCustomField->getValue())->equals('2010-02-01 00:00:00');
+    verify($subscriberCustomField->getValue())->equals('2010-02-01 00:00:00');
   }
 
   public function testValueYearIsFormatted(): void {
@@ -45,7 +45,7 @@ class SubscriberCustomFieldEntityTest extends \MailPoetUnitTest {
     $subscriberCustomField = new SubscriberCustomFieldEntity($subscriber, $customField, [
       'year' => 1994,
     ]);
-    expect($subscriberCustomField->getValue())->equals('1994-01-01 00:00:00');
+    verify($subscriberCustomField->getValue())->equals('1994-01-01 00:00:00');
   }
 
   public function testValueStringIsFormatted(): void {
@@ -53,6 +53,6 @@ class SubscriberCustomFieldEntityTest extends \MailPoetUnitTest {
     $customField = new CustomFieldEntity();
     $customField->setType(CustomFieldEntity::TYPE_TEXT);
     $subscriberCustomField = new SubscriberCustomFieldEntity($subscriber, $customField, 'some value');
-    expect($subscriberCustomField->getValue())->equals('some value');
+    verify($subscriberCustomField->getValue())->equals('some value');
   }
 }
diff --git a/mailpoet/tests/unit/Entities/SubscriberEntityTest.php b/mailpoet/tests/unit/Entities/SubscriberEntityTest.php
index 5658301ddd..8f0fdb79a1 100644
--- a/mailpoet/tests/unit/Entities/SubscriberEntityTest.php
+++ b/mailpoet/tests/unit/Entities/SubscriberEntityTest.php
@@ -6,7 +6,7 @@ class SubscriberEntityTest extends \MailPoetUnitTest {
   public function testMagicGetterReturnsData() {
     $subscriber = new SubscriberEntity();
     $subscriber->setWpUserId(4);
-    expect($subscriber->wp_user_id)->equals(4);// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
+    verify($subscriber->wp_user_id)->equals(4);// phpcs:ignore Squiz.NamingConventions.ValidVariableName.MemberNotCamelCaps
   }
 
   public function testMagicGetterReturnsNullForUnknown() {
diff --git a/mailpoet/tests/unit/Features/FeaturesControllerTest.php b/mailpoet/tests/unit/Features/FeaturesControllerTest.php
index d6c9bd11bd..cd6fcddc21 100644
--- a/mailpoet/tests/unit/Features/FeaturesControllerTest.php
+++ b/mailpoet/tests/unit/Features/FeaturesControllerTest.php
@@ -25,9 +25,9 @@ class FeaturesControllerTest extends \MailPoetUnitTest {
       ]
     );
 
-    expect($controller->isSupported('feature-a'))->equals(true);
-    expect($controller->isSupported('feature-b'))->equals(false);
-    expect($controller->getAllFlags())->equals([
+    verify($controller->isSupported('feature-a'))->equals(true);
+    verify($controller->isSupported('feature-b'))->equals(false);
+    verify($controller->getAllFlags())->equals([
       'feature-a' => true,
       'feature-b' => false,
     ]);
@@ -47,8 +47,8 @@ class FeaturesControllerTest extends \MailPoetUnitTest {
       ],
     ]);
 
-    expect($controller->isSupported('feature-a'))->equals(false);
-    expect($controller->getAllFlags())->equals([
+    verify($controller->isSupported('feature-a'))->equals(false);
+    verify($controller->getAllFlags())->equals([
       'feature-a' => false,
     ]);
   }
@@ -68,7 +68,7 @@ class FeaturesControllerTest extends \MailPoetUnitTest {
     try {
       $controller->isSupported('feature-unknown');
     } catch (\RuntimeException $e) {
-      expect($e->getMessage())->equals("Unknown feature 'feature-unknown'");
+      verify($e->getMessage())->equals("Unknown feature 'feature-unknown'");
     }
     expect($controller->getAllFlags())->isEmpty();
   }
diff --git a/mailpoet/tests/unit/Form/Block/BlockRendererHelperTest.php b/mailpoet/tests/unit/Form/Block/BlockRendererHelperTest.php
index 368801541a..f84cfa5eef 100644
--- a/mailpoet/tests/unit/Form/Block/BlockRendererHelperTest.php
+++ b/mailpoet/tests/unit/Form/Block/BlockRendererHelperTest.php
@@ -48,16 +48,16 @@ class BlockRendererHelperTest extends \MailPoetUnitTest {
 
     $block['styles'] = ['bold' => '1'];
     $label = $this->rendererHelper->renderLabel($block, []);
-    expect($label)->equals('<label class="mailpoet_text_label" style="font-weight: bold;">Input label</label>');
+    verify($label)->equals('<label class="mailpoet_text_label" style="font-weight: bold;">Input label</label>');
 
     $block['params']['required'] = '1';
     $block['styles'] = [];
     $label = $this->rendererHelper->renderLabel($block, []);
-    expect($label)->equals('<label class="mailpoet_text_label" >Input label <span class="mailpoet_required">*</span></label>');
+    verify($label)->equals('<label class="mailpoet_text_label" >Input label <span class="mailpoet_required">*</span></label>');
 
     $block['params']['hide_label'] = '1';
     $label = $this->rendererHelper->renderLabel($block, []);
-    expect($label)->equals('');
+    verify($label)->equals('');
 
     $label = $this->rendererHelper->renderLabel($this->block, ['fontSize' => 10]);
     expect($label)->stringContainsString('style="font-size: 10px;');
@@ -73,92 +73,92 @@ class BlockRendererHelperTest extends \MailPoetUnitTest {
 
     $block['styles'] = ['bold' => '1'];
     $label = $this->rendererHelper->renderLegend($block, []);
-    expect($label)->equals('<legend class="mailpoet_text_label" style="font-weight: bold;">Input label</legend>');
+    verify($label)->equals('<legend class="mailpoet_text_label" style="font-weight: bold;">Input label</legend>');
 
     $block['params']['required'] = '1';
     $block['styles'] = [];
     $label = $this->rendererHelper->renderLegend($block, []);
-    expect($label)->equals('<legend class="mailpoet_text_label" >Input label <span class="mailpoet_required">*</span></legend>');
+    verify($label)->equals('<legend class="mailpoet_text_label" >Input label <span class="mailpoet_required">*</span></legend>');
 
     $block['params']['hide_label'] = '1';
     $label = $this->rendererHelper->renderLegend($block, []);
-    expect($label)->equals('');
+    verify($label)->equals('');
   }
 
   public function testItShouldRenderPlaceholder() {
     $block = $this->block;
     $placeholder = $this->rendererHelper->renderInputPlaceholder($block);
-    expect($placeholder)->equals('');
+    verify($placeholder)->equals('');
 
     $block['params']['label_within'] = '1';
     $placeholder = $this->rendererHelper->renderInputPlaceholder($block);
-    expect($placeholder)->equals(' placeholder="Input label" ');
+    verify($placeholder)->equals(' placeholder="Input label" ');
 
     $block['params']['required'] = '1';
     $placeholder = $this->rendererHelper->renderInputPlaceholder($block);
-    expect($placeholder)->equals(' placeholder="Input label *" ');
+    verify($placeholder)->equals(' placeholder="Input label *" ');
   }
 
   public function testItShouldRenderInputValidations() {
     $block = $this->block;
     $validation = $this->rendererHelper->getInputValidation($block);
-    expect($validation)->equals('');
+    verify($validation)->equals('');
 
     $block['params']['required'] = '1';
     $validation = $this->rendererHelper->getInputValidation($block, [], 2);
-    expect($validation)->equals('data-parsley-required="true" data-parsley-errors-container=".mailpoet_error_1_2" data-parsley-required-message="This field is required."');
+    verify($validation)->equals('data-parsley-required="true" data-parsley-errors-container=".mailpoet_error_1_2" data-parsley-required-message="This field is required."');
 
     $block['params']['required'] = '0';
     $block['id'] = 'email';
     $validation = $this->rendererHelper->getInputValidation($block);
-    expect($validation)->equals('data-parsley-required="true" data-parsley-minlength="6" data-parsley-maxlength="150" data-parsley-type-message="This value should be a valid email."');
+    verify($validation)->equals('data-parsley-required="true" data-parsley-minlength="6" data-parsley-maxlength="150" data-parsley-type-message="This value should be a valid email."');
 
     $block = $this->block;
     $block['params']['validate'] = 'phone';
     $validation = $this->rendererHelper->getInputValidation($block);
-    expect($validation)->equals('data-parsley-pattern="^[\d\+\-\.\(\)\/\s]*$" data-parsley-error-message="Please specify a valid phone number."');
+    verify($validation)->equals('data-parsley-pattern="^[\d\+\-\.\(\)\/\s]*$" data-parsley-error-message="Please specify a valid phone number."');
 
     $block = $this->block;
     $block['type'] = 'radio';
     $validation = $this->rendererHelper->getInputValidation($block);
-    expect($validation)->equals('data-parsley-group="custom_field_1" data-parsley-errors-container=".mailpoet_error_1" data-parsley-required-message="Please select at least one option."');
+    verify($validation)->equals('data-parsley-group="custom_field_1" data-parsley-errors-container=".mailpoet_error_1" data-parsley-required-message="Please select at least one option."');
 
     $block = $this->block;
     $block['type'] = 'date';
     $validation = $this->rendererHelper->getInputValidation($block);
-    expect($validation)->equals('data-parsley-group="custom_field_1" data-parsley-errors-container=".mailpoet_error_1"');
+    verify($validation)->equals('data-parsley-group="custom_field_1" data-parsley-errors-container=".mailpoet_error_1"');
 
     $block = $this->block;
     $validation = $this->rendererHelper->getInputValidation($block, ['custom']);
-    expect($validation)->equals('data-parsley-0="custom"');
+    verify($validation)->equals('data-parsley-0="custom"');
   }
 
   public function testItShouldRenderInputValidationsWithFormId(): void {
     $block = $this->block;
     $block['type'] = 'radio';
     $validation = $this->rendererHelper->getInputValidation($block, [], 1);
-    expect($validation)->equals('data-parsley-group="custom_field_1" data-parsley-errors-container=".mailpoet_error_1_1" data-parsley-required-message="Please select at least one option."');
+    verify($validation)->equals('data-parsley-group="custom_field_1" data-parsley-errors-container=".mailpoet_error_1_1" data-parsley-required-message="Please select at least one option."');
 
     $block = $this->block;
     $block['type'] = 'checkbox';
     $validation = $this->rendererHelper->getInputValidation($block, [], 2);
-    expect($validation)->equals('data-parsley-group="custom_field_1" data-parsley-errors-container=".mailpoet_error_1_2" data-parsley-required-message="Please select at least one option."');
+    verify($validation)->equals('data-parsley-group="custom_field_1" data-parsley-errors-container=".mailpoet_error_1_2" data-parsley-required-message="Please select at least one option."');
 
     $block = $this->block;
     $block['type'] = 'date';
     $validation = $this->rendererHelper->getInputValidation($block, [], 3);
-    expect($validation)->equals('data-parsley-group="custom_field_1" data-parsley-errors-container=".mailpoet_error_1_3"');
+    verify($validation)->equals('data-parsley-group="custom_field_1" data-parsley-errors-container=".mailpoet_error_1_3"');
 
     $block = $this->block;
     $block['id'] = 'segments';
     $validation = $this->rendererHelper->getInputValidation($block, [], 4);
-    expect($validation)->equals('data-parsley-required="true" data-parsley-group="segments" data-parsley-errors-container=".mailpoet_error_segments_4" data-parsley-required-message="Please select a list."');
+    verify($validation)->equals('data-parsley-required="true" data-parsley-group="segments" data-parsley-errors-container=".mailpoet_error_segments_4" data-parsley-required-message="Please select a list."');
   }
 
   public function testItShouldObfuscateFieldNameIfNeeded() {
     $block = $this->block;
     $fieldName = $this->rendererHelper->getFieldName($block);
-    expect($fieldName)->equals('cf_1');
+    verify($fieldName)->equals('cf_1');
 
     $obfuscatorMock = $this->createMock(FieldNameObfuscator::class);
     $obfuscatorMock->expects($this->once())->method('obfuscate')->willReturn('xyz');
@@ -166,6 +166,6 @@ class BlockRendererHelperTest extends \MailPoetUnitTest {
 
     $block['id'] = 'email';
     $fieldName = $renderer->getFieldName($block);
-    expect($fieldName)->equals('xyz');
+    verify($fieldName)->equals('xyz');
   }
 }
diff --git a/mailpoet/tests/unit/Form/Block/CheckboxTest.php b/mailpoet/tests/unit/Form/Block/CheckboxTest.php
index 851b0363df..a618c03965 100644
--- a/mailpoet/tests/unit/Form/Block/CheckboxTest.php
+++ b/mailpoet/tests/unit/Form/Block/CheckboxTest.php
@@ -66,10 +66,10 @@ class CheckboxTest extends \MailPoetUnitTest {
     $this->wpMock->expects($this->once())->method('wpKses');
     $html = $this->checkbox->render($this->block, []);
     $checkboxLabel = $this->htmlParser->getElementByXpath($html, "//label[@class='mailpoet_checkbox_label']");
-    expect($checkboxLabel->nodeValue)->equals(' Checkbox label');
+    verify($checkboxLabel->nodeValue)->equals(' Checkbox label');
     $checkbox = $this->htmlParser->getChildElement($checkboxLabel, 'input');
     $checked = $this->htmlParser->getAttribute($checkbox, 'checked');
-    expect($checked->value)->equals('checked');
+    verify($checked->value)->equals('checked');
   }
 
   public function testItShouldRenderErrorContainerWithFormId() {
@@ -82,6 +82,6 @@ class CheckboxTest extends \MailPoetUnitTest {
 
     $errorContainer = $this->htmlParser->getElementByXpath($html, "//span[@class='mailpoet_error_1_213']");
     expect($errorContainer)->notEmpty();
-    expect($errorContainer->nodeName)->equals('span');
+    verify($errorContainer->nodeName)->equals('span');
   }
 }
diff --git a/mailpoet/tests/unit/Form/Block/ColumnTest.php b/mailpoet/tests/unit/Form/Block/ColumnTest.php
index 0286deaf53..bd8ee168b9 100644
--- a/mailpoet/tests/unit/Form/Block/ColumnTest.php
+++ b/mailpoet/tests/unit/Form/Block/ColumnTest.php
@@ -31,7 +31,7 @@ class ColumnTest extends \MailPoetUnitTest {
 
   public function testItShouldRenderColumn() {
     $html = $this->columns->render($this->block, 'content');
-    expect($html)->equals('<div class="mailpoet_form_column">content</div>');
+    verify($html)->equals('<div class="mailpoet_form_column">content</div>');
   }
 
   public function testItShouldRenderWidth() {
diff --git a/mailpoet/tests/unit/Form/Block/ColumnsTest.php b/mailpoet/tests/unit/Form/Block/ColumnsTest.php
index 3e3e72b36b..120b64aa7f 100644
--- a/mailpoet/tests/unit/Form/Block/ColumnsTest.php
+++ b/mailpoet/tests/unit/Form/Block/ColumnsTest.php
@@ -30,7 +30,7 @@ class ColumnsTest extends \MailPoetUnitTest {
 
   public function testItShouldRenderColumns() {
     $html = $this->columns->render($this->block, 'content');
-    expect($html)->equals('<div class="mailpoet_form_columns mailpoet_paragraph mailpoet_stack_on_mobile">content</div>');
+    verify($html)->equals('<div class="mailpoet_form_columns mailpoet_paragraph mailpoet_stack_on_mobile">content</div>');
   }
 
   public function testItShouldRenderVerticalAlignClass() {
diff --git a/mailpoet/tests/unit/Form/Block/DateTest.php b/mailpoet/tests/unit/Form/Block/DateTest.php
index e871224a87..a6cd4418b8 100644
--- a/mailpoet/tests/unit/Form/Block/DateTest.php
+++ b/mailpoet/tests/unit/Form/Block/DateTest.php
@@ -66,17 +66,17 @@ class DateTest extends \MailPoetUnitTest {
     $html = $this->date->render($this->block, []);
     $mothsSelect = $this->htmlParser->getElementByXpath($html, "//select", 0);
     $yearsSelect = $this->htmlParser->getElementByXpath($html, "//select", 1);
-    expect($mothsSelect->childNodes->length)->equals(13); // Months + placeholder
-    expect($yearsSelect->childNodes->length)->equals(101 + 1); // Years + placeholder
+    verify($mothsSelect->childNodes->length)->equals(13); // Months + placeholder
+    verify($yearsSelect->childNodes->length)->equals(101 + 1); // Years + placeholder
 
     $date = Carbon::now();
     $currentMonth = $date->format('F');
     $currentYear = $date->format('Y');
 
     $selectedMonth = $this->htmlParser->getElementByXpath($html, "//option[@selected='selected']", 0);
-    expect($selectedMonth->textContent)->equals($currentMonth);
+    verify($selectedMonth->textContent)->equals($currentMonth);
     $selectedYear = $this->htmlParser->getElementByXpath($html, "//option[@selected='selected']", 1);
-    expect($selectedYear->textContent)->equals($currentYear);
+    verify($selectedYear->textContent)->equals($currentYear);
   }
 
   public function testItShouldRenderYearMonthDayDateFormat() {
@@ -92,9 +92,9 @@ class DateTest extends \MailPoetUnitTest {
     $mothsSelect = $this->htmlParser->getElementByXpath($html, "//select", 0);
     $daysSelect = $this->htmlParser->getElementByXpath($html, "//select", 1);
     $yearsSelect = $this->htmlParser->getElementByXpath($html, "//select", 2);
-    expect($mothsSelect->childNodes->length)->equals(13); // Months + placeholder
-    expect($daysSelect->childNodes->length)->equals(32); // Days + placeholder
-    expect($yearsSelect->childNodes->length)->equals(101 + 1); // Years + placeholder
+    verify($mothsSelect->childNodes->length)->equals(13); // Months + placeholder
+    verify($daysSelect->childNodes->length)->equals(32); // Days + placeholder
+    verify($yearsSelect->childNodes->length)->equals(101 + 1); // Years + placeholder
 
     $date = Carbon::now();
     $currentMonth = $date->format('F');
@@ -102,11 +102,11 @@ class DateTest extends \MailPoetUnitTest {
     $currentDay = $date->format('j');
 
     $selectedMonth = $this->htmlParser->getElementByXpath($html, "//option[@selected='selected']", 0);
-    expect($selectedMonth->textContent)->equals($currentMonth);
+    verify($selectedMonth->textContent)->equals($currentMonth);
     $selectedDay = $this->htmlParser->getElementByXpath($html, "//option[@selected='selected']", 1);
-    expect($selectedDay->textContent)->equals($currentDay);
+    verify($selectedDay->textContent)->equals($currentDay);
     $selectedYear = $this->htmlParser->getElementByXpath($html, "//option[@selected='selected']", 2);
-    expect($selectedYear->textContent)->equals($currentYear);
+    verify($selectedYear->textContent)->equals($currentYear);
   }
 
   public function testItShouldAddValue() {
@@ -123,11 +123,11 @@ class DateTest extends \MailPoetUnitTest {
     $html = $this->date->render($block, []);
 
     $selectedMonth = $this->htmlParser->getElementByXpath($html, "//option[@selected='selected']", 0);
-    expect($selectedMonth->textContent)->equals('February');
+    verify($selectedMonth->textContent)->equals('February');
     $selectedDay = $this->htmlParser->getElementByXpath($html, "//option[@selected='selected']", 1);
-    expect($selectedDay->textContent)->equals('9');
+    verify($selectedDay->textContent)->equals('9');
     $selectedYear = $this->htmlParser->getElementByXpath($html, "//option[@selected='selected']", 2);
-    expect($selectedYear->textContent)->equals('2009');
+    verify($selectedYear->textContent)->equals('2009');
   }
 
   public function testItShouldRenderErrorContainerWithFormId() {
@@ -139,6 +139,6 @@ class DateTest extends \MailPoetUnitTest {
 
     $errorContainer = $this->htmlParser->getElementByXpath($html, "//span[@class='mailpoet_error_1_44']");
     expect($errorContainer)->notEmpty();
-    expect($errorContainer->nodeName)->equals('span');
+    verify($errorContainer->nodeName)->equals('span');
   }
 }
diff --git a/mailpoet/tests/unit/Form/Block/DividerTest.php b/mailpoet/tests/unit/Form/Block/DividerTest.php
index f9a1abf0c3..13e4fe998b 100644
--- a/mailpoet/tests/unit/Form/Block/DividerTest.php
+++ b/mailpoet/tests/unit/Form/Block/DividerTest.php
@@ -49,7 +49,7 @@ class DividerTest extends \MailPoetUnitTest {
     $block['params']['type'] = 'spacer';
     $block['params']['height'] = '10';
     $result = $this->divider->render($block);
-    expect($result)->equals("<div class='mailpoet_spacer' style='height: 10px;'></div>");
+    verify($result)->equals("<div class='mailpoet_spacer' style='height: 10px;'></div>");
   }
 
   public function testItRendersDivider() {
diff --git a/mailpoet/tests/unit/Form/Block/HeadingTest.php b/mailpoet/tests/unit/Form/Block/HeadingTest.php
index 8bea8676be..4d813eacb1 100644
--- a/mailpoet/tests/unit/Form/Block/HeadingTest.php
+++ b/mailpoet/tests/unit/Form/Block/HeadingTest.php
@@ -27,7 +27,7 @@ class HeadingTest extends \MailPoetUnitTest {
         'content' => 'Header',
       ],
     ]);
-    expect($html)->equals('<h2 class="mailpoet-heading">Header</h2>');
+    verify($html)->equals('<h2 class="mailpoet-heading">Header</h2>');
   }
 
   public function testItShouldRenderLevel() {
@@ -37,7 +37,7 @@ class HeadingTest extends \MailPoetUnitTest {
         'level' => 1,
       ],
     ]);
-    expect($html)->equals('<h1 class="mailpoet-heading">Header</h1>');
+    verify($html)->equals('<h1 class="mailpoet-heading">Header</h1>');
   }
 
   public function testItShouldRenderClass() {
@@ -48,7 +48,7 @@ class HeadingTest extends \MailPoetUnitTest {
         'class_name' => 'class1 class2',
       ],
     ]);
-    expect($html)->equals('<h1 class="mailpoet-heading class1 class2">Header</h1>');
+    verify($html)->equals('<h1 class="mailpoet-heading class1 class2">Header</h1>');
   }
 
   public function testItShouldRenderAnchor() {
@@ -59,7 +59,7 @@ class HeadingTest extends \MailPoetUnitTest {
         'anchor' => 'anchor',
       ],
     ]);
-    expect($html)->equals('<h1 class="mailpoet-heading" id="anchor">Header</h1>');
+    verify($html)->equals('<h1 class="mailpoet-heading" id="anchor">Header</h1>');
   }
 
   public function testItShouldRenderAlign() {
@@ -70,7 +70,7 @@ class HeadingTest extends \MailPoetUnitTest {
         'align' => 'right',
       ],
     ]);
-    expect($html)->equals('<h1 class="mailpoet-heading" style="text-align: right">Header</h1>');
+    verify($html)->equals('<h1 class="mailpoet-heading" style="text-align: right">Header</h1>');
   }
 
   public function testItShouldRenderTextColour() {
@@ -81,7 +81,7 @@ class HeadingTest extends \MailPoetUnitTest {
         'text_color' => 'red',
       ],
     ]);
-    expect($html)->equals('<h1 class="mailpoet-heading" style="color: red">Header</h1>');
+    verify($html)->equals('<h1 class="mailpoet-heading" style="color: red">Header</h1>');
   }
 
   public function testItShouldRenderBackgroundColor() {
@@ -102,7 +102,7 @@ class HeadingTest extends \MailPoetUnitTest {
         'font_size' => '33',
       ],
     ]);
-    expect($html)->equals('<h2 class="mailpoet-heading mailpoet-has-font-size" style="font-size: 33px">Header</h2>');
+    verify($html)->equals('<h2 class="mailpoet-heading mailpoet-has-font-size" style="font-size: 33px">Header</h2>');
   }
 
   public function testItShouldRenderFontSizeWithUnit() {
@@ -112,7 +112,7 @@ class HeadingTest extends \MailPoetUnitTest {
         'font_size' => '2.2em',
       ],
     ]);
-    expect($html)->equals('<h2 class="mailpoet-heading mailpoet-has-font-size" style="font-size: 2.2em">Header</h2>');
+    verify($html)->equals('<h2 class="mailpoet-heading mailpoet-has-font-size" style="font-size: 2.2em">Header</h2>');
   }
 
   public function testItShouldRenderLineHeight() {
@@ -122,6 +122,6 @@ class HeadingTest extends \MailPoetUnitTest {
         'line_height' => '2.3',
       ],
     ]);
-    expect($html)->equals('<h2 class="mailpoet-heading" style="line-height: 2.3">Header</h2>');
+    verify($html)->equals('<h2 class="mailpoet-heading" style="line-height: 2.3">Header</h2>');
   }
 }
diff --git a/mailpoet/tests/unit/Form/Block/HtmlTest.php b/mailpoet/tests/unit/Form/Block/HtmlTest.php
index 8a72f016c4..9a3eb1b04b 100644
--- a/mailpoet/tests/unit/Form/Block/HtmlTest.php
+++ b/mailpoet/tests/unit/Form/Block/HtmlTest.php
@@ -29,27 +29,27 @@ class HtmlTest extends \MailPoetUnitTest {
 
   public function testItShouldRenderCustomHtml() {
     $html = $this->html->render($this->block, []);
-    expect($html)->equals("<div class=\"mailpoet_paragraph\" >line1<br />\nline2</div>");
+    verify($html)->equals("<div class=\"mailpoet_paragraph\" >line1<br />\nline2</div>");
   }
 
   public function testItShouldRenderCustomClass() {
     $block = $this->block;
     $block['params']['class_name'] = 'my_class';
     $html = $this->html->render($block, []);
-    expect($html)->equals("<div class=\"mailpoet_paragraph my_class\" >line1<br />\nline2</div>");
+    verify($html)->equals("<div class=\"mailpoet_paragraph my_class\" >line1<br />\nline2</div>");
   }
 
   public function testItShouldRenderCustomHtmlWithoutAutomaticBrs() {
     $block = $this->block;
     $block['params']['nl2br'] = '';
     $html = $this->html->render($block, []);
-    expect($html)->equals("<div class=\"mailpoet_paragraph\" >line1\nline2</div>");
+    verify($html)->equals("<div class=\"mailpoet_paragraph\" >line1\nline2</div>");
   }
 
   public function testItShouldNotEscapeHtml() {
     $block = $this->block;
     $block['params']['text'] = '<p class="my-p">Hello</p>';
     $html = $this->html->render($block, []);
-    expect($html)->equals("<div class=\"mailpoet_paragraph\" ><p class=\"my-p\">Hello</p></div>");
+    verify($html)->equals("<div class=\"mailpoet_paragraph\" ><p class=\"my-p\">Hello</p></div>");
   }
 }
diff --git a/mailpoet/tests/unit/Form/Block/ImageTest.php b/mailpoet/tests/unit/Form/Block/ImageTest.php
index fc8cf7a61c..ed52f3af25 100644
--- a/mailpoet/tests/unit/Form/Block/ImageTest.php
+++ b/mailpoet/tests/unit/Form/Block/ImageTest.php
@@ -67,32 +67,32 @@ class ImageTest extends \MailPoetUnitTest {
     $html = $this->image->render($this->block);
     $block = $this->htmlParser->getElementByXpath($html, '//div');
     $blockClass = $this->htmlParser->getAttribute($block, 'class');
-    expect($blockClass->value)->equals('mailpoet_form_image my-class');
+    verify($blockClass->value)->equals('mailpoet_form_image my-class');
 
     $figure = $this->htmlParser->getChildElement($block, 'figure');
     $figureClass = $this->htmlParser->getAttribute($figure, 'class');
-    expect($figureClass->value)->equals('size-medium alignleft');
+    verify($figureClass->value)->equals('size-medium alignleft');
 
     $img = $this->htmlParser->getChildElement($figure, 'img');
     $imgSrc = $this->htmlParser->getAttribute($img, 'src');
-    expect($imgSrc->value)->equals('http://example.com/image.jpg');
+    verify($imgSrc->value)->equals('http://example.com/image.jpg');
     $imgSrcset = $this->htmlParser->getAttribute($img, 'srcset');
-    expect($imgSrcset->value)->equals('srcsetvalue');
+    verify($imgSrcset->value)->equals('srcsetvalue');
     $imgWidth = $this->htmlParser->getAttribute($img, 'width');
-    expect($imgWidth->value)->equals(100);
+    verify($imgWidth->value)->equals(100);
     $imgHeight = $this->htmlParser->getAttribute($img, 'height');
-    expect($imgHeight->value)->equals(200);
+    verify($imgHeight->value)->equals(200);
     $imgTitle = $this->htmlParser->getAttribute($img, 'title');
-    expect($imgTitle->value)->equals('Title');
+    verify($imgTitle->value)->equals('Title');
     $imgAlt = $this->htmlParser->getAttribute($img, 'alt');
-    expect($imgAlt->value)->equals('Alt text');
+    verify($imgAlt->value)->equals('Alt text');
     $style = $this->htmlParser->getAttribute($img, 'style');
     expect($style->value)->stringContainsString('width: 100px');
     expect($style->value)->stringContainsString('height: 200px');
 
     $caption = $this->htmlParser->getChildElement($figure, 'figcaption');
     $captionContent = $this->htmlParser->getChildElement($caption, 'strong');
-    expect($captionContent->textContent)->equals('Caption');
+    verify($captionContent->textContent)->equals('Caption');
   }
 
   public function testItShouldRenderImageBlockWithLink() {
@@ -107,22 +107,22 @@ class ImageTest extends \MailPoetUnitTest {
     $figure = $this->htmlParser->getElementByXpath($html, '//figure');
     $link = $this->htmlParser->getChildElement($figure, 'a');
     $linkHref = $this->htmlParser->getAttribute($link, 'href');
-    expect($linkHref->value)->equals('http://example.com/');
+    verify($linkHref->value)->equals('http://example.com/');
     $linkTarget = $this->htmlParser->getAttribute($link, 'target');
-    expect($linkTarget->value)->equals('_blank');
+    verify($linkTarget->value)->equals('_blank');
     $linkRel = $this->htmlParser->getAttribute($link, 'rel');
-    expect($linkRel->value)->equals('relrel');
+    verify($linkRel->value)->equals('relrel');
     $linkClass = $this->htmlParser->getAttribute($link, 'class');
-    expect($linkClass->value)->equals('link-class');
+    verify($linkClass->value)->equals('link-class');
   }
 
   public function testItRendersNothingWhenUrlIsEmpty() {
     $block = $this->block;
     $block['params']['url'] = null;
     $html = $this->image->render($block);
-    expect($html)->equals('');
+    verify($html)->equals('');
     $block['params']['url'] = '';
     $html = $this->image->render($block);
-    expect($html)->equals('');
+    verify($html)->equals('');
   }
 }
diff --git a/mailpoet/tests/unit/Form/Block/ParagraphTest.php b/mailpoet/tests/unit/Form/Block/ParagraphTest.php
index 25a147b77a..90dc0195f0 100644
--- a/mailpoet/tests/unit/Form/Block/ParagraphTest.php
+++ b/mailpoet/tests/unit/Form/Block/ParagraphTest.php
@@ -27,7 +27,7 @@ class ParagraphTest extends \MailPoetUnitTest {
         'content' => 'Paragraph',
       ],
     ]);
-    expect($html)->equals('<p class="mailpoet_form_paragraph">Paragraph</p>');
+    verify($html)->equals('<p class="mailpoet_form_paragraph">Paragraph</p>');
   }
 
   public function testItShouldRenderClass() {
@@ -37,7 +37,7 @@ class ParagraphTest extends \MailPoetUnitTest {
         'class_name' => 'class1 class2',
       ],
     ]);
-    expect($html)->equals('<p class="mailpoet_form_paragraph class1 class2">Paragraph</p>');
+    verify($html)->equals('<p class="mailpoet_form_paragraph class1 class2">Paragraph</p>');
   }
 
   public function testItShouldRenderAlign() {
@@ -47,7 +47,7 @@ class ParagraphTest extends \MailPoetUnitTest {
         'align' => 'right',
       ],
     ]);
-    expect($html)->equals('<p class="mailpoet_form_paragraph" style="text-align: right">Paragraph</p>');
+    verify($html)->equals('<p class="mailpoet_form_paragraph" style="text-align: right">Paragraph</p>');
   }
 
   public function testItShouldRenderTextColor() {
@@ -57,7 +57,7 @@ class ParagraphTest extends \MailPoetUnitTest {
         'text_color' => 'red',
       ],
     ]);
-    expect($html)->equals('<p class="mailpoet_form_paragraph" style="color: red">Paragraph</p>');
+    verify($html)->equals('<p class="mailpoet_form_paragraph" style="color: red">Paragraph</p>');
   }
 
   public function testItShouldRenderBackgroundColor() {
@@ -77,7 +77,7 @@ class ParagraphTest extends \MailPoetUnitTest {
         'font_size' => '33',
       ],
     ]);
-    expect($html)->equals('<p class="mailpoet_form_paragraph mailpoet-has-font-size" style="font-size: 33px">Paragraph</p>');
+    verify($html)->equals('<p class="mailpoet_form_paragraph mailpoet-has-font-size" style="font-size: 33px">Paragraph</p>');
   }
 
   public function testItShouldRenderFontSizeWithUnit() {
@@ -87,7 +87,7 @@ class ParagraphTest extends \MailPoetUnitTest {
         'font_size' => '2.3em',
       ],
     ]);
-    expect($html)->equals('<p class="mailpoet_form_paragraph mailpoet-has-font-size" style="font-size: 2.3em">Paragraph</p>');
+    verify($html)->equals('<p class="mailpoet_form_paragraph mailpoet-has-font-size" style="font-size: 2.3em">Paragraph</p>');
   }
 
   public function testItShouldRenderLineHeight() {
@@ -97,7 +97,7 @@ class ParagraphTest extends \MailPoetUnitTest {
         'line_height' => '2.3',
       ],
     ]);
-    expect($html)->equals('<p class="mailpoet_form_paragraph" style="line-height: 2.3">Paragraph</p>');
+    verify($html)->equals('<p class="mailpoet_form_paragraph" style="line-height: 2.3">Paragraph</p>');
   }
 
   public function testItShouldRenderDropCap() {
@@ -107,7 +107,7 @@ class ParagraphTest extends \MailPoetUnitTest {
         'drop_cap' => '1',
       ],
     ]);
-    expect($html)->equals('<p class="mailpoet_form_paragraph has-drop-cap">Paragraph</p>');
+    verify($html)->equals('<p class="mailpoet_form_paragraph has-drop-cap">Paragraph</p>');
   }
 
   public function testItShouldRenderBackgroundClass() {
diff --git a/mailpoet/tests/unit/Form/Block/RadioTest.php b/mailpoet/tests/unit/Form/Block/RadioTest.php
index 655ca834a7..f9bb502303 100644
--- a/mailpoet/tests/unit/Form/Block/RadioTest.php
+++ b/mailpoet/tests/unit/Form/Block/RadioTest.php
@@ -69,15 +69,15 @@ class RadioTest extends \MailPoetUnitTest {
 
     $radio1 = $this->htmlParser->getElementByXpath($html, "//label[@class='mailpoet_radio_label']", 0);
     $radio2 = $this->htmlParser->getElementByXpath($html, "//label[@class='mailpoet_radio_label']", 1);
-    expect($radio1->textContent)->equals(' Radio 1');
-    expect($radio2->textContent)->equals(' Radio 2');
+    verify($radio1->textContent)->equals(' Radio 1');
+    verify($radio2->textContent)->equals(' Radio 2');
 
     $radio1Input = $this->htmlParser->getChildElement($radio1, 'input');
     $radio2Input = $this->htmlParser->getChildElement($radio2, 'input');
-    expect($this->htmlParser->getAttribute($radio1Input, 'value')->value)->equals('Radio 1');
-    expect($this->htmlParser->getAttribute($radio2Input, 'value')->value)->equals('Radio 2');
+    verify($this->htmlParser->getAttribute($radio1Input, 'value')->value)->equals('Radio 1');
+    verify($this->htmlParser->getAttribute($radio2Input, 'value')->value)->equals('Radio 2');
 
-    expect($this->htmlParser->getAttribute($radio2Input, 'checked')->value)->equals('checked');
+    verify($this->htmlParser->getAttribute($radio2Input, 'checked')->value)->equals('checked');
   }
 
   public function testItShouldRenderErrorContainerWithFormId() {
@@ -90,6 +90,6 @@ class RadioTest extends \MailPoetUnitTest {
 
     $errorContainer = $this->htmlParser->getElementByXpath($html, "//span[@class='mailpoet_error_1_31']");
     expect($errorContainer)->notEmpty();
-    expect($errorContainer->nodeName)->equals('span');
+    verify($errorContainer->nodeName)->equals('span');
   }
 }
diff --git a/mailpoet/tests/unit/Form/Block/SegmentTest.php b/mailpoet/tests/unit/Form/Block/SegmentTest.php
index acfcb5df77..0ca751d2c2 100644
--- a/mailpoet/tests/unit/Form/Block/SegmentTest.php
+++ b/mailpoet/tests/unit/Form/Block/SegmentTest.php
@@ -76,16 +76,16 @@ class SegmentTest extends \MailPoetUnitTest {
 
     $checkbox1 = $this->htmlParser->getElementByXpath($html, "//label[@class='mailpoet_checkbox_label']", 0);
     $checkbox2 = $this->htmlParser->getElementByXpath($html, "//label[@class='mailpoet_checkbox_label']", 1);
-    expect($checkbox1->textContent)->equals(' List 1');
-    expect($checkbox2->textContent)->equals(' List 2');
+    verify($checkbox1->textContent)->equals(' List 1');
+    verify($checkbox2->textContent)->equals(' List 2');
 
     $checkbox1Input = $this->htmlParser->getChildElement($checkbox1, 'input');
     $checkbox2Input = $this->htmlParser->getChildElement($checkbox2, 'input');
-    expect($this->htmlParser->getAttribute($checkbox1Input, 'value')->value)->equals(1);
-    expect($this->htmlParser->getAttribute($checkbox2Input, 'value')->value)->equals(2);
-    expect($this->htmlParser->getAttribute($checkbox1Input, 'name')->value)->equals('data[Segments][]');
-    expect($this->htmlParser->getAttribute($checkbox2Input, 'name')->value)->equals('data[Segments][]');
-    expect($this->htmlParser->getAttribute($checkbox1Input, 'checked')->value)->equals('checked');
+    verify($this->htmlParser->getAttribute($checkbox1Input, 'value')->value)->equals(1);
+    verify($this->htmlParser->getAttribute($checkbox2Input, 'value')->value)->equals(2);
+    verify($this->htmlParser->getAttribute($checkbox1Input, 'name')->value)->equals('data[Segments][]');
+    verify($this->htmlParser->getAttribute($checkbox2Input, 'name')->value)->equals('data[Segments][]');
+    verify($this->htmlParser->getAttribute($checkbox1Input, 'checked')->value)->equals('checked');
   }
 
   public function testItShouldRenderErrorContainerWithFormId(): void {
@@ -101,7 +101,7 @@ class SegmentTest extends \MailPoetUnitTest {
 
     $errorContainer = $this->htmlParser->getElementByXpath($html, "//span[@class='mailpoet_error_segment_1']");
     expect($errorContainer)->notEmpty();
-    expect($errorContainer->nodeName)->equals('span');
+    verify($errorContainer->nodeName)->equals('span');
   }
 
   /**
diff --git a/mailpoet/tests/unit/Form/Block/SubmitTest.php b/mailpoet/tests/unit/Form/Block/SubmitTest.php
index 426ca029f0..b0c0ca319f 100644
--- a/mailpoet/tests/unit/Form/Block/SubmitTest.php
+++ b/mailpoet/tests/unit/Form/Block/SubmitTest.php
@@ -60,8 +60,8 @@ class SubmitTest extends \MailPoetUnitTest {
     $type = $this->htmlParser->getAttribute($input, 'type');
     $value = $this->htmlParser->getAttribute($input, 'value');
     $style = $this->htmlParser->getAttribute($input, 'style');
-    expect($type->value)->equals('submit');
-    expect($value->value)->equals('Submit label');
-    expect($style->value)->equals('border-radius: 10px;');
+    verify($type->value)->equals('submit');
+    verify($value->value)->equals('Submit label');
+    verify($style->value)->equals('border-radius: 10px;');
   }
 }
diff --git a/mailpoet/tests/unit/Form/Block/TextTest.php b/mailpoet/tests/unit/Form/Block/TextTest.php
index 3122630dc2..1f30647ec9 100644
--- a/mailpoet/tests/unit/Form/Block/TextTest.php
+++ b/mailpoet/tests/unit/Form/Block/TextTest.php
@@ -73,12 +73,12 @@ class TextTest extends \MailPoetUnitTest {
     $modifiers = $this->htmlParser->getAttribute($input, 'modifiers');
     $class = $this->htmlParser->getAttribute($input, 'class');
     $style = $this->htmlParser->getAttribute($input, 'style');
-    expect($name->value)->equals('data[Field name]');
-    expect($type->value)->equals('text');
-    expect($validation->value)->equals('1');
-    expect($value->value)->equals('val');
-    expect($modifiers->value)->equals('mod');
-    expect($class->value)->equals('mailpoet_text');
-    expect($style->value)->equals('border-radius: 10px;');
+    verify($name->value)->equals('data[Field name]');
+    verify($type->value)->equals('text');
+    verify($validation->value)->equals('1');
+    verify($value->value)->equals('val');
+    verify($modifiers->value)->equals('mod');
+    verify($class->value)->equals('mailpoet_text');
+    verify($style->value)->equals('border-radius: 10px;');
   }
 }
diff --git a/mailpoet/tests/unit/Form/Block/TextareaTest.php b/mailpoet/tests/unit/Form/Block/TextareaTest.php
index 48727342fa..dde4ecc18d 100644
--- a/mailpoet/tests/unit/Form/Block/TextareaTest.php
+++ b/mailpoet/tests/unit/Form/Block/TextareaTest.php
@@ -72,11 +72,11 @@ class TextareaTest extends \MailPoetUnitTest {
     $modifiers = $this->htmlParser->getAttribute($textarea, 'modifiers');
     $class = $this->htmlParser->getAttribute($textarea, 'class');
     $style = $this->htmlParser->getAttribute($textarea, 'style');
-    expect($textarea->textContent)->equals('val');
-    expect($name->value)->equals('data[Field name]');
-    expect($validation->value)->equals('1');
-    expect($class->value)->equals('mailpoet_textarea');
-    expect($modifiers->value)->equals('mod');
-    expect($style->value)->equals('border-radius: 10px;');
+    verify($textarea->textContent)->equals('val');
+    verify($name->value)->equals('data[Field name]');
+    verify($validation->value)->equals('1');
+    verify($class->value)->equals('mailpoet_textarea');
+    verify($modifiers->value)->equals('mod');
+    verify($style->value)->equals('border-radius: 10px;');
   }
 }
diff --git a/mailpoet/tests/unit/Form/BlockStylesRendererTest.php b/mailpoet/tests/unit/Form/BlockStylesRendererTest.php
index 695dca283b..ebc34f45b7 100644
--- a/mailpoet/tests/unit/Form/BlockStylesRendererTest.php
+++ b/mailpoet/tests/unit/Form/BlockStylesRendererTest.php
@@ -19,15 +19,15 @@ class BlockStylesRendererTest extends \MailPoetUnitTest {
   }
 
   public function testItShouldReturnEmptyStringForNoStylesOrUnsupportedStyles() {
-    expect($this->renderer->renderForTextInput([]))->equals('');
-    expect($this->renderer->renderForTextInput(['nonsense' => '10px']))->equals('');
+    verify($this->renderer->renderForTextInput([]))->equals('');
+    verify($this->renderer->renderForTextInput(['nonsense' => '10px']))->equals('');
   }
 
   public function testItShouldRenderSingleTextInputStyles() {
-    expect($this->renderer->renderForTextInput(['border_radius' => 10]))->equals('border-style:solid;border-radius:10px !important;');
-    expect($this->renderer->renderForTextInput(['border_color' => '#fff']))->equals('border-style:solid;border-color:#fff;');
-    expect($this->renderer->renderForTextInput(['border_size' => 10]))->equals('border-style:solid;border-width:10px;');
-    expect($this->renderer->renderForTextInput(['background_color' => '#dddddd']))->equals('background-color:#dddddd;');
+    verify($this->renderer->renderForTextInput(['border_radius' => 10]))->equals('border-style:solid;border-radius:10px !important;');
+    verify($this->renderer->renderForTextInput(['border_color' => '#fff']))->equals('border-style:solid;border-color:#fff;');
+    verify($this->renderer->renderForTextInput(['border_size' => 10]))->equals('border-style:solid;border-width:10px;');
+    verify($this->renderer->renderForTextInput(['background_color' => '#dddddd']))->equals('background-color:#dddddd;');
   }
 
   public function testItShouldCompleteTextInputStyles() {
@@ -53,12 +53,12 @@ class BlockStylesRendererTest extends \MailPoetUnitTest {
   }
 
   public function testItShouldRenderSingleButtonStyles() {
-    expect($this->renderer->renderForButton(['border_radius' => 10]))->equals('border-style:solid;border-radius:10px !important;border-color:transparent;');
-    expect($this->renderer->renderForButton(['border_color' => '#fff']))->equals('border-style:solid;border-color:#fff;');
-    expect($this->renderer->renderForButton(['border_size' => 10]))->equals('border-style:solid;border-width:10px;border-color:transparent;');
-    expect($this->renderer->renderForButton(['background_color' => '#dddddd']))->equals('background-color:#dddddd;border-color:transparent;');
-    expect($this->renderer->renderForButton(['font_color' => '#aaa']))->equals('color:#aaa;border-color:transparent;');
-    expect($this->renderer->renderForButton(['font_size' => 10]))->equals('font-size:10px;line-height:1.5;height:auto;border-color:transparent;');
+    verify($this->renderer->renderForButton(['border_radius' => 10]))->equals('border-style:solid;border-radius:10px !important;border-color:transparent;');
+    verify($this->renderer->renderForButton(['border_color' => '#fff']))->equals('border-style:solid;border-color:#fff;');
+    verify($this->renderer->renderForButton(['border_size' => 10]))->equals('border-style:solid;border-width:10px;border-color:transparent;');
+    verify($this->renderer->renderForButton(['background_color' => '#dddddd']))->equals('background-color:#dddddd;border-color:transparent;');
+    verify($this->renderer->renderForButton(['font_color' => '#aaa']))->equals('color:#aaa;border-color:transparent;');
+    verify($this->renderer->renderForButton(['font_size' => 10]))->equals('font-size:10px;line-height:1.5;height:auto;border-color:transparent;');
   }
 
   public function testItShouldCompleteButtonStyles() {
@@ -99,14 +99,14 @@ class BlockStylesRendererTest extends \MailPoetUnitTest {
   }
 
   public function testItShouldRenderSegmentInputStyles() {
-    expect($this->renderer->renderForSelect([], ['input_padding' => 10]))->equals('padding:10px;');
-    expect($this->renderer->renderForSelect([], ['alignment' => 'right']))->equals('margin: 0 0 0 auto;');
-    expect($this->renderer->renderForSelect([], ['alignment' => 'center']))->equals('margin: 0 auto;');
+    verify($this->renderer->renderForSelect([], ['input_padding' => 10]))->equals('padding:10px;');
+    verify($this->renderer->renderForSelect([], ['alignment' => 'right']))->equals('margin: 0 0 0 auto;');
+    verify($this->renderer->renderForSelect([], ['alignment' => 'center']))->equals('margin: 0 auto;');
   }
 
   public function testItShouldRenderPlaceholderStyles() {
-    expect($this->renderer->renderPlaceholderStyles([], 'input'))->equals('');
-    expect($this->renderer->renderPlaceholderStyles(['params' => ['label_within' => '1']], 'input'))->equals('');
+    verify($this->renderer->renderPlaceholderStyles([], 'input'))->equals('');
+    verify($this->renderer->renderPlaceholderStyles(['params' => ['label_within' => '1']], 'input'))->equals('');
     expect($this->renderer->renderPlaceholderStyles([
       'params' => ['label_within' => '1'],
       'styles' => ['font_color' => 'red'],
diff --git a/mailpoet/tests/unit/Form/BlockWrapperRendererTest.php b/mailpoet/tests/unit/Form/BlockWrapperRendererTest.php
index f55c18a28a..574877e0aa 100644
--- a/mailpoet/tests/unit/Form/BlockWrapperRendererTest.php
+++ b/mailpoet/tests/unit/Form/BlockWrapperRendererTest.php
@@ -13,7 +13,7 @@ class BlockWrapperRendererTest extends \MailPoetUnitTest {
     $renderer = new BlockWrapperRenderer($wpMock);
     $block = Fixtures::get('simple_form_body')[0];
     $result = $renderer->render($block, 'content');
-    expect($result)->equals('<div class="mailpoet_paragraph">content</div>');
+    verify($result)->equals('<div class="mailpoet_paragraph">content</div>');
   }
 
   public function testItShouldWrapRenderCustomClasses() {
@@ -23,6 +23,6 @@ class BlockWrapperRendererTest extends \MailPoetUnitTest {
     $block = Fixtures::get('simple_form_body')[0];
     $block['params']['class_name'] = 'class1 class2';
     $result = $renderer->render($block, 'content');
-    expect($result)->equals('<div class="mailpoet_paragraph class1 class2">content</div>');
+    verify($result)->equals('<div class="mailpoet_paragraph class1 class2">content</div>');
   }
 }
diff --git a/mailpoet/tests/unit/Form/DisplayFormInWPContentTest.php b/mailpoet/tests/unit/Form/DisplayFormInWPContentTest.php
index 68d3383124..dd6fe9551f 100644
--- a/mailpoet/tests/unit/Form/DisplayFormInWPContentTest.php
+++ b/mailpoet/tests/unit/Form/DisplayFormInWPContentTest.php
@@ -113,7 +113,7 @@ class DisplayFormInWPContentTest extends \MailPoetUnitTest {
     expect($result)->endsWith($renderedForm);
 
     $result2 = $this->hook->contentDisplay('content');
-    expect($result2)->equals('content');
+    verify($result2)->equals('content');
   }
 
   public function testAppendsRenderedFormAfterOnASpecificPost() {
@@ -277,9 +277,9 @@ class DisplayFormInWPContentTest extends \MailPoetUnitTest {
     $this->wp->expects($this->never())->method('isSingular');
     $this->repository->expects($this->never())->method('findAll');
     expect($this->hook->contentDisplay(null))->null();
-    expect($this->hook->contentDisplay([1,2,3]))->equals([1,2,3]);
-    expect($this->hook->contentDisplay(1))->equals(1);
-    expect($this->hook->contentDisplay(1.1))->equals(1.1);
+    verify($this->hook->contentDisplay([1,2,3]))->equals([1,2,3]);
+    verify($this->hook->contentDisplay(1))->equals(1);
+    verify($this->hook->contentDisplay(1.1))->equals(1.1);
   }
 
   public function testDoesNotAppendFormIfDisabled() {
@@ -297,7 +297,7 @@ class DisplayFormInWPContentTest extends \MailPoetUnitTest {
     $form->setBody([['type' => 'submit', 'params' => ['label' => 'Subscribe!'], 'id' => 'submit', 'name' => 'Submit']]);
     $this->repository->expects($this->once())->method('findBy')->willReturn([$form]);
     $result = $this->hook->contentDisplay('content');
-    expect($result)->equals('content');
+    verify($result)->equals('content');
   }
 
   public function testDoesNotAppendFormIfEnabledAndPlacementIsDisabled() {
@@ -313,14 +313,14 @@ class DisplayFormInWPContentTest extends \MailPoetUnitTest {
     $form->setBody([['type' => 'submit', 'params' => ['label' => 'Subscribe!'], 'id' => 'submit', 'name' => 'Submit']]);
     $this->repository->expects($this->once())->method('findBy')->willReturn([$form]);
     $result = $this->hook->contentDisplay('content');
-    expect($result)->equals('content');
+    verify($result)->equals('content');
   }
 
   public function testDoesNotAppendFormIfNotOnSinglePage() {
     $this->wp->expects($this->once())->method('isSingle')->willReturn(false);
     $this->repository->expects($this->never())->method('findBy');
     $result = $this->hook->contentDisplay('content');
-    expect($result)->equals('content');
+    verify($result)->equals('content');
   }
 
   public function testDoesNotAppendFormIfNotOnPost() {
@@ -337,7 +337,7 @@ class DisplayFormInWPContentTest extends \MailPoetUnitTest {
     $this->repository->expects($this->once())->method('findBy')->willReturn([$form]);
 
     $result = $this->hook->contentDisplay('content');
-    expect($result)->equals('content');
+    verify($result)->equals('content');
   }
 
   public function testAppendsRenderedFormOnWoocommerceShopListingPage() {
@@ -429,7 +429,7 @@ class DisplayFormInWPContentTest extends \MailPoetUnitTest {
     $form->setBody([['type' => 'submit', 'params' => ['label' => 'Subscribe!'], 'id' => 'submit', 'name' => 'Submit']]);
     $this->repository->expects($this->once())->method('findBy')->willReturn([$form]);
     $result = $this->hook->contentDisplay('content');
-    expect($result)->equals('content');
+    verify($result)->equals('content');
   }
 
   public function testItDoesNotAppendFormOnOtherWoocommercePageWhenNotOnListingPage() {
@@ -465,7 +465,7 @@ class DisplayFormInWPContentTest extends \MailPoetUnitTest {
     $form->setBody([['type' => 'submit', 'params' => ['label' => 'Subscribe!'], 'id' => 'submit', 'name' => 'Submit']]);
     $this->repository->expects($this->never())->method('findBy')->willReturn([$form]);
     $result = $this->hook->wooProductListDisplay('content');
-    expect($result)->equals('content');
+    verify($result)->equals('content');
   }
 
   public function testAppendsRenderedFormAfterPageContent() {
@@ -564,7 +564,7 @@ class DisplayFormInWPContentTest extends \MailPoetUnitTest {
     ob_start();
     $this->hook->maybeRenderFormsInFooter();
     $renderedFormHtml = ob_get_clean();
-    expect($renderedFormHtml)->equals($formHtml);
+    verify($renderedFormHtml)->equals($formHtml);
   }
 
   public function testItRendersOnlyForSpecificTagArchive(): void {
@@ -594,7 +594,7 @@ class DisplayFormInWPContentTest extends \MailPoetUnitTest {
     ob_start();
     $this->hook->maybeRenderFormsInFooter();
     $renderedFormHtml = ob_get_clean();
-    expect($renderedFormHtml)->equals($formHtml);
+    verify($renderedFormHtml)->equals($formHtml);
 
     $form->setSettings([
       'segments' => ['3'],
@@ -607,7 +607,7 @@ class DisplayFormInWPContentTest extends \MailPoetUnitTest {
     ob_start();
     $this->hook->maybeRenderFormsInFooter();
     $renderedFormHtml = ob_get_clean();
-    expect($renderedFormHtml)->equals('');
+    verify($renderedFormHtml)->equals('');
   }
 
   public function testItDoesNotDisplayOnTagListingIfNotEnabled(): void {
@@ -628,7 +628,7 @@ class DisplayFormInWPContentTest extends \MailPoetUnitTest {
     ob_start();
     $this->hook->maybeRenderFormsInFooter();
     $renderedFormHtml = ob_get_clean();
-    expect($renderedFormHtml)->equals('');
+    verify($renderedFormHtml)->equals('');
   }
 
   public function testDisplayFormOnAllCategoryArchives(): void {
@@ -651,7 +651,7 @@ class DisplayFormInWPContentTest extends \MailPoetUnitTest {
     ob_start();
     $this->hook->maybeRenderFormsInFooter();
     $renderedFormHtml = ob_get_clean();
-    expect($renderedFormHtml)->equals($formHtml);
+    verify($renderedFormHtml)->equals($formHtml);
   }
 
   public function testItRendersOnlyForSpecificCategoryArchive(): void {
@@ -677,7 +677,7 @@ class DisplayFormInWPContentTest extends \MailPoetUnitTest {
     ob_start();
     $this->hook->maybeRenderFormsInFooter();
     $renderedFormHtml = ob_get_clean();
-    expect($renderedFormHtml)->equals($formHtml);
+    verify($renderedFormHtml)->equals($formHtml);
 
     $form->setSettings([
       'segments' => ['3'],
@@ -690,7 +690,7 @@ class DisplayFormInWPContentTest extends \MailPoetUnitTest {
     ob_start();
     $this->hook->maybeRenderFormsInFooter();
     $renderedFormHtml = ob_get_clean();
-    expect($renderedFormHtml)->equals('');
+    verify($renderedFormHtml)->equals('');
   }
 
   public function testItDoesNotDisplayOnCategoryListingIfNotEnabled(): void {
@@ -711,7 +711,7 @@ class DisplayFormInWPContentTest extends \MailPoetUnitTest {
     ob_start();
     $this->hook->maybeRenderFormsInFooter();
     $renderedFormHtml = ob_get_clean();
-    expect($renderedFormHtml)->equals('');
+    verify($renderedFormHtml)->equals('');
   }
 
   public function testItDisplaysOnHomepage(): void {
@@ -733,7 +733,7 @@ class DisplayFormInWPContentTest extends \MailPoetUnitTest {
     ob_start();
     $this->hook->maybeRenderFormsInFooter();
     $renderedFormHtml = ob_get_clean();
-    expect($renderedFormHtml)->equals($formHtml);
+    verify($renderedFormHtml)->equals($formHtml);
   }
 
   public function testItDisplaysOnSpecificPostsPageWhenAllPagesSelected(): void {
@@ -757,7 +757,7 @@ class DisplayFormInWPContentTest extends \MailPoetUnitTest {
     ob_start();
     $this->hook->maybeRenderFormsInFooter();
     $renderedFormHtml = ob_get_clean();
-    expect($renderedFormHtml)->equals($formHtml);
+    verify($renderedFormHtml)->equals($formHtml);
   }
 
   public function testItDisplaysOnSpecificPostsPageWhenConfiguredToMatchThatPage(): void {
@@ -783,7 +783,7 @@ class DisplayFormInWPContentTest extends \MailPoetUnitTest {
     ob_start();
     $this->hook->maybeRenderFormsInFooter();
     $renderedFormHtml = ob_get_clean();
-    expect($renderedFormHtml)->equals($formHtml);
+    verify($renderedFormHtml)->equals($formHtml);
   }
 
   public function testDoesNotAppendPopupFormIfLoggedInAndSubscribed() {
@@ -811,7 +811,7 @@ class DisplayFormInWPContentTest extends \MailPoetUnitTest {
     $this->repository->expects($this->once())->method('findBy')->willReturn([$form]);
 
     $result = $this->hook->contentDisplay('content');
-    expect($result)->equals('content');
+    verify($result)->equals('content');
   }
 
   public function testAppendsPopupFormIfLoggedInAndNotSubscribed() {
diff --git a/mailpoet/tests/unit/Form/RendererTest.php b/mailpoet/tests/unit/Form/RendererTest.php
index 4909e08aa5..8e020d2cfb 100644
--- a/mailpoet/tests/unit/Form/RendererTest.php
+++ b/mailpoet/tests/unit/Form/RendererTest.php
@@ -53,7 +53,7 @@ class RendererTest extends \MailPoetUnitTest {
       ->willReturn(CaptchaConstants::TYPE_DISABLED);
     $html = $this->renderer->renderBlocks(Fixtures::get('simple_form_body'));
     $blocks = $this->htmlParser->findByXpath($html, "//div[@class='block']");
-    expect($blocks->length)->equals(2);
+    verify($blocks->length)->equals(2);
   }
 
   public function testItShouldRenderHoneypot() {
@@ -64,9 +64,9 @@ class RendererTest extends \MailPoetUnitTest {
       ->willReturn(CaptchaConstants::TYPE_DISABLED);
     $html = $this->renderer->renderBlocks(Fixtures::get('simple_form_body'));
     $hpLabel = $this->htmlParser->findByXpath($html, "//label[@class='mailpoet_hp_email_label']");
-    expect($hpLabel->length)->equals(1);
+    verify($hpLabel->length)->equals(1);
     $hpInput = $this->htmlParser->findByXpath($html, "//input[@type='email']");
-    expect($hpInput->length)->equals(1);
+    verify($hpInput->length)->equals(1);
   }
 
   public function testItShouldRenderReCaptcha() {
@@ -80,15 +80,15 @@ class RendererTest extends \MailPoetUnitTest {
       ]));
     $html = $this->renderer->renderBlocks(Fixtures::get('simple_form_body'));
     $recaptcha = $this->htmlParser->findByXpath($html, "//div[@class='mailpoet_recaptcha']");
-    expect($recaptcha->length)->equals(1);
+    verify($recaptcha->length)->equals(1);
     $recaptchaIframes = $this->htmlParser->findByXpath($html, "//iframe");
-    expect($recaptchaIframes->length)->equals(1);
+    verify($recaptchaIframes->length)->equals(1);
     $iframe = $recaptchaIframes->item(0);
     $this->assertInstanceOf(\DOMNode::class, $iframe);
     $this->assertInstanceOf(\DOMNamedNodeMap::class, $iframe->attributes);
     $source = $iframe->attributes->getNamedItem('src');
     $this->assertInstanceOf(\DOMAttr::class, $source);
-    expect($source->value)->equals("https://www.google.com/recaptcha/api/fallback?k=$token");
+    verify($source->value)->equals("https://www.google.com/recaptcha/api/fallback?k=$token");
   }
 
   public function testItShouldNotRenderHoneypotAndRecaptcha() {
@@ -99,8 +99,8 @@ class RendererTest extends \MailPoetUnitTest {
       ->willReturn(CaptchaConstants::TYPE_DISABLED);
     $html = $this->renderer->renderBlocks(Fixtures::get('simple_form_body'), [], null, false);
     $hpLabel = $this->htmlParser->findByXpath($html, "//label[@class='mailpoet_hp_email_label']");
-    expect($hpLabel->length)->equals(0);
+    verify($hpLabel->length)->equals(0);
     $recaptcha = $this->htmlParser->findByXpath($html, "//div[@class='mailpoet_recaptcha']");
-    expect($recaptcha->length)->equals(0);
+    verify($recaptcha->length)->equals(0);
   }
 }
diff --git a/mailpoet/tests/unit/Form/Util/FieldNameObfuscatorTest.php b/mailpoet/tests/unit/Form/Util/FieldNameObfuscatorTest.php
index 91ac88c996..10bcb0a43a 100644
--- a/mailpoet/tests/unit/Form/Util/FieldNameObfuscatorTest.php
+++ b/mailpoet/tests/unit/Form/Util/FieldNameObfuscatorTest.php
@@ -26,7 +26,7 @@ class FieldNameObfuscatorTest extends \MailPoetUnitTest {
 
   public function testObfuscateDeobfuscateWorks() {
     $obfuscated = $this->obfuscator->obfuscate('email');
-    expect($this->obfuscator->deobfuscate($obfuscated))->equals('email');
+    verify($this->obfuscator->deobfuscate($obfuscated))->equals('email');
   }
 
   public function testObfuscatePayloadWorks() {
@@ -36,7 +36,7 @@ class FieldNameObfuscatorTest extends \MailPoetUnitTest {
       $obfuscated => 'obfuscatedFieldValue',
     ];
     $deobfuscatedPayload = $this->obfuscator->deobfuscateFormPayload($data);
-    expect($deobfuscatedPayload)->equals([
+    verify($deobfuscatedPayload)->equals([
       'regularField' => 'regularValue',
       'email' => 'obfuscatedFieldValue',
     ]);
diff --git a/mailpoet/tests/unit/Form/Util/StylesTest.php b/mailpoet/tests/unit/Form/Util/StylesTest.php
index 3fe2196b65..715c2c5dee 100644
--- a/mailpoet/tests/unit/Form/Util/StylesTest.php
+++ b/mailpoet/tests/unit/Form/Util/StylesTest.php
@@ -27,13 +27,13 @@ class StylesTest extends \MailPoetUnitTest {
     // 4. each style should be on a separate line
     $expectedResult = "mailpoet input[name=first_name], mailpoet input.some_class, mailpoet .some_class { color: red; background: blue; }" . PHP_EOL
     . "mailpoet .another_style { font-size: 20px; }";
-    expect($extractedAndPrefixedStyles)->equals($expectedResult);
+    verify($extractedAndPrefixedStyles)->equals($expectedResult);
   }
 
   public function testItShouldNotRenderStylesForFormWithoutSettings() {
     $form = Fixtures::get('simple_form_body');
     $styles = $this->styles->renderFormSettingsStyles($this->createForm($form), '#prefix', FormEntity::DISPLAY_TYPE_OTHERS);
-    expect($styles)->equals('');
+    verify($styles)->equals('');
   }
 
   public function testItShouldRenderBackgroundColour() {
diff --git a/mailpoet/tests/unit/Listing/HandlerTest.php b/mailpoet/tests/unit/Listing/HandlerTest.php
index 6d6c6e8735..55a1ac0591 100644
--- a/mailpoet/tests/unit/Listing/HandlerTest.php
+++ b/mailpoet/tests/unit/Listing/HandlerTest.php
@@ -28,16 +28,16 @@ class HandlerTest extends \MailPoetUnitTest {
 
   public function testItCreatesListingDefinition() {
     $definition = $this->handler->getListingDefinition($this->listingData);
-    expect($definition->getSearch())->equals('abcd');
-    expect($definition->getGroup())->equals('sent');
-    expect($definition->getOffset())->equals(0);
-    expect($definition->getLimit())->equals(20);
-    expect($definition->getSortBy())->equals('sent_at');
-    expect($definition->getSortOrder())->equals('desc');
-    expect($definition->getParameters())->equals([
+    verify($definition->getSearch())->equals('abcd');
+    verify($definition->getGroup())->equals('sent');
+    verify($definition->getOffset())->equals(0);
+    verify($definition->getLimit())->equals(20);
+    verify($definition->getSortBy())->equals('sent_at');
+    verify($definition->getSortOrder())->equals('desc');
+    verify($definition->getParameters())->equals([
       0 => 'page[1]/sort_by[sent_at]/sort_order[desc]/group[sent]',
       'type' => 'standard',
     ]);
-    expect($definition->getSelection())->equals([1, 2]);
+    verify($definition->getSelection())->equals([1, 2]);
   }
 }
diff --git a/mailpoet/tests/unit/Logging/LoggerFactoryTest.php b/mailpoet/tests/unit/Logging/LoggerFactoryTest.php
index fd53585f6f..befb7a4cfc 100644
--- a/mailpoet/tests/unit/Logging/LoggerFactoryTest.php
+++ b/mailpoet/tests/unit/Logging/LoggerFactoryTest.php
@@ -60,7 +60,7 @@ class LoggerFactoryTest extends \MailPoetUnitTest {
     $logger1 = $this->loggerFactory->getLogger('logger-with-handler');
     $handlers = $logger1->getHandlers();
     $this->assertInstanceOf(AbstractHandler::class, $handlers[0]);
-    expect($handlers[0]->getLevel())->equals(\MailPoetVendor\Monolog\Logger::ERROR);
+    verify($handlers[0]->getLevel())->equals(\MailPoetVendor\Monolog\Logger::ERROR);
   }
 
   public function testItSetsLoggingLevelForNothing() {
@@ -68,7 +68,7 @@ class LoggerFactoryTest extends \MailPoetUnitTest {
     $logger1 = $this->loggerFactory->getLogger('logger-for-nothing');
     $handlers = $logger1->getHandlers();
     $this->assertInstanceOf(AbstractHandler::class, $handlers[0]);
-    expect($handlers[0]->getLevel())->equals(\MailPoetVendor\Monolog\Logger::EMERGENCY);
+    verify($handlers[0]->getLevel())->equals(\MailPoetVendor\Monolog\Logger::EMERGENCY);
   }
 
   public function testItSetsLoggingLevelForErrors() {
@@ -76,7 +76,7 @@ class LoggerFactoryTest extends \MailPoetUnitTest {
     $logger1 = $this->loggerFactory->getLogger('logger-for-errors');
     $handlers = $logger1->getHandlers();
     $this->assertInstanceOf(AbstractHandler::class, $handlers[0]);
-    expect($handlers[0]->getLevel())->equals(\MailPoetVendor\Monolog\Logger::ERROR);
+    verify($handlers[0]->getLevel())->equals(\MailPoetVendor\Monolog\Logger::ERROR);
   }
 
   public function testItSetsLoggingLevelForEverything() {
@@ -84,6 +84,6 @@ class LoggerFactoryTest extends \MailPoetUnitTest {
     $logger1 = $this->loggerFactory->getLogger('logger-for-everything');
     $handlers = $logger1->getHandlers();
     $this->assertInstanceOf(AbstractHandler::class, $handlers[0]);
-    expect($handlers[0]->getLevel())->equals(\MailPoetVendor\Monolog\Logger::DEBUG);
+    verify($handlers[0]->getLevel())->equals(\MailPoetVendor\Monolog\Logger::DEBUG);
   }
 }
diff --git a/mailpoet/tests/unit/Mailer/MailerErrorTest.php b/mailpoet/tests/unit/Mailer/MailerErrorTest.php
index dc7550735b..f607a16c7c 100644
--- a/mailpoet/tests/unit/Mailer/MailerErrorTest.php
+++ b/mailpoet/tests/unit/Mailer/MailerErrorTest.php
@@ -18,7 +18,7 @@ class MailerErrorTest extends \MailPoetUnitTest {
 
   public function testItCanComposeErrorMessageWithoutSubscribers() {
     $error = new MailerError(MailerError::OPERATION_SEND, MailerError::LEVEL_HARD, 'Some Message');
-    expect($error->getMessageWithFailedSubscribers())->equals('Some Message');
+    verify($error->getMessageWithFailedSubscribers())->equals('Some Message');
   }
 
   public function testItCanComposeErrorMessageWithOneSubscriber() {
@@ -30,7 +30,7 @@ class MailerErrorTest extends \MailPoetUnitTest {
       null,
       [$subscriberError]
     );
-    expect($error->getMessageWithFailedSubscribers())->equals('Some Message Unprocessed subscriber: (email@example.com: Subscriber message)');
+    verify($error->getMessageWithFailedSubscribers())->equals('Some Message Unprocessed subscriber: (email@example.com: Subscriber message)');
   }
 
   public function testItCanComposeErrorMessageWithMultipleSubscriberErrors() {
@@ -43,7 +43,7 @@ class MailerErrorTest extends \MailPoetUnitTest {
       null,
       [$subscriberError1, $subscriberError2]
     );
-    expect($error->getMessageWithFailedSubscribers())->equals(
+    verify($error->getMessageWithFailedSubscribers())->equals(
       'Some Message Unprocessed subscribers: (email1@example.com: Subscriber 1 message), (email2@example.com)'
     );
   }
diff --git a/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/AmazonSESMapperTest.php b/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/AmazonSESMapperTest.php
index 72d487496d..169adcefa0 100644
--- a/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/AmazonSESMapperTest.php
+++ b/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/AmazonSESMapperTest.php
@@ -30,16 +30,16 @@ class AmazonSESMapperTest extends \MailPoetUnitTest {
   public function testGetProperError() {
     $response = $this->buildXmlResponseFromArray($this->responseData, new SimpleXMLElement('<response/>'));
     $error = $this->mapper->getErrorFromResponse($response, 'john@rambo.com');
-    expect($error->getLevel())->equals(MailerError::LEVEL_HARD);
-    expect($error->getMessage())->equals('Some message');
-    expect($error->getSubscriberErrors()[0]->getEmail())->equals('john@rambo.com');
+    verify($error->getLevel())->equals(MailerError::LEVEL_HARD);
+    verify($error->getMessage())->equals('Some message');
+    verify($error->getSubscriberErrors()[0]->getEmail())->equals('john@rambo.com');
   }
 
   public function testGetSoftErrorForRejectedMessage() {
     $this->responseData['Error']['Code'] = 'MessageRejected';
     $response = $this->buildXmlResponseFromArray($this->responseData, new SimpleXMLElement('<response/>'));
     $error = $this->mapper->getErrorFromResponse($response, 'john@rambo.com');
-    expect($error->getLevel())->equals(MailerError::LEVEL_SOFT);
+    verify($error->getLevel())->equals(MailerError::LEVEL_SOFT);
   }
 
   /**
diff --git a/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/MailPoetMapperTest.php b/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/MailPoetMapperTest.php
index 327ad9f79d..e794ee10d9 100644
--- a/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/MailPoetMapperTest.php
+++ b/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/MailPoetMapperTest.php
@@ -38,8 +38,8 @@ class MailPoetMapperTest extends \MailPoetUnitTest {
   public function testCreateBlacklistError() {
     $error = $this->mapper->getBlacklistError($this->subscribers[1]);
     expect($error)->isInstanceOf(MailerError::class);
-    expect($error->getOperation())->equals(MailerError::OPERATION_SEND);
-    expect($error->getLevel())->equals(MailerError::LEVEL_SOFT);
+    verify($error->getOperation())->equals(MailerError::OPERATION_SEND);
+    verify($error->getLevel())->equals(MailerError::LEVEL_SOFT);
     expect($error->getMessage())->stringContainsString('unknown error');
     expect($error->getMessage())->stringContainsString('MailPoet');
   }
@@ -47,9 +47,9 @@ class MailPoetMapperTest extends \MailPoetUnitTest {
   public function testCreateConnectionError() {
     $error = $this->mapper->getConnectionError('connection error');
     expect($error)->isInstanceOf(MailerError::class);
-    expect($error->getOperation())->equals(MailerError::OPERATION_CONNECT);
-    expect($error->getLevel())->equals(MailerError::LEVEL_HARD);
-    expect($error->getMessage())->equals('connection error');
+    verify($error->getOperation())->equals(MailerError::OPERATION_CONNECT);
+    verify($error->getLevel())->equals(MailerError::LEVEL_HARD);
+    verify($error->getMessage())->equals('connection error');
   }
 
   public function testGetErrorNotArray() {
@@ -61,9 +61,9 @@ class MailPoetMapperTest extends \MailPoetUnitTest {
     $error = $this->mapper->getErrorForResult($apiResult, $this->subscribers);
 
     expect($error)->isInstanceOf(MailerError::class);
-    expect($error->getOperation())->equals(MailerError::OPERATION_SEND);
-    expect($error->getLevel())->equals(MailerError::LEVEL_HARD);
-    expect($error->getMessage())->equals('JSON input is not an array');
+    verify($error->getOperation())->equals(MailerError::OPERATION_SEND);
+    verify($error->getLevel())->equals(MailerError::LEVEL_HARD);
+    verify($error->getMessage())->equals('JSON input is not an array');
   }
 
   public function testGetErrorBannedAccount() {
@@ -76,8 +76,8 @@ class MailPoetMapperTest extends \MailPoetUnitTest {
     $error = $this->mapper->getErrorForResult($apiResult, $this->subscribers);
 
     expect($error)->isInstanceOf(MailerError::class);
-    expect($error->getOperation())->equals(MailerError::OPERATION_SEND);
-    expect($error->getLevel())->equals(MailerError::LEVEL_HARD);
+    verify($error->getOperation())->equals(MailerError::OPERATION_SEND);
+    verify($error->getLevel())->equals(MailerError::LEVEL_HARD);
     expect($error->getMessage())->stringContainsString('MailPoet Sending Service has been temporarily suspended for your site due to');
   }
 
@@ -91,8 +91,8 @@ class MailPoetMapperTest extends \MailPoetUnitTest {
     $error = $this->mapper->getErrorForResult($apiResult, $this->subscribers);
 
     expect($error)->isInstanceOf(MailerError::class);
-    expect($error->getOperation())->equals(MailerError::OPERATION_INSUFFICIENT_PRIVILEGES);
-    expect($error->getLevel())->equals(MailerError::LEVEL_HARD);
+    verify($error->getOperation())->equals(MailerError::OPERATION_INSUFFICIENT_PRIVILEGES);
+    verify($error->getLevel())->equals(MailerError::LEVEL_HARD);
     expect($error->getMessage())->stringContainsString('You have reached the subscriber limit of your plan.');
   }
 
@@ -106,8 +106,8 @@ class MailPoetMapperTest extends \MailPoetUnitTest {
     $error = $this->mapper->getErrorForResult($apiResult, $this->subscribers);
 
     expect($error)->isInstanceOf(MailerError::class);
-    expect($error->getOperation())->equals(MailerError::OPERATION_SUBSCRIBER_LIMIT_REACHED);
-    expect($error->getLevel())->equals(MailerError::LEVEL_HARD);
+    verify($error->getOperation())->equals(MailerError::OPERATION_SUBSCRIBER_LIMIT_REACHED);
+    verify($error->getLevel())->equals(MailerError::LEVEL_HARD);
     expect($error->getMessage())->stringContainsString('You have reached the subscriber limit of your plan.');
   }
 
@@ -121,8 +121,8 @@ class MailPoetMapperTest extends \MailPoetUnitTest {
     $error = $this->mapper->getErrorForResult($apiResult, $this->subscribers);
 
     expect($error)->isInstanceOf(MailerError::class);
-    expect($error->getOperation())->equals(MailerError::OPERATION_AUTHORIZATION);
-    expect($error->getLevel())->equals(MailerError::LEVEL_HARD);
+    verify($error->getOperation())->equals(MailerError::OPERATION_AUTHORIZATION);
+    verify($error->getLevel())->equals(MailerError::LEVEL_HARD);
     expect($error->getMessage())->stringContainsString('Sending all of your emails has been paused');
     expect($error->getMessage())->stringContainsString('because your email address');
   }
@@ -135,9 +135,9 @@ class MailPoetMapperTest extends \MailPoetUnitTest {
     ];
     $error = $this->mapper->getErrorForResult($apiResult, $this->subscribers);
     expect($error)->isInstanceOf(MailerError::class);
-    expect($error->getOperation())->equals(MailerError::OPERATION_SEND);
-    expect($error->getLevel())->equals(MailerError::LEVEL_HARD);
-    expect($error->getMessage())->equals('error too big');
+    verify($error->getOperation())->equals(MailerError::OPERATION_SEND);
+    verify($error->getLevel())->equals(MailerError::LEVEL_HARD);
+    verify($error->getMessage())->equals('error too big');
   }
 
   public function testGetPayloadError() {
@@ -148,9 +148,9 @@ class MailPoetMapperTest extends \MailPoetUnitTest {
     ];
     $error = $this->mapper->getErrorForResult($apiResult, $this->subscribers);
     expect($error)->isInstanceOf(MailerError::class);
-    expect($error->getOperation())->equals(MailerError::OPERATION_SEND);
-    expect($error->getLevel())->equals(MailerError::LEVEL_HARD);
-    expect($error->getMessage())->equals('Error while sending. Api Error');
+    verify($error->getOperation())->equals(MailerError::OPERATION_SEND);
+    verify($error->getLevel())->equals(MailerError::LEVEL_HARD);
+    verify($error->getMessage())->equals('Error while sending. Api Error');
   }
 
   public function testGetPayloadErrorWithErrorMessage() {
@@ -161,14 +161,14 @@ class MailPoetMapperTest extends \MailPoetUnitTest {
     ];
     $error = $this->mapper->getErrorForResult($apiResult, $this->subscribers);
     expect($error)->isInstanceOf(MailerError::class);
-    expect($error->getOperation())->equals(MailerError::OPERATION_SEND);
-    expect($error->getLevel())->equals(MailerError::LEVEL_SOFT);
+    verify($error->getOperation())->equals(MailerError::OPERATION_SEND);
+    verify($error->getLevel())->equals(MailerError::LEVEL_SOFT);
     $subscriberErrors = $error->getSubscriberErrors();
-    expect(count($subscriberErrors))->equals(2);
-    expect($subscriberErrors[0]->getEmail())->equals('a@example.com');
-    expect($subscriberErrors[0]->getMessage())->equals('subject is missing');
-    expect($subscriberErrors[1]->getEmail())->equals('c d <b@example.com>');
-    expect($subscriberErrors[1]->getMessage())->equals('subject is missing');
+    verify(count($subscriberErrors))->equals(2);
+    verify($subscriberErrors[0]->getEmail())->equals('a@example.com');
+    verify($subscriberErrors[0]->getMessage())->equals('subject is missing');
+    verify($subscriberErrors[1]->getEmail())->equals('c d <b@example.com>');
+    verify($subscriberErrors[1]->getMessage())->equals('subject is missing');
   }
 
   public function testGetPayloadErrorForMalformedMSSResponse() {
@@ -179,9 +179,9 @@ class MailPoetMapperTest extends \MailPoetUnitTest {
     ];
     $error = $this->mapper->getErrorForResult($apiResult, $this->subscribers);
     expect($error)->isInstanceOf(MailerError::class);
-    expect($error->getOperation())->equals(MailerError::OPERATION_SEND);
-    expect($error->getLevel())->equals(MailerError::LEVEL_HARD);
-    expect($error->getMessage())->equals('Error while sending. Invalid MSS response format.');
+    verify($error->getOperation())->equals(MailerError::OPERATION_SEND);
+    verify($error->getLevel())->equals(MailerError::LEVEL_HARD);
+    verify($error->getMessage())->equals('Error while sending. Invalid MSS response format.');
   }
 
   public function testGetPendingApprovalMessage() {
@@ -193,8 +193,8 @@ class MailPoetMapperTest extends \MailPoetUnitTest {
     ];
     $error = $this->mapper->getErrorForResult($apiResult, $this->subscribers);
     expect($error)->isInstanceOf(MailerError::class);
-    expect($error->getOperation())->equals(MailerError::OPERATION_PENDING_APPROVAL);
-    expect($error->getLevel())->equals(MailerError::LEVEL_HARD);
+    verify($error->getOperation())->equals(MailerError::OPERATION_PENDING_APPROVAL);
+    verify($error->getLevel())->equals(MailerError::LEVEL_HARD);
     expect($error->getMessage())->stringContainsString('pending approval');
     expect($error->getMessage())->stringContainsString("You’ll soon be able to send once our team reviews your account.");
   }
@@ -208,10 +208,10 @@ class MailPoetMapperTest extends \MailPoetUnitTest {
 
     $error = $this->mapper->getErrorForResult($apiResult, $this->subscribers);
     expect($error)->isInstanceOf(MailerError::class);
-    expect($error->getRetryInterval())->equals(MailPoetMapper::TEMPORARY_UNAVAILABLE_RETRY_INTERVAL);
-    expect($error->getOperation())->equals(MailerError::OPERATION_SEND);
-    expect($error->getLevel())->equals(MailerError::LEVEL_HARD);
-    expect($error->getMessage())->equals('Email service is temporarily not available, please try again in a few minutes.');
+    verify($error->getRetryInterval())->equals(MailPoetMapper::TEMPORARY_UNAVAILABLE_RETRY_INTERVAL);
+    verify($error->getOperation())->equals(MailerError::OPERATION_SEND);
+    verify($error->getLevel())->equals(MailerError::LEVEL_HARD);
+    verify($error->getMessage())->equals('Email service is temporarily not available, please try again in a few minutes.');
   }
 
   public function testGetErrorEmailVolumeLimitWithAndWithoutKnownLimit(): void {
@@ -250,8 +250,8 @@ class MailPoetMapperTest extends \MailPoetUnitTest {
     );
     $error = $this->mapper->getErrorForResult($apiResult, $this->subscribers);
     expect($error)->isInstanceOf(MailerError::class);
-    expect($error->getOperation())->equals(MailerError::OPERATION_EMAIL_LIMIT_REACHED);
-    expect($error->getLevel())->equals(MailerError::LEVEL_HARD);
+    verify($error->getOperation())->equals(MailerError::OPERATION_EMAIL_LIMIT_REACHED);
+    verify($error->getLevel())->equals(MailerError::LEVEL_HARD);
     expect($error->getMessage())->stringContainsString('You have sent more emails this month than your MailPoet plan includes (1000),');
     expect($error->getMessage())->stringContainsString('wait until sending is automatically resumed on 2023-01-31');
 
diff --git a/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/PHPMailMapperTest.php b/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/PHPMailMapperTest.php
index de7ab1e20c..2b8596a504 100644
--- a/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/PHPMailMapperTest.php
+++ b/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/PHPMailMapperTest.php
@@ -24,21 +24,21 @@ class PHPMailMapperTest extends \MailPoetUnitTest {
 
   public function testGetProperErrorForSubscriber() {
     $error = $this->mapper->getErrorForSubscriber('john@rambo.com');
-    expect($error->getLevel())->equals(MailerError::LEVEL_HARD);
-    expect($error->getMessage())->equals('PHPMail has returned an unknown error.');
-    expect($error->getSubscriberErrors()[0]->getEmail())->equals('john@rambo.com');
+    verify($error->getLevel())->equals(MailerError::LEVEL_HARD);
+    verify($error->getMessage())->equals('PHPMail has returned an unknown error.');
+    verify($error->getSubscriberErrors()[0]->getEmail())->equals('john@rambo.com');
   }
 
   public function testGetProperErrorFromException() {
     $error = $this->mapper->getErrorFromException(new \Exception('Some message'), 'john@rambo.com');
-    expect($error->getLevel())->equals(MailerError::LEVEL_HARD);
-    expect($error->getMessage())->equals('Some message');
-    expect($error->getSubscriberErrors()[0]->getEmail())->equals('john@rambo.com');
+    verify($error->getLevel())->equals(MailerError::LEVEL_HARD);
+    verify($error->getMessage())->equals('Some message');
+    verify($error->getSubscriberErrors()[0]->getEmail())->equals('john@rambo.com');
   }
 
   public function testGetSoftErrorFromExceptionForInvalidEmail() {
     $error = $this->mapper->getErrorFromException(new \Exception('Invalid address. (Add ...'), 'john@rambo.com');
-    expect($error->getLevel())->equals(MailerError::LEVEL_SOFT);
+    verify($error->getLevel())->equals(MailerError::LEVEL_SOFT);
   }
 
   public function _after() {
diff --git a/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/SMTPMapperTest.php b/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/SMTPMapperTest.php
index 6d7d561c9b..e984af27dc 100644
--- a/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/SMTPMapperTest.php
+++ b/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/SMTPMapperTest.php
@@ -29,7 +29,7 @@ class SMTPMapperTest extends \MailPoetUnitTest {
   public function testItCreatesSoftErrorForInvalidEmail() {
     $message = 'Invalid address (to): john@rambo.com';
     $error = $this->mapper->getErrorFromException(new Exception($message), 'john@rambo.com');
-    expect($error->getLevel())->equals(MailerError::LEVEL_SOFT);
+    verify($error->getLevel())->equals(MailerError::LEVEL_SOFT);
   }
 
   public function _after() {
diff --git a/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/SendGridMapperTest.php b/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/SendGridMapperTest.php
index 8533fba91e..8d18bd4c79 100644
--- a/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/SendGridMapperTest.php
+++ b/mailpoet/tests/unit/Mailer/Methods/ErrorMappers/SendGridMapperTest.php
@@ -25,14 +25,14 @@ class SendGridMapperTest extends \MailPoetUnitTest {
 
   public function testGetProperError() {
     $error = $this->mapper->getErrorFromResponse($this->response, 'john@rambo.com');
-    expect($error->getLevel())->equals(MailerError::LEVEL_HARD);
-    expect($error->getMessage())->equals('Some message');
-    expect($error->getSubscriberErrors()[0]->getEmail())->equals('john@rambo.com');
+    verify($error->getLevel())->equals(MailerError::LEVEL_HARD);
+    verify($error->getMessage())->equals('Some message');
+    verify($error->getSubscriberErrors()[0]->getEmail())->equals('john@rambo.com');
   }
 
   public function testGetSoftErrorForInvalidEmail() {
     $this->response['errors'][0] = 'Invalid email address ,,@';
     $error = $this->mapper->getErrorFromResponse($this->response, ',,@');
-    expect($error->getLevel())->equals(MailerError::LEVEL_SOFT);
+    verify($error->getLevel())->equals(MailerError::LEVEL_SOFT);
   }
 }
diff --git a/mailpoet/tests/unit/Newsletter/Editor/NewsletterCouponTest.php b/mailpoet/tests/unit/Newsletter/Editor/NewsletterCouponTest.php
index bb9677625a..1e12150836 100644
--- a/mailpoet/tests/unit/Newsletter/Editor/NewsletterCouponTest.php
+++ b/mailpoet/tests/unit/Newsletter/Editor/NewsletterCouponTest.php
@@ -39,8 +39,8 @@ class NewsletterCouponTest extends \MailPoetUnitTest {
     ];
     $updatedBody = $newsletterCoupon->cleanupBodySensitiveData(['content' => ['blocks' => $blocks]]);
     $cleanBlock = ['type' => Coupon::TYPE, 'code' => Coupon::CODE_PLACEHOLDER];
-    expect($updatedBody['content']['blocks'][0]['blocks'][0])->equals($cleanBlock);
-    expect($updatedBody['content']['blocks'][0]['blocks'][1]['blocks'][0])->equals($cleanBlock);
-    expect($updatedBody['content']['blocks'][1])->equals($cleanBlock);
+    verify($updatedBody['content']['blocks'][0]['blocks'][0])->equals($cleanBlock);
+    verify($updatedBody['content']['blocks'][0]['blocks'][1]['blocks'][0])->equals($cleanBlock);
+    verify($updatedBody['content']['blocks'][1])->equals($cleanBlock);
   }
 }
diff --git a/mailpoet/tests/unit/Newsletter/Editor/StructureTransformerTest.php b/mailpoet/tests/unit/Newsletter/Editor/StructureTransformerTest.php
index 5b0abb2e95..8e09aeef94 100644
--- a/mailpoet/tests/unit/Newsletter/Editor/StructureTransformerTest.php
+++ b/mailpoet/tests/unit/Newsletter/Editor/StructureTransformerTest.php
@@ -19,14 +19,14 @@ class StructureTransformerTest extends \MailPoetUnitTest {
     $blocks = $this->transformer->transform($html, false);
 
     expect($blocks)->count(3);
-    expect($blocks[0]['type'])->equals('text');
-    expect($blocks[0]['text'])->equals('<p><i>italic</i><em>previous text</em></p>');
+    verify($blocks[0]['type'])->equals('text');
+    verify($blocks[0]['text'])->equals('<p><i>italic</i><em>previous text</em></p>');
 
-    expect($blocks[1]['type'])->equals('image');
-    expect($blocks[1]['src'])->equals('#myimage');
-    expect($blocks[1]['link'])->equals('#mylink');
+    verify($blocks[1]['type'])->equals('image');
+    verify($blocks[1]['src'])->equals('#myimage');
+    verify($blocks[1]['link'])->equals('#mylink');
 
-    expect($blocks[2]['type'])->equals('text');
-    expect($blocks[2]['text'])->equals('<p><em>next text</em><b>bolded</b></p>');
+    verify($blocks[2]['type'])->equals('text');
+    verify($blocks[2]['text'])->equals('<p><em>next text</em><b>bolded</b></p>');
   }
 }
diff --git a/mailpoet/tests/unit/Newsletter/Renderer/Blocks/ButtonTest.php b/mailpoet/tests/unit/Newsletter/Renderer/Blocks/ButtonTest.php
index 50107ce04b..753ad1b314 100644
--- a/mailpoet/tests/unit/Newsletter/Renderer/Blocks/ButtonTest.php
+++ b/mailpoet/tests/unit/Newsletter/Renderer/Blocks/ButtonTest.php
@@ -61,6 +61,6 @@ class ButtonTest extends \MailPoetUnitTest {
           </div>
         </td>
       </tr>';
-    expect($output)->equals($expectedResult);
+    verify($output)->equals($expectedResult);
   }
 }
diff --git a/mailpoet/tests/unit/Newsletter/Renderer/Blocks/CouponTest.php b/mailpoet/tests/unit/Newsletter/Renderer/Blocks/CouponTest.php
index a14dca84d5..63f322fda7 100644
--- a/mailpoet/tests/unit/Newsletter/Renderer/Blocks/CouponTest.php
+++ b/mailpoet/tests/unit/Newsletter/Renderer/Blocks/CouponTest.php
@@ -66,6 +66,6 @@ class CouponTest extends \MailPoetUnitTest {
           </div>
         </td>
       </tr>';
-    expect($output)->equals($expectedResult);
+    verify($output)->equals($expectedResult);
   }
 }
diff --git a/mailpoet/tests/unit/Newsletter/Renderer/Blocks/DividerTest.php b/mailpoet/tests/unit/Newsletter/Renderer/Blocks/DividerTest.php
index e5e279ee0d..d7d5ba2da1 100644
--- a/mailpoet/tests/unit/Newsletter/Renderer/Blocks/DividerTest.php
+++ b/mailpoet/tests/unit/Newsletter/Renderer/Blocks/DividerTest.php
@@ -31,6 +31,6 @@ class DividerTest extends \MailPoetUnitTest {
           </table>
         </td>
       </tr>';
-    expect($output)->equals($expectedResult);
+    verify($output)->equals($expectedResult);
   }
 }
diff --git a/mailpoet/tests/unit/Newsletter/Renderer/Blocks/FooterTest.php b/mailpoet/tests/unit/Newsletter/Renderer/Blocks/FooterTest.php
index 8df174a471..db7c332b9b 100644
--- a/mailpoet/tests/unit/Newsletter/Renderer/Blocks/FooterTest.php
+++ b/mailpoet/tests/unit/Newsletter/Renderer/Blocks/FooterTest.php
@@ -32,7 +32,7 @@ class FooterTest extends \MailPoetUnitTest {
           Footer text. <a href="http://example.com" style="color:#689f2c;text-decoration:none">link</a>
         </td>
       </tr>';
-    expect($output)->equals($expectedResult);
+    verify($output)->equals($expectedResult);
   }
 
   public function testItRendersWithBackgroundColor() {
@@ -44,7 +44,7 @@ class FooterTest extends \MailPoetUnitTest {
           Footer text. <a href="http://example.com" style="color:#689f2c;text-decoration:none">link</a>
         </td>
       </tr>';
-    expect($output)->equals($expectedResult);
+    verify($output)->equals($expectedResult);
   }
 
   public function testItPrefersInlinedCssForLinks() {
diff --git a/mailpoet/tests/unit/Newsletter/Renderer/Blocks/HeaderTest.php b/mailpoet/tests/unit/Newsletter/Renderer/Blocks/HeaderTest.php
index 67450f9e70..adb6916324 100644
--- a/mailpoet/tests/unit/Newsletter/Renderer/Blocks/HeaderTest.php
+++ b/mailpoet/tests/unit/Newsletter/Renderer/Blocks/HeaderTest.php
@@ -32,7 +32,7 @@ class HeaderTest extends \MailPoetUnitTest {
           <a href="[link:newsletter_view_in_browser_url]" style="color:#6cb7d4;text-decoration:underline">View this in your browser.</a>
         </td>
       </tr>';
-    expect($output)->equals($expectedResult);
+    verify($output)->equals($expectedResult);
   }
 
   public function testItRendersBackgroundColorCorrectly() {
@@ -44,7 +44,7 @@ class HeaderTest extends \MailPoetUnitTest {
           <a href="[link:newsletter_view_in_browser_url]" style="color:#6cb7d4;text-decoration:underline">View this in your browser.</a>
         </td>
       </tr>';
-    expect($output)->equals($expectedResult);
+    verify($output)->equals($expectedResult);
   }
 
   public function testItPrefersInlinedCssForLinks() {
diff --git a/mailpoet/tests/unit/Newsletter/Renderer/Blocks/ImageTest.php b/mailpoet/tests/unit/Newsletter/Renderer/Blocks/ImageTest.php
index 4515fa937d..4bfd11da54 100644
--- a/mailpoet/tests/unit/Newsletter/Renderer/Blocks/ImageTest.php
+++ b/mailpoet/tests/unit/Newsletter/Renderer/Blocks/ImageTest.php
@@ -27,7 +27,7 @@ class ImageTest extends \MailPoetUnitTest {
           <a href="http://example.com"><img src="http://mailpoet.localhost/image.jpg" width="160" alt="Alt text"/></a>
         </td>
       </tr>';
-    expect($output)->equals($expectedResult);
+    verify($output)->equals($expectedResult);
   }
 
   public function testItRendersWithoutLink() {
@@ -39,6 +39,6 @@ class ImageTest extends \MailPoetUnitTest {
           <img src="http://mailpoet.localhost/image.jpg" width="160" alt="Alt text"/>
         </td>
       </tr>';
-    expect($output)->equals($expectedResult);
+    verify($output)->equals($expectedResult);
   }
 }
diff --git a/mailpoet/tests/unit/Newsletter/Renderer/Blocks/SocialTest.php b/mailpoet/tests/unit/Newsletter/Renderer/Blocks/SocialTest.php
index 3ddcf53b16..81fbbac161 100644
--- a/mailpoet/tests/unit/Newsletter/Renderer/Blocks/SocialTest.php
+++ b/mailpoet/tests/unit/Newsletter/Renderer/Blocks/SocialTest.php
@@ -56,6 +56,6 @@ class SocialTest extends \MailPoetUnitTest {
         ></a>&nbsp;
         </td>
       </tr>';
-    expect($output)->equals($expectedResult);
+    verify($output)->equals($expectedResult);
   }
 }
diff --git a/mailpoet/tests/unit/Newsletter/Renderer/Blocks/SpacerTest.php b/mailpoet/tests/unit/Newsletter/Renderer/Blocks/SpacerTest.php
index e1b03c8783..863418273c 100644
--- a/mailpoet/tests/unit/Newsletter/Renderer/Blocks/SpacerTest.php
+++ b/mailpoet/tests/unit/Newsletter/Renderer/Blocks/SpacerTest.php
@@ -20,7 +20,7 @@ class SpacerTest extends \MailPoetUnitTest {
       <tr>
         <td class="mailpoet_spacer" height="13" valign="top"></td>
       </tr>';
-    expect($output)->equals($expectedResult);
+    verify($output)->equals($expectedResult);
   }
 
   public function testsItRendersWithBackground() {
@@ -30,6 +30,6 @@ class SpacerTest extends \MailPoetUnitTest {
       <tr>
         <td class="mailpoet_spacer" bgcolor="#ffffff" height="13" valign="top"></td>
       </tr>';
-    expect($output)->equals($expectedResult);
+    verify($output)->equals($expectedResult);
   }
 }
diff --git a/mailpoet/tests/unit/Newsletter/Renderer/Blocks/TextTest.php b/mailpoet/tests/unit/Newsletter/Renderer/Blocks/TextTest.php
index 4527cdddeb..9543428523 100644
--- a/mailpoet/tests/unit/Newsletter/Renderer/Blocks/TextTest.php
+++ b/mailpoet/tests/unit/Newsletter/Renderer/Blocks/TextTest.php
@@ -29,7 +29,7 @@ class TextTest extends \MailPoetUnitTest {
           Text
         </td>
       </tr>';
-    expect($output)->equals($expectedResult);
+    verify($output)->equals($expectedResult);
   }
 
   public function testItRendersParagraph() {
@@ -46,7 +46,7 @@ class TextTest extends \MailPoetUnitTest {
             Text
           </td>
         </tr></table>';
-    expect($paragraphTable)->equals($expectedResult);
+    verify($paragraphTable)->equals($expectedResult);
   }
 
   public function testItRendersNewLinesBetweenWordPressParagraphs(): void {
@@ -66,7 +66,7 @@ class TextTest extends \MailPoetUnitTest {
             First<br /><br />
           </td>
         </tr></table>';
-    expect($paragraphTable)->equals($expectedResult);
+    verify($paragraphTable)->equals($expectedResult);
     $tableElement = $table[1];
     $this->assertInstanceOf(DomNode::class, $tableElement);
     $paragraphTable = $tableElement->toString();
@@ -76,7 +76,7 @@ class TextTest extends \MailPoetUnitTest {
             Second
           </td>
         </tr></table>';
-    expect($paragraphTable)->equals($expectedResult);
+    verify($paragraphTable)->equals($expectedResult);
   }
 
   public function testItRendersNewLinesWordPressParagraphAndHeading(): void {
@@ -96,14 +96,14 @@ class TextTest extends \MailPoetUnitTest {
             First<br /><br />
           </td>
         </tr></table>';
-    expect($paragraphTable)->equals($expectedResult);
+    verify($paragraphTable)->equals($expectedResult);
     $heading = $this->parser->parseStr($output)->query('h1');
     $this->assertInstanceOf(pQuery::class, $heading);
     $headingElement = $heading[0];
     $this->assertInstanceOf(DomNode::class, $headingElement);
     $heading = $headingElement->toString();
     $expectedResult = '<h1 style="text-align:left;padding:0;font-style:normal;font-weight:normal;">Second</h1>';
-    expect($heading)->equals($expectedResult);
+    verify($heading)->equals($expectedResult);
   }
 
   public function testItRendersList() {
@@ -115,7 +115,7 @@ class TextTest extends \MailPoetUnitTest {
     $this->assertInstanceOf(DomNode::class, $ulElement);
     $list = $ulElement->toString();
     $expectedResult = '<ul class="mailpoet_paragraph" style="padding-top:0;padding-bottom:0;margin-top:10px;text-align:left;margin-bottom:10px;"><li class="mailpoet_paragraph" style="text-align:left;margin-bottom:10px;">Item 1</li><li class="mailpoet_paragraph" style="text-align:left;margin-bottom:10px;">Item 2</li></ul>';
-    expect($list)->equals($expectedResult);
+    verify($list)->equals($expectedResult);
   }
 
   public function testItRendersBlockquotes() {
@@ -142,7 +142,7 @@ class TextTest extends \MailPoetUnitTest {
             </td>
           </tr>
         </tbody></table>';
-    expect($blockquoteTable)->equals($expectedResult);
+    verify($blockquoteTable)->equals($expectedResult);
   }
 
   public function testItShouldRemoveEmptyParagraphs() {
@@ -164,7 +164,7 @@ class TextTest extends \MailPoetUnitTest {
         </tr></table>
         </td>
       </tr>';
-    expect($output)->equals($expectedResult);
+    verify($output)->equals($expectedResult);
   }
 
   public function testItStylesHeadings() {
diff --git a/mailpoet/tests/unit/Newsletter/Renderer/EscapeHelperTest.php b/mailpoet/tests/unit/Newsletter/Renderer/EscapeHelperTest.php
index ef079c89fb..f16360285c 100644
--- a/mailpoet/tests/unit/Newsletter/Renderer/EscapeHelperTest.php
+++ b/mailpoet/tests/unit/Newsletter/Renderer/EscapeHelperTest.php
@@ -6,27 +6,27 @@ use MailPoet\Newsletter\Renderer\EscapeHelper as EHelper;
 
 class EscapeHelperTest extends \MailPoetUnitTest {
   public function testItEscapesHtmlText() {
-    expect(EHelper::escapeHtmlText('Text<tag>\'"Hello</tag>'))
+    verify(EHelper::escapeHtmlText('Text<tag>\'"Hello</tag>'))
       ->equals("Text&lt;tag&gt;'\"Hello&lt;/tag&gt;");
   }
 
   public function testItEscapesHtmlAttr() {
-    expect(EHelper::escapeHtmlAttr('Text<tag>\'"Hello</tag>'))
+    verify(EHelper::escapeHtmlAttr('Text<tag>\'"Hello</tag>'))
       ->equals("Text&lt;tag&gt;&#039;&quot;Hello&lt;/tag&gt;");
   }
 
   public function testItEscapesLinkAttr() {
-    expect(EHelper::escapeHtmlLinkAttr('Text<tag>\'"Hello</tag>'))
+    verify(EHelper::escapeHtmlLinkAttr('Text<tag>\'"Hello</tag>'))
       ->equals("Text&lt;tag&gt;&#039;&quot;Hello&lt;/tag&gt;");
-    expect(EHelper::escapeHtmlLinkAttr('javaScRipt:Text<tag>\'"Hello</tag>'))
+    verify(EHelper::escapeHtmlLinkAttr('javaScRipt:Text<tag>\'"Hello</tag>'))
       ->equals("");
-    expect(EHelper::escapeHtmlLinkAttr(' javaScRipt:Text<tag>\'"Hello</tag>'))
+    verify(EHelper::escapeHtmlLinkAttr(' javaScRipt:Text<tag>\'"Hello</tag>'))
       ->equals("");
-    expect(EHelper::escapeHtmlLinkAttr('DAta:Text<tag>\'"Hello</tag>'))
+    verify(EHelper::escapeHtmlLinkAttr('DAta:Text<tag>\'"Hello</tag>'))
       ->equals("");
-    expect(EHelper::escapeHtmlLinkAttr('    DAta:Text<tag>\'"Hello</tag>'))
+    verify(EHelper::escapeHtmlLinkAttr('    DAta:Text<tag>\'"Hello</tag>'))
       ->equals("");
-    expect(EHelper::escapeHtmlLinkAttr('DAta:appliCation<tag>\'"Hello</tag>'))
+    verify(EHelper::escapeHtmlLinkAttr('DAta:appliCation<tag>\'"Hello</tag>'))
       ->equals("");
   }
 }
diff --git a/mailpoet/tests/unit/Newsletter/Renderer/PreprocessorTest.php b/mailpoet/tests/unit/Newsletter/Renderer/PreprocessorTest.php
index 0e72454614..34a66ebdc9 100644
--- a/mailpoet/tests/unit/Newsletter/Renderer/PreprocessorTest.php
+++ b/mailpoet/tests/unit/Newsletter/Renderer/PreprocessorTest.php
@@ -28,7 +28,7 @@ class PreprocessorTest extends \MailPoetUnitTest {
       $wooPreprocessor,
       $couponPreProcessor
     );
-    expect($preprocessor->processBlock(new NewsletterEntity(), ['type' => 'woocommerceHeading']))->equals([[
+    verify($preprocessor->processBlock(new NewsletterEntity(), ['type' => 'woocommerceHeading']))->equals([[
       'type' => 'container',
       'orientation' => 'horizontal',
       'styles' => [
@@ -61,7 +61,7 @@ class PreprocessorTest extends \MailPoetUnitTest {
       $wooPreprocessor,
       $couponPreProcessor
     );
-    expect($preprocessor->processBlock(new NewsletterEntity(), ['type' => 'woocommerceContent']))->equals([[
+    verify($preprocessor->processBlock(new NewsletterEntity(), ['type' => 'woocommerceContent']))->equals([[
       'type' => 'container',
       'orientation' => 'horizontal',
       'styles' => [
diff --git a/mailpoet/tests/unit/Newsletter/Renderer/StylesHelperTest.php b/mailpoet/tests/unit/Newsletter/Renderer/StylesHelperTest.php
index b15e233e16..2a1ddf7860 100644
--- a/mailpoet/tests/unit/Newsletter/Renderer/StylesHelperTest.php
+++ b/mailpoet/tests/unit/Newsletter/Renderer/StylesHelperTest.php
@@ -60,10 +60,10 @@ class StylesHelperTest extends \MailPoetUnitTest {
       ],
     ];
 
-    expect(StylesHelper::getCustomFontsLinks($stylesWithCustomFonts))
+    verify(StylesHelper::getCustomFontsLinks($stylesWithCustomFonts))
       ->equals('<!--[if !mso]><!-- --><link href="https://fonts.googleapis.com/css?family=Roboto:400,400i,700,700i|Source+Sans+Pro:400,400i,700,700i" rel="stylesheet"><!--<![endif]-->');
 
-    expect(StylesHelper::getCustomFontsLinks($stylesWithoutCustomFonts))
+    verify(StylesHelper::getCustomFontsLinks($stylesWithoutCustomFonts))
       ->equals('');
   }
 
diff --git a/mailpoet/tests/unit/Newsletter/Scheduler/SchedulerTest.php b/mailpoet/tests/unit/Newsletter/Scheduler/SchedulerTest.php
index cb639bc0c7..c665af9763 100644
--- a/mailpoet/tests/unit/Newsletter/Scheduler/SchedulerTest.php
+++ b/mailpoet/tests/unit/Newsletter/Scheduler/SchedulerTest.php
@@ -32,32 +32,32 @@ class SchedulerTest extends \MailPoetUnitTest {
   public function testItScheduleTimeWithDelayByHours(): void {
     $scheduledAt = $this->testee->getScheduledTimeWithDelay('hours', 6);
     $expectedDate = (Carbon::createFromTimestamp($this->currentTime->timestamp))->addHours(6);
-    expect($scheduledAt)->equals($expectedDate);
+    verify($scheduledAt)->equals($expectedDate);
 
     $scheduledAt = $this->testee->getScheduledTimeWithDelay('hours', 38);
     $expectedDate = (Carbon::createFromTimestamp($this->currentTime->timestamp))->addHours(38);
-    expect($scheduledAt)->equals($expectedDate);
+    verify($scheduledAt)->equals($expectedDate);
   }
 
   public function testItScheduleTimeWithDelayByDays(): void {
     $scheduledAt = $this->testee->getScheduledTimeWithDelay('days', 23);
     $expectedDate = (Carbon::createFromTimestamp($this->currentTime->timestamp))->addDays(23);
-    expect($scheduledAt)->equals($expectedDate);
+    verify($scheduledAt)->equals($expectedDate);
   }
 
   public function testItScheduleTimeWithDelayByWeek(): void {
     $scheduledAt = $this->testee->getScheduledTimeWithDelay('weeks', 2);
     $expectedDate = (Carbon::createFromTimestamp($this->currentTime->timestamp))->addWeeks(2);
-    expect($scheduledAt)->equals($expectedDate);
+    verify($scheduledAt)->equals($expectedDate);
 
     $scheduledAt = $this->testee->getScheduledTimeWithDelay('weeks', 14);
     $expectedDate = (Carbon::createFromTimestamp($this->currentTime->timestamp))->addWeeks(14);
-    expect($scheduledAt)->equals($expectedDate);
+    verify($scheduledAt)->equals($expectedDate);
   }
 
   public function testItDoesNotScheduleTimeWithDelayOutOfRange(): void {
     $scheduledAt = $this->testee->getScheduledTimeWithDelay('weeks', 4000);
     $maxDate = Carbon::createFromFormat('Y-m-d H:i:s', Scheduler::MYSQL_TIMESTAMP_MAX);
-    expect($scheduledAt)->equals($maxDate);
+    verify($scheduledAt)->equals($maxDate);
   }
 }
diff --git a/mailpoet/tests/unit/Referrals/ReferralDetectorTest.php b/mailpoet/tests/unit/Referrals/ReferralDetectorTest.php
index 53b7ae706b..10a91e4793 100644
--- a/mailpoet/tests/unit/Referrals/ReferralDetectorTest.php
+++ b/mailpoet/tests/unit/Referrals/ReferralDetectorTest.php
@@ -31,7 +31,7 @@ class ReferralDetectorTest extends \MailPoetUnitTest {
       ->expects($this->never())
       ->method('getOption');
     $referralDetector = new ReferralDetector($this->wpMock, $this->settingsMock);
-    expect($referralDetector->detect())->equals('settings_referral_id');
+    verify($referralDetector->detect())->equals('settings_referral_id');
   }
 
   public function testItPrefersOptionValueToConstantAndStoresValueToSettings() {
@@ -48,7 +48,7 @@ class ReferralDetectorTest extends \MailPoetUnitTest {
       ->method('set')
       ->with(ReferralDetector::REFERRAL_SETTING_NAME, 'option_referral_id');
     $referralDetector = new ReferralDetector($this->wpMock, $this->settingsMock);
-    expect($referralDetector->detect())->equals('option_referral_id');
+    verify($referralDetector->detect())->equals('option_referral_id');
   }
 
   public function testItCanReadConstantAndStoreValueToSettings() {
@@ -65,6 +65,6 @@ class ReferralDetectorTest extends \MailPoetUnitTest {
       ->method('set')
       ->with(ReferralDetector::REFERRAL_SETTING_NAME, 'constant_referral_id');
     $referralDetector = new ReferralDetector($this->wpMock, $this->settingsMock);
-    expect($referralDetector->detect())->equals('constant_referral_id');
+    verify($referralDetector->detect())->equals('constant_referral_id');
   }
 }
diff --git a/mailpoet/tests/unit/Settings/CharsetsTest.php b/mailpoet/tests/unit/Settings/CharsetsTest.php
index d38ef2a7ab..da98dc48c7 100644
--- a/mailpoet/tests/unit/Settings/CharsetsTest.php
+++ b/mailpoet/tests/unit/Settings/CharsetsTest.php
@@ -8,6 +8,6 @@ class CharsetsTest extends \MailPoetUnitTest {
   public function testItReturnsAListOfCharsets() {
     $charsets = Charsets::getAll();
     expect($charsets)->notEmpty();
-    expect($charsets[0])->equals('UTF-8');
+    verify($charsets[0])->equals('UTF-8');
   }
 }
diff --git a/mailpoet/tests/unit/Subscribers/SubscriberSubscribeControllerUnitTest.php b/mailpoet/tests/unit/Subscribers/SubscriberSubscribeControllerUnitTest.php
index 9cc783d20e..0fec52e13f 100644
--- a/mailpoet/tests/unit/Subscribers/SubscriberSubscribeControllerUnitTest.php
+++ b/mailpoet/tests/unit/Subscribers/SubscriberSubscribeControllerUnitTest.php
@@ -171,7 +171,7 @@ class SubscriberSubscribeControllerUnitTest extends \MailPoetUnitTest {
     );
 
     $result = $testee->subscribe(array_merge(['form_id' => 1], $submitData));
-    expect($result)->equals([
+    verify($result)->equals([
       'refresh_captcha' => true,
       'error' => 'You need to wait 1 before subscribing again.',
     ]);
@@ -263,7 +263,7 @@ class SubscriberSubscribeControllerUnitTest extends \MailPoetUnitTest {
     $captchaSession = Stub::makeEmpty(CaptchaSession::class,
       [
         'init' => function($receivedSessionId) use ($captchaSessionId) {
-          expect($receivedSessionId)->equals($captchaSessionId);
+          verify($receivedSessionId)->equals($captchaSessionId);
         },
       ]);
     $subscriberActions = Stub::makeEmpty(
@@ -370,7 +370,7 @@ class SubscriberSubscribeControllerUnitTest extends \MailPoetUnitTest {
     );
 
     $result = $testee->subscribe(array_merge(['form_id' => 1], $submitData));
-    expect($result)->equals([
+    verify($result)->equals([
       'error' => 'Please fill in the CAPTCHA.',
       'redirect_url' => $expectedRedirectLink,
     ]);
@@ -384,7 +384,7 @@ class SubscriberSubscribeControllerUnitTest extends \MailPoetUnitTest {
       [
         'getCaptchaHash' => ['phrase' => 'a_string_that_does_not_match'],
         'init' => function($receivedSessionId) use ($captchaSessionId) {
-          expect($receivedSessionId)->equals($captchaSessionId);
+          verify($receivedSessionId)->equals($captchaSessionId);
         },
       ]);
     $subscriberActions = Stub::makeEmpty(
@@ -499,7 +499,7 @@ class SubscriberSubscribeControllerUnitTest extends \MailPoetUnitTest {
     );
 
     $result = $testee->subscribe(array_merge(['form_id' => 1], $submitData));
-    expect($result)->equals([
+    verify($result)->equals([
       'refresh_captcha' => true,
       'error' => 'The characters entered do not match with the previous CAPTCHA.',
     ]);
@@ -555,7 +555,7 @@ class SubscriberSubscribeControllerUnitTest extends \MailPoetUnitTest {
     );
 
     $result = $testee->isSubscribedToAnyFormSegments($form, $subscriber);
-    expect($result)->equals(true);
+    verify($result)->equals(true);
   }
 
   public function testItShouldReturnFalseIfNotSubscribedToAnySegmentsInForm() {
@@ -608,7 +608,7 @@ class SubscriberSubscribeControllerUnitTest extends \MailPoetUnitTest {
     );
 
     $result = $testee->isSubscribedToAnyFormSegments($form, $subscriber);
-    expect($result)->equals(false);
+    verify($result)->equals(false);
   }
 
   public function testSubscribeSuccess() {
@@ -620,7 +620,7 @@ class SubscriberSubscribeControllerUnitTest extends \MailPoetUnitTest {
       [
         'getCaptchaHash' => $captcha,
         'init' => function($receivedSessionId) use ($captchaSessionId) {
-          expect($receivedSessionId)->equals($captchaSessionId);
+          verify($receivedSessionId)->equals($captchaSessionId);
         },
       ]);
     $formFields = [
@@ -657,8 +657,8 @@ class SubscriberSubscribeControllerUnitTest extends \MailPoetUnitTest {
       [
         'subscribe' => function($receivedData, $receivedSegmentIds) use ($formFields, $segmentIds, $subscriber) {
 
-          expect($receivedData)->equals($formFields);
-          expect($receivedSegmentIds)->equals($segmentIds);
+          verify($receivedData)->equals($formFields);
+          verify($receivedSegmentIds)->equals($segmentIds);
           return [$subscriber, ['confirmationEmailResult' => true]];
         },
       ],
@@ -697,10 +697,10 @@ class SubscriberSubscribeControllerUnitTest extends \MailPoetUnitTest {
       WPFunctions::class,
     [
       'doAction' => function($receivedHook, $receivedData, $receivedSegmentIds, $receivedForm) use ($formFields, $segmentIds, $form) {
-        expect($receivedHook)->equals('mailpoet_subscription_before_subscribe');
-        expect($receivedData)->equals($formFields);
-        expect($receivedSegmentIds)->equals($segmentIds);
-        expect($receivedForm)->equals($form);
+        verify($receivedHook)->equals('mailpoet_subscription_before_subscribe');
+        verify($receivedData)->equals($formFields);
+        verify($receivedSegmentIds)->equals($segmentIds);
+        verify($receivedForm)->equals($form);
       },
       ]
     );
@@ -710,7 +710,7 @@ class SubscriberSubscribeControllerUnitTest extends \MailPoetUnitTest {
       BuiltInCaptchaValidator::class,
       [
         'validate' => function($data) use ($captcha) {
-          expect($data['captcha'])->equals($captcha);
+          verify($data['captcha'])->equals($captcha);
           return true;
         },
       ],
@@ -736,6 +736,6 @@ class SubscriberSubscribeControllerUnitTest extends \MailPoetUnitTest {
     );
 
     $result = $testee->subscribe(array_merge(['form_id' => 1], $submitData));
-    expect($result)->equals([]);
+    verify($result)->equals([]);
   }
 }
diff --git a/mailpoet/tests/unit/Subscription/BlacklistTest.php b/mailpoet/tests/unit/Subscription/BlacklistTest.php
index 00b7c1dddf..1017624061 100644
--- a/mailpoet/tests/unit/Subscription/BlacklistTest.php
+++ b/mailpoet/tests/unit/Subscription/BlacklistTest.php
@@ -8,12 +8,12 @@ class BlacklistTest extends \MailPoetUnitTest {
     $domain = 'example.com';
     $blacklist = new Blacklist();
     $result = $blacklist->isBlacklisted($email);
-    expect($result)->equals(false);
+    verify($result)->equals(false);
     $blacklist = new Blacklist([$email]);
     $result = $blacklist->isBlacklisted($email);
-    expect($result)->equals(true);
+    verify($result)->equals(true);
     $blacklist = new Blacklist(null, [$domain]);
     $result = $blacklist->isBlacklisted($email);
-    expect($result)->equals(true);
+    verify($result)->equals(true);
   }
 }
diff --git a/mailpoet/tests/unit/Subscription/Captcha/CaptchaPhraseTest.php b/mailpoet/tests/unit/Subscription/Captcha/CaptchaPhraseTest.php
index 58d3b5e56e..0bf6b4076d 100644
--- a/mailpoet/tests/unit/Subscription/Captcha/CaptchaPhraseTest.php
+++ b/mailpoet/tests/unit/Subscription/Captcha/CaptchaPhraseTest.php
@@ -16,7 +16,7 @@ class CaptchaPhraseTest extends \MailPoetUnitTest {
         },
         'getCaptchaHash' => false,
         'setCaptchaHash' => Stub\Expected::once(function($data) use ($expectedPhrase) {
-          expect($data['phrase'])->equals($expectedPhrase);
+          verify($data['phrase'])->equals($expectedPhrase);
         }),
       ],
       $this
@@ -24,14 +24,14 @@ class CaptchaPhraseTest extends \MailPoetUnitTest {
     $phraseBuilder = Stub::make(
       PhraseBuilder::class,
       [
-        'build' => Stub\Expected::once(function() use ($expectedPhrase) { return $expectedPhrase; 
+        'build' => Stub\Expected::once(function() use ($expectedPhrase) { return $expectedPhrase;
         }),
       ],
       $this
     );
     $testee = new CaptchaPhrase($session, $phraseBuilder);
     $phrase = $testee->getPhraseForType('type-a', null);
-    expect($phrase)->equals($expectedPhrase);
+    verify($phrase)->equals($expectedPhrase);
   }
 
   public function testItRegeneratesPhraseWhenCalledTwice() {
@@ -48,10 +48,10 @@ class CaptchaPhraseTest extends \MailPoetUnitTest {
           static $count;
           if (!$count) {
             $count = 1;
-            expect($data['phrase'])->equals($expectedFirstPhrase);
+            verify($data['phrase'])->equals($expectedFirstPhrase);
             return;
           }
-          expect($data['phrase'])->equals($expectedSecondPhrase);
+          verify($data['phrase'])->equals($expectedSecondPhrase);
         }),
       ],
       $this
@@ -72,9 +72,9 @@ class CaptchaPhraseTest extends \MailPoetUnitTest {
     );
     $testee = new CaptchaPhrase($session, $phraseBuilder);
     $phrase = $testee->getPhraseForType('type-a', null);
-    expect($phrase)->equals($expectedFirstPhrase);
+    verify($phrase)->equals($expectedFirstPhrase);
     $phrase = $testee->getPhraseForType('type-a', null);
-    expect($phrase)->equals($expectedSecondPhrase);
+    verify($phrase)->equals($expectedSecondPhrase);
   }
 
   public function testItKeepsDifferentTypesInSync() {
@@ -106,7 +106,7 @@ class CaptchaPhraseTest extends \MailPoetUnitTest {
             return;
           }
           $count = 1;
-          expect($storage)->equals($expectedFirstStorage);
+          verify($storage)->equals($expectedFirstStorage);
         }),
       ],
       $this
@@ -114,7 +114,7 @@ class CaptchaPhraseTest extends \MailPoetUnitTest {
     $phraseBuilder = Stub::make(
       PhraseBuilder::class,
       [
-        'build' => Stub\Expected::once(function() use ($phrase) { return $phrase; 
+        'build' => Stub\Expected::once(function() use ($phrase) { return $phrase;
         }),
       ],
       $this
@@ -122,6 +122,6 @@ class CaptchaPhraseTest extends \MailPoetUnitTest {
     $testee = new CaptchaPhrase($session, $phraseBuilder);
     $phraseTypeA = $testee->getPhraseForType('type-a', null);
     $phraseTypeB = $testee->getPhraseForType('type-b', null);
-    expect($phraseTypeA)->equals($phraseTypeB);
+    verify($phraseTypeA)->equals($phraseTypeB);
   }
 }
diff --git a/mailpoet/tests/unit/Subscription/Captcha/Validator/BuiltInCaptchaValidatorTest.php b/mailpoet/tests/unit/Subscription/Captcha/Validator/BuiltInCaptchaValidatorTest.php
index 625fe89112..d2f852c6b5 100644
--- a/mailpoet/tests/unit/Subscription/Captcha/Validator/BuiltInCaptchaValidatorTest.php
+++ b/mailpoet/tests/unit/Subscription/Captcha/Validator/BuiltInCaptchaValidatorTest.php
@@ -236,8 +236,8 @@ class BuiltInCaptchaValidatorTest extends \MailPoetUnitTest {
     try {
       $testee->validate($data);
     } catch (ValidationError $error) {
-      expect($error->getMessage())->equals('Please regenerate the CAPTCHA.');
-      expect($error->getMeta()['redirect_url'])->equals($newUrl);
+      verify($error->getMessage())->equals('Please regenerate the CAPTCHA.');
+      verify($error->getMeta()['redirect_url'])->equals($newUrl);
     }
     expect($error)->isInstanceOf(ValidationError::class);
   }
@@ -273,7 +273,7 @@ class BuiltInCaptchaValidatorTest extends \MailPoetUnitTest {
     try {
       $testee->validate($data);
     } catch (ValidationError $error) {
-      expect($error->getMessage())->equals('The characters entered do not match with the previous CAPTCHA.');
+      verify($error->getMessage())->equals('The characters entered do not match with the previous CAPTCHA.');
       expect($error->getMeta()['refresh_captcha'])->true();
     }
     expect($error)->isInstanceOf(ValidationError::class);
@@ -316,8 +316,8 @@ class BuiltInCaptchaValidatorTest extends \MailPoetUnitTest {
     try {
       $testee->validate($data);
     } catch (ValidationError $error) {
-      expect($error->getMessage())->equals('Please fill in the CAPTCHA.');
-      expect($error->getMeta()['redirect_url'])->equals($newUrl);
+      verify($error->getMessage())->equals('Please fill in the CAPTCHA.');
+      verify($error->getMeta()['redirect_url'])->equals($newUrl);
     }
     expect($error)->isInstanceOf(ValidationError::class);
   }
diff --git a/mailpoet/tests/unit/Subscription/Captcha/Validator/RecaptchaValidatorTest.php b/mailpoet/tests/unit/Subscription/Captcha/Validator/RecaptchaValidatorTest.php
index ca719f9d50..55d25e7f29 100644
--- a/mailpoet/tests/unit/Subscription/Captcha/Validator/RecaptchaValidatorTest.php
+++ b/mailpoet/tests/unit/Subscription/Captcha/Validator/RecaptchaValidatorTest.php
@@ -32,14 +32,14 @@ class RecaptchaValidatorTest extends \MailPoetUnitTest {
       WPFunctions::class,
       [
         'wpRemotePost' => function($url, $args) use ($recaptchaResponseToken, $captchaSettings, $response) {
-          expect($url)->equals('https://www.google.com/recaptcha/api/siteverify');
-          expect($args['body']['secret'])->equals($captchaSettings['recaptcha_invisible_secret_token']);
-          expect($args['body']['response'])->equals($recaptchaResponseToken);
+          verify($url)->equals('https://www.google.com/recaptcha/api/siteverify');
+          verify($args['body']['secret'])->equals($captchaSettings['recaptcha_invisible_secret_token']);
+          verify($args['body']['response'])->equals($recaptchaResponseToken);
           return $response;
         },
         'isWpError' => false,
         'wpRemoteRetrieveBody' => function($data) use ($response) {
-          expect($data)->equals($response);
+          verify($data)->equals($response);
           return $response;
         },
       ],
@@ -77,14 +77,14 @@ class RecaptchaValidatorTest extends \MailPoetUnitTest {
       WPFunctions::class,
       [
         'wpRemotePost' => function($url, $args) use ($recaptchaResponseToken, $captchaSettings, $response) {
-          expect($url)->equals('https://www.google.com/recaptcha/api/siteverify');
-          expect($args['body']['secret'])->equals($captchaSettings['recaptcha_secret_token']);
-          expect($args['body']['response'])->equals($recaptchaResponseToken);
+          verify($url)->equals('https://www.google.com/recaptcha/api/siteverify');
+          verify($args['body']['secret'])->equals($captchaSettings['recaptcha_secret_token']);
+          verify($args['body']['response'])->equals($recaptchaResponseToken);
           return $response;
         },
         'isWpError' => false,
         'wpRemoteRetrieveBody' => function($data) use ($response) {
-          expect($data)->equals($response);
+          verify($data)->equals($response);
           return $response;
         },
       ],
@@ -140,7 +140,7 @@ class RecaptchaValidatorTest extends \MailPoetUnitTest {
     try {
       $testee->validate($data);
     } catch (ValidationError $error) {
-      expect($error->getMessage())->equals('Error while validating the CAPTCHA.');
+      verify($error->getMessage())->equals('Error while validating the CAPTCHA.');
     }
     expect($error)->isInstanceOf(ValidationError::class);
   }
@@ -184,7 +184,7 @@ class RecaptchaValidatorTest extends \MailPoetUnitTest {
     try {
       $testee->validate($data);
     } catch (ValidationError $error) {
-      expect($error->getMessage())->equals('Error while validating the CAPTCHA.');
+      verify($error->getMessage())->equals('Error while validating the CAPTCHA.');
     }
     expect($error)->isInstanceOf(ValidationError::class);
   }
diff --git a/mailpoet/tests/unit/Util/DOMTest.php b/mailpoet/tests/unit/Util/DOMTest.php
index e551286bd5..63cd19591d 100644
--- a/mailpoet/tests/unit/Util/DOMTest.php
+++ b/mailpoet/tests/unit/Util/DOMTest.php
@@ -21,7 +21,7 @@ class DOMTest extends \MailPoetUnitTest {
     $this->assertInstanceOf(DomNode::class, $aElement);
     DOMUtil::splitOn($this->root, $aElement);
 
-    expect($this->root->html())->equals(
+    verify($this->root->html())->equals(
       '<p><i>italic</i><em>previous text</em></p>' .
       '<a href="#mylink"><img src="#myimage" /></a>' .
       '<p><em>next text</em><b>bolded</b></p>'
@@ -38,6 +38,6 @@ class DOMTest extends \MailPoetUnitTest {
     $this->assertInstanceOf(pQuery::class, $p);
     $paragraph = $p->offsetGet(0);
 
-    expect(DOMUtil::findTopAncestor($image))->equals($paragraph);
+    verify(DOMUtil::findTopAncestor($image))->equals($paragraph);
   }
 }
diff --git a/mailpoet/tests/unit/Util/DateConverterTest.php b/mailpoet/tests/unit/Util/DateConverterTest.php
index 01194d24e9..07d291d7e8 100644
--- a/mailpoet/tests/unit/Util/DateConverterTest.php
+++ b/mailpoet/tests/unit/Util/DateConverterTest.php
@@ -22,7 +22,7 @@ class DateConverterTest extends \MailPoetUnitTest {
       'YYYY/DD/MM' => '2016/10/05',
     ];
     foreach ($date as $dateFormat => $date) {
-      expect($this->dateConverter->convertDateToDatetime($date, $dateFormat))
+      verify($this->dateConverter->convertDateToDatetime($date, $dateFormat))
         ->equals('2016-05-10 00:00:00');
     }
   }
@@ -33,61 +33,61 @@ class DateConverterTest extends \MailPoetUnitTest {
       'YYYY/MM' => '2016/05',
     ];
     foreach ($date as $dateFormat => $date) {
-      expect($this->dateConverter->convertDateToDatetime($date, $dateFormat))
+      verify($this->dateConverter->convertDateToDatetime($date, $dateFormat))
         ->equals('2016-05-01 00:00:00');
     }
   }
 
   public function testItCanConvertDayToDatetime() {
     $currentYear = date('Y');
-    expect($this->dateConverter->convertDateToDatetime('23', 'DD'))
+    verify($this->dateConverter->convertDateToDatetime('23', 'DD'))
       ->equals(sprintf('%s-01-23 00:00:00', $currentYear));
   }
 
   public function testItCanConvertMonthToDatetime() {
     $currentYear = date('Y');
-    expect($this->dateConverter->convertDateToDatetime('05', 'MM'))
+    verify($this->dateConverter->convertDateToDatetime('05', 'MM'))
       ->equals(sprintf('%s-05-01 00:00:00', $currentYear));
   }
 
   public function testItCanConvertYearToDatetime() {
-    expect($this->dateConverter->convertDateToDatetime('2016', 'YYYY'))
+    verify($this->dateConverter->convertDateToDatetime('2016', 'YYYY'))
       ->equals('2016-01-01 00:00:00');
   }
 
   public function testItCanConvertDatetimeToDatetime() {
-    expect($this->dateConverter->convertDateToDatetime('2016-05-10 00:00:00', 'datetime'))
+    verify($this->dateConverter->convertDateToDatetime('2016-05-10 00:00:00', 'datetime'))
       ->equals('2016-05-10 00:00:00');
   }
 
   public function testItCanClearDate() {
-    expect($this->dateConverter->convertDateToDatetime('0/10/5', 'YYYY/MM/DD'))
+    verify($this->dateConverter->convertDateToDatetime('0/10/5', 'YYYY/MM/DD'))
       ->equals(date('Y') . '-10-05 00:00:00');
-    expect($this->dateConverter->convertDateToDatetime('0/0/5', 'YYYY/MM/DD'))
+    verify($this->dateConverter->convertDateToDatetime('0/0/5', 'YYYY/MM/DD'))
       ->equals(date('Y') . '-' . date('m') . '-05 00:00:00');
-    expect($this->dateConverter->convertDateToDatetime('0/0/0', 'YYYY/MM/DD'))
+    verify($this->dateConverter->convertDateToDatetime('0/0/0', 'YYYY/MM/DD'))
       ->equals('');
-    expect($this->dateConverter->convertDateToDatetime('0', 'YYYY'))
+    verify($this->dateConverter->convertDateToDatetime('0', 'YYYY'))
       ->equals('');
-    expect($this->dateConverter->convertDateToDatetime('0', 'MM'))
+    verify($this->dateConverter->convertDateToDatetime('0', 'MM'))
       ->equals('');
   }
 
   public function testItCanConvertCustomFormat() {
-    expect($this->dateConverter->convertDateToDatetime('31/12/2021', 'd/m/Y'))
+    verify($this->dateConverter->convertDateToDatetime('31/12/2021', 'd/m/Y'))
       ->equals('2021-12-31 00:00:00');
-    expect($this->dateConverter->convertDateToDatetime('1/12/2021', 'd/m/Y'))
+    verify($this->dateConverter->convertDateToDatetime('1/12/2021', 'd/m/Y'))
       ->equals('2021-12-01 00:00:00');
-    expect($this->dateConverter->convertDateToDatetime('12/31/2021', 'd/m/Y'))
+    verify($this->dateConverter->convertDateToDatetime('12/31/2021', 'd/m/Y'))
       ->equals(false);
 
-    expect($this->dateConverter->convertDateToDatetime('31/12/2021 10:26', 'd/m/Y'))
+    verify($this->dateConverter->convertDateToDatetime('31/12/2021 10:26', 'd/m/Y'))
       ->equals('2021-12-31 10:26:00');
-    expect($this->dateConverter->convertDateToDatetime('1/12/2021 17:11', 'd/m/Y'))
+    verify($this->dateConverter->convertDateToDatetime('1/12/2021 17:11', 'd/m/Y'))
       ->equals('2021-12-01 17:11:00');
-    expect($this->dateConverter->convertDateToDatetime('1/12/2021 1:11', 'd/m/Y'))
+    verify($this->dateConverter->convertDateToDatetime('1/12/2021 1:11', 'd/m/Y'))
       ->equals('2021-12-01 01:11:00');
-    expect($this->dateConverter->convertDateToDatetime('12/31/2021 11:00', 'd/m/Y'))
+    verify($this->dateConverter->convertDateToDatetime('12/31/2021 11:00', 'd/m/Y'))
       ->equals(false);
   }
 }
diff --git a/mailpoet/tests/unit/Util/HelpersTest.php b/mailpoet/tests/unit/Util/HelpersTest.php
index fcd6667dfd..e08247c091 100644
--- a/mailpoet/tests/unit/Util/HelpersTest.php
+++ b/mailpoet/tests/unit/Util/HelpersTest.php
@@ -8,7 +8,7 @@ class HelpersTest extends \MailPoetUnitTest {
   public function testItReplacesLinkTags() {
     $source = '[link]example link[/link]';
     $link = 'http://example.com';
-    expect(Helpers::replaceLinkTags($source, $link))
+    verify(Helpers::replaceLinkTags($source, $link))
       ->equals('<a href="' . $link . '">example link</a>');
   }
 
@@ -19,14 +19,14 @@ class HelpersTest extends \MailPoetUnitTest {
       'class' => 'test class',
       'target' => '_blank',
     ];
-    expect(Helpers::replaceLinkTags($source, $link, $attributes))
+    verify(Helpers::replaceLinkTags($source, $link, $attributes))
       ->equals('<a class="test class" target="_blank" href="' . $link . '">example link</a>');
   }
 
   public function testItAcceptsCustomLinkTag() {
     $source = '[custom_link_tag]example link[/custom_link_tag]';
     $link = 'http://example.com';
-    expect(Helpers::replaceLinkTags($source, $link, [], 'custom_link_tag'))
+    verify(Helpers::replaceLinkTags($source, $link, [], 'custom_link_tag'))
       ->equals('<a href="' . $link . '">example link</a>');
   }
 
@@ -37,10 +37,10 @@ class HelpersTest extends \MailPoetUnitTest {
   }
 
   public function testItTrimStringsRecursively() {
-    expect(Helpers::recursiveTrim('  foo'))->equals('foo');
-    expect(Helpers::recursiveTrim('foo  '))->equals('foo');
-    expect(Helpers::recursiveTrim(123))->equals(123);
-    expect(Helpers::recursiveTrim([
+    verify(Helpers::recursiveTrim('  foo'))->equals('foo');
+    verify(Helpers::recursiveTrim('foo  '))->equals('foo');
+    verify(Helpers::recursiveTrim(123))->equals(123);
+    verify(Helpers::recursiveTrim([
       'name' => '   some text here   ',
       'list' => [
         'string 1',
@@ -60,13 +60,13 @@ class HelpersTest extends \MailPoetUnitTest {
   }
 
   public function testSanitizeSearch() {
-    expect(Helpers::escapeSearch('Hello'))->equals('Hello');
-    expect(Helpers::escapeSearch('Hello '))->equals('Hello');
-    expect(Helpers::escapeSearch(' Hello '))->equals('Hello');
-    expect(Helpers::escapeSearch('%Hello '))->equals('\%Hello');
-    expect(Helpers::escapeSearch('%Hello %'))->equals('\%Hello \%');
-    expect(Helpers::escapeSearch('He%llo'))->equals('He\%llo');
-    expect(Helpers::escapeSearch('He_llo'))->equals('He\_llo');
-    expect(Helpers::escapeSearch('He\\llo'))->equals('He\\\llo');
+    verify(Helpers::escapeSearch('Hello'))->equals('Hello');
+    verify(Helpers::escapeSearch('Hello '))->equals('Hello');
+    verify(Helpers::escapeSearch(' Hello '))->equals('Hello');
+    verify(Helpers::escapeSearch('%Hello '))->equals('\%Hello');
+    verify(Helpers::escapeSearch('%Hello %'))->equals('\%Hello \%');
+    verify(Helpers::escapeSearch('He%llo'))->equals('He\%llo');
+    verify(Helpers::escapeSearch('He_llo'))->equals('He\_llo');
+    verify(Helpers::escapeSearch('He\\llo'))->equals('He\\\llo');
   }
 }
diff --git a/mailpoet/tests/unit/Util/License/LicenseTest.php b/mailpoet/tests/unit/Util/License/LicenseTest.php
index 407cebf163..1beee5bcf6 100644
--- a/mailpoet/tests/unit/Util/License/LicenseTest.php
+++ b/mailpoet/tests/unit/Util/License/LicenseTest.php
@@ -8,6 +8,6 @@ class LicenseTest extends \MailPoetUnitTest {
   public function testItGetsLicense() {
     if (defined('MAILPOET_PREMIUM_LICENSE')) return;
     expect(License::getLicense())->false();
-    expect(License::getLicense('valid'))->equals('valid');
+    verify(License::getLicense('valid'))->equals('valid');
   }
 }
diff --git a/mailpoet/tests/unit/Util/PQueryTest.php b/mailpoet/tests/unit/Util/PQueryTest.php
index e4b90d0641..295ad95e9f 100644
--- a/mailpoet/tests/unit/Util/PQueryTest.php
+++ b/mailpoet/tests/unit/Util/PQueryTest.php
@@ -9,7 +9,7 @@ class PQueryTest extends \MailPoetUnitTest {
     $html = '<a href="#" title="Escape " this"></a>';
     $domnode = pQuery::parseStr($html);
     $innerText = $domnode->getInnerText();
-    expect($innerText)->equals("");
+    verify($innerText)->equals("");
   }
 
   public function testQuotesAreCorrectlyEscaped() {
@@ -58,7 +58,7 @@ class PQueryTest extends \MailPoetUnitTest {
   public function parseTest($html, $equals = true) {
     $parsedHtml = pQuery::parseStr($html)->getInnerText();
     if ($equals) {
-      expect($parsedHtml)->equals($html);
+      verify($parsedHtml)->equals($html);
     } else {
       expect($parsedHtml)->notEquals($html);
     }
diff --git a/mailpoet/tests/unit/Util/SecondLevelDomainNamesTest.php b/mailpoet/tests/unit/Util/SecondLevelDomainNamesTest.php
index b024f97101..4c829e7645 100644
--- a/mailpoet/tests/unit/Util/SecondLevelDomainNamesTest.php
+++ b/mailpoet/tests/unit/Util/SecondLevelDomainNamesTest.php
@@ -13,22 +13,22 @@ class SecondLevelDomainNamesTest extends \MailPoetUnitTest {
   }
 
   public function testItGetsSecondLevelDomainName() {
-    expect($this->extractor->get('mailpoet.com'))->equals('mailpoet.com');
+    verify($this->extractor->get('mailpoet.com'))->equals('mailpoet.com');
   }
 
   public function testItGetsSecondLevelDomainNameFromThirdLevel() {
-    expect($this->extractor->get('newsletters.mailpoet.com'))->equals('mailpoet.com');
+    verify($this->extractor->get('newsletters.mailpoet.com'))->equals('mailpoet.com');
   }
 
   public function testItGetsSecondLevelDomainNameWithCoUk() {
-    expect($this->extractor->get('example.co.uk'))->equals('example.co.uk');
+    verify($this->extractor->get('example.co.uk'))->equals('example.co.uk');
   }
 
   public function testItGetsSecondLevelDomainNameFromThirdLevelWithCoUk() {
-    expect($this->extractor->get('test.example.co.uk'))->equals('example.co.uk');
+    verify($this->extractor->get('test.example.co.uk'))->equals('example.co.uk');
   }
 
   public function testItGetsSecondLevelDomainNameForLocalhost() {
-    expect($this->extractor->get('localhost'))->equals('localhost');
+    verify($this->extractor->get('localhost'))->equals('localhost');
   }
 }
diff --git a/mailpoet/tests/unit/Util/SecurityTest.php b/mailpoet/tests/unit/Util/SecurityTest.php
index 1728828e03..9d9dfaf4e9 100644
--- a/mailpoet/tests/unit/Util/SecurityTest.php
+++ b/mailpoet/tests/unit/Util/SecurityTest.php
@@ -8,14 +8,14 @@ class SecurityTest extends \MailPoetUnitTest {
   public function testItCanGenerateARandomString() {
     // it has a default length of 5
     $hash = Security::generateRandomString();
-    expect(strlen($hash))->equals(5);
+    verify(strlen($hash))->equals(5);
 
     // it has a min length of 5
     $shortHash = Security::generateRandomString(1);
-    expect(strlen($shortHash))->equals(5);
+    verify(strlen($shortHash))->equals(5);
 
     $longHash = Security::generateRandomString(64);
-    expect(strlen($longHash))->equals(64);
+    verify(strlen($longHash))->equals(64);
 
     // expect only alphanumerical characters
     expect(ctype_alnum($hash))->true();
@@ -27,10 +27,10 @@ class SecurityTest extends \MailPoetUnitTest {
     $hash1 = Security::generateHash();
     $hash2 = Security::generateHash();
     expect($hash1)->notEquals($hash2);
-    expect(strlen($hash1))->equals(Security::HASH_LENGTH);
+    verify(strlen($hash1))->equals(Security::HASH_LENGTH);
   }
 
   public function testItGeneratesRandomHashWithCustomLength() {
-    expect(strlen(Security::generateHash(10)))->equals(10);
+    verify(strlen(Security::generateHash(10)))->equals(10);
   }
 }
diff --git a/mailpoet/tests/unit/Util/UrlTest.php b/mailpoet/tests/unit/Util/UrlTest.php
index 22e212b6bd..02340b214c 100644
--- a/mailpoet/tests/unit/Util/UrlTest.php
+++ b/mailpoet/tests/unit/Util/UrlTest.php
@@ -14,6 +14,6 @@ class UrlTest extends \MailPoetUnitTest {
       'addQueryArg' => '',
     ]));
     $currentUrl = $urlHelper->getCurrentUrl();
-    expect($currentUrl)->equals($homeUrl);
+    verify($currentUrl)->equals($homeUrl);
   }
 }
diff --git a/mailpoet/tests/unit/WP/DateTimeTest.php b/mailpoet/tests/unit/WP/DateTimeTest.php
index b4507f5871..40bf4f565d 100644
--- a/mailpoet/tests/unit/WP/DateTimeTest.php
+++ b/mailpoet/tests/unit/WP/DateTimeTest.php
@@ -13,14 +13,14 @@ class DateTimeTest extends \MailPoetUnitTest {
         return 'H:i';
       },
     ]));
-    expect($dateTime->getTimeFormat())->equals('H:i');
+    verify($dateTime->getTimeFormat())->equals('H:i');
 
     $dateTime = new WPDateTime(Stub::make(new WPFunctions(), [
       'getOption' => function($key) {
         return '';
       },
     ]));
-    expect($dateTime->getTimeFormat())->equals('H:i:s');
+    verify($dateTime->getTimeFormat())->equals('H:i:s');
   }
 
   public function testGetDateFormat() {
@@ -29,14 +29,14 @@ class DateTimeTest extends \MailPoetUnitTest {
         return 'm-d';
       },
     ]));
-    expect($dateTime->getDateFormat())->equals('m-d');
+    verify($dateTime->getDateFormat())->equals('m-d');
 
     $dateTime = new WPDateTime(Stub::make(new WPFunctions(), [
       'getOption' => function($key) {
         return '';
       },
     ]));
-    expect($dateTime->getDateFormat())->equals('Y-m-d');
+    verify($dateTime->getDateFormat())->equals('Y-m-d');
   }
 
   public function testGetCurrentDate() {
@@ -45,7 +45,7 @@ class DateTimeTest extends \MailPoetUnitTest {
         return date($format);
       },
     ]));
-    expect($dateTime->getCurrentDate("Y-m"))->equals(date("Y-m"));
+    verify($dateTime->getCurrentDate("Y-m"))->equals(date("Y-m"));
   }
 
   public function testGetCurrentTime() {
@@ -65,8 +65,8 @@ class DateTimeTest extends \MailPoetUnitTest {
     ]));
     $timestamp = 1234567;
     $format = "H:i:s";
-    expect($dateTime->formatTime($timestamp))->equals(date($dateTime->getTimeFormat(), $timestamp));
-    expect($dateTime->formatTime($timestamp, $format))->equals(date($format, $timestamp));
+    verify($dateTime->formatTime($timestamp))->equals(date($dateTime->getTimeFormat(), $timestamp));
+    verify($dateTime->formatTime($timestamp, $format))->equals(date($format, $timestamp));
   }
 
   public function testFormatDate() {
@@ -77,8 +77,8 @@ class DateTimeTest extends \MailPoetUnitTest {
     ]));
     $timestamp = 1234567;
     $format = "Y-m-d";
-    expect($dateTime->formatDate($timestamp))->equals(date($dateTime->getDateFormat(), $timestamp));
-    expect($dateTime->formatDate($timestamp, $format))->equals(date($format, $timestamp));
+    verify($dateTime->formatDate($timestamp))->equals(date($dateTime->getDateFormat(), $timestamp));
+    verify($dateTime->formatDate($timestamp, $format))->equals(date($format, $timestamp));
   }
 
   public function testTimeInterval() {
@@ -94,7 +94,7 @@ class DateTimeTest extends \MailPoetUnitTest {
     ));
     $oneHourExpected = [
       '00:00:00', '01:00:00', '02:00:00', '03:00:00', '04:00:00'];
-    expect($oneHourInterval)->equals($oneHourExpected);
+    verify($oneHourInterval)->equals($oneHourExpected);
 
     $quarterHourInterval = array_keys($dateTime->getTimeInterval(
       '00:00:00',
@@ -104,7 +104,7 @@ class DateTimeTest extends \MailPoetUnitTest {
     $quarterHourExpected = [
       '00:00:00', '00:15:00', '00:30:00', '00:45:00', '01:00:00',
     ];
-    expect($quarterHourInterval)->equals($quarterHourExpected);
+    verify($quarterHourInterval)->equals($quarterHourExpected);
 
     $offsetStartTimeInterval = array_keys($dateTime->getTimeInterval(
       '03:00:00',
@@ -114,6 +114,6 @@ class DateTimeTest extends \MailPoetUnitTest {
     $offsetStartTimeExpected = [
       '03:00:00', '04:00:00', '05:00:00', '06:00:00', '07:00:00',
     ];
-    expect($offsetStartTimeInterval)->equals($offsetStartTimeExpected);
+    verify($offsetStartTimeInterval)->equals($offsetStartTimeExpected);
   }
 }
diff --git a/mailpoet/tests/unit/WP/ReadmeTest.php b/mailpoet/tests/unit/WP/ReadmeTest.php
index 5db219c3e9..f365db37b2 100644
--- a/mailpoet/tests/unit/WP/ReadmeTest.php
+++ b/mailpoet/tests/unit/WP/ReadmeTest.php
@@ -15,14 +15,14 @@ class ReadmeTest extends \MailPoetUnitTest {
 
   public function testItParsesChangelog() {
     $result = Readme::parseChangelog($this->data);
-    expect(count($result))->equals(2);
-    expect(count($result[0]['changes']))->equals(2);
-    expect(count($result[1]['changes']))->equals(1);
+    verify(count($result))->equals(2);
+    verify(count($result[0]['changes']))->equals(2);
+    verify(count($result[1]['changes']))->equals(1);
   }
 
   public function testItRespectsLimitOfParsedItems() {
     $result = Readme::parseChangelog($this->data, 1);
-    expect(count($result))->equals(1);
+    verify(count($result))->equals(1);
   }
 
   public function testItReturnsFalseOnMalformedData() {
diff --git a/mailpoet/tests/unit/WPCOM/DotcomHelperFunctionsTest.php b/mailpoet/tests/unit/WPCOM/DotcomHelperFunctionsTest.php
index c8065f6e5c..3fc22ba633 100644
--- a/mailpoet/tests/unit/WPCOM/DotcomHelperFunctionsTest.php
+++ b/mailpoet/tests/unit/WPCOM/DotcomHelperFunctionsTest.php
@@ -22,42 +22,42 @@ class DotcomHelperFunctionsTest extends \MailPoetUnitTest {
   }
 
   public function testItReturnsEmptyStringIfNoPlan() {
-    expect($this->dotcomHelper->getDotcomPlan())->equals('');
+    verify($this->dotcomHelper->getDotcomPlan())->equals('');
   }
 
   public function testItReturnsPerformanceIfWooExpressPerformance() {
     $dotcomHelper = $this->createPartialMock(DotcomHelperFunctions::class, ['isWooExpressPerformance']);
     $dotcomHelper->method('isWooExpressPerformance')->willReturn(true);
-    expect($dotcomHelper->getDotcomPlan())->equals('performance');
+    verify($dotcomHelper->getDotcomPlan())->equals('performance');
   }
 
   public function testItReturnsEssentialIfWooExpressEssential() {
     $dotcomHelper = $this->createPartialMock(DotcomHelperFunctions::class, ['isWooExpressEssential']);
     $dotcomHelper->method('isWooExpressEssential')->willReturn(true);
-    expect($dotcomHelper->getDotcomPlan())->equals('essential');
+    verify($dotcomHelper->getDotcomPlan())->equals('essential');
   }
 
   public function testItReturnsBusinessIfWooBusiness() {
     $dotcomHelper = $this->createPartialMock(DotcomHelperFunctions::class, ['isBusiness']);
     $dotcomHelper->method('isBusiness')->willReturn(true);
-    expect($dotcomHelper->getDotcomPlan())->equals('business');
+    verify($dotcomHelper->getDotcomPlan())->equals('business');
   }
 
   public function testItReturnsEcommerceTrialIfEcommerceTrial() {
     $dotcomHelper = $this->createPartialMock(DotcomHelperFunctions::class, ['isEcommerceTrial']);
     $dotcomHelper->method('isEcommerceTrial')->willReturn(true);
-    expect($dotcomHelper->getDotcomPlan())->equals('ecommerce_trial');
+    verify($dotcomHelper->getDotcomPlan())->equals('ecommerce_trial');
   }
 
   public function testItReturnsEcommerceWPComIfEcommerceWPCom() {
     $dotcomHelper = $this->createPartialMock(DotcomHelperFunctions::class, ['isEcommerceWPCom']);
     $dotcomHelper->method('isEcommerceWPCom')->willReturn(true);
-    expect($dotcomHelper->getDotcomPlan())->equals('ecommerce_wpcom');
+    verify($dotcomHelper->getDotcomPlan())->equals('ecommerce_wpcom');
   }
 
   public function testItReturnsEcommerceIfEcommerce() {
     $dotcomHelper = $this->createPartialMock(DotcomHelperFunctions::class, ['isEcommerce']);
     $dotcomHelper->method('isEcommerce')->willReturn(true);
-    expect($dotcomHelper->getDotcomPlan())->equals('ecommerce');
+    verify($dotcomHelper->getDotcomPlan())->equals('ecommerce');
   }
 }
diff --git a/mailpoet/tests/unit/WooCommerce/CouponPreProcessorTest.php b/mailpoet/tests/unit/WooCommerce/CouponPreProcessorTest.php
index 0a13848952..f488eb3313 100644
--- a/mailpoet/tests/unit/WooCommerce/CouponPreProcessorTest.php
+++ b/mailpoet/tests/unit/WooCommerce/CouponPreProcessorTest.php
@@ -51,7 +51,7 @@ class CouponPreProcessorTest extends \MailPoetUnitTest {
     ]];
     $result = $this->processor->processCoupons($newsletter, $blocks, true);
 
-    expect($result)->equals($blocks);
+    verify($result)->equals($blocks);
   }
 
   public function testEnsureCouponForBlocks() {
@@ -77,7 +77,7 @@ class CouponPreProcessorTest extends \MailPoetUnitTest {
     $this->assertWCCouponReceivesCorrectValues($mockedWCCoupon, self::$saveCouponId, $expiryDay);
 
     $result = $processor->processCoupons($newsletter, $blocks, false);
-    expect($result[0]['blocks'][0]['couponId'])->equals(self::$saveCouponId);
+    verify($result[0]['blocks'][0]['couponId'])->equals(self::$saveCouponId);
   }
 
   public function testEnsureCouponForBlocksSaves() {
@@ -104,7 +104,7 @@ class CouponPreProcessorTest extends \MailPoetUnitTest {
      * If the coupon already is generated for the block, it should not get re-generated
      */
     $result = $processor->processCoupons($newsletter, $blocks, false);
-    expect($result[0]['blocks'][0]['couponId'])->equals(self::$updatingCouponId);
+    verify($result[0]['blocks'][0]['couponId'])->equals(self::$updatingCouponId);
   }
 
   public function testEnsureCouponIsNotGeneratedWhenIsSet(): void {
@@ -134,7 +134,7 @@ class CouponPreProcessorTest extends \MailPoetUnitTest {
     $mockedWCCoupon->expects($this->never())->method('set_description');
     $mockedWCCoupon->expects($this->never())->method('save');
     $result = $processor->processCoupons($newsletter, $blocks);
-    expect($result[0]['blocks'][0]['couponId'])->equals(self::$saveCouponId);
+    verify($result[0]['blocks'][0]['couponId'])->equals(self::$saveCouponId);
   }
 
   public function testItThrowsWhenWCIsNotActive() {
@@ -155,7 +155,7 @@ class CouponPreProcessorTest extends \MailPoetUnitTest {
     $this->expectException(NewsletterProcessingException::class);
     $this->expectExceptionMessage('WooCommerce is not active');
     $result = $processor->processCoupons($newsletter, $blocks, false);
-    expect($result)->equals($blocks);
+    verify($result)->equals($blocks);
   }
 
   public function testItThrowsWhenCouponClassThrows() {
@@ -189,7 +189,7 @@ class CouponPreProcessorTest extends \MailPoetUnitTest {
     });
 
     $mockedWCCoupon->method('set_date_expires')->willReturnCallback(function ($date) use ($expiryDay) {
-      expect(\date('Y-m-d', $date))->equals((new \DateTime("now", new \DateTimeZone('UTC')))->modify("+{$expiryDay} days")->format('Y-m-d'));
+      verify(\date('Y-m-d', $date))->equals((new \DateTime("now", new \DateTimeZone('UTC')))->modify("+{$expiryDay} days")->format('Y-m-d'));
     });
   }
 
diff --git a/mailpoet/tests/unit/WooCommerce/TransactionalEmailsUnitTest.php b/mailpoet/tests/unit/WooCommerce/TransactionalEmailsUnitTest.php
index 3208494f0e..3655c69ced 100644
--- a/mailpoet/tests/unit/WooCommerce/TransactionalEmailsUnitTest.php
+++ b/mailpoet/tests/unit/WooCommerce/TransactionalEmailsUnitTest.php
@@ -25,11 +25,11 @@ class TransactionalEmailsUnitTest extends \MailPoetUnitTest {
       },
       'homeUrl' => 'http://test.loc',
       'wpSpecialcharsDecode' => function($text) {
-        expect($text)->equals('Test');
+        verify($text)->equals('Test');
         return $text;
       },
       'wpParseUrl' => function($url) {
-        expect($url)->equals('http://test.loc');
+        verify($url)->equals('http://test.loc');
         return 'test.loc';
       },
     ]);
@@ -38,7 +38,7 @@ class TransactionalEmailsUnitTest extends \MailPoetUnitTest {
     $woocommerceHelper = Stub::make(WooCommerceHelper::class);
     $newslettersRepository = Stub::make(NewslettersRepository::class);
     $transactionalEmails = new TransactionalEmails($wp, $settings, $template, $woocommerceHelper, $newslettersRepository);
-    expect($transactionalEmails->getEmailHeadings())->equals([
+    verify($transactionalEmails->getEmailHeadings())->equals([
       'new_account' => 'Test: New Order: #0001',
       'processing_order' => 'Thank you for your order',
       'completed_order' => 'Thanks for shopping at test.loc',