diff --git a/tests/Zend/Acl/AclTest.php b/tests/Zend/Acl/AclTest.php
index f114de90..b0cb2245 100644
--- a/tests/Zend/Acl/AclTest.php
+++ b/tests/Zend/Acl/AclTest.php
@@ -88,7 +88,7 @@ public function testRoleRegistryRemoveOneNonExistent()
             $this->_acl->removeRole('nonexistent');
             $this->fail('Expected Zend_Acl_Role_Registry_Exception not thrown upon removing a non-existent Role');
         } catch (Zend_Acl_Role_Registry_Exception $e) {
-            $this->assertContains('not found', $e->getMessage());
+            $this->assertStringContainsString('not found', $e->getMessage());
         }
     }
 
@@ -112,7 +112,7 @@ public function testRoleRegistryAddInheritsNonExistent()
             $this->_acl->addRole(new Zend_Acl_Role('guest'), 'nonexistent');
             $this->fail('Expected Zend_Acl_Role_Registry_Exception not thrown upon specifying a non-existent parent');
         } catch (Zend_Acl_Role_Registry_Exception $e) {
-            $this->assertContains('does not exist', $e->getMessage());
+            $this->assertStringContainsString('does not exist', $e->getMessage());
         }
     }
 
@@ -128,14 +128,14 @@ public function testRoleRegistryInheritsNonExistent()
             $this->_acl->inheritsRole('nonexistent', $roleGuest);
             $this->fail('Expected Zend_Acl_Role_Registry_Exception not thrown upon specifying a non-existent child Role');
         } catch (Zend_Acl_Role_Registry_Exception $e) {
-            $this->assertContains('not found', $e->getMessage());
+            $this->assertStringContainsString('not found', $e->getMessage());
         }
 
         try {
             $this->_acl->inheritsRole($roleGuest, 'nonexistent');
             $this->fail('Expected Zend_Acl_Role_Registry_Exception not thrown upon specifying a non-existent parent Role');
         } catch (Zend_Acl_Role_Registry_Exception $e) {
-            $this->assertContains('not found', $e->getMessage());
+            $this->assertStringContainsString('not found', $e->getMessage());
         }
     }
 
@@ -210,7 +210,7 @@ public function testRoleRegistryDuplicate()
                 ->add($roleGuest);
             $this->fail('Expected exception not thrown upon adding same Role twice');
         } catch (Zend_Acl_Role_Registry_Exception $e) {
-            $this->assertContains('already exists', $e->getMessage());
+            $this->assertStringContainsString('already exists', $e->getMessage());
         }
     }
 
@@ -228,7 +228,7 @@ public function testRoleRegistryDuplicateId()
                 ->add($roleGuest2);
             $this->fail('Expected exception not thrown upon adding two Roles with same ID');
         } catch (Zend_Acl_Role_Registry_Exception $e) {
-            $this->assertContains('already exists', $e->getMessage());
+            $this->assertStringContainsString('already exists', $e->getMessage());
         }
     }
 
@@ -291,7 +291,7 @@ public function testResourceRemoveOneNonExistent()
             $this->_acl->remove('nonexistent');
             $this->fail('Expected Zend_Acl_Exception not thrown upon removing a non-existent Resource');
         } catch (Zend_Acl_Exception $e) {
-            $this->assertContains('not found', $e->getMessage());
+            $this->assertStringContainsString('not found', $e->getMessage());
         }
     }
 
@@ -315,7 +315,7 @@ public function testResourceAddInheritsNonExistent()
             $this->_acl->add(new Zend_Acl_Resource('area'), 'nonexistent');
             $this->fail('Expected Zend_Acl_Exception not thrown upon specifying a non-existent parent');
         } catch (Zend_Acl_Exception $e) {
-            $this->assertContains('does not exist', $e->getMessage());
+            $this->assertStringContainsString('does not exist', $e->getMessage());
         }
     }
 
@@ -331,14 +331,14 @@ public function testResourceInheritsNonExistent()
             $this->_acl->inherits('nonexistent', $resourceArea);
             $this->fail('Expected Zend_Acl_Exception not thrown upon specifying a non-existent child Resource');
         } catch (Zend_Acl_Exception $e) {
-            $this->assertContains('not found', $e->getMessage());
+            $this->assertStringContainsString('not found', $e->getMessage());
         }
 
         try {
             $this->_acl->inherits($resourceArea, 'nonexistent');
             $this->fail('Expected Zend_Acl_Exception not thrown upon specifying a non-existent parent Resource');
         } catch (Zend_Acl_Exception $e) {
-            $this->assertContains('not found', $e->getMessage());
+            $this->assertStringContainsString('not found', $e->getMessage());
         }
     }
 
@@ -374,7 +374,7 @@ public function testResourceDuplicate()
                 ->add($resourceArea);
             $this->fail('Expected exception not thrown upon adding same Resource twice');
         } catch (Zend_Acl_Exception $e) {
-            $this->assertContains('already exists', $e->getMessage());
+            $this->assertStringContainsString('already exists', $e->getMessage());
         }
     }
 
@@ -390,7 +390,7 @@ public function testResourceDuplicateId()
                 ->add($resourceArea2);
             $this->fail('Expected exception not thrown upon adding two Resources with same ID');
         } catch (Zend_Acl_Exception $e) {
-            $this->assertContains('already exists', $e->getMessage());
+            $this->assertStringContainsString('already exists', $e->getMessage());
         }
     }
 
@@ -403,14 +403,14 @@ public function testIsAllowedNonExistent()
             $this->_acl->isAllowed('nonexistent');
             $this->fail('Expected Zend_Acl_Role_Registry_Exception not thrown upon non-existent Role');
         } catch (Zend_Acl_Role_Registry_Exception $e) {
-            $this->assertContains('not found', $e->getMessage());
+            $this->assertStringContainsString('not found', $e->getMessage());
         }
 
         try {
             $this->_acl->isAllowed(null, 'nonexistent');
             $this->fail('Expected Zend_Acl_Exception not thrown upon non-existent Resource');
         } catch (Zend_Acl_Exception $e) {
-            $this->assertContains('not found', $e->getMessage());
+            $this->assertStringContainsString('not found', $e->getMessage());
         }
     }
 
@@ -719,7 +719,7 @@ public function testRuleRoleRemove()
             $this->_acl->isAllowed('guest');
             $this->fail('Expected Zend_Acl_Role_Registry_Exception not thrown upon isAllowed() on non-existent Role');
         } catch (Zend_Acl_Role_Registry_Exception $e) {
-            $this->assertContains('not found', $e->getMessage());
+            $this->assertStringContainsString('not found', $e->getMessage());
         }
         $this->_acl->addRole(new Zend_Acl_Role('guest'));
         $this->assertFalse($this->_acl->isAllowed('guest'));
@@ -739,7 +739,7 @@ public function testRuleRoleRemoveAll()
             $this->_acl->isAllowed('guest');
             $this->fail('Expected Zend_Acl_Role_Registry_Exception not thrown upon isAllowed() on non-existent Role');
         } catch (Zend_Acl_Role_Registry_Exception $e) {
-            $this->assertContains('not found', $e->getMessage());
+            $this->assertStringContainsString('not found', $e->getMessage());
         }
         $this->_acl->addRole(new Zend_Acl_Role('guest'));
         $this->assertFalse($this->_acl->isAllowed('guest'));
@@ -759,7 +759,7 @@ public function testRulesResourceRemove()
             $this->_acl->isAllowed(null, 'area');
             $this->fail('Expected Zend_Acl_Exception not thrown upon isAllowed() on non-existent Resource');
         } catch (Zend_Acl_Exception $e) {
-            $this->assertContains('not found', $e->getMessage());
+            $this->assertStringContainsString('not found', $e->getMessage());
         }
         $this->_acl->add(new Zend_Acl_Resource('area'));
         $this->assertFalse($this->_acl->isAllowed(null, 'area'));
@@ -779,7 +779,7 @@ public function testRulesResourceRemoveAll()
             $this->_acl->isAllowed(null, 'area');
             $this->fail('Expected Zend_Acl_Exception not thrown upon isAllowed() on non-existent Resource');
         } catch (Zend_Acl_Exception $e) {
-            $this->assertContains('not found', $e->getMessage());
+            $this->assertStringContainsString('not found', $e->getMessage());
         }
         $this->_acl->add(new Zend_Acl_Resource('area'));
         $this->assertFalse($this->_acl->isAllowed(null, 'area'));
@@ -1076,11 +1076,11 @@ protected function _loadUseCase1()
     /**
      * Returns an array of registered roles.
      *
-     * @expectedException \PHPUnit\Framework\Exception
      * @group ZF-5638
      */
     public function testGetRegisteredRoles()
     {
+        $this->expectException(\PHPUnit\Framework\Exception::class);
         $acl = $this->_acl;
         $acl->addRole('developer');
 
@@ -1165,13 +1165,13 @@ public function testGetRegisteredRolesIsDeprecated()
         try {
             $this->_acl->getRegisteredRoles();
             $this->fail('getRegisteredRoles() did not throw an exception');
-        } catch (\PHPUnit\Framework\Exception $e) {
+        } catch (\PHPUnit\Framework\Exception) {
             self::assertTrue(true);
 
             return;
         }
 
-        $this->fail('An expected notice has not been raised');
+        static::fail('An expected notice has not been raised');
     }
 
     /**
diff --git a/tests/Zend/AllTests/StreamWrapper/PhpInput.php b/tests/Zend/AllTests/StreamWrapper/PhpInput.php
index b8de085c..b365e6b5 100644
--- a/tests/Zend/AllTests/StreamWrapper/PhpInput.php
+++ b/tests/Zend/AllTests/StreamWrapper/PhpInput.php
@@ -104,7 +104,7 @@ public function stream_eof()
             return self::$_returnValues[__FUNCTION__];
         }
 
-        return 0 == strlen(self::$_data);
+        return 0 == strlen((string) self::$_data);
     }
 
     public function stream_read($count)
@@ -117,7 +117,7 @@ public function stream_read($count)
 
         // To match the behavior of php://input, we need to clear out the data
         // as it is read
-        if ($count > strlen(self::$_data)) {
+        if ($count > strlen((string) self::$_data)) {
             $data = self::$_data;
             self::$_data = '';
         } else {
diff --git a/tests/Zend/Application/ApplicationTest.php b/tests/Zend/Application/ApplicationTest.php
index c6fac5f1..d3e9f9f9 100644
--- a/tests/Zend/Application/ApplicationTest.php
+++ b/tests/Zend/Application/ApplicationTest.php
@@ -32,7 +32,7 @@ class Zend_Application_ApplicationTest extends \PHPUnit\Framework\TestCase
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite(self::class);
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     public function setUp(): void
@@ -175,7 +175,7 @@ public function testPassingIncludePathOptionShouldModifyIncludePath()
             ),
         ));
         $test = get_include_path();
-        $this->assertContains($expected, $test);
+        $this->assertStringContainsString($expected, $test);
     }
 
     public function testPassingPhpSettingsSetsIniValues()
@@ -244,11 +244,9 @@ public function testPassingArrayBootstrapOptionShouldRegisterBootstrapBasedOnPat
         $this->assertTrue($bootstrap instanceof ZfAppBootstrap);
     }
 
-    /**
-     * @expectedException Zend_Application_Exception
-     */
     public function testPassingArrayBootstrapWithoutPathOptionShouldRaiseException()
     {
+        $this->expectException(\Zend_Application_Exception::class);
         $this->application->setOptions(array(
             'bootstrap' => array(
                 'class' => 'ZfAppBootstrap',
@@ -257,22 +255,18 @@ public function testPassingArrayBootstrapWithoutPathOptionShouldRaiseException()
         $bootstrap = $this->application->getBootstrap();
     }
 
-    /**
-     * @expectedException Zend_Application_Exception
-     */
     public function testPassingInvalidBootstrapOptionShouldRaiseException()
     {
+        $this->expectException(\Zend_Application_Exception::class);
         $this->application->setOptions(array(
             'bootstrap' => new stdClass(),
         ));
         $bootstrap = $this->application->getBootstrap();
     }
 
-    /**
-     * @expectedException Zend_Application_Exception
-     */
     public function testPassingInvalidOptionsArgumentToConstructorShouldRaiseException()
     {
+        $this->expectException(\Zend_Application_Exception::class);
         $application = new Zend_Application('testing', new stdClass());
     }
 
@@ -331,11 +325,9 @@ public function testPassingArrayOptionsWithConfigKeyShouldLoadOptionsAndNotOverr
         $this->assertNotEquals('bar', $application->getOption('foo'));
     }
 
-    /**
-     * @expectedException Zend_Application_Exception
-     */
     public function testPassingInvalidStringOptionToConstructorShouldRaiseException()
     {
+        $this->expectException(\Zend_Application_Exception::class);
         $application = new Zend_Application('testing', __DIR__ . '/_files/appconfig');
     }
 
@@ -359,11 +351,9 @@ public function testBootstrapImplementsFluentInterface()
         $this->assertSame($application, $this->application);
     }
 
-    /**
-     * @expectedException Zend_Application_Exception
-     */
     public function testApplicationShouldRaiseExceptionIfBootstrapFileDoesNotContainBootstrapClass()
     {
+        $this->expectException(\Zend_Application_Exception::class);
         $this->application->setOptions(array(
             'bootstrap' => array(
                 'path' => __DIR__ . '/_files/ZfAppNoBootstrap.php',
@@ -373,11 +363,9 @@ public function testApplicationShouldRaiseExceptionIfBootstrapFileDoesNotContain
         $bootstrap = $this->application->getBootstrap();
     }
 
-    /**
-     * @expectedException Zend_Application_Exception
-     */
     public function testApplicationShouldRaiseExceptionWhenBootstrapClassNotOfCorrectType()
     {
+        $this->expectException(\Zend_Application_Exception::class);
         $this->application->setOptions(array(
             'bootstrap' => array(
                 'path' => __DIR__ . '/_files/ZfAppBadBootstrap.php',
diff --git a/tests/Zend/Application/Bootstrap/BootstrapAbstractTest.php b/tests/Zend/Application/Bootstrap/BootstrapAbstractTest.php
index 04738d24..a47b12e4 100644
--- a/tests/Zend/Application/Bootstrap/BootstrapAbstractTest.php
+++ b/tests/Zend/Application/Bootstrap/BootstrapAbstractTest.php
@@ -56,7 +56,7 @@ class Zend_Application_Bootstrap_BootstrapAbstractTest extends \PHPUnit\Framewor
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite(self::class);
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     public function setUp(): void
@@ -126,11 +126,9 @@ public function testConstructorShouldAllowPassingAnotherBootstrapObject()
         $this->assertSame($bootstrap1, $bootstrap2->getApplication());
     }
 
-    /**
-     * @expectedException Zend_Application_Bootstrap_Exception
-     */
     public function testConstructorShouldRaiseExceptionForInvalidApplicationArgument()
     {
+        $this->expectException(\Zend_Application_Bootstrap_Exception::class);
         require_once __DIR__ . '/../_files/ZfAppBootstrap.php';
         $bootstrap = new ZfAppBootstrap(new stdClass());
     }
@@ -248,11 +246,9 @@ public function testInternalInitializersShouldRegisterResourceNames()
         $this->assertEquals($resources, $test);
     }
 
-    /**
-     * @expectedException Zend_Application_Bootstrap_Exception
-     */
     public function testRegisterPluginResourceShouldThrowExceptionForInvalidResourceType()
     {
+        $this->expectException(\Zend_Application_Bootstrap_Exception::class);
         require_once __DIR__ . '/../_files/ZfAppBootstrap.php';
         $bootstrap = new ZfAppBootstrap($this->application);
         $bootstrap->registerPluginResource(array());
@@ -286,7 +282,7 @@ public function testShouldAllowRegisteringPluginResourceUsingNameOnly()
         $bootstrap = new ZfAppBootstrap($this->application);
         $bootstrap->registerPluginResource('view');
         $test = $bootstrap->getPluginResource('view');
-        $this->assertEquals(\Zend_Application_Resource_View::class, get_class($test));
+        $this->assertEquals(\Zend_Application_Resource_View::class, $test::class);
     }
 
     public function testShouldAllowUnregisteringPluginResourcesUsingConcreteInstance()
@@ -299,11 +295,9 @@ public function testShouldAllowUnregisteringPluginResourcesUsingConcreteInstance
         $this->assertFalse($bootstrap->hasPluginResource('view'));
     }
 
-    /**
-     * @expectedException Zend_Application_Bootstrap_Exception
-     */
     public function testAttemptingToUnregisterPluginResourcesUsingInvalidResourceTypeShouldThrowException()
     {
+        $this->expectException(\Zend_Application_Bootstrap_Exception::class);
         require_once __DIR__ . '/../_files/ZfAppBootstrap.php';
         $bootstrap = new ZfAppBootstrap($this->application);
         $bootstrap->registerPluginResource('view');
@@ -424,21 +418,17 @@ public function testPassingNoValuesToBootstrapExecutesAllResources()
         $this->assertTrue($bootstrap->executedFoobarResource);
     }
 
-    /**
-     * @expectedException Zend_Application_Bootstrap_Exception
-     */
     public function testPassingInvalidResourceArgumentToBootstrapShouldThrowException()
     {
+        $this->expectException(\Zend_Application_Bootstrap_Exception::class);
         require_once __DIR__ . '/../_files/ZfAppBootstrap.php';
         $bootstrap = new ZfAppBootstrap($this->application);
         $bootstrap->bootstrap(new stdClass());
     }
 
-    /**
-     * @expectedException Zend_Application_Bootstrap_Exception
-     */
     public function testPassingUnknownResourceToBootstrapShouldThrowException()
     {
+        $this->expectException(\Zend_Application_Bootstrap_Exception::class);
         require_once __DIR__ . '/../_files/ZfAppBootstrap.php';
         $bootstrap = new ZfAppBootstrap($this->application);
         $bootstrap->bootstrap('bazbat');
@@ -452,21 +442,17 @@ public function testCallShouldOverloadToBootstrap()
         $this->assertEquals(1, $bootstrap->fooExecuted);
     }
 
-    /**
-     * @expectedException Zend_Application_Bootstrap_Exception
-     */
     public function testCallShouldThrowExceptionForInvalidMethodCall()
     {
+        $this->expectException(\Zend_Application_Bootstrap_Exception::class);
         require_once __DIR__ . '/../_files/ZfAppBootstrap.php';
         $bootstrap = new ZfAppBootstrap($this->application);
         $bootstrap->initFoo();
     }
 
-    /**
-     * @expectedException Zend_Application_Bootstrap_Exception
-     */
     public function testDependencyTrackingShouldDetectCircularDependencies()
     {
+        $this->expectException(\Zend_Application_Bootstrap_Exception::class);
         require_once __DIR__ . '/../_files/BootstrapBaseCircularDependency.php';
         $bootstrap = new BootstrapBaseCircularDependency($this->application);
         $bootstrap->bootstrap();
@@ -682,6 +668,7 @@ public function testRequestingPluginsByAutoloadableClassNameShouldNotRaiseFatalE
         $this->application->setOptions($options);
         $bootstrap = new Zend_Application_Bootstrap_Bootstrap($this->application);
         $bootstrap->bootstrap();
+        self::assertTrue(true);
     }
 
     /**
@@ -707,10 +694,10 @@ public function testCallingSetOptionsMultipleTimesShouldUpdateOptionKeys()
 
     /**
      * @group ZF-9110
-     * @expectedException Zend_Application_Bootstrap_Exception
      */
     public function testPassingSameBootstrapAsApplicationShouldNotCauseRecursion()
     {
+        $this->expectException(\Zend_Application_Bootstrap_Exception::class);
         $bootstrap = new Zend_Application_Bootstrap_Bootstrap($this->application);
         $bootstrap->setApplication($bootstrap);
     }
@@ -730,6 +717,7 @@ public function testUsingFallbackAutoloaderWithModulesShouldNotResultInFrontcont
         $this->application->setOptions($options);
         $bootstrap = new Zf7696Bootstrap($this->application);
         $bootstrap->bootstrap(array('modules'));
+        self::assertTrue(true);
     }
 
     /**
diff --git a/tests/Zend/Application/Bootstrap/BootstrapTest.php b/tests/Zend/Application/Bootstrap/BootstrapTest.php
index 906c2744..15da689b 100644
--- a/tests/Zend/Application/Bootstrap/BootstrapTest.php
+++ b/tests/Zend/Application/Bootstrap/BootstrapTest.php
@@ -31,7 +31,7 @@ class Zend_Application_Bootstrap_BootstrapTest extends \PHPUnit\Framework\TestCa
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite(self::class);
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     public function setUp(): void
@@ -84,11 +84,9 @@ public function testFrontControllerResourcePluginShouldBeRegisteredByDefault()
         $this->assertTrue($this->bootstrap->hasPluginResource('FrontController'));
     }
 
-    /**
-     * @expectedException Zend_Application_Bootstrap_Exception
-     */
     public function testRunShouldRaiseExceptionIfNoControllerDirectoryRegisteredWithFrontController()
     {
+        $this->expectException(\Zend_Application_Bootstrap_Exception::class);
         $this->bootstrap->bootstrap();
         $this->bootstrap->run();
     }
diff --git a/tests/Zend/Application/Module/AutoloaderTest.php b/tests/Zend/Application/Module/AutoloaderTest.php
index 84ccfd51..7bfa0c84 100644
--- a/tests/Zend/Application/Module/AutoloaderTest.php
+++ b/tests/Zend/Application/Module/AutoloaderTest.php
@@ -44,7 +44,7 @@ class Zend_Application_Module_AutoloaderTest extends \PHPUnit\Framework\TestCase
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite(self::class);
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     public function setUp(): void
diff --git a/tests/Zend/Application/Module/BootstrapTest.php b/tests/Zend/Application/Module/BootstrapTest.php
index 2bd8eb0c..5b383d43 100644
--- a/tests/Zend/Application/Module/BootstrapTest.php
+++ b/tests/Zend/Application/Module/BootstrapTest.php
@@ -31,7 +31,7 @@ class Zend_Application_Module_BootstrapTest extends \PHPUnit\Framework\TestCase
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite(self::class);
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     public function setUp(): void
diff --git a/tests/Zend/Application/Resource/CacheManagerTest.php b/tests/Zend/Application/Resource/CacheManagerTest.php
index 0d3fd481..ee1fd925 100644
--- a/tests/Zend/Application/Resource/CacheManagerTest.php
+++ b/tests/Zend/Application/Resource/CacheManagerTest.php
@@ -51,7 +51,7 @@ class Zend_Application_Resource_CacheManagerTest extends \PHPUnit\Framework\Test
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite(self::class);
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     public function setUp(): void
diff --git a/tests/Zend/Application/Resource/FrontcontrollerTest.php b/tests/Zend/Application/Resource/FrontcontrollerTest.php
index fa65dd99..ad653097 100644
--- a/tests/Zend/Application/Resource/FrontcontrollerTest.php
+++ b/tests/Zend/Application/Resource/FrontcontrollerTest.php
@@ -36,7 +36,7 @@ class Zend_Application_Resource_FrontcontrollerTest extends \PHPUnit\Framework\T
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite(self::class);
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     public function setUp(): void
@@ -359,7 +359,7 @@ public function testSettingOfRegisterPluginIndexActuallyWorks()
 
         $this->assertEquals(count($expected), count($plugins));
         foreach ($expected as $index => $class) {
-            $this->assertEquals($class, get_class($plugins[$index]));
+            $this->assertEquals($class, $plugins[$index]::class);
         }
     }
 
@@ -393,7 +393,7 @@ public function testShouldSetDispatcherFromConfiguration()
         ));
         $resource->init();
         $front = $resource->getFrontController();
-        $this->assertEquals('ZF9724_Dispatcher', get_class($front->getDispatcher()));
+        $this->assertEquals('ZF9724_Dispatcher', $front->getDispatcher()::class);
         $this->assertEquals('baz', $front->getDispatcher()->getParam('bar'));
     }
 }
diff --git a/tests/Zend/Application/Resource/LayoutTest.php b/tests/Zend/Application/Resource/LayoutTest.php
index 660906a3..e643b1bd 100644
--- a/tests/Zend/Application/Resource/LayoutTest.php
+++ b/tests/Zend/Application/Resource/LayoutTest.php
@@ -31,7 +31,7 @@ class Zend_Application_Resource_LayoutTest extends \PHPUnit\Framework\TestCase
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite(self::class);
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     public function setUp(): void
diff --git a/tests/Zend/Application/Resource/LocaleTest.php b/tests/Zend/Application/Resource/LocaleTest.php
index e6b1c1e0..cd19a2f7 100644
--- a/tests/Zend/Application/Resource/LocaleTest.php
+++ b/tests/Zend/Application/Resource/LocaleTest.php
@@ -31,7 +31,7 @@ class Zend_Application_Resource_LocaleTest extends \PHPUnit\Framework\TestCase
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite(self::class);
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     public function setUp(): void
diff --git a/tests/Zend/Application/Resource/ModulesTest.php b/tests/Zend/Application/Resource/ModulesTest.php
index cd94f158..359ec808 100644
--- a/tests/Zend/Application/Resource/ModulesTest.php
+++ b/tests/Zend/Application/Resource/ModulesTest.php
@@ -31,7 +31,7 @@ class Zend_Application_Resource_ModulesTest extends \PHPUnit\Framework\TestCase
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite(self::class);
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     public function setUp(): void
diff --git a/tests/Zend/Application/Resource/NavigationTest.php b/tests/Zend/Application/Resource/NavigationTest.php
index 1250cc41..fe3f00ca 100644
--- a/tests/Zend/Application/Resource/NavigationTest.php
+++ b/tests/Zend/Application/Resource/NavigationTest.php
@@ -31,7 +31,7 @@ class Zend_Application_Resource_NavigationTest extends \PHPUnit\Framework\TestCa
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite(self::class);
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     public function setUp(): void
@@ -159,7 +159,7 @@ public function testDefaultPageTypeIsSet()
         try {
             $resource->setBootstrap($this->bootstrap)->init();
             $this->fail('An exception should have been thrown but wasn\'t');
-        } catch (Zend_Exception $e) {
+        } catch (Zend_Exception) {
             $this->assertTrue(true);
         }
 
diff --git a/tests/Zend/Application/Resource/ResourceAbstractTest.php b/tests/Zend/Application/Resource/ResourceAbstractTest.php
index 35426879..6c3409c7 100644
--- a/tests/Zend/Application/Resource/ResourceAbstractTest.php
+++ b/tests/Zend/Application/Resource/ResourceAbstractTest.php
@@ -31,7 +31,7 @@ class Zend_Application_Resource_ResourceAbstractTest extends \PHPUnit\Framework\
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite(self::class);
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     public function setUp(): void
diff --git a/tests/Zend/Application/Resource/RouterTest.php b/tests/Zend/Application/Resource/RouterTest.php
index 3e9efc32..984f32d4 100644
--- a/tests/Zend/Application/Resource/RouterTest.php
+++ b/tests/Zend/Application/Resource/RouterTest.php
@@ -31,7 +31,7 @@ class Zend_Application_Resource_RouterTest extends \PHPUnit\Framework\TestCase
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite(self::class);
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     public function setUp(): void
diff --git a/tests/Zend/Application/Resource/SessionTest.php b/tests/Zend/Application/Resource/SessionTest.php
index 5eae35cb..6e5a2480 100644
--- a/tests/Zend/Application/Resource/SessionTest.php
+++ b/tests/Zend/Application/Resource/SessionTest.php
@@ -47,7 +47,7 @@ public function testSetSaveHandler()
     public function testSetSaveHandlerString()
     {
         $saveHandler = $this->createMock(\Zend_Session_SaveHandler_Interface::class);
-        $saveHandlerClassName = get_class($saveHandler);
+        $saveHandlerClassName = $saveHandler::class;
 
         $this->resource->setSaveHandler($saveHandlerClassName);
 
@@ -57,7 +57,7 @@ public function testSetSaveHandlerString()
     public function testSetSaveHandlerArray()
     {
         $saveHandler = $this->createMock(\Zend_Session_SaveHandler_Interface::class);
-        $saveHandlerClassName = get_class($saveHandler);
+        $saveHandlerClassName = $saveHandler::class;
 
         $this->resource->setSaveHandler(array('class' => $saveHandlerClassName));
 
diff --git a/tests/Zend/Application/Resource/UseragentTest.php b/tests/Zend/Application/Resource/UseragentTest.php
index 7df4d5cb..f48339a1 100644
--- a/tests/Zend/Application/Resource/UseragentTest.php
+++ b/tests/Zend/Application/Resource/UseragentTest.php
@@ -31,7 +31,7 @@ class Zend_Application_Resource_UseragentTest extends \PHPUnit\Framework\TestCas
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite(self::class);
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     public function setUp(): void
diff --git a/tests/Zend/Application/Resource/ViewTest.php b/tests/Zend/Application/Resource/ViewTest.php
index 9c13f50e..aa580e0d 100644
--- a/tests/Zend/Application/Resource/ViewTest.php
+++ b/tests/Zend/Application/Resource/ViewTest.php
@@ -33,7 +33,7 @@ class Zend_Application_Resource_ViewTest extends \PHPUnit\Framework\TestCase
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite(self::class);
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     public function setUp(): void
diff --git a/tests/Zend/Captcha/DumbTest.php b/tests/Zend/Captcha/DumbTest.php
index 432aa59e..0395eaa5 100644
--- a/tests/Zend/Captcha/DumbTest.php
+++ b/tests/Zend/Captcha/DumbTest.php
@@ -31,7 +31,7 @@ class Zend_Captcha_DumbTest extends \PHPUnit\Framework\TestCase
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite('Zend_Captcha_DumbTest');
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     /**
@@ -69,7 +69,7 @@ public function testRendersWordInReverse()
         $id = $this->captcha->generate('test');
         $word = $this->captcha->getWord();
         $html = $this->captcha->render(new Zend_View());
-        $this->assertContains(strrev($word), $html);
+        $this->assertStringContainsString(strrev($word), $html);
         $this->assertNotContains($word, $html);
     }
 
@@ -99,7 +99,7 @@ public function testRendersLabelUsingProvidedValue()
 
         $id = $this->captcha->generate('test');
         $html = $this->captcha->render(new Zend_View());
-        $this->assertContains('Testing 123', $html);
+        $this->assertStringContainsString('Testing 123', $html);
     }
 }
 
@@ -136,13 +136,8 @@ public function __isset($name)
 
     public function __call($method, $args)
     {
-        switch ($method) {
-            case 'setExpirationHops':
-            case 'setExpirationSeconds':
-                $this->$method = array_shift($args);
-
-                break;
-            default:
-        }
+        $this->$method = match ($method) {
+            'setExpirationHops', 'setExpirationSeconds' => array_shift($args),
+        };
     }
 }
diff --git a/tests/Zend/Captcha/FigletTest.php b/tests/Zend/Captcha/FigletTest.php
index b15659b4..82a5dbdd 100644
--- a/tests/Zend/Captcha/FigletTest.php
+++ b/tests/Zend/Captcha/FigletTest.php
@@ -32,7 +32,7 @@ class Zend_Captcha_FigletTest extends \PHPUnit\Framework\TestCase
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite('Zend_Captcha_FigletTest');
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     /**
@@ -82,7 +82,7 @@ public function getView()
     public function testCaptchaIsRendered()
     {
         $html = $this->element->render($this->getView());
-        $this->assertContains($this->element->getName(), $html);
+        $this->assertStringContainsString($this->element->getName(), $html);
     }
 
     public function testCaptchaHasIdAndInput()
@@ -136,7 +136,7 @@ public function testGetWordReturnsWord()
         $word = $this->captcha->getWord();
         $this->assertFalse(empty($word));
         $this->assertTrue(is_string($word));
-        $this->assertTrue(strlen($word) == 8);
+        $this->assertTrue(strlen((string) $word) == 8);
         $this->word = $word;
     }
 
@@ -146,7 +146,7 @@ public function testGetWordLength()
         $this->captcha->generate();
         $word = $this->captcha->getWord();
         $this->assertTrue(is_string($word));
-        $this->assertTrue(strlen($word) == 4);
+        $this->assertTrue(strlen((string) $word) == 4);
         $this->word = $word;
     }
 
@@ -329,13 +329,8 @@ public function __isset($name)
 
     public function __call($method, $args)
     {
-        switch ($method) {
-            case 'setExpirationHops':
-            case 'setExpirationSeconds':
-                $this->$method = array_shift($args);
-
-                break;
-            default:
-        }
+        $this->$method = match ($method) {
+            'setExpirationHops', 'setExpirationSeconds' => array_shift($args),
+        };
     }
 }
diff --git a/tests/Zend/Captcha/ImageTest.php b/tests/Zend/Captcha/ImageTest.php
index 6bcb93f2..f1398868 100644
--- a/tests/Zend/Captcha/ImageTest.php
+++ b/tests/Zend/Captcha/ImageTest.php
@@ -33,7 +33,7 @@ class Zend_Captcha_ImageTest extends \PHPUnit\Framework\TestCase
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite('Zend_Captcha_ImageTest');
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     /**
@@ -130,7 +130,7 @@ public function getView()
     public function testCaptchaIsRendered()
     {
         $html = $this->element->render($this->getView());
-        $this->assertContains($this->element->getName(), $html);
+        $this->assertStringContainsString($this->element->getName(), $html);
     }
 
     public function testCaptchaHasIdAndInput()
@@ -162,14 +162,14 @@ public function testCaptchaSetSuffix()
     {
         $this->captcha->setSuffix('.jpeg');
         $html = $this->element->render($this->getView());
-        $this->assertContains('.jpeg', $html, $html);
+        $this->assertStringContainsString('.jpeg', $html, $html);
     }
 
     public function testCaptchaSetImgURL()
     {
         $this->captcha->setImgURL('/some/other/URL/');
         $html = $this->element->render($this->getView());
-        $this->assertContains('/some/other/URL/', $html, $html);
+        $this->assertStringContainsString('/some/other/URL/', $html, $html);
     }
 
     public function testCaptchaCreatesImage()
@@ -199,7 +199,7 @@ public function testGetWordReturnsWord()
         $word = $this->captcha->getWord();
         $this->assertFalse(empty($word));
         $this->assertTrue(is_string($word));
-        $this->assertTrue(strlen($word) == 8);
+        $this->assertTrue(strlen((string) $word) == 8);
         $this->word = $word;
     }
 
@@ -209,7 +209,7 @@ public function testGetWordLength()
         $this->captcha->generate();
         $word = $this->captcha->getWord();
         $this->assertTrue(is_string($word));
-        $this->assertTrue(strlen($word) == 4);
+        $this->assertTrue(strlen((string) $word) == 4);
         $this->word = $word;
     }
 
@@ -344,13 +344,8 @@ public function __isset($name)
 
     public function __call($method, $args)
     {
-        switch ($method) {
-            case 'setExpirationHops':
-            case 'setExpirationSeconds':
-                $this->$method = array_shift($args);
-
-                break;
-            default:
-        }
+        $this->$method = match ($method) {
+            'setExpirationHops', 'setExpirationSeconds' => array_shift($args),
+        };
     }
 }
diff --git a/tests/Zend/Config/IniTest.php b/tests/Zend/Config/IniTest.php
index 55d63c46..e7262ee6 100644
--- a/tests/Zend/Config/IniTest.php
+++ b/tests/Zend/Config/IniTest.php
@@ -108,7 +108,7 @@ public function testErrorNoExtendsSection()
             $config = new Zend_Config_Ini($this->_iniFileConfig, 'extendserror');
             $this->fail('An expected Zend_Config_Exception has not been raised');
         } catch (Zend_Config_Exception $expected) {
-            $this->assertContains('cannot be found', $expected->getMessage());
+            $this->assertStringContainsString('cannot be found', $expected->getMessage());
         }
     }
 
@@ -120,7 +120,7 @@ public function testInvalidKeys()
                 $config = new Zend_Config_Ini($this->_iniFileConfig, $section);
                 $this->fail('An expected Zend_Config_Exception has not been raised');
             } catch (Zend_Config_Exception $expected) {
-                $this->assertContains('Invalid key', $expected->getMessage());
+                $this->assertStringContainsString('Invalid key', $expected->getMessage());
             }
         }
     }
@@ -131,7 +131,7 @@ public function testZF426()
             $config = new Zend_Config_Ini($this->_iniFileConfig, 'zf426');
             $this->fail('An expected Zend_Config_Exception has not been raised');
         } catch (Zend_Config_Exception $expected) {
-            $this->assertContains('Cannot create sub-key for', $expected->getMessage());
+            $this->assertStringContainsString('Cannot create sub-key for', $expected->getMessage());
         }
     }
 
@@ -171,7 +171,7 @@ public function testZF415()
             $config = new Zend_Config_Ini($this->_iniFileCircularConfig, null);
             $this->fail('An expected Zend_Config_Exception has not been raised');
         } catch (Zend_Config_Exception $expected) {
-            $this->assertContains('circular inheritance', $expected->getMessage());
+            $this->assertStringContainsString('circular inheritance', $expected->getMessage());
         }
     }
 
@@ -181,7 +181,7 @@ public function testErrorNoFile()
             $config = new Zend_Config_Ini('','');
             $this->fail('An expected Zend_Config_Exception has not been raised');
         } catch (Zend_Config_Exception $expected) {
-            $this->assertContains('Filename is not set', $expected->getMessage());
+            $this->assertStringContainsString('Filename is not set', $expected->getMessage());
         }
     }
 
@@ -192,7 +192,7 @@ public function testErrorMultipleExensions()
             zend::dump($config);
             $this->fail('An expected Zend_Config_Exception has not been raised');
         } catch (Zend_Config_Exception $expected) {
-            $this->assertContains('may not extend multiple sections', $expected->getMessage());
+            $this->assertStringContainsString('may not extend multiple sections', $expected->getMessage());
         }
     }
 
@@ -202,14 +202,14 @@ public function testErrorNoSectionFound()
             $config = new Zend_Config_Ini($this->_iniFileConfig,array('all', 'notthere'));
             $this->fail('An expected Zend_Config_Exception has not been raised');
         } catch (Zend_Config_Exception $expected) {
-            $this->assertContains('cannot be found', $expected->getMessage());
+            $this->assertStringContainsString('cannot be found', $expected->getMessage());
         }
 
         try {
             $config = new Zend_Config_Ini($this->_iniFileConfig,'notthere');
             $this->fail('An expected Zend_Config_Exception has not been raised');
         } catch (Zend_Config_Exception $expected) {
-            $this->assertContains('cannot be found', $expected->getMessage());
+            $this->assertStringContainsString('cannot be found', $expected->getMessage());
         }
     }
 
diff --git a/tests/Zend/Config/XmlTest.php b/tests/Zend/Config/XmlTest.php
index 8662165e..846e0216 100644
--- a/tests/Zend/Config/XmlTest.php
+++ b/tests/Zend/Config/XmlTest.php
@@ -88,14 +88,14 @@ public function testErrorNoInitialSection()
             $config = @new Zend_Config_Xml($this->_xmlFileConfig, 'notthere');
             $this->fail('An expected Zend_Config_Exception has not been raised');
         } catch (Zend_Config_Exception $expected) {
-            $this->assertContains('cannot be found in', $expected->getMessage());
+            $this->assertStringContainsString('cannot be found in', $expected->getMessage());
         }
 
         try {
             $config = @new Zend_Config_Xml($this->_xmlFileConfig, array('notthere', 'all'));
             $this->fail('An expected Zend_Config_Exception has not been raised');
         } catch (Zend_Config_Exception $expected) {
-            $this->assertContains('cannot be found in', $expected->getMessage());
+            $this->assertStringContainsString('cannot be found in', $expected->getMessage());
         }
     }
 
@@ -105,7 +105,7 @@ public function testErrorNoExtendsSection()
             $config = new Zend_Config_Xml($this->_xmlFileConfig, 'extendserror');
             $this->fail('An expected Zend_Config_Exception has not been raised');
         } catch (Zend_Config_Exception $expected) {
-            $this->assertContains('cannot be found', $expected->getMessage());
+            $this->assertStringContainsString('cannot be found', $expected->getMessage());
         }
     }
 
@@ -145,7 +145,7 @@ public function testZF415()
             $config = new Zend_Config_Xml($this->_xmlFileCircularConfig, null);
             $this->fail('An expected Zend_Config_Exception has not been raised');
         } catch (Zend_Config_Exception $expected) {
-            $this->assertContains('circular inheritance', $expected->getMessage());
+            $this->assertStringContainsString('circular inheritance', $expected->getMessage());
         }
     }
 
@@ -155,7 +155,7 @@ public function testErrorNoFile()
             $config = new Zend_Config_Xml('',null);
             $this->fail('An expected Zend_Config_Exception has not been raised');
         } catch (Zend_Config_Exception $expected) {
-            $this->assertContains('Filename is not set', $expected->getMessage());
+            $this->assertStringContainsString('Filename is not set', $expected->getMessage());
         }
     }
 
@@ -199,14 +199,14 @@ public function testZF3578_InvalidOrMissingfXmlFile()
             $config = new Zend_Config_Xml($this->_xmlFileInvalid);
             $this->fail('An expected Zend_Config_Exception has not been raised');
         } catch (Zend_Config_Exception $expected) {
-            $this->assertContains('failed to load', $expected->getMessage());
+            $this->assertStringContainsString('failed to load', $expected->getMessage());
         }
 
         try {
             $config = new Zend_Config_Xml('I/dont/exist');
             $this->fail('An expected Zend_Config_Exception has not been raised');
         } catch (Zend_Config_Exception $expected) {
-            $this->assertContains('doesn\'t exist', $expected->getMessage());
+            $this->assertStringContainsString('doesn\'t exist', $expected->getMessage());
         }
     }
 
diff --git a/tests/Zend/ConfigTest.php b/tests/Zend/ConfigTest.php
index 082b32dd..a6a1583c 100644
--- a/tests/Zend/ConfigTest.php
+++ b/tests/Zend/ConfigTest.php
@@ -124,7 +124,7 @@ public function testNoModifications()
         try {
             $config->hostname = 'test';
         } catch (Zend_Config_Exception $expected) {
-            static::assertContains('is read only', $expected->getMessage());
+            static::assertStringContainsString('is read only', $expected->getMessage());
 
             return;
         }
@@ -138,7 +138,7 @@ public function testNoNestedModifications()
         try {
             $config->db->host = 'test';
         } catch (Zend_Config_Exception $expected) {
-            static::assertContains('is read only', $expected->getMessage());
+            static::assertStringContainsString('is read only', $expected->getMessage());
 
             return;
         }
@@ -168,14 +168,14 @@ public function testIterator()
                 $var .= "\nkey = $key, value = $value";
             }
         }
-        $this->assertContains('key = name, value = thisname', $var);
+        $this->assertStringContainsString('key = name, value = thisname', $var);
 
         // 1 nest
         $var = '';
         foreach ($config->db as $key => $value) {
             $var .= "\nkey = $key, value = $value";
         }
-        $this->assertContains('key = host, value = 127.0.0.1', $var);
+        $this->assertStringContainsString('key = host, value = 127.0.0.1', $var);
 
         // 2 nests
         $config = new Zend_Config($this->_menuData1);
@@ -183,7 +183,7 @@ public function testIterator()
         foreach ($config->button->b1 as $key => $value) {
             $var .= "\nkey = $key, value = $value";
         }
-        $this->assertContains('key = L1, value = button1-1', $var);
+        $this->assertStringContainsString('key = L1, value = button1-1', $var);
     }
 
     public function testArray()
@@ -194,9 +194,9 @@ public function testArray()
         print_r($config->toArray());
         $contents = ob_get_clean();
 
-        $this->assertContains('Array', $contents);
-        $this->assertContains('[hostname] => all', $contents);
-        $this->assertContains('[user] => username', $contents);
+        $this->assertStringContainsString('Array', $contents);
+        $this->assertStringContainsString('[hostname] => all', $contents);
+        $this->assertStringContainsString('[user] => username', $contents);
     }
 
     public function testErrorWriteToReadOnly()
@@ -206,7 +206,7 @@ public function testErrorWriteToReadOnly()
         try {
             $config->test = '32';
         } catch (Zend_Config_Exception $expected) {
-            static::assertContains('read only', $expected->getMessage());
+            static::assertStringContainsString('read only', $expected->getMessage());
 
             return;
         }
@@ -284,7 +284,7 @@ public function testUnsetException()
         try {
             unset($config->hostname);
         } catch (Zend_Config_Exception $expected) {
-            static::assertContains('is read only', $expected->getMessage());
+            static::assertStringContainsString('is read only', $expected->getMessage());
 
             return;
         }
@@ -371,7 +371,7 @@ public function testSetReadOnly()
         try {
             $config->c = 'c';
         } catch (Zend_Config_Exception $expected) {
-            static::assertContains('is read only', $expected->getMessage());
+            static::assertStringContainsString('is read only', $expected->getMessage());
 
             return;
         }
diff --git a/tests/Zend/Console/GetoptTest.php b/tests/Zend/Console/GetoptTest.php
index 8d5c204d..c8992816 100644
--- a/tests/Zend/Console/GetoptTest.php
+++ b/tests/Zend/Console/GetoptTest.php
@@ -107,7 +107,7 @@ public function testGetoptExceptionForMissingFlag()
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
             $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
-                'Expected Zend_Console_Getopt_Exception, got ' . get_class($e));
+                'Expected Zend_Console_Getopt_Exception, got ' . $e::class);
             $this->assertEquals($e->getMessage(),
                 'Blank flag not allowed in rule "|a".');
         }
@@ -121,7 +121,7 @@ public function testGetoptExceptionForDuplicateFlag()
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
             $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
-                'Expected Zend_Console_Getopt_Exception, got ' . get_class($e));
+                'Expected Zend_Console_Getopt_Exception, got ' . $e::class);
             $this->assertEquals($e->getMessage(),
                 'Option "--apple" is being defined more than once.');
         }
@@ -132,7 +132,7 @@ public function testGetoptExceptionForDuplicateFlag()
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
             $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
-                'Expected Zend_Console_Getopt_Exception, got ' . get_class($e));
+                'Expected Zend_Console_Getopt_Exception, got ' . $e::class);
             $this->assertEquals($e->getMessage(),
                 'Option "-a" is being defined more than once.');
         }
@@ -152,7 +152,7 @@ public function testGetoptAddRules()
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
             $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
-                'Expected Zend_Console_Getopt_Exception, got ' . get_class($e));
+                'Expected Zend_Console_Getopt_Exception, got ' . $e::class);
             $this->assertEquals($e->getMessage(), 'Option "pear" is not recognized.');
         }
         $opts->addRules(array('pear|p=s' => 'Pear option'));
@@ -173,7 +173,7 @@ public function testGetoptExceptionMissingParameter()
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
             $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
-                'Expected Zend_Console_Getopt_Exception, got ' . get_class($e));
+                'Expected Zend_Console_Getopt_Exception, got ' . $e::class);
             $this->assertEquals($e->getMessage(), 'Option "apple" requires a parameter.');
         }
     }
@@ -279,7 +279,7 @@ public function testVerifyRequiredArgument()
         } catch (Zend_Exception $e) {
             $this->assertTrue(
                 $e instanceof Zend_Console_Getopt_Exception,
-                'Expected Zend_Console_Getopt_Exception, got ' . get_class($e)
+                'Expected Zend_Console_Getopt_Exception, got ' . $e::class
             );
             $this->assertEquals(
                 'Option "$alias" requires a parameter.', $e->getMessage()
@@ -322,7 +322,7 @@ public function testEmptyRequiredOption()
         } catch (Zend_Exception $e) {
             $this->assertTrue(
                 $e instanceof Zend_Console_Getopt_Exception,
-                'Expected Zend_Console_Getopt_Exception, got ' . get_class($e)
+                'Expected Zend_Console_Getopt_Exception, got ' . $e::class
             );
             $this->assertEquals(
                 'Option "a" requires a parameter.', $e->getMessage()
@@ -342,7 +342,7 @@ public function testGetoptAddSetNonArrayArguments()
             $this->fail('Expected to catch a Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
             $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
-                'Expected Zend_Console_Getopt_Exception, got ' . get_class($e));
+                'Expected Zend_Console_Getopt_Exception, got ' . $e::class);
             $this->assertEquals('Parameter #1 to setArguments should be an array',
                 $e->getMessage());
         }
@@ -352,7 +352,7 @@ public function testGetoptAddSetNonArrayArguments()
             $this->fail('Expected to catch a Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
             $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
-                'Expected Zend_Console_Getopt_Exception, got ' . get_class($e));
+                'Expected Zend_Console_Getopt_Exception, got ' . $e::class);
             $this->assertEquals('Parameter #1 to addArguments should be an array',
                 $e->getMessage());
         }
@@ -383,7 +383,7 @@ public function testGetoptDashDashFalse()
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
             $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
-                'Expected Zend_Console_Getopt_Exception, got ' . get_class($e));
+                'Expected Zend_Console_Getopt_Exception, got ' . $e::class);
             $this->assertEquals($e->getMessage(), 'Option "fakeflag" is not recognized.');
         }
     }
@@ -417,7 +417,7 @@ public function testGetoptUsageMessageFromException()
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
             $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
-                'Expected Zend_Console_Getopt_Exception, got ' . get_class($e));
+                'Expected Zend_Console_Getopt_Exception, got ' . $e::class);
             $message = preg_replace('/Usage: .* \[ options \]/',
                 'Usage: <progname> [ options ]',
                 $e->getUsageMessage());
@@ -452,7 +452,7 @@ public function testGetoptSetAliasesWithNamingConflict()
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
             $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
-                'Expected Zend_Console_Getopt_Exception, got ' . get_class($e));
+                'Expected Zend_Console_Getopt_Exception, got ' . $e::class);
             $this->assertEquals($e->getMessage(), 'Option "--apple" is being defined more than once.');
         }
     }
@@ -468,7 +468,7 @@ public function testGetoptSetAliasesInvalid()
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
             $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
-                'Expected Zend_Console_Getopt_Exception, got ' . get_class($e));
+                'Expected Zend_Console_Getopt_Exception, got ' . $e::class);
             $this->assertEquals('Option "c" is not recognized.', $e->getMessage());
         }
     }
@@ -525,7 +525,7 @@ public function testGetoptCheckParameterType()
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
             $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
-                'Expected Zend_Console_Getopt_Exception, got ' . get_class($e));
+                'Expected Zend_Console_Getopt_Exception, got ' . $e::class);
             $this->assertEquals($e->getMessage(), 'Option "apple" requires an integer parameter, but was given "noninteger".');
         }
 
@@ -539,7 +539,7 @@ public function testGetoptCheckParameterType()
             $this->fail('Expected to catch Zend_Console_Getopt_Exception');
         } catch (Zend_Exception $e) {
             $this->assertTrue($e instanceof Zend_Console_Getopt_Exception,
-                'Expected Zend_Console_Getopt_Exception, got ' . get_class($e));
+                'Expected Zend_Console_Getopt_Exception, got ' . $e::class);
             $this->assertEquals($e->getMessage(), 'Option "banana" requires a single-word parameter, but was given "two words".');
         }
 
@@ -571,7 +571,7 @@ public function testRegisterArgcArgvOffThrowsException()
             $opts = new Zend_Console_GetOpt('abp:');
             $this->fail();
         } catch (Zend_Console_GetOpt_Exception $e) {
-            $this->assertContains('$_SERVER["argv"]', $e->getMessage());
+            $this->assertStringContainsString('$_SERVER["argv"]', $e->getMessage());
         }
 
         $_SERVER['argv'] = $argv;
diff --git a/tests/Zend/Controller/Action/Helper/ActionStackTest.php b/tests/Zend/Controller/Action/Helper/ActionStackTest.php
index 1d641d61..c36dae3d 100644
--- a/tests/Zend/Controller/Action/Helper/ActionStackTest.php
+++ b/tests/Zend/Controller/Action/Helper/ActionStackTest.php
@@ -48,7 +48,7 @@ class Zend_Controller_Action_Helper_ActionStackTest extends \PHPUnit\Framework\T
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite('Zend_Controller_Action_Helper_ActionStackTest');
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     /**
@@ -155,7 +155,7 @@ public function testDirectProxiesToActionToStack()
         } catch (Zend_Exception $e) {
             $this->assertTrue(
                 $e instanceof Zend_Controller_Action_Exception,
-                'Zend_Controller_Action_Exception expected, ' . get_class($e)
+                'Zend_Controller_Action_Exception expected, ' . $e::class
                     . ' caught'
             );
         }
diff --git a/tests/Zend/Controller/Action/Helper/AjaxContextTest.php b/tests/Zend/Controller/Action/Helper/AjaxContextTest.php
index 27f77f2f..b8744a0e 100644
--- a/tests/Zend/Controller/Action/Helper/AjaxContextTest.php
+++ b/tests/Zend/Controller/Action/Helper/AjaxContextTest.php
@@ -45,7 +45,7 @@ class Zend_Controller_Action_Helper_AjaxContextTest extends \PHPUnit\Framework\T
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite('Zend_Controller_Action_Helper_AjaxContextTest');
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     /**
diff --git a/tests/Zend/Controller/Action/Helper/CacheTest.php b/tests/Zend/Controller/Action/Helper/CacheTest.php
index e7a0c91a..8923533e 100644
--- a/tests/Zend/Controller/Action/Helper/CacheTest.php
+++ b/tests/Zend/Controller/Action/Helper/CacheTest.php
@@ -22,7 +22,7 @@ class Zend_Controller_Action_Helper_CacheTest extends \PHPUnit\Framework\TestCas
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite('Zend_Controller_Action_Helper_CacheTest');
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     public function setUp(): void
diff --git a/tests/Zend/Controller/Action/Helper/ContextSwitchTest.php b/tests/Zend/Controller/Action/Helper/ContextSwitchTest.php
index 46261f11..acda2cd9 100644
--- a/tests/Zend/Controller/Action/Helper/ContextSwitchTest.php
+++ b/tests/Zend/Controller/Action/Helper/ContextSwitchTest.php
@@ -47,7 +47,7 @@ class Zend_Controller_Action_Helper_ContextSwitchTest extends \PHPUnit\Framework
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite('Zend_Controller_Action_Helper_ContextSwitchTest');
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     /**
@@ -105,21 +105,21 @@ public function testDirectReturnsObjectInstance()
     public function testSetSuffixModifiesContextSuffix()
     {
         $this->helper->setSuffix('xml', 'foobar');
-        $this->assertContains('foobar', $this->helper->getSuffix('xml'));
+        $this->assertStringContainsString('foobar', $this->helper->getSuffix('xml'));
     }
 
     public function testSetSuffixPrependsToViewRendererSuffixByDefault()
     {
         $this->helper->setSuffix('xml', 'foobar');
         $expected = 'foobar.' . $this->viewRenderer->getViewSuffix();
-        $this->assertContains($expected, $this->helper->getSuffix('xml'));
+        $this->assertStringContainsString($expected, $this->helper->getSuffix('xml'));
     }
 
     public function testCanSetSuffixWithoutViewRendererSuffix()
     {
         $this->helper->setSuffix('xml', 'foobar', false);
         $expected = 'foobar';
-        $this->assertContains($expected, $this->helper->getSuffix('xml'));
+        $this->assertStringContainsString($expected, $this->helper->getSuffix('xml'));
     }
 
     public function testSuffixAccessorsThrowExceptionOnInvalidContextType()
@@ -128,14 +128,14 @@ public function testSuffixAccessorsThrowExceptionOnInvalidContextType()
             $this->helper->setSuffix('foobar', 'foobar');
             $this->fail('setSuffix() should throw exception with invalid context type');
         } catch (Zend_Controller_Action_Exception $e) {
-            $this->assertContains('Cannot set suffix', $e->getMessage());
+            $this->assertStringContainsString('Cannot set suffix', $e->getMessage());
         }
 
         try {
             $this->helper->getSuffix('foobar');
             $this->fail('getSuffix() should throw exception with invalid context type');
         } catch (Zend_Controller_Action_Exception $e) {
-            $this->assertContains('Cannot retrieve suffix', $e->getMessage());
+            $this->assertStringContainsString('Cannot retrieve suffix', $e->getMessage());
         }
     }
 
@@ -170,7 +170,7 @@ public function testAddHeaderThrowsExceptionWhenReferencingExistingHeader()
             $this->helper->addHeader('xml', 'Content-Type', 'application/xml');
             $this->fail('addHeader() should raise exception for existing headers');
         } catch (Zend_Controller_Exception $e) {
-            $this->assertContains('already exists', $e->getMessage());
+            $this->assertStringContainsString('already exists', $e->getMessage());
         }
     }
 
@@ -213,56 +213,56 @@ public function testHeaderAccessorsThrowExceptionOnInvalidContextType()
             $this->helper->addHeader('foobar', 'foobar', 'baz');
             $this->fail('addHeader() should throw exception with invalid context type');
         } catch (Zend_Controller_Action_Exception $e) {
-            $this->assertContains('does not exist', $e->getMessage());
+            $this->assertStringContainsString('does not exist', $e->getMessage());
         }
 
         try {
             $this->helper->setHeader('foobar', 'foobar', 'baz');
             $this->fail('setHeader() should throw exception with invalid context type');
         } catch (Zend_Controller_Action_Exception $e) {
-            $this->assertContains('does not exist', $e->getMessage());
+            $this->assertStringContainsString('does not exist', $e->getMessage());
         }
 
         try {
             $this->helper->getHeader('foobar', 'Content-Type');
             $this->fail('getHeader() should throw exception with invalid context type');
         } catch (Zend_Controller_Action_Exception $e) {
-            $this->assertContains('does not exist', $e->getMessage());
+            $this->assertStringContainsString('does not exist', $e->getMessage());
         }
 
         try {
             $this->helper->getHeaders('foobar');
             $this->fail('getHeaders() should throw exception with invalid context type');
         } catch (Zend_Controller_Action_Exception $e) {
-            $this->assertContains('does not exist', $e->getMessage());
+            $this->assertStringContainsString('does not exist', $e->getMessage());
         }
 
         try {
             $this->helper->addHeaders('foobar', array('X-Foo' => 'Bar'));
             $this->fail('addHeaders() should throw exception with invalid context type');
         } catch (Zend_Controller_Action_Exception $e) {
-            $this->assertContains('does not exist', $e->getMessage());
+            $this->assertStringContainsString('does not exist', $e->getMessage());
         }
 
         try {
             $this->helper->setHeaders('foobar', array('X-Foo' => 'Bar'));
             $this->fail('setHeaders() should throw exception with invalid context type');
         } catch (Zend_Controller_Action_Exception $e) {
-            $this->assertContains('does not exist', $e->getMessage());
+            $this->assertStringContainsString('does not exist', $e->getMessage());
         }
 
         try {
             $this->helper->removeHeader('foobar', 'X-Foo');
             $this->fail('removeHeader() should throw exception with invalid context type');
         } catch (Zend_Controller_Action_Exception $e) {
-            $this->assertContains('does not exist', $e->getMessage());
+            $this->assertStringContainsString('does not exist', $e->getMessage());
         }
 
         try {
             $this->helper->clearHeaders('foobar');
             $this->fail('clearHeaders() should throw exception with invalid context type');
         } catch (Zend_Controller_Action_Exception $e) {
-            $this->assertContains('does not exist', $e->getMessage());
+            $this->assertStringContainsString('does not exist', $e->getMessage());
         }
     }
 
@@ -324,7 +324,7 @@ public function testAddContextThrowsExceptionIfContextAlreadyExists()
             $this->helper->addContext('xml', array());
             $this->fail('Shold not be able to add context if already exists');
         } catch (Zend_Controller_Exception $e) {
-            $this->assertContains('exists', $e->getMessage());
+            $this->assertStringContainsString('exists', $e->getMessage());
         }
     }
 
@@ -374,9 +374,9 @@ public function testCanOverwriteManyContextsAtOnce()
         $this->assertTrue($this->helper->hasContext('barbaz'));
         $this->assertEquals('xml', $this->helper->getSuffix('xml'));
         $this->assertNotEquals('foo.bar', $this->helper->getSuffix('foobar'));
-        $this->assertContains('foo.bar', $this->helper->getSuffix('foobar'));
+        $this->assertStringContainsString('foo.bar', $this->helper->getSuffix('foobar'));
         $this->assertNotEquals('bar.baz', $this->helper->getSuffix('barbaz'));
-        $this->assertContains('bar.baz', $this->helper->getSuffix('barbaz'));
+        $this->assertStringContainsString('bar.baz', $this->helper->getSuffix('barbaz'));
     }
 
     public function testCanRemoveSingleContext()
@@ -425,7 +425,7 @@ public function testSetDefaultContextThrowsExceptionIfContextDoesNotExist()
             $this->helper->setDefaultContext('foobar');
             $this->fail('setDefaultContext() should raise exception if context does not exist');
         } catch (Zend_Controller_Action_Exception $e) {
-            $this->assertContains('Cannot set default context', $e->getMessage());
+            $this->assertStringContainsString('Cannot set default context', $e->getMessage());
         }
     }
 
@@ -829,7 +829,7 @@ public function testPostJsonContextDoesntThrowExceptionWhenGetVarsMethodsExists(
         try {
             $this->helper->setAutoJsonSerialization(true);
             $this->helper->postJsonContext();
-        } catch (Zend_Controller_Action_Exception $zcae) {
+        } catch (Zend_Controller_Action_Exception) {
             $this->fail('Exception should be throw when view does not implement getVars() method');
         }
         self::assertTrue(true);
@@ -847,7 +847,7 @@ public function testPostJsonContextThrowsExceptionWhenGetVarsMethodsDoesntExist(
             $this->helper->setAutoJsonSerialization(true);
             $this->helper->postJsonContext();
             $this->fail('Exception should be throw when view does not implement getVars() method');
-        } catch (Zend_Controller_Action_Exception $zcae) {
+        } catch (Zend_Controller_Action_Exception) {
             self::assertTrue(true);
         }
     }
diff --git a/tests/Zend/Controller/Action/Helper/FlashMessengerTest.php b/tests/Zend/Controller/Action/Helper/FlashMessengerTest.php
index e54cd154..45d23002 100644
--- a/tests/Zend/Controller/Action/Helper/FlashMessengerTest.php
+++ b/tests/Zend/Controller/Action/Helper/FlashMessengerTest.php
@@ -66,14 +66,14 @@ class Zend_Controller_Action_Helper_FlashMessengerTest extends \PHPUnit\Framewor
     public static function main()
     {
         $suite = new \PHPUnit\Framework\TestSuite('Zend_Controller_Action_Helper_FlashMessengerTest');
-        $result = \PHPUnit\TextUI\TestRunner::run($suite);
+        $result = (new \PHPUnit\TextUI\TestRunner())->run($suite);
     }
 
     public function setUp(): void
     {
         $savePath = ini_get('session.save_path');
         if (strpos($savePath, ';')) {
-            $savePath = explode(';', $savePath);
+            $savePath = explode(';', (string) $savePath);
             $savePath = array_pop($savePath);
         }
         if (empty($savePath)) {
@@ -96,32 +96,32 @@ public function setUp(): void
         $this->helper = new Zend_Controller_Action_Helper_FlashMessenger();
     }
 
-    public function testLoadFlashMessenger()
+    public function testLoadFlashMessenger(): never
     {
         $this->markTestSkipped();
         $response = $this->front->dispatch($this->request);
-        $this->assertEquals('Zend_Controller_Action_Helper_FlashMessenger123456', $response->getBody());
+        static::assertEquals('Zend_Controller_Action_Helper_FlashMessenger123456', $response->getBody());
     }
 
-    public function testClearMessages()
+    public function testClearMessages(): never
     {
         $this->markTestSkipped();
         $this->helper->addMessage('foo');
         $this->helper->addMessage('bar');
-        $this->assertTrue($this->helper->hasMessages());
-        $this->assertEquals(2, count($this->helper));
+        static::assertTrue($this->helper->hasMessages());
+        static::assertEquals(2, count($this->helper));
 
         $this->helper->clearMessages();
-        $this->assertFalse($this->helper->hasMessages());
-        $this->assertEquals(0, count($this->helper));
+        static::assertFalse($this->helper->hasMessages());
+        static::assertEquals(0, count($this->helper));
     }
 
-    public function testDirectProxiesToAddMessage()
+    public function testDirectProxiesToAddMessage(): never
     {
         $this->markTestSkipped();
         $this->helper->direct('foo');
-        $this->assertTrue($this->helper->hasMessages());
-        $this->assertEquals(1, count($this->helper));
+        static::assertTrue($this->helper->hasMessages());
+        static::assertEquals(1, count($this->helper));
     }
 
     /**
diff --git a/tests/Zend/Controller/Action/Helper/RedirectorTest.php b/tests/Zend/Controller/Action/Helper/RedirectorTest.php
index 2021e203..97c4c3c8 100644
--- a/tests/Zend/Controller/Action/Helper/RedirectorTest.php
+++ b/tests/Zend/Controller/Action/Helper/RedirectorTest.php
@@ -483,7 +483,7 @@ public function testServerVariableHttpsToOffDoesNotBuildHttpsUrl()
         $this->redirector->gotoUrl('/bar/baz');
         $test = $this->redirector->getRedirectUrl();
 
-        $this->assertNotContains('https://', $test);
+        $this->assertStringNotContainsString('https://', $test);
         $this->assertEquals('http://localhost/bar/baz', $test);
     }
 
diff --git a/tests/Zend/Controller/Action/Helper/UrlTest.php b/tests/Zend/Controller/Action/Helper/UrlTest.php
index a717deee..f703be1e 100644
--- a/tests/Zend/Controller/Action/Helper/UrlTest.php
+++ b/tests/Zend/Controller/Action/Helper/UrlTest.php
@@ -65,8 +65,8 @@ public function testSimpleWithAllParamsProducesAppropriateUrl()
     {
         $url = $this->helper->simple('baz', 'bar', 'foo', array('bat' => 'foo', 'ho' => 'hum'));
         $this->assertEquals('/foo/bar/baz', substr($url, 0, 12));
-        $this->assertContains('/bat/foo', $url);
-        $this->assertContains('/ho/hum', $url);
+        $this->assertStringContainsString('/bat/foo', $url);
+        $this->assertStringContainsString('/ho/hum', $url);
     }
 
     public function testSimpleWithMissingControllerAndModuleProducesAppropriateUrl()
@@ -76,8 +76,8 @@ public function testSimpleWithMissingControllerAndModuleProducesAppropriateUrl()
             ->setControllerName('bar');
         $url = $this->helper->simple('baz', null, null, array('bat' => 'foo', 'ho' => 'hum'));
         $this->assertEquals('/foo/bar/baz', substr($url, 0, 12));
-        $this->assertContains('/bat/foo', $url);
-        $this->assertContains('/ho/hum', $url);
+        $this->assertStringContainsString('/bat/foo', $url);
+        $this->assertStringContainsString('/ho/hum', $url);
     }
 
     public function testSimpleWithDefaultModuleProducesUrlWithoutModuleSegment()
@@ -132,16 +132,16 @@ public function testUrlMethodCreatesUrlBasedOnPassedParametersUsingDefaultRouteW
             'ho' => 'hum',
         ));
         $this->assertEquals('/foo/bar/baz', substr($url, 0, 12));
-        $this->assertContains('/bat/foo', $url);
-        $this->assertContains('/ho/hum', $url);
+        $this->assertStringContainsString('/bat/foo', $url);
+        $this->assertStringContainsString('/ho/hum', $url);
     }
 
     public function testDirectProxiesToSimple()
     {
         $url = $this->helper->direct('baz', 'bar', 'foo', array('bat' => 'foo', 'ho' => 'hum'));
         $this->assertEquals('/foo/bar/baz', substr($url, 0, 12));
-        $this->assertContains('/bat/foo', $url);
-        $this->assertContains('/ho/hum', $url);
+        $this->assertStringContainsString('/bat/foo', $url);
+        $this->assertStringContainsString('/ho/hum', $url);
     }
 
     /**
diff --git a/tests/Zend/Controller/Action/Helper/ViewRendererTest.php b/tests/Zend/Controller/Action/Helper/ViewRendererTest.php
index 4d24c138..d27bee4c 100644
--- a/tests/Zend/Controller/Action/Helper/ViewRendererTest.php
+++ b/tests/Zend/Controller/Action/Helper/ViewRendererTest.php
@@ -310,7 +310,7 @@ public function testNeverRenderFlagDisablesRendering()
         $this->helper->postDispatch();
 
         $content = $this->response->getBody();
-        $this->assertNotContains('Rendered index/test.phtml', $this->response->getBody());
+        $this->assertStringNotContainsString('Rendered index/test.phtml', $this->response->getBody());
     }
 
     public function testNoRenderFlag()
@@ -388,7 +388,7 @@ public function testPostDispatchRendersAppropriateScript()
         $this->helper->postDispatch();
 
         $content = $this->response->getBody();
-        $this->assertContains('Rendered index/test.phtml in bar module', $content);
+        $this->assertStringContainsString('Rendered index/test.phtml in bar module', $content);
     }
 
     public function testPostDispatchDoesNothingOnForward()
@@ -402,7 +402,7 @@ public function testPostDispatchDoesNothingOnForward()
         $this->helper->postDispatch();
 
         $content = $this->response->getBody();
-        $this->assertNotContains('Rendered index/test.phtml in bar module', $content);
+        $this->assertStringNotContainsString('Rendered index/test.phtml in bar module', $content);
         $this->assertTrue(empty($content));
     }
 
@@ -418,7 +418,7 @@ public function testPostDispatchDoesNothingOnRedirect()
         $this->helper->postDispatch();
 
         $content = $this->response->getBody();
-        $this->assertNotContains('Rendered index/test.phtml in bar module', $content);
+        $this->assertStringNotContainsString('Rendered index/test.phtml in bar module', $content);
         $this->assertTrue(empty($content));
     }
 
@@ -431,7 +431,7 @@ public function testPostDispatchDoesNothingWithNoController()
         $this->helper->postDispatch();
 
         $content = $this->response->getBody();
-        $this->assertNotContains('Rendered index/test.phtml in bar module', $content);
+        $this->assertStringNotContainsString('Rendered index/test.phtml in bar module', $content);
         $this->assertTrue(empty($content));
     }
 
@@ -445,7 +445,7 @@ public function testPostDispatchDoesNothingWithNeverController()
         $this->helper->postDispatch();
 
         $content = $this->response->getBody();
-        $this->assertNotContains('Rendered index/test.phtml in bar module', $content);
+        $this->assertStringNotContainsString('Rendered index/test.phtml in bar module', $content);
         $this->assertTrue(empty($content));
     }
 
@@ -543,7 +543,7 @@ public function testRenderScript()
         $controller = new Bar_IndexController($this->request, $this->response, array());
         $this->helper->renderScript('index/test.phtml');
         $body = $this->response->getBody();
-        $this->assertContains('Rendered index/test.phtml in bar module', $body);
+        $this->assertStringContainsString('Rendered index/test.phtml in bar module', $body);
     }
 
     public function testRenderScriptToNamedResponseSegment()
@@ -554,7 +554,7 @@ public function testRenderScriptToNamedResponseSegment()
         $controller = new Bar_IndexController($this->request, $this->response, array());
         $this->helper->renderScript('index/test.phtml', 'foo');
         $body = $this->response->getBody('foo');
-        $this->assertContains('Rendered index/test.phtml in bar module', $body);
+        $this->assertStringContainsString('Rendered index/test.phtml in bar module', $body);
     }
 
     public function testRenderScriptToPreviouslyNamedResponseSegment()
@@ -566,7 +566,7 @@ public function testRenderScriptToPreviouslyNamedResponseSegment()
         $this->helper->setResponseSegment('foo');
         $this->helper->renderScript('index/test.phtml');
         $body = $this->response->getBody('foo');
-        $this->assertContains('Rendered index/test.phtml in bar module', $body);
+        $this->assertStringContainsString('Rendered index/test.phtml in bar module', $body);
     }
 
     public function testRenderWithDefaults()
@@ -577,7 +577,7 @@ public function testRenderWithDefaults()
         $controller = new Bar_IndexController($this->request, $this->response, array());
         $this->helper->render();
         $body = $this->response->getBody();
-        $this->assertContains('Rendered index/test.phtml in bar module', $body);
+        $this->assertStringContainsString('Rendered index/test.phtml in bar module', $body);
     }
 
     public function testRenderToSpecifiedAction()
@@ -588,7 +588,7 @@ public function testRenderToSpecifiedAction()
         $controller = new Bar_IndexController($this->request, $this->response, array());
         $this->helper->render('test');
         $body = $this->response->getBody();
-        $this->assertContains('Rendered index/test.phtml in bar module', $body);
+        $this->assertStringContainsString('Rendered index/test.phtml in bar module', $body);
     }
 
     public function testRenderWithNoController()
@@ -599,7 +599,7 @@ public function testRenderWithNoController()
         $controller = new Bar_IndexController($this->request, $this->response, array());
         $this->helper->render(null, null, true);
         $body = $this->response->getBody();
-        $this->assertContains('Rendered test.phtml in bar module', $body);
+        $this->assertStringContainsString('Rendered test.phtml in bar module', $body);
     }
 
     public function testRenderToNamedSegment()
@@ -610,7 +610,7 @@ public function testRenderToNamedSegment()
         $controller = new Bar_IndexController($this->request, $this->response, array());
         $this->helper->render(null, 'foo');
         $body = $this->response->getBody('foo');
-        $this->assertContains('Rendered index/test.phtml in bar module', $body);
+        $this->assertStringContainsString('Rendered index/test.phtml in bar module', $body);
     }
 
     public function testRenderBySpec()
@@ -621,7 +621,7 @@ public function testRenderBySpec()
         $controller = new Bar_IndexController($this->request, $this->response, array());
         $this->helper->renderBySpec('foo', array('controller' => 'test', 'suffix' => 'php'));
         $body = $this->response->getBody();
-        $this->assertContains('Rendered test/foo.php', $body);
+        $this->assertStringContainsString('Rendered test/foo.php', $body);
     }
 
     public function testRenderBySpecToNamedResponseSegment()
@@ -632,7 +632,7 @@ public function testRenderBySpecToNamedResponseSegment()
         $controller = new Bar_IndexController($this->request, $this->response, array());
         $this->helper->renderBySpec('foo', array('controller' => 'test', 'suffix' => 'php'), 'foo');
         $body = $this->response->getBody('foo');
-        $this->assertContains('Rendered test/foo.php', $body);
+        $this->assertStringContainsString('Rendered test/foo.php', $body);
     }
 
     public function testInitDoesNotInitViewWhenNoViewRendererSet()
@@ -718,7 +718,7 @@ public function testCustomInflectorCanUseItsOwnTarget()
 
         $this->helper->render();
         $body = $this->response->getBody();
-        $this->assertContains('Rendered test.phtml in bar module', $body);
+        $this->assertStringContainsString('Rendered test.phtml in bar module', $body);
     }
 
     public function testCustomInflectorUsesViewRendererTargetWhenPassedInWithReferenceFlag()
@@ -747,7 +747,7 @@ public function testCustomInflectorUsesViewRendererTargetWhenPassedInWithReferen
 
         $this->helper->render();
         $body = $this->response->getBody();
-        $this->assertContains('Rendered index/test.phtml in bar module', $body);
+        $this->assertStringContainsString('Rendered index/test.phtml in bar module', $body);
     }
 
     public function testStockInflectorAllowsSubDirectoryViewScripts()
@@ -812,7 +812,7 @@ public function testCorrectViewHelperPathShouldBePropagatedWhenSubControllerInvo
 
         $this->helper->render();
         $body = $this->response->getBody();
-        $this->assertContains('fooUseHelper invoked', $body, 'Received ' . $body);
+        $this->assertStringContainsString('fooUseHelper invoked', $body, 'Received ' . $body);
     }
 
     /**
@@ -838,7 +838,7 @@ public function testCorrectViewHelperPathShouldBePropagatedWhenSubControllerInvo
 
         $this->helper->render();
         $body = $this->response->getBody();
-        $this->assertContains('SampleZfHelper invoked', $body, 'Received ' . $body);
+        $this->assertStringContainsString('SampleZfHelper invoked', $body, 'Received ' . $body);
     }
 
     /**
diff --git a/tests/Zend/Controller/Action/HelperBrokerTest.php b/tests/Zend/Controller/Action/HelperBrokerTest.php
index 689a342f..17962c5b 100644
--- a/tests/Zend/Controller/Action/HelperBrokerTest.php
+++ b/tests/Zend/Controller/Action/HelperBrokerTest.php
@@ -173,7 +173,7 @@ public function testNonExistentHelper()
 
         $this->front->returnResponse(true);
         $response = $this->front->dispatch($request);
-        $this->assertContains('not found', $response->getBody());
+        $this->assertStringContainsString('not found', $response->getBody());
     }
 
     public function testCustomHelperRegistered()
diff --git a/tests/Zend/Controller/ActionTest.php b/tests/Zend/Controller/ActionTest.php
index 9ed46f10..714f4657 100644
--- a/tests/Zend/Controller/ActionTest.php
+++ b/tests/Zend/Controller/ActionTest.php
@@ -184,7 +184,7 @@ public function testRun2()
             $response = $this->_controller->run();
             $this->fail('Should not be able to call bar as action');
         } catch (Exception $e) {
-            //success!
+            self::assertTrue(true);
         }
     }
 
@@ -296,7 +296,7 @@ public function testRender()
         $controller = new ViewController($request, $response);
 
         $controller->indexAction();
-        $this->assertContains('In the index action view', $response->getBody());
+        $this->assertStringContainsString('In the index action view', $response->getBody());
     }
 
     public function testRenderByName()
@@ -310,7 +310,7 @@ public function testRenderByName()
         $controller = new ViewController($request, $response);
 
         $controller->testAction();
-        $this->assertContains('In the index action view', $response->getBody());
+        $this->assertStringContainsString('In the index action view', $response->getBody());
     }
 
     public function testRenderOutsideControllerSubdir()
@@ -324,7 +324,7 @@ public function testRenderOutsideControllerSubdir()
         $controller = new ViewController($request, $response);
 
         $controller->siteAction();
-        $this->assertContains('In the sitewide view', $response->getBody());
+        $this->assertStringContainsString('In the sitewide view', $response->getBody());
     }
 
     public function testRenderNamedSegment()
@@ -338,7 +338,7 @@ public function testRenderNamedSegment()
         $controller = new ViewController($request, $response);
 
         $controller->nameAction();
-        $this->assertContains('In the name view', $response->getBody('name'));
+        $this->assertStringContainsString('In the name view', $response->getBody('name'));
     }
 
     public function testRenderNormalizesScriptName()
@@ -352,7 +352,7 @@ public function testRenderNormalizesScriptName()
         $controller = new FooBarController($request, $response);
 
         $controller->bazBatAction();
-        $this->assertContains('Inside foo-bar/baz-bat.phtml', $response->getBody());
+        $this->assertStringContainsString('Inside foo-bar/baz-bat.phtml', $response->getBody());
     }
 
     public function testGetViewScript()
@@ -366,10 +366,10 @@ public function testGetViewScript()
         $controller = new ViewController($request, $response);
 
         $script = $controller->getViewScript();
-        $this->assertContains('view' . DIRECTORY_SEPARATOR . 'test.phtml', $script);
+        $this->assertStringContainsString('view' . DIRECTORY_SEPARATOR . 'test.phtml', $script);
 
         $script = $controller->getViewScript('foo');
-        $this->assertContains('view' . DIRECTORY_SEPARATOR . 'foo.phtml', $script);
+        $this->assertStringContainsString('view' . DIRECTORY_SEPARATOR . 'foo.phtml', $script);
     }
 
     public function testGetViewScriptDoesNotOverwriteNoControllerFlagWhenNullPassed()
@@ -405,7 +405,7 @@ public function testRenderScript()
         $controller = new ViewController($request, $response);
 
         $controller->scriptAction();
-        $this->assertContains('Inside custom/renderScript.php', $response->getBody());
+        $this->assertStringContainsString('Inside custom/renderScript.php', $response->getBody());
     }
 
     public function testRenderScriptToNamedResponseSegment()
@@ -420,7 +420,7 @@ public function testRenderScriptToNamedResponseSegment()
 
         $controller->scriptNameAction();
 
-        $this->assertContains('Inside custom/renderScript.php', $response->getBody('foo'));
+        $this->assertStringContainsString('Inside custom/renderScript.php', $response->getBody('foo'));
     }
 
     public function testGetHelper()
@@ -463,7 +463,7 @@ public function testRenderUsingViewRenderer()
         $controller = new ViewController($request, $response);
 
         $controller->scriptAction();
-        $this->assertContains('Inside custom/renderScript.php', $response->getBody());
+        $this->assertStringContainsString('Inside custom/renderScript.php', $response->getBody());
     }
 
     public function testMissingActionExceptionsDifferFromMissingMethods()
@@ -473,8 +473,8 @@ public function testMissingActionExceptionsDifferFromMissingMethods()
             $this->fail('Invalid action should throw exception');
         } catch (Zend_Controller_Exception $e) {
             $this->assertRegexp('/^Action.*?(does not exist and was not trapped in __call\(\))$/', $e->getMessage());
-            $this->assertContains('bogus', $e->getMessage());
-            $this->assertNotContains('bogusAction', $e->getMessage());
+            $this->assertStringContainsString('bogus', $e->getMessage());
+            $this->assertStringNotContainsString('bogusAction', $e->getMessage());
             $this->assertEquals(404, $e->getCode());
         }
 
@@ -483,7 +483,7 @@ public function testMissingActionExceptionsDifferFromMissingMethods()
             $this->fail('Invalid method should throw exception');
         } catch (Zend_Controller_Exception $e) {
             $this->assertRegexp('/^Method.*?(does not exist and was not trapped in __call\(\))$/', $e->getMessage());
-            $this->assertContains('bogus', $e->getMessage());
+            $this->assertStringContainsString('bogus', $e->getMessage());
             $this->assertEquals(500, $e->getCode());
         }
     }
diff --git a/tests/Zend/Controller/Dispatcher/StandardTest.php b/tests/Zend/Controller/Dispatcher/StandardTest.php
index 85ce133a..4bc23d4e 100644
--- a/tests/Zend/Controller/Dispatcher/StandardTest.php
+++ b/tests/Zend/Controller/Dispatcher/StandardTest.php
@@ -207,7 +207,7 @@ public function testDispatchValidControllerWithInvalidAction()
             $this->_dispatcher->dispatch($request, $response);
             $this->fail('Exception should be raised by __call');
         } catch (Exception $e) {
-            // success
+            self::assertTrue(true);
         }
     }
 
@@ -221,7 +221,7 @@ public function testDispatchInvalidController()
             $this->_dispatcher->dispatch($request, $response);
             $this->fail('Exception should be raised; no such controller');
         } catch (Exception $e) {
-            // success
+            self::assertTrue(true);
         }
     }
 
@@ -563,7 +563,7 @@ public function testDispatcherCanDispatchControllersFromModuleWithHyphenatedName
         $response = new Zend_Controller_Response_Cli();
         $dispatcher->dispatch($request, $response);
         $body = $dispatcher->getResponse()->getBody();
-        $this->assertContains('BazBat_FooController::indexAction() called', $body, $body);
+        $this->assertStringContainsString('BazBat_FooController::indexAction() called', $body, $body);
     }
 
     public function testLoadClassLoadsControllerInDefaultModuleWithModulePrefixWhenRequested()
@@ -614,7 +614,7 @@ public function testCamelCasedActionsNotRequestedWithWordSeparatorsShouldNotReso
             $this->_dispatcher->dispatch($request, $response);
             $this->fail('Invalid camelCased action should raise exception');
         } catch (Zend_Controller_Exception $e) {
-            $this->assertContains('does not exist', $e->getMessage());
+            $this->assertStringContainsString('does not exist', $e->getMessage());
         }
     }
 
@@ -689,7 +689,7 @@ public function testGetControllerClassThrowsExceptionIfNoDefaultModuleDefined()
         try {
             $class = $this->_dispatcher->getControllerClass($request);
         } catch (Zend_Controller_Exception $e) {
-            $this->assertContains('No default module', $e->getMessage());
+            $this->assertStringContainsString('No default module', $e->getMessage());
         }
     }
 }
diff --git a/tests/Zend/Controller/FrontTest.php b/tests/Zend/Controller/FrontTest.php
index 2bf49198..c4b3b959 100644
--- a/tests/Zend/Controller/FrontTest.php
+++ b/tests/Zend/Controller/FrontTest.php
@@ -108,7 +108,7 @@ public function testSetRequestThrowsExceptionWithBadRequest()
             $this->_controller->setRequest(\Zend_Controller_Response_Cli::class);
             $this->fail('Should not be able to set invalid request class');
         } catch (Exception $e) {
-            // success
+            self::assertTrue(true);
         }
     }
 
@@ -130,7 +130,7 @@ public function testSetResponseThrowsExceptionWithBadResponse()
             $this->_controller->setResponse(\Zend_Controller_Request_Http::class);
             $this->fail('Should not be able to set invalid response class');
         } catch (Exception $e) {
-            // success
+            self::assertTrue(true);
         }
     }
 
@@ -152,7 +152,7 @@ public function testSetRouterThrowsExceptionWithBadRouter()
             $this->_controller->setRouter(\Zend_Controller_Request_Http::class);
             $this->fail('Should not be able to set invalid router class');
         } catch (Exception $e) {
-            // success
+            self::assertTrue(true);
         }
     }
 
@@ -401,7 +401,7 @@ public function testSetBaseUrlThrowsExceptionOnNonString()
             $this->_controller->setBaseUrl(array());
             $this->fail('Should not be able to set non-string base URL');
         } catch (Exception $e) {
-            // success
+            self::assertTrue(true);
         }
     }
 
@@ -416,7 +416,7 @@ public function testBaseUrlPushedToRequest()
         $response = new Zend_Controller_Response_Cli();
         $response = $this->_controller->dispatch($request, $response);
 
-        $this->assertContains('index.php', $request->getBaseUrl());
+        $this->assertStringContainsString('index.php', $request->getBaseUrl());
     }
 
     /**
@@ -451,7 +451,7 @@ public function testThrowExceptionsThrows()
             $response = $this->_controller->dispatch($request);
             $this->fail('Invalid controller should throw exception');
         } catch (Exception $e) {
-            // success
+            self::assertTrue(true);
         }
     }
 
@@ -487,7 +487,7 @@ public function testReturnResponseReturnsResponse()
         $body = ob_get_clean();
 
         $actual = $this->_controller->getResponse()->getBody();
-        $this->assertContains($actual, $body);
+        $this->assertStringContainsString($actual, $body);
     }
 
     public function testRunStatically()
@@ -495,6 +495,7 @@ public function testRunStatically()
         $request = new Zend_Controller_Request_Http('http://example.com/index/index');
         $this->_controller->setRequest($request);
         Zend_Controller_Front::run(__DIR__ . DIRECTORY_SEPARATOR . '_files');
+        self::assertTrue(true);
     }
 
     public function testRunDynamically()
@@ -502,6 +503,7 @@ public function testRunDynamically()
         $request = new Zend_Controller_Request_Http('http://example.com/index/index');
         $this->_controller->setRequest($request);
         $this->_controller->run(__DIR__ . DIRECTORY_SEPARATOR . '_files');
+        self::assertTrue(true);
     }
 
     public function testModulePathDispatched()
@@ -656,7 +658,7 @@ public function testReplaceRequestAndResponseMidStream()
         $this->assertNotSame($response, $responsePost);
 
         $this->assertContains('Reset action called', $responsePost->getBody());
-        $this->assertNotContains('Reset action called', $response->getBody());
+        $this->assertStringNotContainsString('Reset action called', $response->getBody());
     }
 
     public function testViewRendererHelperRegisteredWhenDispatched()
diff --git a/tests/Zend/Controller/Plugin/BrokerTest.php b/tests/Zend/Controller/Plugin/BrokerTest.php
index 0c016054..486ef877 100644
--- a/tests/Zend/Controller/Plugin/BrokerTest.php
+++ b/tests/Zend/Controller/Plugin/BrokerTest.php
@@ -60,7 +60,7 @@ public function testDuplicatePlugin()
             $broker->registerPlugin($plugin);
             $this->fail('Duplicate registry of plugin object should be disallowed');
         } catch (Exception $expected) {
-            $this->assertContains('already', $expected->getMessage());
+            $this->assertStringContainsString('already', $expected->getMessage());
         }
     }
 
@@ -210,6 +210,7 @@ public function testRegisterPluginThrowsExceptionOnDuplicateStackIndex()
             $broker->registerPlugin($plugin2, 5);
             $this->fail('Registering plugins with same stack index should raise exception');
         } catch (Exception $e) {
+            self::assertTrue(true);
         }
     }
 
diff --git a/tests/Zend/Controller/Plugin/ErrorHandlerTest.php b/tests/Zend/Controller/Plugin/ErrorHandlerTest.php
index f65011f5..b1cc5462 100644
--- a/tests/Zend/Controller/Plugin/ErrorHandlerTest.php
+++ b/tests/Zend/Controller/Plugin/ErrorHandlerTest.php
@@ -208,6 +208,7 @@ public function testPostDispatchDoesNothingWhenCalledRepeatedlyWithoutNewExcepti
         } catch (Exception $e) {
             $this->fail('Repeated calls with no new exceptions should not throw exceptions');
         }
+        self::assertTrue(true);
     }
 
     public function testPostDispatchWithoutException()
diff --git a/tests/Zend/Controller/Response/HttpTest.php b/tests/Zend/Controller/Response/HttpTest.php
index 934ccd6b..a2630ee1 100644
--- a/tests/Zend/Controller/Response/HttpTest.php
+++ b/tests/Zend/Controller/Response/HttpTest.php
@@ -289,7 +289,7 @@ public function testSendResponseWithExceptions()
         ob_start();
         $this->_response->sendResponse();
         $string = ob_get_clean();
-        $this->assertContains('Test exception rendering', $string);
+        $this->assertStringContainsString('Test exception rendering', $string);
     }
 
     public function testSetResponseCodeThrowsExceptionWithBadCode()
diff --git a/tests/Zend/Controller/Response/HttpTestCaseTest.php b/tests/Zend/Controller/Response/HttpTestCaseTest.php
index 916e0489..34da8fe5 100644
--- a/tests/Zend/Controller/Response/HttpTestCaseTest.php
+++ b/tests/Zend/Controller/Response/HttpTestCaseTest.php
@@ -70,7 +70,7 @@ public function testSendResponseShouldRenderHeaders()
         $this->response->setHeader('X-Foo-Bar', 'baz')
             ->setBody('Body to emit');
         $test = $this->response->sendResponse();
-        $this->assertContains("X-Foo-Bar: baz\n\nBody to emit", $test);
+        $this->assertStringContainsString("X-Foo-Bar: baz\n\nBody to emit", $test);
     }
 
     public function testOutputBodyShouldReturnStringInsteadOfEchoingOutput()
@@ -83,7 +83,7 @@ public function testOutputBodyShouldReturnStringInsteadOfEchoingOutput()
         $test = ob_get_clean();
         $this->assertTrue(empty($test));
         $this->assertFalse(empty($content));
-        $this->assertContains("Baz Content\nFoo Content\nBar Content\n", $content, $content);
+        $this->assertStringContainsString("Baz Content\nFoo Content\nBar Content\n", $content, $content);
     }
 
     public function testSendHeadersShouldReturnArrayOfHeadersInsteadOfSendingHeaders()
diff --git a/tests/Zend/Controller/Router/RewriteTest.php b/tests/Zend/Controller/Router/RewriteTest.php
index e8acdbfa..acd564b3 100644
--- a/tests/Zend/Controller/Router/RewriteTest.php
+++ b/tests/Zend/Controller/Router/RewriteTest.php
@@ -752,10 +752,10 @@ public function testCanGenerateNumericKeyUri()
 
     /**
      * @group ZF-11393
-     * @expectedException Zend_Controller_Router_Exception
      */
     public function testCallingAssembleWithNullArgumentShouldThrowException()
     {
+        $this->expectException(\Zend_Controller_Router_Exception::class);
         $this->_router->assemble(null);
     }
 }
diff --git a/tests/Zend/Controller/Router/Route/HostnameTest.php b/tests/Zend/Controller/Router/Route/HostnameTest.php
index 410a0281..225b3b9f 100644
--- a/tests/Zend/Controller/Router/Route/HostnameTest.php
+++ b/tests/Zend/Controller/Router/Route/HostnameTest.php
@@ -103,7 +103,7 @@ public function testAssembleHostWithMissingParam()
             $route->assemble();
             $this->fail('An expected Zend_Controller_Router_Exception has not been raised');
         } catch (Zend_Controller_Router_Exception $expected) {
-            $this->assertContains('subdomain is not specified', $expected->getMessage());
+            $this->assertStringContainsString('subdomain is not specified', $expected->getMessage());
         }
     }
 
diff --git a/tests/Zend/Controller/Router/Route/ModuleTest.php b/tests/Zend/Controller/Router/Route/ModuleTest.php
index 927855d3..7d77cd8d 100644
--- a/tests/Zend/Controller/Router/Route/ModuleTest.php
+++ b/tests/Zend/Controller/Router/Route/ModuleTest.php
@@ -467,6 +467,6 @@ public function testAssembleShouldUrlEncodeAllParameterNames()
             'module' => 'default',
         );
         $url = $this->route->assemble($params);
-        $this->assertNotContains('"><script>alert(11639)<', $url);
+        $this->assertStringNotContainsString('"><script>alert(11639)<', $url);
     }
 }
diff --git a/tests/Zend/Controller/Router/RouteTest.php b/tests/Zend/Controller/Router/RouteTest.php
index e427ee4f..952b8b20 100644
--- a/tests/Zend/Controller/Router/RouteTest.php
+++ b/tests/Zend/Controller/Router/RouteTest.php
@@ -320,6 +320,8 @@ public function testAssembleWithoutValue()
         try {
             $url = $route->assemble();
         } catch (Exception $e) {
+            self::assertTrue(true);
+
             return true;
         }
 
diff --git a/tests/Zend/DateTest.php b/tests/Zend/DateTest.php
index 78fc7b47..b5d9f71d 100644
--- a/tests/Zend/DateTest.php
+++ b/tests/Zend/DateTest.php
@@ -288,7 +288,7 @@ public function testSetTimestamp2()
             $result = $date->setTimestamp('notimestamp');
             $this->Fail('exception expected');
         } catch (Zend_Date_Exception $e) {
-            // success
+            self::assertTrue(true);
         }
     }
 
@@ -324,7 +324,7 @@ public function testAddTimestamp2()
             $result = $date->addTimestamp('notimestamp');
             $this->fail('exception expected');
         } catch (Zend_Date_Exception $e) {
-            // success
+            self::assertTrue(true);
         }
     }
 
@@ -350,7 +350,7 @@ public function testSubTimestamp2()
             $result = $date->subTimestamp('notimestamp');
             $this->fail('exception expected');
         } catch (Zend_Date_Exception $e) {
-            // success
+            self::assertTrue(true);
         }
     }
 
diff --git a/tests/Zend/ExceptionTest.php b/tests/Zend/ExceptionTest.php
index bc64402d..bb405693 100644
--- a/tests/Zend/ExceptionTest.php
+++ b/tests/Zend/ExceptionTest.php
@@ -57,8 +57,8 @@ public function testToString()
         $p = new Zend_Exception('p', 0);
         $e = new Zend_Exception('e', 0, $p);
         $s = $e->__toString();
-        $this->assertContains('p', $s);
-        $this->assertContains('Next', $s);
-        $this->assertContains('e', $s);
+        $this->assertStringContainsString('p', $s);
+        $this->assertStringContainsString('Next', $s);
+        $this->assertStringContainsString('e', $s);
     }
 }
diff --git a/tests/Zend/File/Transfer/Adapter/AbstractTest.php b/tests/Zend/File/Transfer/Adapter/AbstractTest.php
index 5b8a39d2..b53bdac0 100644
--- a/tests/Zend/File/Transfer/Adapter/AbstractTest.php
+++ b/tests/Zend/File/Transfer/Adapter/AbstractTest.php
@@ -63,11 +63,9 @@ public function tearDown(): void
     {
     }
 
-    /**
-     * @expectedException Zend_File_Transfer_Exception
-     */
     public function testAdapterShouldThrowExceptionWhenRetrievingPluginLoaderOfInvalidType()
     {
+        $this->expectException(\Zend_File_Transfer_Exception::class);
         $this->adapter->getPluginLoader('bogus');
     }
 
@@ -84,11 +82,9 @@ public function testAdapterShouldAllowAddingCustomPluginLoader()
         $this->assertSame($loader, $this->adapter->getPluginLoader('filter'));
     }
 
-    /**
-     * @expectedException Zend_File_Transfer_Exception
-     */
     public function testAddingInvalidPluginLoaderTypeToAdapterShouldRaiseException()
     {
+        $this->expectException(\Zend_File_Transfer_Exception::class);
         $loader = new Zend_Loader_PluginLoader();
         $this->adapter->setPluginLoader($loader, 'bogus');
     }
@@ -112,11 +108,9 @@ public function testPassingNoTypeWhenAddingPrefixPathToAdapterShouldGeneratePath
         $this->assertTrue(is_array($paths));
     }
 
-    /**
-     * @expectedException Zend_File_Transfer_Exception
-     */
     public function testPassingInvalidTypeWhenAddingPrefixPathToAdapterShouldThrowException()
     {
+        $this->expectException(\Zend_File_Transfer_Exception::class);
         $this->adapter->addPrefixPath('Foo', 'Foo', 'bogus');
     }
 
@@ -170,11 +164,9 @@ public function testAdapterShouldAllowAddingValidatorViaPluginLoader()
         $this->assertTrue($test instanceof Zend_Validate_File_Count);
     }
 
-    /**
-     * @expectedException Zend_File_Transfer_Exception
-     */
     public function testAdapterhShouldRaiseExceptionWhenAddingInvalidValidatorType()
     {
+        $this->expectException(\Zend_File_Transfer_Exception::class);
         $this->adapter->addValidator(new Zend_Filter_BaseName());
     }
 
@@ -371,11 +363,9 @@ public function testAdapterShouldAllowAddingFilterViaPluginLoader()
         $this->assertTrue($test instanceof Zend_Filter_StringTrim);
     }
 
-    /**
-     * @expectedException Zend_File_Transfer_Exception
-     */
     public function testAdapterhShouldRaiseExceptionWhenAddingInvalidFilterType()
     {
+        $this->expectException(\Zend_File_Transfer_Exception::class);
         $this->adapter->addFilter(new Zend_Validate_File_Extension('jpg'));
     }
 
@@ -564,51 +554,39 @@ public function testGetAdditionalFileInfosForSingleFile()
         $this->assertEquals('baz.text', $files['baz']['name']);
     }
 
-    /**
-     * @expectedException Zend_File_Transfer_Exception
-     */
     public function testGetAdditionalFileInfosForUnknownFile()
     {
+        $this->expectException(\Zend_File_Transfer_Exception::class);
         $files = $this->adapter->getFileInfo('unknown');
     }
 
-    /**
-     * @expectedException Zend_File_Transfer_Exception
-     */
     public function testGetUnknownOption()
     {
+        $this->expectException(\Zend_File_Transfer_Exception::class);
         $this->adapter->setOptions(array('unknownOption' => 'unknown'));
     }
 
-    /**
-     * @expectedException Zend_File_Transfer_Exception
-     */
     public function testGetFileIsNotImplemented()
     {
+        $this->expectException(\Zend_File_Transfer_Exception::class);
         $this->adapter->getFile();
     }
 
-    /**
-     * @expectedException Zend_File_Transfer_Exception
-     */
     public function testAddFileIsNotImplemented()
     {
+        $this->expectException(\Zend_File_Transfer_Exception::class);
         $this->adapter->addFile('foo');
     }
 
-    /**
-     * @expectedException Zend_File_Transfer_Exception
-     */
     public function testGetTypeIsNotImplemented()
     {
+        $this->expectException(\Zend_File_Transfer_Exception::class);
         $this->adapter->getType();
     }
 
-    /**
-     * @expectedException Zend_File_Transfer_Exception
-     */
     public function testAddTypeIsNotImplemented()
     {
+        $this->expectException(\Zend_File_Transfer_Exception::class);
         $this->adapter->addType('foo');
     }
 
@@ -666,7 +644,7 @@ public function testExceptionForUnknownHashValue()
             $this->adapter->getHash('foo', 'unknown_hash');
             $this->fail();
         } catch (Zend_Exception $e) {
-            $this->assertContains('Unknown hash algorithm', $e->getMessage());
+            $this->assertStringContainsString('Unknown hash algorithm', $e->getMessage());
         }
     }
 
@@ -703,7 +681,7 @@ public function testFileSizeButNoFileFound()
             $this->assertEquals(10, $this->adapter->getFileSize());
             $this->fail();
         } catch (Zend_File_Transfer_Exception $e) {
-            $this->assertContains('does not exist', $e->getMessage());
+            $this->assertStringContainsString('does not exist', $e->getMessage());
         }
     }
 
@@ -731,7 +709,7 @@ public function testMimeTypeButNoFileFound()
             $this->assertEquals('image/jpeg', $this->adapter->getMimeType());
             $this->fail();
         } catch (Zend_File_Transfer_Exception $e) {
-            $this->assertContains('does not exist', $e->getMessage());
+            $this->assertStringContainsString('does not exist', $e->getMessage());
         }
     }
 
@@ -758,7 +736,7 @@ public function testSetOwnErrorMessage()
             $this->assertEquals('image/jpeg', $this->adapter->getMimeType());
             $this->fail();
         } catch (Zend_File_Transfer_Exception $e) {
-            $this->assertContains('does not exist', $e->getMessage());
+            $this->assertStringContainsString('does not exist', $e->getMessage());
         }
     }
 
@@ -772,7 +750,7 @@ public function testTransferDestinationAtNonExistingElement()
             $this->assertTrue(is_string($this->adapter->getDestination('reallynonexisting')));
             $this->fail();
         } catch (Exception $e) {
-            $this->assertContains('not find', $e->getMessage());
+            $this->assertStringContainsString('not find', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/File/Transfer/Adapter/HttpTest.php b/tests/Zend/File/Transfer/Adapter/HttpTest.php
index 0eac4eb3..4af33355 100644
--- a/tests/Zend/File/Transfer/Adapter/HttpTest.php
+++ b/tests/Zend/File/Transfer/Adapter/HttpTest.php
@@ -82,19 +82,15 @@ public function testAutoSetUploadValidator()
         $this->assertTrue($test instanceof Zend_Validate_File_Upload);
     }
 
-    /**
-     * @expectedException Zend_File_Transfer_Exception
-     */
     public function testSendingFiles()
     {
+        $this->expectException(\Zend_File_Transfer_Exception::class);
         $this->adapter->send();
     }
 
-    /**
-     * @expectedException Zend_File_Transfer_Exception
-     */
     public function testFileIsSent()
     {
+        $this->expectException(\Zend_File_Transfer_Exception::class);
         $this->adapter->isSent();
     }
 
@@ -125,7 +121,7 @@ public function testReceiveUnknownFile()
         try {
             $this->assertFalse($this->adapter->receive('unknownFile'));
         } catch (Zend_File_Transfer_Exception $e) {
-            $this->assertContains('not find', $e->getMessage());
+            $this->assertStringContainsString('not find', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Filter/BooleanTest.php b/tests/Zend/Filter/BooleanTest.php
index 9e4b46b6..a1eafaf1 100644
--- a/tests/Zend/Filter/BooleanTest.php
+++ b/tests/Zend/Filter/BooleanTest.php
@@ -694,7 +694,7 @@ public function testSettingFalseType()
             $this->_filter->setType(true);
             $this->fail();
         } catch (Zend_Exception $e) {
-            $this->assertContains('Unknown', $e->getMessage());
+            $this->assertStringContainsString('Unknown', $e->getMessage());
         }
     }
 
@@ -715,7 +715,7 @@ public function testSettingFalseLocaleType()
             $this->_filter->setLocale(true);
             $this->fail();
         } catch (Zend_Exception $e) {
-            $this->assertContains('Locale has to be', $e->getMessage());
+            $this->assertStringContainsString('Locale has to be', $e->getMessage());
         }
     }
 
@@ -728,7 +728,7 @@ public function testSettingUnknownLocale()
             $this->_filter->setLocale('yy');
             $this->fail();
         } catch (Zend_Exception $e) {
-            $this->assertContains('Unknown locale', $e->getMessage());
+            $this->assertStringContainsString('Unknown locale', $e->getMessage());
         }
     }
 }
diff --git a/tests/Zend/Filter/Compress/Bz2Test.php b/tests/Zend/Filter/Compress/Bz2Test.php
index 44960f9a..cc7298e4 100644
--- a/tests/Zend/Filter/Compress/Bz2Test.php
+++ b/tests/Zend/Filter/Compress/Bz2Test.php
@@ -111,7 +111,7 @@ public function testBz2GetSetBlocksize()
             $filter->setBlocksize(15);
             $this->fail('Exception expected');
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('must be between', $e->getMessage());
+            $this->assertStringContainsString('must be between', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Filter/Compress/GzTest.php b/tests/Zend/Filter/Compress/GzTest.php
index b24fa035..3d74324d 100644
--- a/tests/Zend/Filter/Compress/GzTest.php
+++ b/tests/Zend/Filter/Compress/GzTest.php
@@ -113,7 +113,7 @@ public function testGzGetSetLevel()
             $filter->setLevel(15);
             $this->fail('Exception expected');
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('must be between', $e->getMessage());
+            $this->assertStringContainsString('must be between', $e->getMessage());
         }
     }
 
@@ -131,7 +131,7 @@ public function testGzGetSetMode()
             $filter->setMode('unknown');
             $this->fail('Exception expected');
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('mode not supported', $e->getMessage());
+            $this->assertStringContainsString('mode not supported', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Filter/Compress/RarTest.php b/tests/Zend/Filter/Compress/RarTest.php
index 0f0effb0..76b71087 100644
--- a/tests/Zend/Filter/Compress/RarTest.php
+++ b/tests/Zend/Filter/Compress/RarTest.php
@@ -197,7 +197,7 @@ public function testRarGetSetTarget()
             $filter->setTarget('/unknown/path/to/file.txt');
             $this->fails('Exception expected');
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('does not exist', $e->getMessage());
+            $this->assertStringContainsString('does not exist', $e->getMessage());
         }
     }
 
@@ -212,14 +212,14 @@ public function testSettingCallback()
             $filter->compress('test.txt');
             $this->fails('Exception expected');
         } catch (Exception $e) {
-            $this->assertContains('No compression callback', $e->getMessage());
+            $this->assertStringContainsString('No compression callback', $e->getMessage());
         }
 
         try {
             $filter->setCallback('invalidCallback');
             $this->fails('Exception expected');
         } catch (Exception $e) {
-            $this->assertContains('Callback can not be accessed', $e->getMessage());
+            $this->assertStringContainsString('Callback can not be accessed', $e->getMessage());
         }
 
         $callback = array('Zend_Filter_Compress_RarTest', 'rarCompress');
diff --git a/tests/Zend/Filter/Compress/TarTest.php b/tests/Zend/Filter/Compress/TarTest.php
index 0d50f546..b9855d3e 100644
--- a/tests/Zend/Filter/Compress/TarTest.php
+++ b/tests/Zend/Filter/Compress/TarTest.php
@@ -187,7 +187,7 @@ public function testTarGetSetTarget()
             $filter->setTarget('/unknown/path/to/file.txt');
             $this->fail('Exception expected');
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('does not exist', $e->getMessage());
+            $this->assertStringContainsString('does not exist', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Filter/Compress/ZipTest.php b/tests/Zend/Filter/Compress/ZipTest.php
index edb29117..d3b3d7a3 100644
--- a/tests/Zend/Filter/Compress/ZipTest.php
+++ b/tests/Zend/Filter/Compress/ZipTest.php
@@ -177,7 +177,7 @@ public function testZipGetSetTarget()
             $filter->setTarget('/unknown/path/to/file.txt');
             $this->fails('Exception expected');
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('does not exist', $e->getMessage());
+            $this->assertStringContainsString('does not exist', $e->getMessage());
         }
     }
 
@@ -271,10 +271,10 @@ public function testZipToString()
 
     /**
      * @group
-     * @expectedException Zend_Filter_Exception
      */
     public function testDecompressWillThrowExceptionWhenDecompressingWithNoTarget()
     {
+        $this->expectException(\Zend_Filter_Exception::class);
         $filter = new Zend_Filter_Compress_Zip(
             array(
                 'archive' => __DIR__ . '/../_files/compressed.zip',
@@ -299,10 +299,10 @@ public function testDecompressWillThrowExceptionWhenDecompressingWithNoTarget()
 
     /**
      * @group RS
-     * @expectedException Zend_Filter_Exception
      */
     public function testDecompressWillThrowExceptionWhenDetectingUpwardDirectoryTraversal()
     {
+        $this->expectException(\Zend_Filter_Exception::class);
         if (version_compare(PHP_VERSION, '5.2.8', '>=')) {
             $this->markTestSkipped('This test is to run on PHP less than 5.2.8');
 
diff --git a/tests/Zend/Filter/CompressTest.php b/tests/Zend/Filter/CompressTest.php
index ab0881cf..22e982ad 100644
--- a/tests/Zend/Filter/CompressTest.php
+++ b/tests/Zend/Filter/CompressTest.php
@@ -123,7 +123,7 @@ public function testGetSetBlocksize()
             $filter->setBlocksize(15);
             $this->fail('Exception expected');
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('must be between', $e->getMessage());
+            $this->assertStringContainsString('must be between', $e->getMessage());
         }
     }
 
@@ -198,7 +198,7 @@ public function testSetAdapter()
             $adapter = $filter->getAdapter();
             $this->fail('Invalid adapter should fail when retrieved');
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('does not implement', $e->getMessage());
+            $this->assertStringContainsString('does not implement', $e->getMessage());
         }
     }
 
@@ -230,7 +230,7 @@ public function testInvalidMethod()
             $filter->invalidMethod();
             $this->fail('Exception expected');
         } catch (Zend_Exception $e) {
-            $this->assertContains('Unknown method', $e->getMessage());
+            $this->assertStringContainsString('Unknown method', $e->getMessage());
         }
     }
 }
diff --git a/tests/Zend/Filter/File/LowerCaseTest.php b/tests/Zend/Filter/File/LowerCaseTest.php
index e94b818b..e9b9bee9 100644
--- a/tests/Zend/Filter/File/LowerCaseTest.php
+++ b/tests/Zend/Filter/File/LowerCaseTest.php
@@ -76,10 +76,10 @@ public function tearDown(): void
 
     public function testInstanceCreationAndNormalWorkflow()
     {
-        $this->assertContains('This is a File', file_get_contents($this->_newFile));
+        $this->assertStringContainsString('This is a File', file_get_contents($this->_newFile));
         $filter = new Zend_Filter_File_LowerCase();
         $filter->filter($this->_newFile);
-        $this->assertContains('this is a file', file_get_contents($this->_newFile));
+        $this->assertStringContainsString('this is a file', file_get_contents($this->_newFile));
     }
 
     public function testFileNotFoundException()
@@ -89,34 +89,34 @@ public function testFileNotFoundException()
             $filter->filter($this->_newFile . 'unknown');
             $this->fail('Unknown file exception expected');
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('not found', $e->getMessage());
+            $this->assertStringContainsString('not found', $e->getMessage());
         }
     }
 
     public function testCheckSettingOfEncodingInIstance()
     {
-        $this->assertContains('This is a File', file_get_contents($this->_newFile));
+        $this->assertStringContainsString('This is a File', file_get_contents($this->_newFile));
 
         try {
             $filter = new Zend_Filter_File_LowerCase('ISO-8859-1');
             $filter->filter($this->_newFile);
-            $this->assertContains('this is a file', file_get_contents($this->_newFile));
+            $this->assertStringContainsString('this is a file', file_get_contents($this->_newFile));
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('mbstring is required', $e->getMessage());
+            $this->assertStringContainsString('mbstring is required', $e->getMessage());
         }
     }
 
     public function testCheckSettingOfEncodingWithMethod()
     {
-        $this->assertContains('This is a File', file_get_contents($this->_newFile));
+        $this->assertStringContainsString('This is a File', file_get_contents($this->_newFile));
 
         try {
             $filter = new Zend_Filter_File_LowerCase();
             $filter->setEncoding('ISO-8859-1');
             $filter->filter($this->_newFile);
-            $this->assertContains('this is a file', file_get_contents($this->_newFile));
+            $this->assertStringContainsString('this is a file', file_get_contents($this->_newFile));
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('mbstring is required', $e->getMessage());
+            $this->assertStringContainsString('mbstring is required', $e->getMessage());
         }
     }
 }
diff --git a/tests/Zend/Filter/File/RenameTest.php b/tests/Zend/Filter/File/RenameTest.php
index c30de035..083020f3 100644
--- a/tests/Zend/Filter/File/RenameTest.php
+++ b/tests/Zend/Filter/File/RenameTest.php
@@ -335,7 +335,7 @@ public function testGetNewNameExceptionWithExistingFile()
             $this->assertEquals($this->_newFile, $filter->getNewName($this->_oldFile));
             $this->fail();
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('could not be renamed', $e->getMessage());
+            $this->assertStringContainsString('could not be renamed', $e->getMessage());
         }
     }
 
@@ -374,7 +374,7 @@ public function testAddFileWithInvalidOption()
             $filter->addFile(1234);
             $this->fail();
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('Invalid options', $e->getMessage());
+            $this->assertStringContainsString('Invalid options', $e->getMessage());
         }
     }
 
@@ -384,7 +384,7 @@ public function testInvalidContruction()
             $filter = new Zend_Filter_File_Rename(1234);
             $this->fail();
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('Invalid options', $e->getMessage());
+            $this->assertStringContainsString('Invalid options', $e->getMessage());
         }
     }
 }
diff --git a/tests/Zend/Filter/File/UpperCaseTest.php b/tests/Zend/Filter/File/UpperCaseTest.php
index c0975577..76e8e730 100644
--- a/tests/Zend/Filter/File/UpperCaseTest.php
+++ b/tests/Zend/Filter/File/UpperCaseTest.php
@@ -76,10 +76,10 @@ public function tearDown(): void
 
     public function testInstanceCreationAndNormalWorkflow()
     {
-        $this->assertContains('This is a File', file_get_contents($this->_newFile));
+        $this->assertStringContainsString('This is a File', file_get_contents($this->_newFile));
         $filter = new Zend_Filter_File_UpperCase();
         $filter->filter($this->_newFile);
-        $this->assertContains('THIS IS A FILE', file_get_contents($this->_newFile));
+        $this->assertStringContainsString('THIS IS A FILE', file_get_contents($this->_newFile));
     }
 
     public function testFileNotFoundException()
@@ -89,34 +89,34 @@ public function testFileNotFoundException()
             $filter->filter($this->_newFile . 'unknown');
             $this->fail('Unknown file exception expected');
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('not found', $e->getMessage());
+            $this->assertStringContainsString('not found', $e->getMessage());
         }
     }
 
     public function testCheckSettingOfEncodingInIstance()
     {
-        $this->assertContains('This is a File', file_get_contents($this->_newFile));
+        $this->assertStringContainsString('This is a File', file_get_contents($this->_newFile));
 
         try {
             $filter = new Zend_Filter_File_UpperCase('ISO-8859-1');
             $filter->filter($this->_newFile);
-            $this->assertContains('THIS IS A FILE', file_get_contents($this->_newFile));
+            $this->assertStringContainsString('THIS IS A FILE', file_get_contents($this->_newFile));
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('mbstring is required', $e->getMessage());
+            $this->assertStringContainsString('mbstring is required', $e->getMessage());
         }
     }
 
     public function testCheckSettingOfEncodingWithMethod()
     {
-        $this->assertContains('This is a File', file_get_contents($this->_newFile));
+        $this->assertStringContainsString('This is a File', file_get_contents($this->_newFile));
 
         try {
             $filter = new Zend_Filter_File_UpperCase();
             $filter->setEncoding('ISO-8859-1');
             $filter->filter($this->_newFile);
-            $this->assertContains('THIS IS A FILE', file_get_contents($this->_newFile));
+            $this->assertStringContainsString('THIS IS A FILE', file_get_contents($this->_newFile));
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('mbstring is required', $e->getMessage());
+            $this->assertStringContainsString('mbstring is required', $e->getMessage());
         }
     }
 }
diff --git a/tests/Zend/Filter/HtmlEntitiesTest.php b/tests/Zend/Filter/HtmlEntitiesTest.php
index 82f8bdb9..fc321330 100644
--- a/tests/Zend/Filter/HtmlEntitiesTest.php
+++ b/tests/Zend/Filter/HtmlEntitiesTest.php
@@ -221,7 +221,7 @@ public function testStripsUnknownCharactersWhenEncodingMismatchDetected()
         $result = $this->_filter->filter($string);
         restore_error_handler();
 
-        $this->assertContains('&quot;&quot;', $result);
+        $this->assertStringContainsString('&quot;&quot;', $result);
     }
 
     /**
diff --git a/tests/Zend/Filter/InflectorTest.php b/tests/Zend/Filter/InflectorTest.php
index 2b2081d1..a97da19b 100644
--- a/tests/Zend/Filter/InflectorTest.php
+++ b/tests/Zend/Filter/InflectorTest.php
@@ -385,11 +385,11 @@ protected function _testOptions($inflector)
         $rules = $inflector->getRules();
         foreach (array_values($options['rules'][':controller']) as $key => $rule) {
             $class = get_class($rules['controller'][$key]);
-            $this->assertContains($rule, $class);
+            $this->assertStringContainsString($rule, $class);
         }
         foreach (array_values($options['rules'][':action']) as $key => $rule) {
             $class = get_class($rules['action'][$key]);
-            $this->assertContains($rule, $class);
+            $this->assertStringContainsString($rule, $class);
         }
         $this->assertEquals($options['rules']['suffix'], $rules['suffix']);
     }
diff --git a/tests/Zend/Filter/InputTest.php b/tests/Zend/Filter/InputTest.php
index b7a15dfe..17979581 100644
--- a/tests/Zend/Filter/InputTest.php
+++ b/tests/Zend/Filter/InputTest.php
@@ -1448,6 +1448,7 @@ public function testSetPluginLoader()
         $loader = new Zend_Loader_PluginLoader();
 
         $input->setPluginLoader($loader, Zend_Filter_Input::VALIDATE);
+        self::assertTrue(true);
     }
 
     public function testSetPluginLoaderInvalidType()
@@ -1484,7 +1485,7 @@ public function testNamespaceExceptionClassNotFound()
         } catch (Zend_Exception $e) {
             $this->assertTrue($e instanceof Zend_Loader_PluginLoader_Exception,
                 'Expected object of type Zend_Filter_Exception, got ' . get_class($e));
-            $this->assertContains('not found in the registry', $e->getMessage());
+            $this->assertStringContainsString('not found in the registry', $e->getMessage());
         }
     }
 
@@ -2286,6 +2287,7 @@ public function testValidatorRuleCanHaveEmptyArrayAsMetacommandValue()
 
         $validate = new Zend_Filter_Input(null, $validators);
         $validate->isValid();
+        self::assertTrue(true);
     }
 }
 
diff --git a/tests/Zend/Filter/NullTest.php b/tests/Zend/Filter/NullTest.php
index ed24ab5f..a045db1e 100644
--- a/tests/Zend/Filter/NullTest.php
+++ b/tests/Zend/Filter/NullTest.php
@@ -243,7 +243,7 @@ public function testSettingFalseType()
             $this->_filter->setType(true);
             $this->fail();
         } catch (Zend_Exception $e) {
-            $this->assertContains('Unknown', $e->getMessage());
+            $this->assertStringContainsString('Unknown', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Filter/PregReplaceTest.php b/tests/Zend/Filter/PregReplaceTest.php
index 4d55a0e4..7151e092 100644
--- a/tests/Zend/Filter/PregReplaceTest.php
+++ b/tests/Zend/Filter/PregReplaceTest.php
@@ -110,6 +110,7 @@ public function testFilterThrowsExceptionWhenNoMatchPatternPresent()
             $filtered = $this->filter->filter($string);
             $this->fail('Replacement should fail when no match pattern present');
         } catch (Exception $e) {
+            self::assertTrue(true);
         }
     }
 
diff --git a/tests/Zend/Filter/RealPathTest.php b/tests/Zend/Filter/RealPathTest.php
index 810625b5..299ef17c 100644
--- a/tests/Zend/Filter/RealPathTest.php
+++ b/tests/Zend/Filter/RealPathTest.php
@@ -57,7 +57,7 @@ public function setUp(): void
     public function testFileExists()
     {
         $filename = 'file.1';
-        $this->assertContains($filename, $this->_filter->filter($this->_filesPath . DIRECTORY_SEPARATOR . $filename));
+        $this->assertStringContainsString($filename, $this->_filter->filter($this->_filesPath . DIRECTORY_SEPARATOR . $filename));
     }
 
     /**
diff --git a/tests/Zend/Filter/StringToLowerTest.php b/tests/Zend/Filter/StringToLowerTest.php
index 74ba22f5..c064dc7a 100644
--- a/tests/Zend/Filter/StringToLowerTest.php
+++ b/tests/Zend/Filter/StringToLowerTest.php
@@ -77,7 +77,7 @@ public function testWithEncoding()
                 $this->assertEquals($output, $this->_filter->filter($input));
             }
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('mbstring is required', $e->getMessage());
+            $this->assertStringContainsString('mbstring is required', $e->getMessage());
         }
     }
 
@@ -91,7 +91,7 @@ public function testFalseEncoding()
             $this->_filter->setEncoding('aaaaa');
             $this->fail();
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('is not supported', $e->getMessage());
+            $this->assertStringContainsString('is not supported', $e->getMessage());
         }
     }
 
@@ -112,7 +112,7 @@ public function testInitiationWithEncoding()
                 $this->assertEquals($output, $filter->filter($input));
             }
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('mbstring is required', $e->getMessage());
+            $this->assertStringContainsString('mbstring is required', $e->getMessage());
         }
     }
 
@@ -143,7 +143,7 @@ public function testCaseInsensitiveEncoding()
                 $this->assertEquals($output, $this->_filter->filter($input));
             }
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('mbstring is required', $e->getMessage());
+            $this->assertStringContainsString('mbstring is required', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Filter/StringToUpperTest.php b/tests/Zend/Filter/StringToUpperTest.php
index aea7e818..78c65565 100644
--- a/tests/Zend/Filter/StringToUpperTest.php
+++ b/tests/Zend/Filter/StringToUpperTest.php
@@ -77,7 +77,7 @@ public function testWithEncoding()
                 $this->assertEquals($output, $this->_filter->filter($input));
             }
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('mbstring is required', $e->getMessage());
+            $this->assertStringContainsString('mbstring is required', $e->getMessage());
         }
     }
 
@@ -91,7 +91,7 @@ public function testFalseEncoding()
             $this->_filter->setEncoding('aaaaa');
             $this->fail();
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('is not supported', $e->getMessage());
+            $this->assertStringContainsString('is not supported', $e->getMessage());
         }
     }
 
@@ -112,7 +112,7 @@ public function testInitiationWithEncoding()
                 $this->assertEquals($output, $filter->filter($input));
             }
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('mbstring is required', $e->getMessage());
+            $this->assertStringContainsString('mbstring is required', $e->getMessage());
         }
     }
 
@@ -143,7 +143,7 @@ public function testCaseInsensitiveEncoding()
                 $this->assertEquals($output, $this->_filter->filter($input));
             }
         } catch (Zend_Filter_Exception $e) {
-            $this->assertContains('mbstring is required', $e->getMessage());
+            $this->assertStringContainsString('mbstring is required', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Filter/StripTagsTest.php b/tests/Zend/Filter/StripTagsTest.php
index d208a74a..6dfefcb1 100644
--- a/tests/Zend/Filter/StripTagsTest.php
+++ b/tests/Zend/Filter/StripTagsTest.php
@@ -449,7 +449,7 @@ public function testDisallowedAttributesSplitOverMultipleLinesShouldBeStripped()
 =
     "alert(&quot;Gotcha&quot;); return false;">http://framework.zend.com/issues</a>';
         $filtered = $this->_filter->filter($input);
-        $this->assertNotContains('onclick', $filtered);
+        $this->assertStringNotContainsString('onclick', $filtered);
     }
 
     /**
diff --git a/tests/Zend/FilterTest.php b/tests/Zend/FilterTest.php
index 5b834a0b..1f5e0131 100644
--- a/tests/Zend/FilterTest.php
+++ b/tests/Zend/FilterTest.php
@@ -121,10 +121,10 @@ public function testStaticFactoryWithConstructorArguments()
      * Refactored to conform with ZF-2724.
      *
      * @group  ZF-2724
-     * @expectedException Zend_Filter_Exception
      */
     public function testStaticFactoryClassNotFound()
     {
+        $this->expectException(\Zend_Filter_Exception::class);
         Zend_Filter::filterStatic('1234', 'UnknownFilter');
     }
 
diff --git a/tests/Zend/Form/Decorator/AbstractTest.php b/tests/Zend/Form/Decorator/AbstractTest.php
index ef21763b..2d8b3cb1 100644
--- a/tests/Zend/Form/Decorator/AbstractTest.php
+++ b/tests/Zend/Form/Decorator/AbstractTest.php
@@ -115,7 +115,7 @@ public function testSetElementThrowsExceptionWithInvalidElementTypes()
             $this->decorator->setElement($config);
             $this->fail('Invalid element type should raise exception');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('Invalid element', $e->getMessage());
+            $this->assertStringContainsString('Invalid element', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Form/Decorator/CallbackTest.php b/tests/Zend/Form/Decorator/CallbackTest.php
index 472e9349..ea981aec 100644
--- a/tests/Zend/Form/Decorator/CallbackTest.php
+++ b/tests/Zend/Form/Decorator/CallbackTest.php
@@ -77,7 +77,7 @@ public function testInvalidCallbackRaisesException()
             $this->decorator->setCallback(true);
             $this->fail('Only string or array callbacks should be allowed');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('Invalid', $e->getMessage());
+            $this->assertStringContainsString('Invalid', $e->getMessage());
         }
 
         try {
@@ -85,21 +85,21 @@ public function testInvalidCallbackRaisesException()
             $this->decorator->setCallback($o);
             $this->fail('Only string or array callbacks should be allowed');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('Invalid', $e->getMessage());
+            $this->assertStringContainsString('Invalid', $e->getMessage());
         }
 
         try {
             $this->decorator->setCallback(array('foo', 'bar', 'baz'));
             $this->fail('Only arrays of two elements should be allowed as callbacks');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('Invalid', $e->getMessage());
+            $this->assertStringContainsString('Invalid', $e->getMessage());
         }
 
         try {
             $this->decorator->setCallback(array('foo'));
             $this->fail('Only arrays of two elements should be allowed as callbacks');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('Invalid', $e->getMessage());
+            $this->assertStringContainsString('Invalid', $e->getMessage());
         }
     }
 
@@ -113,9 +113,9 @@ public function testRenderCallsFunctionCallback()
             ->setElement($element);
 
         $content = $this->decorator->render('foo bar');
-        $this->assertContains('foo bar', $content);
-        $this->assertContains($element->getName(), $content);
-        $this->assertContains($element->getLabel(), $content);
+        $this->assertStringContainsString('foo bar', $content);
+        $this->assertStringContainsString($element->getName(), $content);
+        $this->assertStringContainsString($element->getLabel(), $content);
     }
 
     public function testRenderCallsMethodCallback()
@@ -128,10 +128,10 @@ public function testRenderCallsMethodCallback()
             ->setElement($element);
 
         $content = $this->decorator->render('foo bar');
-        $this->assertContains('foo bar', $content);
-        $this->assertContains($element->getName(), $content);
-        $this->assertContains($element->getLabel(), $content);
-        $this->assertContains('Item ', $content);
+        $this->assertStringContainsString('foo bar', $content);
+        $this->assertStringContainsString($element->getName(), $content);
+        $this->assertStringContainsString($element->getLabel(), $content);
+        $this->assertStringContainsString('Item ', $content);
     }
 
     public function testRenderCanPrepend()
@@ -144,9 +144,9 @@ public function testRenderCanPrepend()
             ->setElement($element);
 
         $content = $this->decorator->render('foo bar');
-        $this->assertContains('foo bar', $content);
-        $this->assertContains($element->getName(), $content);
-        $this->assertContains($element->getLabel(), $content);
+        $this->assertStringContainsString('foo bar', $content);
+        $this->assertStringContainsString($element->getName(), $content);
+        $this->assertStringContainsString($element->getLabel(), $content);
         $this->assertRegexp('/foo bar$/s', $content);
     }
 
@@ -160,9 +160,9 @@ public function testRenderCanReplaceContent()
             ->setElement($element);
 
         $content = $this->decorator->render('foo bar');
-        $this->assertNotContains('foo bar', $content, $content);
-        $this->assertContains($element->getName(), $content);
-        $this->assertContains($element->getLabel(), $content);
+        $this->assertStringNotContainsString('foo bar', $content, $content);
+        $this->assertStringContainsString($element->getName(), $content);
+        $this->assertStringContainsString($element->getLabel(), $content);
     }
 }
 
diff --git a/tests/Zend/Form/Decorator/DescriptionTest.php b/tests/Zend/Form/Decorator/DescriptionTest.php
index 822c01a3..bfc0f8c3 100644
--- a/tests/Zend/Form/Decorator/DescriptionTest.php
+++ b/tests/Zend/Form/Decorator/DescriptionTest.php
@@ -74,9 +74,9 @@ public function getView()
     public function testRendersDescriptionInParagraphTagsByDefault()
     {
         $html = $this->decorator->render('');
-        $this->assertContains('<p', $html, $html);
-        $this->assertContains('</p>', $html);
-        $this->assertContains($this->element->getDescription(), $html);
+        $this->assertStringContainsString('<p', $html, $html);
+        $this->assertStringContainsString('</p>', $html);
+        $this->assertStringContainsString($this->element->getDescription(), $html);
         $this->html = $html;
     }
 
@@ -90,9 +90,9 @@ public function testCanSpecifyAlternateTag()
     {
         $this->decorator->setTag('quote');
         $html = $this->decorator->render('');
-        $this->assertContains('<quote', $html, $html);
-        $this->assertContains('</quote>', $html);
-        $this->assertContains($this->element->getDescription(), $html);
+        $this->assertStringContainsString('<quote', $html, $html);
+        $this->assertStringContainsString('</quote>', $html);
+        $this->assertStringContainsString($this->element->getDescription(), $html);
         $this->html = $html;
     }
 
@@ -100,9 +100,9 @@ public function testCanSpecifyAlternateTagViaOption()
     {
         $this->decorator->setOption('tag', 'quote');
         $html = $this->decorator->render('');
-        $this->assertContains('<quote', $html, $html);
-        $this->assertContains('</quote>', $html);
-        $this->assertContains($this->element->getDescription(), $html);
+        $this->assertStringContainsString('<quote', $html, $html);
+        $this->assertStringContainsString('</quote>', $html);
+        $this->assertStringContainsString($this->element->getDescription(), $html);
         $this->html = $html;
     }
 
@@ -124,10 +124,10 @@ public function testRenderingEscapesDescriptionByDefault()
         $description = '<span>some spanned text</span>';
         $this->element->setDescription($description);
         $html = $this->decorator->render('');
-        $this->assertNotContains($description, $html);
-        $this->assertContains('&lt;', $html);
-        $this->assertContains('&gt;', $html);
-        $this->assertContains('some spanned text', $html);
+        $this->assertStringNotContainsString($description, $html);
+        $this->assertStringContainsString('&lt;', $html);
+        $this->assertStringContainsString('&gt;', $html);
+        $this->assertStringContainsString('some spanned text', $html);
     }
 
     public function testCanDisableEscapingDescription()
@@ -136,9 +136,9 @@ public function testCanDisableEscapingDescription()
         $this->element->setDescription($description);
         $this->decorator->setEscape(false);
         $html = $this->decorator->render('');
-        $this->assertContains($description, $html);
-        $this->assertNotContains('&lt;', $html);
-        $this->assertNotContains('&gt;', $html);
+        $this->assertStringContainsString($description, $html);
+        $this->assertStringNotContainsString('&lt;', $html);
+        $this->assertStringNotContainsString('&gt;', $html);
     }
 
     public function testCanSetEscapeFlagViaOption()
@@ -147,9 +147,9 @@ public function testCanSetEscapeFlagViaOption()
         $this->element->setDescription($description);
         $this->decorator->setOption('escape', false);
         $html = $this->decorator->render('');
-        $this->assertContains($description, $html);
-        $this->assertNotContains('&lt;', $html);
-        $this->assertNotContains('&gt;', $html);
+        $this->assertStringContainsString($description, $html);
+        $this->assertStringNotContainsString('&lt;', $html);
+        $this->assertStringNotContainsString('&gt;', $html);
     }
 
     public function testDescriptionIsTranslatedWhenTranslationAvailable()
@@ -160,7 +160,7 @@ public function testDescriptionIsTranslatedWhenTranslationAvailable()
         $this->element->setDescription('description')
             ->setTranslator($translate);
         $html = $this->decorator->render('');
-        $this->assertContains($translations['description'], $html);
+        $this->assertStringContainsString($translations['description'], $html);
     }
 
     /**
diff --git a/tests/Zend/Form/Decorator/ErrorsTest.php b/tests/Zend/Form/Decorator/ErrorsTest.php
index 77aedbc7..966d90a1 100644
--- a/tests/Zend/Form/Decorator/ErrorsTest.php
+++ b/tests/Zend/Form/Decorator/ErrorsTest.php
@@ -88,7 +88,7 @@ public function testRenderRendersAllErrorMessages()
         $this->setupElement();
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertContains($content, $test);
+        $this->assertStringContainsString($content, $test);
         foreach ($this->element->getMessages() as $message) {
             $this->assertContains($message, $test);
         }
@@ -116,7 +116,7 @@ public function testRenderSeparatesContentAndErrorsWithPhpEolByDefault()
         $this->setupElement();
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertContains($content . PHP_EOL . '<ul', $test);
+        $this->assertStringContainsString($content . PHP_EOL . '<ul', $test);
     }
 
     public function testRenderSeparatesContentAndErrorsWithCustomSeparatorWhenRequested()
@@ -125,7 +125,7 @@ public function testRenderSeparatesContentAndErrorsWithCustomSeparatorWhenReques
         $this->setupElement();
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertContains($content . $this->decorator->getSeparator() . '<ul', $test, $test);
+        $this->assertStringContainsString($content . $this->decorator->getSeparator() . '<ul', $test, $test);
     }
 
     /**
diff --git a/tests/Zend/Form/Decorator/FieldsetTest.php b/tests/Zend/Form/Decorator/FieldsetTest.php
index 936c425d..6a94443c 100644
--- a/tests/Zend/Form/Decorator/FieldsetTest.php
+++ b/tests/Zend/Form/Decorator/FieldsetTest.php
@@ -118,7 +118,7 @@ public function testCustomIdSupersedesElementId()
         $html = $this->decorator->setElement($form)
             ->setOption('id', 'foo-id')
             ->render('content');
-        $this->assertContains('foo-id', $html);
+        $this->assertStringContainsString('foo-id', $html);
     }
 
     /**
@@ -132,9 +132,9 @@ public function testActionAndMethodAttributesShouldNotBePresentInFieldsetTag()
             ->setView($this->getView());
         $this->decorator->setElement($form);
         $test = $this->decorator->render('content');
-        $this->assertContains('<fieldset', $test, $test);
-        $this->assertNotContains('action="', $test);
-        $this->assertNotContains('method="', $test);
+        $this->assertStringContainsString('<fieldset', $test, $test);
+        $this->assertStringNotContainsString('action="', $test);
+        $this->assertStringNotContainsString('method="', $test);
     }
 
     /**#@+
@@ -149,7 +149,7 @@ public function testIdShouldBePrefixedWithFieldset()
             ->setView($this->getView());
         $this->decorator->setElement($form);
         $test = $this->decorator->render('content');
-        $this->assertContains('id="fieldset-foobar"', $test);
+        $this->assertStringContainsString('id="fieldset-foobar"', $test);
     }
 
     public function testElementWithNoIdShouldNotCreateFieldsetId()
@@ -160,7 +160,7 @@ public function testElementWithNoIdShouldNotCreateFieldsetId()
             ->setView($this->getView());
         $this->decorator->setElement($form);
         $test = $this->decorator->render('content');
-        $this->assertNotContains('id="', $test);
+        $this->assertStringNotContainsString('id="', $test);
     }
     // #@-
 
@@ -176,8 +176,8 @@ public function testEnctypeAttributeShouldNotBePresentInFieldsetTag()
             ->setView($this->getView());
         $this->decorator->setElement($form);
         $test = $this->decorator->render('content');
-        $this->assertContains('<fieldset', $test, $test);
-        $this->assertNotContains('enctype="', $test);
+        $this->assertStringContainsString('<fieldset', $test, $test);
+        $this->assertStringNotContainsString('enctype="', $test);
     }
 
     /**
@@ -192,8 +192,8 @@ public function testHelperAttributeShouldNotBePresentInFieldsetTag()
             ->setView($this->getView());
         $this->decorator->setElement($form);
         $test = $this->decorator->render('content');
-        $this->assertContains('<fieldset', $test, $test);
-        $this->assertNotContains('helper="', $test);
+        $this->assertStringContainsString('<fieldset', $test, $test);
+        $this->assertStringNotContainsString('helper="', $test);
     }
 
     /**
@@ -208,7 +208,7 @@ public function testFieldsetIdOverridesFormId()
         $html = $this->decorator->setElement($form)
             ->setOption('id', 'fieldset-id')
             ->render('content');
-        $this->assertContains('<fieldset id="fieldset-id"', $html);
+        $this->assertStringContainsString('<fieldset id="fieldset-id"', $html);
     }
 
     /**
@@ -236,6 +236,6 @@ public function testFormIdOverridesFieldsetId()
 
         $html = $this->decorator->setElement($form)->render('content');
 
-        $this->assertContains('<fieldset id="fieldset-form-id"', $html);
+        $this->assertStringContainsString('<fieldset id="fieldset-form-id"', $html);
     }
 }
diff --git a/tests/Zend/Form/Decorator/FormErrorsTest.php b/tests/Zend/Form/Decorator/FormErrorsTest.php
index 4beeed09..6cfa3e43 100644
--- a/tests/Zend/Form/Decorator/FormErrorsTest.php
+++ b/tests/Zend/Form/Decorator/FormErrorsTest.php
@@ -139,11 +139,11 @@ public function testRenderRendersAllErrorMessages()
         $this->setupForm();
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertContains($content, $test);
+        $this->assertStringContainsString($content, $test);
         foreach ($this->form->getMessages() as $name => $messages) {
             foreach ($messages as $key => $message) {
                 if (is_string($message)) {
-                    $this->assertContains($message, $test, var_export($messages, 1));
+                    $this->assertStringContainsString($message, $test, var_export($messages, 1));
                 } else {
                     foreach ($message as $m) {
                         $this->assertContains($m, $test, var_export($messages, 1));
@@ -175,7 +175,7 @@ public function testRenderSeparatesContentAndErrorsWithPhpEolByDefault()
         $this->setupForm();
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertContains($content . PHP_EOL . '<ul', $test);
+        $this->assertStringContainsString($content . PHP_EOL . '<ul', $test);
     }
 
     public function testRenderSeparatesContentAndErrorsWithCustomSeparatorWhenRequested()
@@ -184,7 +184,7 @@ public function testRenderSeparatesContentAndErrorsWithCustomSeparatorWhenReques
         $this->setupForm();
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertContains($content . $this->decorator->getSeparator() . '<ul', $test, $test);
+        $this->assertStringContainsString($content . $this->decorator->getSeparator() . '<ul', $test, $test);
     }
 
     public function testIgnoreSubFormsFlagShouldBeFalseByDefault()
@@ -196,11 +196,11 @@ public function testLabelsShouldBeUsed()
     {
         $this->setupForm();
         $markup = $this->decorator->render('');
-        $this->assertContains('>Sub Foo: </b>', $markup, $markup);
-        $this->assertContains('>Sub Bar: </b>', $markup, $markup);
-        $this->assertContains('>Master Foo: </b>', $markup);
-        $this->assertNotContains('>Master Bar: </b>', $markup);
-        $this->assertContains('>bar</b>', $markup);
+        $this->assertStringContainsString('>Sub Foo: </b>', $markup, $markup);
+        $this->assertStringContainsString('>Sub Bar: </b>', $markup, $markup);
+        $this->assertStringContainsString('>Master Foo: </b>', $markup);
+        $this->assertStringNotContainsString('>Master Bar: </b>', $markup);
+        $this->assertStringContainsString('>bar</b>', $markup);
     }
 
     public function testMarkupOptionsMayBePassedViaSetOptions()
@@ -241,7 +241,7 @@ public function testMarkupOptionsShouldBeUsedWhenRendering()
         $markup = $this->decorator->render('');
         foreach ($options as $key => $value) {
             if ($key == 'ignoreSubForms') {
-                $this->assertNotContains('Sub ', $markup);
+                $this->assertStringNotContainsString('Sub ', $markup);
             } else {
                 $this->assertContains($value, $markup);
             }
@@ -255,11 +255,11 @@ public function testRenderIsArrayForm()
             ->setIsArray(true);
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertContains($content, $test);
+        $this->assertStringContainsString($content, $test);
         foreach ($this->form->getMessages() as $name => $messages) {
             while (($message = current($messages))) {
                 if (is_string($message)) {
-                    $this->assertContains($message, $test, var_export($messages, 1));
+                    $this->assertStringContainsString($message, $test, var_export($messages, 1));
                 }
                 if (false === next($messages) && is_array(prev($messages))) {
                     $messages = current($messages);
@@ -274,7 +274,7 @@ public function testCustomFormErrors()
         $this->form->addDecorator($this->decorator)
             ->addError('form-badness');
         $html = $this->form->render();
-        $this->assertContains('form-badness', $html);
+        $this->assertStringContainsString('form-badness', $html);
 
         $this->decorator->setOnlyCustomFormErrors(true);
         $html = $this->form->render();
@@ -282,7 +282,7 @@ public function testCustomFormErrors()
 
         $this->decorator->setShowCustomFormErrors(false);
         $html = $this->form->render();
-        $this->assertNotContains('form-badness', $html);
+        $this->assertStringNotContainsString('form-badness', $html);
     }
 
     /**
@@ -323,7 +323,7 @@ public function testRenderingEscapesFormErrorsByDefault()
         $this->form->addDecorator($this->decorator)
             ->addError('<strong>form-badness</strong>');
         $html = $this->form->render();
-        $this->assertContains('&lt;strong&gt;form-badness&lt;/strong&gt;', $html);
+        $this->assertStringContainsString('&lt;strong&gt;form-badness&lt;/strong&gt;', $html);
     }
 
     /**
@@ -343,8 +343,8 @@ public function testCanDisableEscapingFormErrors()
         $this->form->getDecorator('FormErrors')->setEscape(false);
 
         $html = $this->form->render();
-        $this->assertContains('<li><strong>form-badness</strong>', $html);
-        $this->assertContains('<li><b><strong>Sub Bar: </strong>', $html);
+        $this->assertStringContainsString('<li><strong>form-badness</strong>', $html);
+        $this->assertStringContainsString('<li><b><strong>Sub Bar: </strong>', $html);
     }
 
     /**
@@ -369,11 +369,11 @@ public function testElementNameIsTranslated()
 
         // Test
         $html = $this->form->render();
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<li><b>transleted label</b><ul class="errors">',
             $html
         );
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<li><b>translated name</b><ul class="errors">',
             $html
         );
diff --git a/tests/Zend/Form/Decorator/FormTest.php b/tests/Zend/Form/Decorator/FormTest.php
index e44fdc72..ebb1bc3e 100644
--- a/tests/Zend/Form/Decorator/FormTest.php
+++ b/tests/Zend/Form/Decorator/FormTest.php
@@ -101,7 +101,7 @@ public function testShouldPreferFormIdAttributeOverFormName()
             ->setAttrib('id', 'bazbat')
             ->setView($this->getView());
         $html = $form->render();
-        $this->assertContains('id="bazbat"', $html, $html);
+        $this->assertStringContainsString('id="bazbat"', $html, $html);
     }
 
     public function testEmptyFormNameShouldNotRenderEmptyFormId()
@@ -111,6 +111,6 @@ public function testEmptyFormNameShouldNotRenderEmptyFormId()
             ->setAction('/foo/bar')
             ->setView($this->getView());
         $html = $form->render();
-        $this->assertNotContains('id=""', $html, $html);
+        $this->assertStringNotContainsString('id=""', $html, $html);
     }
 }
diff --git a/tests/Zend/Form/Decorator/HtmlTagTest.php b/tests/Zend/Form/Decorator/HtmlTagTest.php
index bc51aa8a..e8a18b53 100644
--- a/tests/Zend/Form/Decorator/HtmlTagTest.php
+++ b/tests/Zend/Form/Decorator/HtmlTagTest.php
@@ -79,10 +79,10 @@ public function testRendersOptionsAsHtmlAttribsByDefault()
         $html = $this->decorator->render('');
         foreach ($options as $key => $value) {
             if ('tag' == $key) {
-                $this->assertContains('<' . $value, $html);
-                $this->assertContains('</' . $value . '>', $html);
+                $this->assertStringContainsString('<' . $value, $html);
+                $this->assertStringContainsString('</' . $value . '>', $html);
             } else {
-                $this->assertContains($key . '="' . $value . '"', $html);
+                $this->assertStringContainsString($key . '="' . $value . '"', $html);
             }
         }
     }
@@ -96,10 +96,10 @@ public function testDoesNotRenderAttribsWhenNoAttribsOptionSet()
         $html = $this->decorator->render('');
         foreach ($options as $key => $value) {
             if ('tag' == $key) {
-                $this->assertContains('<' . $value, $html);
-                $this->assertContains('</' . $value . '>', $html);
+                $this->assertStringContainsString('<' . $value, $html);
+                $this->assertStringContainsString('</' . $value . '>', $html);
             } else {
-                $this->assertNotContains($key . '="' . (string) $value . '"', $html);
+                $this->assertStringNotContainsString($key . '="' . (string) $value . '"', $html);
             }
         }
     }
@@ -113,12 +113,12 @@ public function testCanRenderOnlyOpeningTag()
         $html = $this->decorator->render('');
         foreach ($options as $key => $value) {
             if ('tag' == $key) {
-                $this->assertContains('<' . $value, $html);
-                $this->assertNotContains('</' . $value . '>', $html);
+                $this->assertStringContainsString('<' . $value, $html);
+                $this->assertStringNotContainsString('</' . $value . '>', $html);
             } elseif ('openOnly' == $key) {
-                $this->assertNotContains($key, $html);
+                $this->assertStringNotContainsString($key, $html);
             } else {
-                $this->assertContains($key . '="' . (string) $value . '"', $html);
+                $this->assertStringContainsString($key . '="' . (string) $value . '"', $html);
             }
         }
     }
@@ -132,10 +132,10 @@ public function testCanRenderOnlyClosingTag()
         $html = $this->decorator->render('');
         foreach ($options as $key => $value) {
             if ('tag' == $key) {
-                $this->assertNotContains('<' . $value, $html);
-                $this->assertContains('</' . $value . '>', $html);
+                $this->assertStringNotContainsString('<' . $value, $html);
+                $this->assertStringContainsString('</' . $value . '>', $html);
             } else {
-                $this->assertNotContains($key . '="' . (string) $value . '"', $html);
+                $this->assertStringNotContainsString($key . '="' . (string) $value . '"', $html);
             }
         }
     }
@@ -147,7 +147,7 @@ public function testArrayAttributesAreRenderedAsSpaceSeparatedLists()
         $this->decorator->setElement($element)
             ->setOptions($options);
         $html = $this->decorator->render('');
-        $this->assertContains('class="foobar bazbat"', $html);
+        $this->assertStringContainsString('class="foobar bazbat"', $html);
     }
 
     public function testAppendPlacementWithCloseOnlyRendersClosingTagFollowingContent()
diff --git a/tests/Zend/Form/Decorator/ImageTest.php b/tests/Zend/Form/Decorator/ImageTest.php
index 033ac0f3..dfd6060f 100644
--- a/tests/Zend/Form/Decorator/ImageTest.php
+++ b/tests/Zend/Form/Decorator/ImageTest.php
@@ -105,10 +105,10 @@ public function testRendersXhtmlImageTag()
         $this->decorator->setElement($element);
 
         $image = $this->decorator->render('');
-        $this->assertContains('<input', $image, $image);
-        $this->assertContains('src="foobar"', $image);
-        $this->assertContains('name="foo"', $image);
-        $this->assertContains('type="image"', $image);
+        $this->assertStringContainsString('<input', $image, $image);
+        $this->assertStringContainsString('src="foobar"', $image);
+        $this->assertStringContainsString('name="foo"', $image);
+        $this->assertStringContainsString('type="image"', $image);
     }
 
     public function testCanRenderImageWithinAdditionalTag()
@@ -149,8 +149,8 @@ public function testImageElementAttributesPassedWithDecoratorOptionsToViewHelper
             ->setOption('class', 'imageclass');
 
         $image = $this->decorator->render('');
-        $this->assertContains('class="imageclass"', $image);
-        $this->assertContains('onClick="foo()"', $image);
-        $this->assertContains('id="foo-element"', $image);
+        $this->assertStringContainsString('class="imageclass"', $image);
+        $this->assertStringContainsString('onClick="foo()"', $image);
+        $this->assertStringContainsString('id="foo-element"', $image);
     }
 }
diff --git a/tests/Zend/Form/Decorator/LabelTest.php b/tests/Zend/Form/Decorator/LabelTest.php
index d7f76b27..073297aa 100644
--- a/tests/Zend/Form/Decorator/LabelTest.php
+++ b/tests/Zend/Form/Decorator/LabelTest.php
@@ -94,7 +94,7 @@ public function testRenderUsesElementIdIfSet()
         $this->decorator->setElement($element);
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertContains('for="foobar"', $test);
+        $this->assertStringContainsString('for="foobar"', $test);
     }
 
     public function testRenderAddsOptionalClassForNonRequiredElements()
@@ -162,10 +162,10 @@ public function testRenderUtilizesOptionalSuffixesAndPrefixesWhenRequested()
         $this->decorator->setElement($element);
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertNotContains('-req-prefix-', $test, $test);
-        $this->assertNotContains('-req-suffix-', $test, $test);
-        $this->assertContains('-opt-prefix-', $test, $test);
-        $this->assertContains('-opt-suffix-', $test, $test);
+        $this->assertStringNotContainsString('-req-prefix-', $test, $test);
+        $this->assertStringNotContainsString('-req-suffix-', $test, $test);
+        $this->assertStringContainsString('-opt-prefix-', $test, $test);
+        $this->assertStringContainsString('-opt-suffix-', $test, $test);
         $this->assertRegexp('/-opt-prefix-[^-]*?My Label[^-]*-opt-suffix-/s', $test, $test);
     }
 
@@ -184,10 +184,10 @@ public function testRenderUtilizesRequiredSuffixesAndPrefixesWhenRequested()
         $this->decorator->setElement($element);
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertNotContains('-opt-prefix-', $test, $test);
-        $this->assertNotContains('-opt-suffix-', $test, $test);
-        $this->assertContains('-req-prefix-', $test, $test);
-        $this->assertContains('-req-suffix-', $test, $test);
+        $this->assertStringNotContainsString('-opt-prefix-', $test, $test);
+        $this->assertStringNotContainsString('-opt-suffix-', $test, $test);
+        $this->assertStringContainsString('-req-prefix-', $test, $test);
+        $this->assertStringContainsString('-req-suffix-', $test, $test);
         $this->assertRegexp('/-req-prefix-[^-]*?My Label[^-]*-req-suffix-/s', $test, $test);
     }
 
@@ -214,10 +214,10 @@ public function testRenderRendersLabel()
         $this->decorator->setElement($element);
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertContains($content, $test);
-        $this->assertContains($element->getLabel(), $test);
-        $this->assertContains('<label for=', $test);
-        $this->assertContains('</label>', $test);
+        $this->assertStringContainsString($content, $test);
+        $this->assertStringContainsString($element->getLabel(), $test);
+        $this->assertStringContainsString('<label for=', $test);
+        $this->assertStringContainsString('</label>', $test);
     }
 
     public function testRenderAppendsOnRequest()
@@ -240,7 +240,7 @@ public function testCanChooseNotToEscapeLabel()
         $this->decorator->setElement($element)
             ->setOptions(array('escape' => false));
         $test = $this->decorator->render('');
-        $this->assertContains($element->getLabel(), $test);
+        $this->assertStringContainsString($element->getLabel(), $test);
     }
 
     public function testRetrievingLabelRetrievesLabelWithTranslationAndPrefixAndSuffix()
diff --git a/tests/Zend/Form/Decorator/ViewHelperTest.php b/tests/Zend/Form/Decorator/ViewHelperTest.php
index 5c276204..a80cf1f6 100644
--- a/tests/Zend/Form/Decorator/ViewHelperTest.php
+++ b/tests/Zend/Form/Decorator/ViewHelperTest.php
@@ -122,7 +122,7 @@ public function testRenderThrowsExceptionIfNoViewSetInElement()
             $test = $this->decorator->render($content);
             $this->fail('Render should raise exception without view');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('ViewHelper decorator cannot render', $e->getMessage());
+            $this->assertStringContainsString('ViewHelper decorator cannot render', $e->getMessage());
         }
     }
 
@@ -132,7 +132,7 @@ public function testRenderRendersElementWithSpecifiedHelper()
         $element->setView($this->getView());
         $content = 'test content';
         $test = $this->decorator->render($content);
-        $this->assertContains($content, $test);
+        $this->assertStringContainsString($content, $test);
         $this->assertRegexp('#<input.*?name="foo"#s', $test);
     }
 
@@ -159,8 +159,8 @@ public function testMultiOptionsPassedToViewHelperAreTranslated()
         $element->setTranslator($translate);
         $test = $element->render($this->getView());
         foreach ($options as $key => $value) {
-            $this->assertNotContains($value, $test);
-            $this->assertContains($translations[$value], $test);
+            $this->assertStringNotContainsString($value, $test);
+            $this->assertStringContainsString($translations[$value], $test);
         }
     }
 
diff --git a/tests/Zend/Form/Decorator/ViewScriptTest.php b/tests/Zend/Form/Decorator/ViewScriptTest.php
index 956b7563..79c3cab3 100644
--- a/tests/Zend/Form/Decorator/ViewScriptTest.php
+++ b/tests/Zend/Form/Decorator/ViewScriptTest.php
@@ -81,7 +81,7 @@ public function testRenderRaisesExceptionIfNoViewScriptRegistered()
         try {
             $this->decorator->render('');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('script', $e->getMessage());
+            $this->assertStringContainsString('script', $e->getMessage());
         }
     }
 
@@ -136,7 +136,7 @@ public function testRenderingRendersViewScript()
     {
         $this->testCanSetViewScriptViaElementAttribute();
         $test = $this->decorator->render('');
-        $this->assertContains('This is content from the view script', $test);
+        $this->assertStringContainsString('This is content from the view script', $test);
     }
 
     public function testRenderingRendersViewScriptWithModule()
@@ -151,7 +151,7 @@ public function testRenderingRendersViewScriptWithModule()
 
         $this->getElement()->setAttrib('viewModule', $module);
         $test = $this->decorator->render('');
-        $this->assertContains('This is content from the view script', $test);
+        $this->assertStringContainsString('This is content from the view script', $test);
     }
 
     public function testOptionsArePassedToPartialAsVariables()
@@ -166,7 +166,7 @@ public function testOptionsArePassedToPartialAsVariables()
         $this->getElement();
         $test = $this->decorator->render('');
         foreach ($this->decorator->getOptions() as $key => $value) {
-            $this->assertContains("$key: $value", $test);
+            $this->assertStringContainsString("$key: $value", $test);
         }
     }
 
@@ -176,8 +176,8 @@ public function testCanReplaceContentBySpecifyingFalsePlacement()
             ->setOption('placement', false)
             ->setElement($this->getElement());
         $test = $this->decorator->render('content to decorate');
-        $this->assertNotContains('content to decorate', $test, $test);
-        $this->assertContains('This is content from the view script', $test);
+        $this->assertStringNotContainsString('content to decorate', $test, $test);
+        $this->assertStringContainsString('This is content from the view script', $test);
     }
 
     public function testContentCanBeRenderedWithinViewScript()
@@ -187,9 +187,9 @@ public function testContentCanBeRenderedWithinViewScript()
             ->setElement($this->getElement());
 
         $test = $this->decorator->render('content to decorate');
-        $this->assertContains('content to decorate', $test, $test);
-        $this->assertContains('This text prefixes the content', $test);
-        $this->assertContains('This text appends the content', $test);
+        $this->assertStringContainsString('content to decorate', $test, $test);
+        $this->assertStringContainsString('This text prefixes the content', $test);
+        $this->assertStringContainsString('This text appends the content', $test);
     }
 
     public function testDecoratorCanControlPlacementFromWithinViewScript()
@@ -198,13 +198,13 @@ public function testDecoratorCanControlPlacementFromWithinViewScript()
             ->setElement($this->getElement());
 
         $test = $this->decorator->render('content to decorate');
-        $this->assertContains('content to decorate', $test, $test);
+        $this->assertStringContainsString('content to decorate', $test, $test);
 
         $count = substr_count($test, 'content to decorate');
         $this->assertEquals(1, $count);
 
-        $this->assertContains('This text prefixes the content', $test);
-        $this->assertContains('This text appends the content', $test);
+        $this->assertStringContainsString('This text prefixes the content', $test);
+        $this->assertStringContainsString('This text appends the content', $test);
     }
 
     /**
diff --git a/tests/Zend/Form/DisplayGroupTest.php b/tests/Zend/Form/DisplayGroupTest.php
index ed6092d0..aa305ad0 100644
--- a/tests/Zend/Form/DisplayGroupTest.php
+++ b/tests/Zend/Form/DisplayGroupTest.php
@@ -90,7 +90,7 @@ public function testSetNameNormalizesValueToContainOnlyValidVariableCharacters()
             $this->group->setName('%\^&*)\(%$#@!.}{;-,');
             $this->fail('Empty names should raise exception');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('Invalid name provided', $e->getMessage());
+            $this->assertStringContainsString('Invalid name provided', $e->getMessage());
         }
     }
 
@@ -139,7 +139,7 @@ public function testPassingInvalidElementsToAddElementsThrowsException()
             $this->group->addElements($elements);
             $this->fail('Invalid elements should raise exception');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('must be Zend_Form_Elements only', $e->getMessage());
+            $this->assertStringContainsString('must be Zend_Form_Elements only', $e->getMessage());
         }
     }
 
@@ -228,7 +228,7 @@ public function testAddingInvalidDecoratorThrowsException()
             $this->group->addDecorator(123);
             $this->fail('Invalid decorator should raise exception');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('Invalid decorator', $e->getMessage());
+            $this->assertStringContainsString('Invalid decorator', $e->getMessage());
         }
     }
 
@@ -389,9 +389,9 @@ public function testRenderingRendersAllElementsWithinFieldsetByDefault()
         $this->group->addElements(array($foo, $bar));
         $html = $this->group->render($this->getView());
         $this->assertRegexp('#^<dt[^>]*>&\#160;</dt><dd[^>]*><fieldset.*?</fieldset></dd>$#s', $html, $html);
-        $this->assertContains('<input', $html, $html);
-        $this->assertContains('"foo"', $html);
-        $this->assertContains('"bar"', $html);
+        $this->assertStringContainsString('<input', $html, $html);
+        $this->assertStringContainsString('"foo"', $html);
+        $this->assertStringContainsString('"bar"', $html);
     }
 
     public function testToStringProxiesToRender()
@@ -403,9 +403,9 @@ public function testToStringProxiesToRender()
             ->setView($this->getView());
         $html = $this->group->__toString();
         $this->assertRegexp('#^<dt[^>]*>&\#160;</dt><dd[^>]*><fieldset.*?</fieldset></dd>$#s', $html, $html);
-        $this->assertContains('<input', $html);
-        $this->assertContains('"foo"', $html);
-        $this->assertContains('"bar"', $html);
+        $this->assertStringContainsString('<input', $html);
+        $this->assertStringContainsString('"foo"', $html);
+        $this->assertStringContainsString('"bar"', $html);
     }
 
     public function raiseDecoratorException($content, $element, $options)
@@ -511,7 +511,7 @@ public function testDisplayGroupIteratesElementsInExpectedOrderWhenFirstElementH
             ->addElement($c)
             ->setView($this->getView());
         $test = $this->group->render();
-        $this->assertContains('name="a"', $test);
+        $this->assertStringContainsString('name="a"', $test);
         if (!preg_match_all('/(<input[^>]+>)/', $test, $matches)) {
             $this->fail('Expected markup not found');
         }
@@ -535,6 +535,7 @@ public function testRemovingElementsShouldNotRaiseExceptionsDuringIteration()
         } catch (Exception $e) {
             static::fail('Exceptions should not be raised by iterator when elements are removed; error message: ' . $e->getMessage());
         }
+        self::assertTrue(true);
     }
 
     // Countable
@@ -579,6 +580,7 @@ public function testSetOptionsOmitsAccessorsRequiringObjectsOrMultipleParams()
         $options['translator'] = true;
         $options['attrib'] = true;
         $this->group->setOptions($options);
+        self::assertTrue(true);
     }
 
     public function testSetOptionsSetsArrayOfStringDecorators()
@@ -746,10 +748,10 @@ public function testGroupShouldOverloadToRenderDecorators()
 
     /**
      * @group ZF-3217
-     * @expectedException Zend_Form_Exception
      */
     public function testOverloadingToInvalidMethodsShouldThrowAnException()
     {
+        $this->expectException(\Zend_Form_Exception::class);
         $html = $this->group->bogusMethodCall();
     }
 
diff --git a/tests/Zend/Form/Element/ButtonTest.php b/tests/Zend/Form/Element/ButtonTest.php
index fb01cb1e..baa38289 100644
--- a/tests/Zend/Form/Element/ButtonTest.php
+++ b/tests/Zend/Form/Element/ButtonTest.php
@@ -127,8 +127,8 @@ public function testValuePropertyShouldNotBeRendered()
         $this->element->setLabel('Button Label')
             ->setView($this->getView());
         $html = $this->element->render();
-        $this->assertContains('Button Label', $html, $html);
-        $this->assertNotContains('value="', $html);
+        $this->assertStringContainsString('Button Label', $html, $html);
+        $this->assertStringNotContainsString('value="', $html);
     }
 
     public function testSetDefaultIgnoredToTrueWhenNotDefined()
diff --git a/tests/Zend/Form/Element/CheckboxTest.php b/tests/Zend/Form/Element/CheckboxTest.php
index 845e36fe..68ce579c 100644
--- a/tests/Zend/Form/Element/CheckboxTest.php
+++ b/tests/Zend/Form/Element/CheckboxTest.php
@@ -90,7 +90,7 @@ public function testCheckedAttributeNotRenderedByDefault()
         require_once 'Zend/View.php';
         $view = new Zend_View();
         $html = $this->element->render($view);
-        $this->assertNotContains('checked="checked"', $html);
+        $this->assertStringNotContainsString('checked="checked"', $html);
     }
 
     public function testCheckedAttributeRenderedWhenCheckedFlagTrue()
@@ -99,7 +99,7 @@ public function testCheckedAttributeRenderedWhenCheckedFlagTrue()
         $view = new Zend_View();
         $this->element->checked = true;
         $html = $this->element->render($view);
-        $this->assertContains('checked="checked"', $html);
+        $this->assertStringContainsString('checked="checked"', $html);
     }
 
     public function testCheckedValueDefaultsToOne()
diff --git a/tests/Zend/Form/Element/FileTest.php b/tests/Zend/Form/Element/FileTest.php
index f035390c..34bc32d1 100644
--- a/tests/Zend/Form/Element/FileTest.php
+++ b/tests/Zend/Form/Element/FileTest.php
@@ -118,11 +118,9 @@ public function testElementShouldAllowSpecifyingAdapterUsingConcreteInstance()
         $this->assertSame($adapter, $test);
     }
 
-    /**
-     * @expectedException Zend_Form_Element_Exception
-     */
     public function testElementShouldThrowExceptionWhenAddingAdapterOfInvalidType()
     {
+        $this->expectException(\Zend_Form_Element_Exception::class);
         $this->element->setTransferAdapter(new stdClass());
     }
 
@@ -227,8 +225,8 @@ public function testFileInSubSubSubform()
 
         $form->setView(new Zend_View());
         $output = (string) $form;
-        $this->assertContains('name="file1"', $output);
-        $this->assertContains('name="file2"', $output);
+        $this->assertStringContainsString('name="file1"', $output);
+        $this->assertStringContainsString('name="file2"', $output);
     }
 
     public function testMultiFileInSubSubSubform()
@@ -249,7 +247,7 @@ public function testMultiFileInSubSubSubform()
 
         $form->setView(new Zend_View());
         $output = (string) $form;
-        $this->assertContains('name="file[]"', $output);
+        $this->assertStringContainsString('name="file[]"', $output);
         $this->assertEquals(2, substr_count($output, 'file[]'));
     }
 
@@ -271,7 +269,7 @@ public function testMultiFileWithOneFile()
 
         $form->setView(new Zend_View());
         $output = (string) $form;
-        $this->assertNotContains('name="file[]"', $output);
+        $this->assertStringNotContainsString('name="file[]"', $output);
     }
 
     public function testSettingMaxFileSize()
@@ -377,7 +375,7 @@ public function testMarkerInterfaceForFileElement()
             $content = $this->element->render(new Zend_View());
             $this->fail();
         } catch (Zend_Form_Element_Exception $e) {
-            $this->assertContains('No file decorator found', $e->getMessage());
+            $this->assertStringContainsString('No file decorator found', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Form/Element/HashTest.php b/tests/Zend/Form/Element/HashTest.php
index 4063302a..6809f567 100644
--- a/tests/Zend/Form/Element/HashTest.php
+++ b/tests/Zend/Form/Element/HashTest.php
@@ -129,8 +129,8 @@ public function testLabelIsNull()
     public function testSessionNameContainsSaltAndName()
     {
         $sessionName = $this->element->getSessionName();
-        $this->assertContains($this->element->getSalt(), $sessionName);
-        $this->assertContains($this->element->getName(), $sessionName);
+        $this->assertStringContainsString($this->element->getSalt(), $sessionName);
+        $this->assertStringContainsString($this->element->getName(), $sessionName);
     }
 
     public function getView()
@@ -167,7 +167,7 @@ public function testRenderInitializesSessionHashToken()
     public function testHashTokenIsRendered()
     {
         $html = $this->element->render($this->getView());
-        $this->assertContains($this->element->getHash(), $html);
+        $this->assertStringContainsString($this->element->getHash(), $html);
     }
 
     public function testHiddenInputRenderedByDefault()
diff --git a/tests/Zend/Form/Element/ImageTest.php b/tests/Zend/Form/Element/ImageTest.php
index 09c75222..34032870 100644
--- a/tests/Zend/Form/Element/ImageTest.php
+++ b/tests/Zend/Form/Element/ImageTest.php
@@ -97,14 +97,14 @@ public function testImageSourceUsedWhenRenderingImage()
     {
         $this->testCanSetImageSourceViaAccessors();
         $html = $this->element->render(new Zend_View());
-        $this->assertContains('src="foo.gif"', $html);
+        $this->assertStringContainsString('src="foo.gif"', $html);
     }
 
     public function testHelperAttributeNotRenderedWhenRenderingImage()
     {
         $this->testCanSetImageSourceViaAccessors();
         $html = $this->element->render(new Zend_View());
-        $this->assertNotContains('helper="', $html);
+        $this->assertStringNotContainsString('helper="', $html);
     }
 
     public function testValueEmptyWhenRenderingImageByDefault()
@@ -114,7 +114,7 @@ public function testValueEmptyWhenRenderingImageByDefault()
         if (!strstr($html, 'value="')) {
             return;
         }
-        $this->assertContains('value=""', $html);
+        $this->assertStringContainsString('value=""', $html);
     }
 
     public function testLabelUsedAsAltAttribute()
@@ -154,9 +154,9 @@ public function testTitleAttributeGetsTranslated()
         $translator = new Zend_Translate_Adapter_Array(array('bar' => 'baz'), 'de');
         $this->element->setTranslator($translator);
         $html = $this->element->render(new Zend_View());
-        $this->assertContains('title', $html);
-        $this->assertContains('baz', $html);
-        $this->assertNotContains('bar', $html);
+        $this->assertStringContainsString('title', $html);
+        $this->assertStringContainsString('baz', $html);
+        $this->assertStringNotContainsString('bar', $html);
     }
 
     public function testTitleAttributeDoesNotGetTranslatedIfTranslatorIsDisabled()
@@ -167,9 +167,9 @@ public function testTitleAttributeDoesNotGetTranslatedIfTranslatorIsDisabled()
         // now disable translator and see if that works
         $this->element->setDisableTranslator(true);
         $html = $this->element->render(new Zend_View());
-        $this->assertContains('title', $html);
-        $this->assertContains('bar', $html);
-        $this->assertNotContains('baz', $html);
+        $this->assertStringContainsString('title', $html);
+        $this->assertStringContainsString('bar', $html);
+        $this->assertStringNotContainsString('baz', $html);
     }
 
     /**
diff --git a/tests/Zend/Form/Element/MultiCheckboxTest.php b/tests/Zend/Form/Element/MultiCheckboxTest.php
index 55a15afe..dbd602e8 100644
--- a/tests/Zend/Form/Element/MultiCheckboxTest.php
+++ b/tests/Zend/Form/Element/MultiCheckboxTest.php
@@ -146,7 +146,7 @@ public function testRenderingMulticheckboxCreatesCorrectArrayNotation()
         $this->element->addMultiOption(1, 'A');
         $this->element->addMultiOption(2, 'B');
         $html = $this->element->render($this->getView());
-        $this->assertContains('name="foo[]"', $html, $html);
+        $this->assertStringContainsString('name="foo[]"', $html, $html);
         $count = substr_count($html, 'name="foo[]"');
         $this->assertEquals(2, $count);
     }
@@ -258,6 +258,7 @@ public function testRetrievingErrorMessagesShouldNotResultInError()
             ->addErrorMessage('%value% is invalid');
         $this->element->isValid(array('foo', 'bogus'));
         $html = $this->element->render($this->getView());
+        self::assertTrue(true);
     }
 
     /**
diff --git a/tests/Zend/Form/Element/MultiselectTest.php b/tests/Zend/Form/Element/MultiselectTest.php
index 10e4d665..7268d223 100644
--- a/tests/Zend/Form/Element/MultiselectTest.php
+++ b/tests/Zend/Form/Element/MultiselectTest.php
@@ -223,7 +223,7 @@ public function testTranslatedOptionsAreRenderedInFinalMarkupWhenTranslatorPrese
 
         $html = $this->element->render($this->getView());
         foreach ($options as $value => $label) {
-            $this->assertNotContains($label, $html, $html);
+            $this->assertStringNotContainsString($label, $html, $html);
             $this->assertRegexp('/<option.*value="' . $value . '"[^>]*>' . $translations[$label] . '/s', $html, $html);
         }
     }
@@ -298,7 +298,7 @@ public function testOptGroupTranslationsShouldWorkAfterPopulatingElement()
         $this->element->setValue('barValue');
 
         $html = $this->element->render($this->getView());
-        $this->assertContains($translations['ThisIsTheLabel'], $html, $html);
+        $this->assertStringContainsString($translations['ThisIsTheLabel'], $html, $html);
     }
 
     /**
diff --git a/tests/Zend/Form/Element/PasswordTest.php b/tests/Zend/Form/Element/PasswordTest.php
index 3b5ecc0c..062adaac 100644
--- a/tests/Zend/Form/Element/PasswordTest.php
+++ b/tests/Zend/Form/Element/PasswordTest.php
@@ -146,10 +146,10 @@ public function testShouldPassRenderPasswordAttributeToViewHelper()
         $this->element->setValue('foobar')
             ->setView(new Zend_View());
         $test = $this->element->render();
-        $this->assertContains('value=""', $test);
+        $this->assertStringContainsString('value=""', $test);
 
         $this->element->setRenderPassword(true);
         $test = $this->element->render();
-        $this->assertContains('value="foobar"', $test);
+        $this->assertStringContainsString('value="foobar"', $test);
     }
 }
diff --git a/tests/Zend/Form/Element/RadioTest.php b/tests/Zend/Form/Element/RadioTest.php
index e104c989..748557af 100644
--- a/tests/Zend/Form/Element/RadioTest.php
+++ b/tests/Zend/Form/Element/RadioTest.php
@@ -179,7 +179,7 @@ public function testRenderingShouldCreateLabelWithoutForAttribute()
         ))
             ->setLabel('Foo');
         $html = $this->element->render($this->getView());
-        $this->assertNotContains('for="foo"', $html);
+        $this->assertStringNotContainsString('for="foo"', $html);
     }
 
     /**
@@ -218,7 +218,7 @@ public function testRenderingWithIndividualDecoratorsAsConstructorOptionsWithout
         ));
 
         $html = $element->render($this->getView());
-        $this->assertNotContains('<dt id="foo-label">&#160;</dt>', $html);
+        $this->assertStringNotContainsString('<dt id="foo-label">&#160;</dt>', $html);
     }
 
     /**
diff --git a/tests/Zend/Form/Element/SelectTest.php b/tests/Zend/Form/Element/SelectTest.php
index 1b3589d2..b1fdaec7 100644
--- a/tests/Zend/Form/Element/SelectTest.php
+++ b/tests/Zend/Form/Element/SelectTest.php
@@ -139,6 +139,7 @@ public function testTranslationShouldNotRaiseWarningsWithNestedGroups()
             ->setTranslator($translate)
             ->setView(new Zend_View());
         $html = $this->element->render();
+        self::assertTrue(true);
     }
 
     /**
@@ -173,8 +174,8 @@ public function testEmptyOptionsShouldNotBeTranslated()
         ));
         $this->element->setView($this->getView());
         $html = $this->element->render();
-        $this->assertNotContains('unused', $html, $html);
-        $this->assertContains('bar', $html, $html);
+        $this->assertStringNotContainsString('unused', $html, $html);
+        $this->assertStringContainsString('bar', $html, $html);
     }
 
     /**
@@ -227,7 +228,7 @@ public function testUsingPoundSymbolInOptionLabelShouldRenderCorrectly()
     {
         $this->element->addMultiOption('1', '£' . number_format(1));
         $html = $this->element->render($this->getView());
-        $this->assertContains('>£', $html);
+        $this->assertStringContainsString('>£', $html);
     }
 
     /**
diff --git a/tests/Zend/Form/Element/SubmitTest.php b/tests/Zend/Form/Element/SubmitTest.php
index 7c3757ab..15b92246 100644
--- a/tests/Zend/Form/Element/SubmitTest.php
+++ b/tests/Zend/Form/Element/SubmitTest.php
@@ -214,9 +214,9 @@ public function testTitleAttributeGetsTranslated()
         $translator = new Zend_Translate_Adapter_Array(array('bar' => 'baz'), 'de');
         $this->element->setTranslator($translator);
         $html = $this->element->render(new Zend_View());
-        $this->assertContains('title', $html);
-        $this->assertContains('baz', $html);
-        $this->assertNotContains('bar', $html);
+        $this->assertStringContainsString('title', $html);
+        $this->assertStringContainsString('baz', $html);
+        $this->assertStringNotContainsString('bar', $html);
     }
 
     public function testTitleAttributeDoesNotGetTranslatedIfTranslatorIsDisabled()
@@ -227,9 +227,9 @@ public function testTitleAttributeDoesNotGetTranslatedIfTranslatorIsDisabled()
         // now disable translator and see if that works
         $this->element->setDisableTranslator(true);
         $html = $this->element->render(new Zend_View());
-        $this->assertContains('title', $html);
-        $this->assertContains('bar', $html);
-        $this->assertNotContains('baz', $html);
+        $this->assertStringContainsString('title', $html);
+        $this->assertStringContainsString('bar', $html);
+        $this->assertStringNotContainsString('baz', $html);
     }
 
     public function testSetDefaultIgnoredToTrueWhenNotDefined()
diff --git a/tests/Zend/Form/ElementTest.php b/tests/Zend/Form/ElementTest.php
index 31ee7570..1cbe8eca 100644
--- a/tests/Zend/Form/ElementTest.php
+++ b/tests/Zend/Form/ElementTest.php
@@ -119,6 +119,7 @@ public function testConstructorRequiresMinimallyElementName()
         } catch (Zend_Form_Exception $e) {
             $this->fail('Zend_Form_Element constructor should accept Zend_Config with name element');
         }
+        self::assertTrue(true);
     }
 
     public function testNoTranslatorByDefault()
@@ -159,7 +160,7 @@ public function testSetNameNormalizesValueToContainOnlyValidVariableCharacters()
             $this->element->setName('%\^&*)\(%$#@!.}{;-,');
             $this->fail('Empty names should raise exception');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('Invalid name provided', $e->getMessage());
+            $this->assertStringContainsString('Invalid name provided', $e->getMessage());
         }
     }
 
@@ -183,7 +184,7 @@ public function testSetNameShouldNotAllowEmptyString()
                 $this->element->setName($name);
                 $this->fail('setName() should not allow empty string');
             } catch (Zend_Form_Exception $e) {
-                $this->assertContains('Invalid name', $e->getMessage());
+                $this->assertStringContainsString('Invalid name', $e->getMessage());
             }
         }
     }
@@ -196,7 +197,7 @@ public function testElementValueInitiallyNull()
     public function testValueAccessorsWork()
     {
         $this->element->setValue('bar');
-        $this->assertContains('bar', $this->element->getValue());
+        $this->assertStringContainsString('bar', $this->element->getValue());
     }
 
     public function testGetValueFiltersValue()
@@ -246,9 +247,9 @@ public function testRetrievingArrayValueDoesNotFilterAllValuesWhenNotIsArray()
         $this->assertTrue(is_array($test));
         require_once 'Zend/Json.php';
         $test = Zend_Json::encode($test);
-        $this->assertNotContains('foo', $test);
+        $this->assertStringNotContainsString('foo', $test);
         foreach (array('bar', 'baz', 'bat') as $value) {
-            $this->assertContains($value, $test);
+            $this->assertStringContainsString($value, $test);
         }
     }
 
@@ -418,7 +419,7 @@ public function testSetAttribThrowsExceptionsForKeysWithLeadingUnderscores()
             $this->element->setAttrib('_foo', 'bar');
             $this->fail('setAttrib() should throw an exception for invalid keys');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('Invalid attribute', $e->getMessage());
+            $this->assertStringContainsString('Invalid attribute', $e->getMessage());
         }
     }
 
@@ -484,7 +485,7 @@ public function testRetrievingOverloadedValuesThrowsExceptionWithInvalidKey()
             $name = $this->element->_name;
             $this->fail('Overloading should not return protected or private members');
         } catch (Zend_Form_Exception $e) {
-            static::assertContains('Cannot retrieve value for protected/private', $e->getMessage());
+            static::assertStringContainsString('Cannot retrieve value for protected/private', $e->getMessage());
         }
     }
 
@@ -501,7 +502,7 @@ public function testGetPluginLoaderRetrievesDefaultValidatorPluginLoader()
         $paths = $loader->getPaths(\Zend_Validate::class);
         $this->assertTrue(is_array($paths), var_export($loader, 1));
         $this->assertTrue(0 < (is_countable($paths) ? count($paths) : 0));
-        $this->assertContains('Validate', $paths[0]);
+        $this->assertStringContainsString('Validate', $paths[0]);
     }
 
     public function testGetPluginLoaderRetrievesDefaultFilterPluginLoader()
@@ -511,7 +512,7 @@ public function testGetPluginLoaderRetrievesDefaultFilterPluginLoader()
         $paths = $loader->getPaths(\Zend_Filter::class);
         $this->assertTrue(is_array($paths));
         $this->assertTrue(0 < (is_countable($paths) ? count($paths) : 0));
-        $this->assertContains('Filter', $paths[0]);
+        $this->assertStringContainsString('Filter', $paths[0]);
     }
 
     public function testGetPluginLoaderRetrievesDefaultDecoratorPluginLoader()
@@ -521,7 +522,7 @@ public function testGetPluginLoaderRetrievesDefaultDecoratorPluginLoader()
         $paths = $loader->getPaths('Zend_Form_Decorator');
         $this->assertTrue(is_array($paths));
         $this->assertTrue(0 < (is_countable($paths) ? count($paths) : 0));
-        $this->assertContains('Decorator', $paths[0]);
+        $this->assertStringContainsString('Decorator', $paths[0]);
     }
 
     public function testCanSetCustomValidatorPluginLoader()
@@ -540,7 +541,7 @@ public function testPassingInvalidTypeToSetPluginLoaderThrowsException()
             $this->element->setPluginLoader($loader, 'foo');
             $this->fail('Invalid loader type should raise exception');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('Invalid type', $e->getMessage());
+            $this->assertStringContainsString('Invalid type', $e->getMessage());
         }
     }
 
@@ -550,7 +551,7 @@ public function testPassingInvalidTypeToGetPluginLoaderThrowsException()
             $this->element->getPluginLoader('foo');
             $this->fail('Invalid loader type should raise exception');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('Invalid type', $e->getMessage());
+            $this->assertStringContainsString('Invalid type', $e->getMessage());
         }
     }
 
@@ -576,7 +577,7 @@ public function testPassingInvalidLoaderTypeToAddPrefixPathThrowsException()
             $this->element->addPrefixPath('Zend_Foo', 'Zend/Foo/', 'foo');
             $this->fail('Invalid loader type should raise exception');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('Invalid type', $e->getMessage());
+            $this->assertStringContainsString('Invalid type', $e->getMessage());
         }
     }
 
@@ -586,7 +587,7 @@ public function testCanAddValidatorPluginLoaderPrefixPath()
         $this->element->addPrefixPath(\Zend_Form::class, 'Zend/Form/', 'validate');
         $paths = $loader->getPaths(\Zend_Form::class);
         $this->assertTrue(is_array($paths));
-        $this->assertContains('Form', $paths[0]);
+        $this->assertStringContainsString('Form', $paths[0]);
     }
 
     public function testAddingValidatorPluginLoaderPrefixPathDoesNotAffectOtherLoaders()
@@ -605,7 +606,7 @@ public function testCanAddFilterPluginLoaderPrefixPath()
         $this->element->addPrefixPath(\Zend_Form::class, 'Zend/Form/', 'validate');
         $paths = $loader->getPaths(\Zend_Form::class);
         $this->assertTrue(is_array($paths));
-        $this->assertContains('Form', $paths[0]);
+        $this->assertStringContainsString('Form', $paths[0]);
     }
 
     public function testAddingFilterPluginLoaderPrefixPathDoesNotAffectOtherLoaders()
@@ -624,7 +625,7 @@ public function testCanAddDecoratorPluginLoaderPrefixPath()
         $this->element->addPrefixPath('Zend_Foo', 'Zend/Foo/', 'decorator');
         $paths = $loader->getPaths('Zend_Foo');
         $this->assertTrue(is_array($paths));
-        $this->assertContains('Foo', $paths[0]);
+        $this->assertStringContainsString('Foo', $paths[0]);
     }
 
     public function testAddingDecoratorrPluginLoaderPrefixPathDoesNotAffectOtherLoaders()
@@ -649,15 +650,15 @@ public function testCanAddAllPluginLoaderPrefixPathsSimultaneously()
 
         $paths = $filterLoader->getPaths(\Zend_Filter::class);
         $this->assertTrue(is_array($paths));
-        $this->assertContains('Filter', $paths[0]);
+        $this->assertStringContainsString('Filter', $paths[0]);
 
         $paths = $validatorLoader->getPaths(\Zend_Validate::class);
         $this->assertTrue(is_array($paths));
-        $this->assertContains('Validate', $paths[0]);
+        $this->assertStringContainsString('Validate', $paths[0]);
 
         $paths = $decoratorLoader->getPaths('Zend_Decorator');
         $this->assertTrue(is_array($paths), var_export($paths, 1));
-        $this->assertContains('Decorator', $paths[0]);
+        $this->assertStringContainsString('Decorator', $paths[0]);
     }
 
     public function testPassingInvalidValidatorToAddValidatorThrowsException()
@@ -666,7 +667,7 @@ public function testPassingInvalidValidatorToAddValidatorThrowsException()
             $this->element->addValidator(123);
             $this->fail('Invalid validator should raise exception');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('Invalid validator', $e->getMessage());
+            $this->assertStringContainsString('Invalid validator', $e->getMessage());
         }
     }
 
@@ -985,7 +986,7 @@ public function testAddingErrorToArrayElementShouldLoopOverAllValues()
         $errors = Zend_Json::encode($errors);
         foreach (array('foo', 'bar', 'baz') as $value) {
             $message = 'error with value ' . $value;
-            $this->assertContains($message, $errors);
+            $this->assertStringContainsString($message, $errors);
         }
     }
 
@@ -1016,8 +1017,8 @@ public function testTranslatedMessagesCanContainVariableSubstitution()
             }
         }
         $this->assertTrue($found, 'String Empty message not found: ' . var_export($messages, 1));
-        $this->assertContains(' "abc"', $message);
-        $this->assertContains('Translating the notDigits string', $message);
+        $this->assertStringContainsString(' "abc"', $message);
+        $this->assertStringContainsString('Translating the notDigits string', $message);
     }
 
     public function testCanRemoveValidator()
@@ -1057,6 +1058,7 @@ public function testCanValidateElement()
         } catch (Exception $e) {
             $this->fail('Validating an element should work');
         }
+        self::assertTrue(true);
     }
 
     public function testCanValidateArrayValue()
@@ -1141,7 +1143,7 @@ public function testAddingInvalidFilterTypeThrowsException()
             $this->element->addFilter(123);
             $this->fail('Invalid filter type should raise exception');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('Invalid filter', $e->getMessage());
+            $this->assertStringContainsString('Invalid filter', $e->getMessage());
         }
     }
 
@@ -1368,7 +1370,7 @@ public function testAddingInvalidDecoratorThrowsException()
             $this->element->addDecorator(123);
             $this->fail('Invalid decorator type should raise exception');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('Invalid decorator', $e->getMessage());
+            $this->assertStringContainsString('Invalid decorator', $e->getMessage());
         }
     }
 
@@ -1554,8 +1556,8 @@ public function testRenderElementReturnsMarkup()
         $html = $this->element->render($this->getView());
         $this->assertTrue(is_string($html));
         $this->assertFalse(empty($html));
-        $this->assertContains('<input', $html);
-        $this->assertContains('"foo"', $html);
+        $this->assertStringContainsString('<input', $html);
+        $this->assertStringContainsString('"foo"', $html);
     }
 
     public function testRenderElementRendersLabelWhenProvided()
@@ -1566,9 +1568,9 @@ public function testRenderElementRendersLabelWhenProvided()
         $html = $this->element->render();
         $this->assertTrue(is_string($html));
         $this->assertFalse(empty($html));
-        $this->assertContains('<label', $html);
-        $this->assertContains('Foo', $html);
-        $this->assertContains('</label>', $html);
+        $this->assertStringContainsString('<label', $html);
+        $this->assertStringContainsString('Foo', $html);
+        $this->assertStringContainsString('</label>', $html);
     }
 
     public function testRenderElementRendersValueWhenProvided()
@@ -1579,9 +1581,9 @@ public function testRenderElementRendersValueWhenProvided()
         $html = $this->element->render();
         $this->assertTrue(is_string($html));
         $this->assertFalse(empty($html));
-        $this->assertContains('<input', $html);
-        $this->assertContains('"foo"', $html);
-        $this->assertContains('"bar"', $html);
+        $this->assertStringContainsString('<input', $html);
+        $this->assertStringContainsString('"foo"', $html);
+        $this->assertStringContainsString('"bar"', $html);
     }
 
     public function testRenderElementRendersErrorsWhenProvided()
@@ -1597,7 +1599,7 @@ public function testRenderElementRendersErrorsWhenProvided()
         $html = $this->element->render();
         $this->assertTrue(is_string($html));
         $this->assertFalse(empty($html));
-        $this->assertContains('error', $html);
+        $this->assertStringContainsString('error', $html);
         $this->assertRegexp('/empty/i', $html);
     }
 
@@ -1608,8 +1610,8 @@ public function testToStringProxiesToRender()
         $html = $this->element->__toString();
         $this->assertTrue(is_string($html));
         $this->assertFalse(empty($html));
-        $this->assertContains('<input', $html);
-        $this->assertContains('"foo"', $html);
+        $this->assertStringContainsString('<input', $html);
+        $this->assertStringContainsString('"foo"', $html);
     }
 
     public function raiseDecoratorException($content, $element, $options)
@@ -1676,6 +1678,7 @@ public function testSetOptionsSkipsCallsToSetOptionsAndSetConfig()
         $options['config'] = $config;
         $options['options'] = $config->toArray();
         $this->element->setOptions($options);
+        self::assertTrue(true);
     }
 
     public function testSetOptionsSkipsSettingAccessorsRequiringObjectsWhenNoObjectPresent()
@@ -1685,6 +1688,7 @@ public function testSetOptionsSkipsSettingAccessorsRequiringObjectsWhenNoObjectP
         $options['pluginLoader'] = true;
         $options['view'] = true;
         $this->element->setOptions($options);
+        self::assertTrue(true);
     }
 
     public function testSetOptionsSetsArrayOfStringValidators()
@@ -1882,7 +1886,7 @@ public function testSetOptionsSetsGlobalPrefixPaths()
             $paths = $loader->getPaths('Zend_Foo_' . ucfirst($type));
             $this->assertTrue(is_array($paths), "Failed for type $type: " . var_export($paths, 1));
             $this->assertFalse(empty($paths));
-            $this->assertContains('Foo', $paths[0]);
+            $this->assertStringContainsString('Foo', $paths[0]);
         }
     }
 
@@ -1898,7 +1902,7 @@ public function testSetOptionsSetsIndividualPrefixPathsFromKeyedArrays()
         $paths = $loader->getPaths('Zend_Foo');
         $this->assertTrue(is_array($paths));
         $this->assertFalse(empty($paths));
-        $this->assertContains('Foo', $paths[0]);
+        $this->assertStringContainsString('Foo', $paths[0]);
     }
 
     public function testSetOptionsSetsIndividualPrefixPathsFromUnKeyedArrays()
@@ -1913,7 +1917,7 @@ public function testSetOptionsSetsIndividualPrefixPathsFromUnKeyedArrays()
         $paths = $loader->getPaths('Zend_Foo');
         $this->assertTrue(is_array($paths));
         $this->assertFalse(empty($paths));
-        $this->assertContains('Foo', $paths[0]);
+        $this->assertStringContainsString('Foo', $paths[0]);
     }
 
     public function testCanSetObjectStateViaSetConfig()
@@ -1982,23 +1986,23 @@ public function testElementShouldOverloadToRenderDecorators()
         $this->element->setLabel('Foo Label')
             ->setView($this->getView());
         $html = $this->element->renderViewHelper();
-        $this->assertContains('<input', $html);
-        $this->assertContains('id="' . $this->element->getFullyQualifiedName() . '"', $html, 'Received: ' . $html);
+        $this->assertStringContainsString('<input', $html);
+        $this->assertStringContainsString('id="' . $this->element->getFullyQualifiedName() . '"', $html, 'Received: ' . $html);
         $this->assertNotContains('<dd', $html);
         $this->assertNotContains('<label', $html);
 
         $html = $this->element->renderLabel('this is the content');
         $this->assertRegexp('#<label[^>]*for="' . $this->element->getFullyQualifiedName() . '"[^>]*>Foo Label</label>#', $html);
-        $this->assertContains('this is the content', $html);
+        $this->assertStringContainsString('this is the content', $html);
         $this->assertNotContains('<input', $html);
     }
 
     /**
      * @group ZF-3217
-     * @expectedException Zend_Form_Element_Exception
      */
     public function testOverloadingToInvalidMethodsShouldThrowAnException()
     {
+        $this->expectException(\Zend_Form_Element_Exception::class);
         $html = $this->element->bogusMethodCall();
     }
 
@@ -2228,15 +2232,15 @@ public function testCanAddPluginLoaderPrefixPathsWithBackslashes()
 
         $paths = $filterLoader->getPaths('Zf\Foo\Filter');
         $this->assertTrue(is_array($paths));
-        $this->assertContains('Filter', $paths[0]);
+        $this->assertStringContainsString('Filter', $paths[0]);
 
         $paths = $validatorLoader->getPaths('Zf\Foo\Validate');
         $this->assertTrue(is_array($paths));
-        $this->assertContains('Validate', $paths[0]);
+        $this->assertStringContainsString('Validate', $paths[0]);
 
         $paths = $decoratorLoader->getPaths('Zf\Foo\Decorator');
         $this->assertTrue(is_array($paths), var_export($paths, 1));
-        $this->assertContains('Decorator', $paths[0]);
+        $this->assertStringContainsString('Decorator', $paths[0]);
     }
 
     /**
diff --git a/tests/Zend/Form/FormTest.php b/tests/Zend/Form/FormTest.php
index 1db272b9..3d39d012 100644
--- a/tests/Zend/Form/FormTest.php
+++ b/tests/Zend/Form/FormTest.php
@@ -120,6 +120,7 @@ public function testSetOptionsSkipsCallsToSetOptionsAndSetConfig()
         $options['config'] = $config;
         $options['options'] = $config->toArray();
         $this->form->setOptions($options);
+        self::assertTrue(true);
     }
 
     public function testSetOptionsSkipsSettingAccessorsRequiringObjectsWhenNonObjectPassed()
@@ -131,6 +132,7 @@ public function testSetOptionsSkipsSettingAccessorsRequiringObjectsWhenNonObject
         $options['default'] = true;
         $options['attrib'] = true;
         $this->form->setOptions($options);
+        self::assertTrue(true);
     }
 
     public function testSetOptionsWithAttribsDoesNotOverwriteActionOrMethodOrName()
@@ -379,6 +381,7 @@ public function testDisplayGroupOrderInConfigShouldNotMatter()
         $config = new Zend_Config_Xml(__DIR__ . '/_files/config/zf3250.xml', 'sitearea', true);
         $form = new Zend_Form($config->test);
         // no assertions needed; throws error if order matters
+        self::assertTrue(true);
     }
 
     /**
@@ -548,7 +551,7 @@ public function testSetNameNormalizesValueToContainOnlyValidVariableCharacters()
             $this->form->setName('%\^&*)\(%$#@!.}{;-,');
             $this->fail('Empty names should raise exception');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('Invalid name provided', $e->getMessage());
+            $this->assertStringContainsString('Invalid name provided', $e->getMessage());
         }
     }
 
@@ -574,7 +577,7 @@ public function testCanSetActionWithGetParams()
             ->setView(new Zend_View());
         $html = $this->form->render();
 
-        $this->assertContains('action="/foo.php?bar"', $html);
+        $this->assertStringContainsString('action="/foo.php?bar"', $html);
         $this->assertEquals('/foo.php?bar', $this->form->getAction());
     }
 
@@ -601,7 +604,7 @@ public function testMethodLimitedToGetPostPutAndDelete()
             $this->form->setMethod('bogus');
             $this->fail('Invalid method type should throw exception');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('invalid', $e->getMessage());
+            $this->assertStringContainsString('invalid', $e->getMessage());
         }
     }
 
@@ -664,7 +667,7 @@ public function testPassingInvalidTypeToSetPluginLoaderThrowsException()
             $this->form->setPluginLoader($loader, 'foo');
             $this->fail('Invalid plugin loader type should raise exception');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('Invalid type', $e->getMessage());
+            $this->assertStringContainsString('Invalid type', $e->getMessage());
         }
     }
 
@@ -674,7 +677,7 @@ public function testPassingInvalidTypeToGetPluginLoaderThrowsException()
             $this->form->getPluginLoader('foo');
             $this->fail('Invalid plugin loader type should raise exception');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('Invalid type', $e->getMessage());
+            $this->assertStringContainsString('Invalid type', $e->getMessage());
         }
     }
 
@@ -692,7 +695,7 @@ public function testPassingInvalidTypeToAddPrefixPathThrowsException()
             $this->form->addPrefixPath('Zend_Foo', 'Zend/Foo/', 'foo');
             $this->fail('Passing invalid loader type to addPrefixPath() should raise exception');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('Invalid type', $e->getMessage());
+            $this->assertStringContainsString('Invalid type', $e->getMessage());
         }
     }
 
@@ -821,7 +824,7 @@ public function testAddElementAsStringElementThrowsExceptionWhenNoNameProvided()
             $this->form->addElement('text');
             $this->fail('Should not be able to specify string element type without name');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('must have', $e->getMessage());
+            $this->assertStringContainsString('must have', $e->getMessage());
         }
     }
 
@@ -1026,15 +1029,15 @@ public function testOverloadingSetThrowsExceptionForInvalidTypes()
             $this->form->foo = true;
             $this->fail('Overloading should not allow scalars');
         } catch (Zend_Form_Exception $e) {
-            static::assertContains('Only form elements and groups may be overloaded', $e->getMessage());
+            static::assertStringContainsString('Only form elements and groups may be overloaded', $e->getMessage());
         }
 
         try {
             $this->form->foo = new Zend_Config(array());
             $this->fail('Overloading should not allow arbitrary object types');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('Only form elements and groups may be overloaded', $e->getMessage());
-            $this->assertContains(\Zend_Config::class, $e->getMessage());
+            $this->assertStringContainsString('Only form elements and groups may be overloaded', $e->getMessage());
+            $this->assertStringContainsString(\Zend_Config::class, $e->getMessage());
         }
     }
 
@@ -1152,8 +1155,8 @@ public function testElementsInDisplayGroupsShouldInheritFormElementsBelongToSett
             ->setView(new Zend_View());
         $html = $this->form->render();
         foreach (array('foo', 'bar', 'baz', 'bat') as $test) {
-            $this->assertContains('id="myform-sub-' . $test . '"', $html);
-            $this->assertContains('name="myform[sub][' . $test . ']"', $html);
+            $this->assertStringContainsString('id="myform-sub-' . $test . '"', $html);
+            $this->assertStringContainsString('name="myform[sub][' . $test . ']"', $html);
         }
     }
 
@@ -1803,7 +1806,7 @@ public function testDisplayGroupsMustContainAtLeastOneElement()
             $this->form->addDisplayGroup(array(), 'foo');
             $this->fail('Empty display group should raise exception');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('No valid elements', $e->getMessage());
+            $this->assertStringContainsString('No valid elements', $e->getMessage());
         }
     }
 
@@ -1962,7 +1965,7 @@ public function testIsValidShouldThrowExceptionWithNonArrayArgument()
             $this->form->isValid(true);
             $this->fail('isValid() should raise exception with non-array argument');
         } catch (Zend_Form_Exception $e) {
-            $this->assertContains('expects an array', $e->getMessage());
+            $this->assertStringContainsString('expects an array', $e->getMessage());
         }
     }
 
@@ -3089,7 +3092,7 @@ public function testRenderReturnsMarkupRepresentingAllElements()
         foreach ($this->form->getElements() as $key => $element) {
             $this->assertFalse(empty($key));
             $this->assertFalse(is_numeric($key));
-            $this->assertContains('<input', $html);
+            $this->assertStringContainsString('<input', $html);
             $this->assertRegexp('/<input type="text" name="' . $key . '"/', $html);
         }
     }
@@ -3101,11 +3104,11 @@ public function testRenderReturnsMarkupContainingSubForms()
         $this->form->setView($this->getView());
         $html = $this->form->render();
         $this->assertRegexp('/<fieldset/', $html);
-        $this->assertContains('</fieldset>', $html);
+        $this->assertStringContainsString('</fieldset>', $html);
         foreach ($this->form->sub as $key => $item) {
             $this->assertFalse(empty($key));
             $this->assertFalse(is_numeric($key));
-            $this->assertContains('<input', $html);
+            $this->assertStringContainsString('<input', $html);
             $pattern = '/<input type="text" name="sub\[' . $key . '\]"/';
             $this->assertRegexp($pattern, $html, 'Pattern: ' . $pattern . "\nHTML:\n" . $html);
         }
@@ -3118,7 +3121,7 @@ public function testRenderReturnsMarkupContainingDisplayGroups()
         $this->form->setView($this->getView());
         $html = $this->html = $this->form->render();
         $this->assertRegexp('/<fieldset/', $html);
-        $this->assertContains('</fieldset>', $html);
+        $this->assertStringContainsString('</fieldset>', $html);
         $this->assertRegexp('#<legend>Display Group</legend>#', $html, $html);
         $dom = new DOMDocument();
         $dom->loadHTML($html);
@@ -3164,12 +3167,12 @@ public function testElementsRenderAsArrayMembersWhenElementsBelongToAnArray()
         $this->setupElements();
         $this->form->setElementsBelongTo('anArray');
         $html = $this->form->render($this->getView());
-        $this->assertContains('name="anArray[foo]"', $html);
-        $this->assertContains('name="anArray[bar]"', $html);
-        $this->assertContains('name="anArray[baz]"', $html);
-        $this->assertContains('id="anArray-foo"', $html);
-        $this->assertContains('id="anArray-bar"', $html);
-        $this->assertContains('id="anArray-baz"', $html);
+        $this->assertStringContainsString('name="anArray[foo]"', $html);
+        $this->assertStringContainsString('name="anArray[bar]"', $html);
+        $this->assertStringContainsString('name="anArray[baz]"', $html);
+        $this->assertStringContainsString('id="anArray-foo"', $html);
+        $this->assertStringContainsString('id="anArray-bar"', $html);
+        $this->assertStringContainsString('id="anArray-baz"', $html);
     }
 
     public function testElementsRenderAsSubArrayMembersWhenElementsBelongToASubArray()
@@ -3177,12 +3180,12 @@ public function testElementsRenderAsSubArrayMembersWhenElementsBelongToASubArray
         $this->setupElements();
         $this->form->setElementsBelongTo('data[foo]');
         $html = $this->form->render($this->getView());
-        $this->assertContains('name="data[foo][foo]"', $html);
-        $this->assertContains('name="data[foo][bar]"', $html);
-        $this->assertContains('name="data[foo][baz]"', $html);
-        $this->assertContains('id="data-foo-foo"', $html);
-        $this->assertContains('id="data-foo-bar"', $html);
-        $this->assertContains('id="data-foo-baz"', $html);
+        $this->assertStringContainsString('name="data[foo][foo]"', $html);
+        $this->assertStringContainsString('name="data[foo][bar]"', $html);
+        $this->assertStringContainsString('name="data[foo][baz]"', $html);
+        $this->assertStringContainsString('id="data-foo-foo"', $html);
+        $this->assertStringContainsString('id="data-foo-bar"', $html);
+        $this->assertStringContainsString('id="data-foo-baz"', $html);
     }
 
     public function testElementsRenderAsArrayMembersWhenRenderAsArrayToggled()
@@ -3191,12 +3194,12 @@ public function testElementsRenderAsArrayMembersWhenRenderAsArrayToggled()
         $this->form->setName('data')
             ->setIsArray(true);
         $html = $this->form->render($this->getView());
-        $this->assertContains('name="data[foo]"', $html);
-        $this->assertContains('name="data[bar]"', $html);
-        $this->assertContains('name="data[baz]"', $html);
-        $this->assertContains('id="data-foo"', $html);
-        $this->assertContains('id="data-bar"', $html);
-        $this->assertContains('id="data-baz"', $html);
+        $this->assertStringContainsString('name="data[foo]"', $html);
+        $this->assertStringContainsString('name="data[bar]"', $html);
+        $this->assertStringContainsString('name="data[baz]"', $html);
+        $this->assertStringContainsString('id="data-foo"', $html);
+        $this->assertStringContainsString('id="data-bar"', $html);
+        $this->assertStringContainsString('id="data-baz"', $html);
     }
 
     public function testElementsRenderAsMembersOfSubFormsWithElementsBelongTo()
@@ -3210,10 +3213,10 @@ public function testElementsRenderAsMembersOfSubFormsWithElementsBelongTo()
         $this->form->addSubForm($subForm, 'sub');
 
         $html = $this->form->render($this->getView());
-        $this->assertContains('name="data[billing][info][name]', $html);
-        $this->assertContains('name="data[billing][info][number]', $html);
-        $this->assertContains('id="data-billing-info-name"', $html);
-        $this->assertContains('id="data-billing-info-number"', $html);
+        $this->assertStringContainsString('name="data[billing][info][name]', $html);
+        $this->assertStringContainsString('name="data[billing][info][number]', $html);
+        $this->assertStringContainsString('id="data-billing-info-name"', $html);
+        $this->assertStringContainsString('id="data-billing-info-number"', $html);
     }
 
     public function testToStringProxiesToRender()
@@ -3398,7 +3401,7 @@ public function testFormObjectIteratesElementsInExpectedOrderWhenFirstElementHas
             ->addElement(new Zend_Form_Element('c',array('label' => 'c', 'order' => 1)))
             ->setView($this->getView());
         $test = $this->form->render();
-        $this->assertContains('name="a"', $test);
+        $this->assertStringContainsString('name="a"', $test);
         if (!preg_match_all('/(<input[^>]+>)/', $test, $matches)) {
             $this->fail('Expected markup not found');
         }
@@ -3471,6 +3474,7 @@ public function testRemovingFormItemsShouldNotRaiseExceptionsDuringIteration()
         } catch (Exception $e) {
             static::fail('Exceptions should not be raised by iterator when elements are removed; error message: ' . $e->getMessage());
         }
+        self::assertTrue(true);
     }
 
     public function testClearingAttachedItemsShouldNotCauseIterationToRaiseExceptions()
@@ -3516,6 +3520,7 @@ public function testClearingAttachedItemsShouldNotCauseIterationToRaiseException
                      . $e->getMessage();
             static::fail($message);
         }
+        self::assertTrue(true);
     }
 
     // Countable
@@ -3961,10 +3966,10 @@ public function testFormShouldOverloadToRenderDecorators()
 
     /**
      * @group ZF-3217
-     * @expectedException Zend_Form_Exception
      */
     public function testOverloadingToInvalidMethodsShouldThrowAnException()
     {
+        $this->expectException(\Zend_Form_Exception::class);
         $html = $this->form->bogusMethodCall();
     }
 
@@ -3983,8 +3988,8 @@ public function testDtDdElementsWithLabelGetUniqueId()
 
         $html = $form->render();
 
-        $this->assertContains('<dt id="foo-label">', $html);
-        $this->assertContains('<dd id="foo-element">', $html);
+        $this->assertStringContainsString('<dt id="foo-label">', $html);
+        $this->assertStringContainsString('<dd id="foo-element">', $html);
     }
 
     /**
@@ -3998,8 +4003,8 @@ public function testDtDdElementsWithoutLabelGetUniqueId()
 
         $html = $form->render();
 
-        $this->assertContains('<dt id="foo-label">&#160;</dt>', $html);
-        $this->assertContains('<dd id="foo-element">', $html);
+        $this->assertStringContainsString('<dt id="foo-label">&#160;</dt>', $html);
+        $this->assertStringContainsString('<dd id="foo-element">', $html);
     }
 
     /**
@@ -4014,8 +4019,8 @@ public function testSubFormGetsUniqueIdWithName()
 
         $html = $form->render();
 
-        $this->assertContains('<dt id="testform-label">&#160;</dt>', $html);
-        $this->assertContains('<dd id="testform-element">', $html);
+        $this->assertStringContainsString('<dt id="testform-label">&#160;</dt>', $html);
+        $this->assertStringContainsString('<dd id="testform-element">', $html);
     }
 
     /**
@@ -4042,8 +4047,8 @@ public function testEnctypeDefaultsToMultipartWhenFileElementIsAttachedToSubForm
             ->setView(new Zend_View());
         $html = $this->form->render();
 
-        $this->assertContains('id="txt"', $html);
-        $this->assertContains('name="txt"', $html);
+        $this->assertStringContainsString('id="txt"', $html);
+        $this->assertStringContainsString('name="txt"', $html);
         $this->assertRegexp('#<form[^>]+enctype="multipart/form-data"#', $html, $html);
     }
 
@@ -4057,8 +4062,8 @@ public function testEnctypeDefaultsToMultipartWhenFileElementIsAttachedToDisplay
             ->setView(new Zend_View());
         $html = $this->form->render();
 
-        $this->assertContains('id="txt"', $html);
-        $this->assertContains('name="txt"', $html);
+        $this->assertStringContainsString('id="txt"', $html);
+        $this->assertStringContainsString('name="txt"', $html);
         $this->assertRegexp('#<form[^>]+enctype="multipart/form-data"#', $html, $html);
     }
 
@@ -4564,10 +4569,10 @@ public function testAddErrorOnElementMakesFormInvalidAndReturnsCustomError()
 
     /**
      * @group ZF-10865
-     * @expectedException Zend_Form_Exception
      */
     public function testExceptionThrownWhenAddElementsIsGivenNullValue()
     {
+        $this->expectException(\Zend_Form_Exception::class);
         $form = new Zend_Form();
         $form->addElement(null);
     }
diff --git a/tests/Zend/Form/SubFormTest.php b/tests/Zend/Form/SubFormTest.php
index e56a775f..a7895f32 100644
--- a/tests/Zend/Form/SubFormTest.php
+++ b/tests/Zend/Form/SubFormTest.php
@@ -95,8 +95,8 @@ public function testDisplayGroupsShouldInheritSubFormNamespace()
         $form->addSubForm($this->form, 'attributes');
         $html = $form->render(new Zend_View());
 
-        $this->assertContains('name="attributes[foo]"', $html);
-        $this->assertContains('name="attributes[bar]"', $html);
+        $this->assertStringContainsString('name="attributes[foo]"', $html);
+        $this->assertStringContainsString('name="attributes[bar]"', $html);
     }
 
     /**
@@ -114,7 +114,7 @@ public function testRenderedSubFormDtShouldContainNoBreakSpace()
         $form->addSubForm($subForm, 'foobar')
             ->setView(new Zend_View());
         $html = $form->render();
-        $this->assertContains('>&#160;</dt>', $html);
+        $this->assertStringContainsString('>&#160;</dt>', $html);
     }
 
     /**
diff --git a/tests/Zend/Json/JsonXMLTest.php b/tests/Zend/Json/JsonXMLTest.php
index 11da9120..88e1058d 100644
--- a/tests/Zend/Json/JsonXMLTest.php
+++ b/tests/Zend/Json/JsonXMLTest.php
@@ -401,7 +401,7 @@ public function testUsingXML5()
         // Test if it is not a NULL object.
         $this->assertNotNull($phpArray, 'JSON result for XML input 5 is NULL');
         // Test for one of the expected CDATA fields in the JSON result.
-        $this->assertContains('Lois & Clark', $phpArray['tvshows']['show'][1]['name'], 'The CDATA name converted from XML input 5 is not correct');
+        $this->assertStringContainsString('Lois & Clark', $phpArray['tvshows']['show'][1]['name'], 'The CDATA name converted from XML input 5 is not correct');
     } // End of function testUsingXML5
 
     /**
@@ -481,9 +481,9 @@ public function testUsingXML6()
         // Test if it is not a NULL object.
         $this->assertNotNull($phpArray, 'JSON result for XML input 6 is NULL');
         // Test for one of the expected fields in the JSON result.
-        $this->assertContains('Zend', $phpArray['demo']['framework']['name'], 'The framework name field converted from XML input 6 is not correct');
+        $this->assertStringContainsString('Zend', $phpArray['demo']['framework']['name'], 'The framework name field converted from XML input 6 is not correct');
         // Test for one of the expected CDATA fields in the JSON result.
-        $this->assertContains('echo getMovies()->asXML();', $phpArray['demo']['listing']['code'], 'The CDATA code converted from XML input 6 is not correct');
+        $this->assertStringContainsString('echo getMovies()->asXML();', $phpArray['demo']['listing']['code'], 'The CDATA code converted from XML input 6 is not correct');
     } // End of function testUsingXML6
 
     /**
@@ -562,13 +562,13 @@ public function testUsingXML8()
 
     /**
      * @group ZF-11385
-     * @expectedException Zend_Json_Exception
      * @dataProvider providerNestingDepthIsHandledProperly
      *
      * @param mixed $xmlStringContents
      */
     public function testNestingDepthIsHandledProperlyWhenNestingDepthExceedsMaximum($xmlStringContents)
     {
+        $this->expectException(\Zend_Json_Exception::class);
         Zend_Json::$maxRecursionDepthAllowed = 1;
         Zend_Json::fromXml($xmlStringContents, true);
     }
diff --git a/tests/Zend/JsonTest.php b/tests/Zend/JsonTest.php
index 5d5ea473..72a59298 100644
--- a/tests/Zend/JsonTest.php
+++ b/tests/Zend/JsonTest.php
@@ -407,7 +407,7 @@ public function testZf461()
             $encoded = Zend_Json_Encoder::encode($everything, true);
             $this->fail('Object cycling not allowed when cycleCheck parameter is true');
         } catch (Exception $e) {
-            // success
+            self::assertTrue(true);
         }
     }
 
@@ -453,21 +453,21 @@ public function testEncodeClass()
     {
         $encoded = Zend_Json_Encoder::encodeClass('Zend_JsonTest_Object');
 
-        $this->assertContains("Class.create('Zend_JsonTest_Object'", $encoded);
-        $this->assertContains("ZAjaxEngine.invokeRemoteMethod(this, 'foo'", $encoded);
-        $this->assertContains("ZAjaxEngine.invokeRemoteMethod(this, 'bar'", $encoded);
-        $this->assertNotContains("ZAjaxEngine.invokeRemoteMethod(this, 'baz'", $encoded);
+        $this->assertStringContainsString("Class.create('Zend_JsonTest_Object'", $encoded);
+        $this->assertStringContainsString("ZAjaxEngine.invokeRemoteMethod(this, 'foo'", $encoded);
+        $this->assertStringContainsString("ZAjaxEngine.invokeRemoteMethod(this, 'bar'", $encoded);
+        $this->assertStringNotContainsString("ZAjaxEngine.invokeRemoteMethod(this, 'baz'", $encoded);
 
-        $this->assertContains('variables:{foo:"bar",bar:"baz"}', $encoded);
-        $this->assertContains('constants : {FOO: "bar"}', $encoded);
+        $this->assertStringContainsString('variables:{foo:"bar",bar:"baz"}', $encoded);
+        $this->assertStringContainsString('constants : {FOO: "bar"}', $encoded);
     }
 
     public function testEncodeClasses()
     {
         $encoded = Zend_Json_Encoder::encodeClasses(array('Zend_JsonTest_Object', 'Zend_JsonTest'));
 
-        $this->assertContains("Class.create('Zend_JsonTest_Object'", $encoded);
-        $this->assertContains("Class.create('Zend_JsonTest'", $encoded);
+        $this->assertStringContainsString("Class.create('Zend_JsonTest_Object'", $encoded);
+        $this->assertStringContainsString("Class.create('Zend_JsonTest'", $encoded);
     }
 
     public function testToJsonSerialization()
@@ -799,10 +799,10 @@ public function testBuiltinJsonEncoderWillProperlyEncodeSolidusInStringValues()
 
     /**
      * @group ZF-8918
-     * @expectedException Zend_Json_Exception
      */
     public function testDecodingInvalidJsonShouldRaiseAnException()
     {
+        $this->expectException(\Zend_Json_Exception::class);
         Zend_Json::decode(' some string ');
     }
 
diff --git a/tests/Zend/Layout/LayoutTest.php b/tests/Zend/Layout/LayoutTest.php
index 9231f887..8be26392 100644
--- a/tests/Zend/Layout/LayoutTest.php
+++ b/tests/Zend/Layout/LayoutTest.php
@@ -438,6 +438,7 @@ public function testMinimalViewObjectWorks()
             'ViewScriptPath' => 'some/path',
         ));
         $layout->render();
+        self::assertTrue(true);
     }
 
     /**
diff --git a/tests/Zend/Layout/PluginTest.php b/tests/Zend/Layout/PluginTest.php
index 7cb30aac..643e2a9e 100644
--- a/tests/Zend/Layout/PluginTest.php
+++ b/tests/Zend/Layout/PluginTest.php
@@ -123,8 +123,8 @@ public function testPostDispatchRendersLayout()
         $plugin->postDispatch($request);
 
         $body = $response->getBody();
-        $this->assertContains('Application content', $body, $body);
-        $this->assertContains('Site Layout', $body, $body);
+        $this->assertStringContainsString('Application content', $body, $body);
+        $this->assertStringContainsString('Site Layout', $body, $body);
     }
 
     public function testPostDispatchDoesNotRenderLayoutWhenForwardDetected()
@@ -148,8 +148,8 @@ public function testPostDispatchDoesNotRenderLayoutWhenForwardDetected()
         $plugin->postDispatch($request);
 
         $body = $response->getBody();
-        $this->assertContains('Application content', $body);
-        $this->assertNotContains('Site Layout', $body);
+        $this->assertStringContainsString('Application content', $body);
+        $this->assertStringNotContainsString('Site Layout', $body);
     }
 
     public function testPostDispatchDoesNotRenderLayoutWhenLayoutDisabled()
@@ -174,8 +174,8 @@ public function testPostDispatchDoesNotRenderLayoutWhenLayoutDisabled()
         $plugin->postDispatch($request);
 
         $body = $response->getBody();
-        $this->assertContains('Application content', $body);
-        $this->assertNotContains('Site Layout', $body);
+        $this->assertStringContainsString('Application content', $body);
+        $this->assertStringNotContainsString('Site Layout', $body);
     }
 
     /**
@@ -204,8 +204,8 @@ public function testPostDispatchDoesNotRenderLayoutWhenResponseRedirected()
         $plugin->postDispatch($request);
 
         $body = $response->getBody();
-        $this->assertContains('Application content', $body);
-        $this->assertNotContains('Site Layout', $body);
+        $this->assertStringContainsString('Application content', $body);
+        $this->assertStringNotContainsString('Site Layout', $body);
     }
 }
 
diff --git a/tests/Zend/Loader/Autoloader/ResourceTest.php b/tests/Zend/Loader/Autoloader/ResourceTest.php
index 217a4f86..dd4b2e36 100644
--- a/tests/Zend/Loader/Autoloader/ResourceTest.php
+++ b/tests/Zend/Loader/Autoloader/ResourceTest.php
@@ -91,27 +91,21 @@ public function tearDown(): void
         Zend_Loader_Autoloader::resetInstance();
     }
 
-    /**
-     * @expectedException Zend_Loader_Exception
-     */
     public function testAutoloaderInstantiationShouldRaiseExceptionWithoutNamespace()
     {
+        $this->expectException(\Zend_Loader_Exception::class);
         $loader = new Zend_Loader_Autoloader_Resource(array('basePath' => __DIR__));
     }
 
-    /**
-     * @expectedException Zend_Loader_Exception
-     */
     public function testAutoloaderInstantiationShouldRaiseExceptionWithoutBasePath()
     {
+        $this->expectException(\Zend_Loader_Exception::class);
         $loader = new Zend_Loader_Autoloader_Resource(array('namespace' => 'Foo'));
     }
 
-    /**
-     * @expectedException Zend_Loader_Exception
-     */
     public function testAutoloaderInstantiationShouldRaiseExceptionWhenInvalidOptionsTypeProvided()
     {
+        $this->expectException(\Zend_Loader_Exception::class);
         $loader = new Zend_Loader_Autoloader_Resource('foo');
     }
 
@@ -119,11 +113,13 @@ public function testAutoloaderConstructorShouldAcceptZendConfigObject()
     {
         $config = new Zend_Config(array('namespace' => 'Foo', 'basePath' => __DIR__));
         $loader = new Zend_Loader_Autoloader_Resource($config);
+        self::assertTrue(true);
     }
 
     public function testAutoloaderShouldAllowRetrievingNamespace()
     {
         $this->assertEquals('FooBar', $this->loader->getNamespace());
+        self::assertTrue(true);
     }
 
     public function testAutoloaderShouldAllowRetrievingBasePath()
@@ -138,19 +134,15 @@ public function testNoResourceTypesShouldBeRegisteredByDefault()
         $this->assertTrue(empty($resourceTypes));
     }
 
-    /**
-     * @expectedException Zend_Loader_Exception
-     */
     public function testInitialResourceTypeDefinitionShouldRequireNamespace()
     {
+        $this->expectException(\Zend_Loader_Exception::class);
         $this->loader->addResourceType('foo', 'foo');
     }
 
-    /**
-     * @expectedException Zend_Loader_Exception
-     */
     public function testPassingNonStringPathWhenAddingResourceTypeShouldRaiseAnException()
     {
+        $this->expectException(\Zend_Loader_Exception::class);
         $this->loader->addResourceType('foo', array('foo'), 'Foo');
     }
 
@@ -183,19 +175,15 @@ public function testAutoloaderShouldSupportAddingMultipleResourceTypesAtOnce()
         $this->assertContains('form', array_keys($resources));
     }
 
-    /**
-     * @expectedException Zend_Loader_Exception
-     */
     public function testAddingMultipleResourceTypesShouldRaiseExceptionWhenReceivingNonArrayItem()
     {
+        $this->expectException(\Zend_Loader_Exception::class);
         $this->loader->addResourceTypes(array('foo' => 'bar'));
     }
 
-    /**
-     * @expectedException Zend_Loader_Exception
-     */
     public function testAddingMultipleResourceTypesShouldRaiseExceptionWhenMissingResourcePath()
     {
+        $this->expectException(\Zend_Loader_Exception::class);
         $this->loader->addResourceTypes(array('model' => array('namespace' => 'Model')));
     }
 
@@ -259,19 +247,15 @@ public function testSettingDefaultResourceTypeToUndefinedTypeShouldHaveNoEffect(
         $this->assertNull($this->loader->getDefaultResourceType());
     }
 
-    /**
-     * @expectedException Zend_Loader_Exception
-     */
     public function testLoadShouldRaiseExceptionWhenNotTypePassedAndNoDefaultSpecified()
     {
+        $this->expectException(\Zend_Loader_Exception::class);
         $this->loader->load('Foo');
     }
 
-    /**
-     * @expectedException Zend_Loader_Exception
-     */
     public function testLoadShouldRaiseExceptionWhenResourceTypeDoesNotExist()
     {
+        $this->expectException(\Zend_Loader_Exception::class);
         $this->loader->load('Foo', 'model');
     }
 
@@ -323,27 +307,21 @@ public function testPassingClassWithUnmatchedResourceTypeToAutoloadShouldReturnF
         $this->assertFalse($this->loader->autoload('FooBar_Baz_Bat'));
     }
 
-    /**
-     * @expectedException Zend_Loader_Exception
-     */
     public function testMethodOverloadingShouldRaiseExceptionForNonGetterMethodCalls()
     {
+        $this->expectException(\Zend_Loader_Exception::class);
         $this->loader->lalalalala();
     }
 
-    /**
-     * @expectedException Zend_Loader_Exception
-     */
     public function testMethodOverloadingShouldRaiseExceptionWhenRequestedResourceDoesNotExist()
     {
+        $this->expectException(\Zend_Loader_Exception::class);
         $this->loader->getModel('Foo');
     }
 
-    /**
-     * @expectedException Zend_Loader_Exception
-     */
     public function testMethodOverloadingShouldRaiseExceptionWhenNoArgumentPassed()
     {
+        $this->expectException(\Zend_Loader_Exception::class);
         $this->loader->addResourceTypes(array(
             'model' => array('path' => 'models', 'namespace' => 'Model'),
         ));
diff --git a/tests/Zend/Loader/AutoloaderFactoryTest.php b/tests/Zend/Loader/AutoloaderFactoryTest.php
index 2513c9d2..63b0204f 100644
--- a/tests/Zend/Loader/AutoloaderFactoryTest.php
+++ b/tests/Zend/Loader/AutoloaderFactoryTest.php
@@ -89,11 +89,10 @@ public function testRegisteringValidMapFilePopulatesAutoloader()
 
     /**
      * This tests checks if invalid autoloaders cause exceptions.
-     *
-     * @expectedException Zend_Loader_Exception_InvalidArgumentException
      */
     public function testFactoryCatchesInvalidClasses()
     {
+        $this->expectException(\Zend_Loader_Exception_InvalidArgumentException::class);
         if (!version_compare(PHP_VERSION, '5.3.7', '>=')) {
             $this->markTestSkipped('Cannot test invalid interface loader with versions less than 5.3.7');
         }
diff --git a/tests/Zend/Loader/AutoloaderMultiVersionTest.php b/tests/Zend/Loader/AutoloaderMultiVersionTest.php
index 831117be..9a244852 100644
--- a/tests/Zend/Loader/AutoloaderMultiVersionTest.php
+++ b/tests/Zend/Loader/AutoloaderMultiVersionTest.php
@@ -84,27 +84,21 @@ public function testZfPathIsNullByDefault()
         $this->assertNull($this->autoloader->getZfPath());
     }
 
-    /**
-     * @expectedException Zend_Loader_Exception
-     */
     public function testSettingZfPathFailsOnInvalidVersionString()
     {
+        $this->expectException(\Zend_Loader_Exception::class);
         $this->autoloader->setZfPath($this->path, 'foo.bar.baz.bat');
     }
 
-    /**
-     * @expectedException Zend_Loader_Exception
-     */
     public function testSettingZfPathFailsWhenBasePathDoesNotExist()
     {
+        $this->expectException(\Zend_Loader_Exception::class);
         $this->autoloader->setZfPath('foo.bar.baz.bat', 'latest');
     }
 
-    /**
-     * @expectedException Zend_Loader_Exception
-     */
     public function testSettingZfVersionFailsWhenNoValidInstallsDiscovered()
     {
+        $this->expectException(\Zend_Loader_Exception::class);
         $this->autoloader->setZfPath(__DIR__, 'latest');
     }
 
diff --git a/tests/Zend/Loader/AutoloaderTest.php b/tests/Zend/Loader/AutoloaderTest.php
index f1637420..f0df1520 100644
--- a/tests/Zend/Loader/AutoloaderTest.php
+++ b/tests/Zend/Loader/AutoloaderTest.php
@@ -118,11 +118,9 @@ public function testDefaultAutoloaderShouldBeMutable()
         $this->assertSame(array($this, 'autoload'), $this->autoloader->getDefaultAutoloader());
     }
 
-    /**
-     * @expectedException Zend_Loader_Exception
-     */
     public function testSpecifyingInvalidDefaultAutoloaderShouldRaiseException()
     {
+        $this->expectException(\Zend_Loader_Exception::class);
         $this->autoloader->setDefaultAutoloader(uniqid());
     }
 
@@ -148,11 +146,9 @@ public function testAutoloaderShouldAllowRegisteringMultipleNamespacesAtOnce()
         $this->assertContains('Solar_', $namespaces);
     }
 
-    /**
-     * @expectedException Zend_Loader_Exception
-     */
     public function testRegisteringInvalidNamespaceSpecShouldRaiseException()
     {
+        $this->expectException(\Zend_Loader_Exception::class);
         $o = new stdClass();
         $this->autoloader->registerNamespace($o);
     }
@@ -172,11 +168,9 @@ public function testAutoloaderShouldAllowUnregisteringMultipleNamespacesAtOnce()
         $this->assertNotContains('ZendX', $namespaces);
     }
 
-    /**
-     * @expectedException Zend_Loader_Exception
-     */
     public function testUnregisteringInvalidNamespaceSpecShouldRaiseException()
     {
+        $this->expectException(\Zend_Loader_Exception::class);
         $o = new stdClass();
         $this->autoloader->unregisterNamespace($o);
     }
diff --git a/tests/Zend/Loader/ClassMapAutoloaderTest.php b/tests/Zend/Loader/ClassMapAutoloaderTest.php
index 7d49b7ed..ffd9ceb7 100644
--- a/tests/Zend/Loader/ClassMapAutoloaderTest.php
+++ b/tests/Zend/Loader/ClassMapAutoloaderTest.php
@@ -147,7 +147,7 @@ public function testRegisterMapsThrowsExceptionForNonTraversableArguments()
                 $this->loader->registerAutoloadMaps($test);
                 $this->fail('Should not register non-traversable arguments');
             } catch (Zend_Loader_Exception_InvalidArgumentException $e) {
-                $this->assertContains('array or implement Traversable', $e->getMessage());
+                $this->assertStringContainsString('array or implement Traversable', $e->getMessage());
             }
         }
     }
diff --git a/tests/Zend/Loader/PluginLoaderTest.php b/tests/Zend/Loader/PluginLoaderTest.php
index 77586f29..72218340 100644
--- a/tests/Zend/Loader/PluginLoaderTest.php
+++ b/tests/Zend/Loader/PluginLoaderTest.php
@@ -125,6 +125,7 @@ public function testAddPrefixPathThrowsExceptionWithNonStringPrefix()
             $this->fail('addPrefixPath() should throw exception with non-string prefix');
         } catch (Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testAddPrefixPathThrowsExceptionWithNonStringPath()
@@ -136,6 +137,7 @@ public function testAddPrefixPathThrowsExceptionWithNonStringPath()
             $this->fail('addPrefixPath() should throw exception with non-string path');
         } catch (Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testRemoveAllPathsForGivenPrefixNonStatically()
@@ -172,6 +174,7 @@ public function testRemovePrefixPathThrowsExceptionIfPrefixNotRegistered()
             $this->fail('Removing non-existent prefix should throw an exception');
         } catch (Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testRemovePrefixPathThrowsExceptionIfPrefixPathPairNotRegistered()
@@ -302,6 +305,7 @@ public function testLoadThrowsExceptionIfFileFoundInPrefixButClassNotLoaded()
             $this->fail('Invalid prefix for a path should throw an exception');
         } catch (Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testLoadThrowsExceptionIfNoHelperClassLoaded()
@@ -314,6 +318,7 @@ public function testLoadThrowsExceptionIfNoHelperClassLoaded()
             $this->fail('Not finding a helper should throw an exception');
         } catch (Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testGetClassAfterNonStaticLoadReturnsResolvedClassName()
@@ -406,10 +411,10 @@ public function testPluginLoaderShouldAllowSpecifyingIncludeFileCache()
 
     /**
      * @group ZF-4670
-     * @expectedException Zend_Loader_PluginLoader_Exception
      */
     public function testPluginLoaderShouldThrowExceptionWhenPathDoesNotExist()
     {
+        $this->expectException(\Zend_Loader_PluginLoader_Exception::class);
         $cacheFile = __DIR__ . '/_filesDoNotExist/includeCache.inc.php';
         $this->testIncludeCacheShouldBeNullByDefault();
         Zend_Loader_PluginLoader::setIncludeFileCache($cacheFile);
@@ -452,7 +457,7 @@ public function testClassFilesGrabCorrectPathForLoadedClasses()
         }
 
         $classPath = $loader->getClassPath('DeclareVars');
-        $this->assertContains($expected, $classPath);
+        $this->assertStringContainsString($expected, $classPath);
     }
 
     /**
@@ -492,7 +497,7 @@ public function testRemovePrefixPathThrowsExceptionIfPathNotRegisteredInPrefix()
             $this->fail();
         } catch (Exception $e) {
             $this->assertTrue($e instanceof Zend_Loader_PluginLoader_Exception);
-            $this->assertContains('Prefix My_Namespace_ / Path ZF9721', $e->getMessage());
+            $this->assertStringContainsString('Prefix My_Namespace_ / Path ZF9721', $e->getMessage());
         }
         $this->assertEquals(1, is_countable($loader->getPaths('My_Namespace_')) ? count($loader->getPaths('My_Namespace_')) : 0);
     }
diff --git a/tests/Zend/Loader/StandardAutoloaderTest.php b/tests/Zend/Loader/StandardAutoloaderTest.php
index 7ab71cb3..4af49410 100644
--- a/tests/Zend/Loader/StandardAutoloaderTest.php
+++ b/tests/Zend/Loader/StandardAutoloaderTest.php
@@ -82,7 +82,7 @@ public function testPassingNonTraversableOptionsToSetOptionsRaisesException()
                 $loader->setOptions(true);
                 $this->fail('Setting options with invalid type should fail');
             } catch (Zend_Loader_Exception_InvalidArgumentException $e) {
-                $this->assertContains('array or Traversable', $e->getMessage());
+                $this->assertStringContainsString('array or Traversable', $e->getMessage());
             }
         }
     }
diff --git a/tests/Zend/LoaderTest.php b/tests/Zend/LoaderTest.php
index f031b842..c1c7fbc5 100644
--- a/tests/Zend/LoaderTest.php
+++ b/tests/Zend/LoaderTest.php
@@ -108,6 +108,7 @@ public function testLoaderClassValid()
         $dir = implode(DIRECTORY_SEPARATOR, array(__DIR__, '_files', '_testDir1'));
 
         Zend_Loader::loadClass('Class1', $dir);
+        self::assertTrue(true);
     }
 
     public function testLoaderInterfaceViaLoadClass()
@@ -117,6 +118,7 @@ public function testLoaderInterfaceViaLoadClass()
         } catch (Zend_Exception $e) {
             $this->fail('Loading interfaces should not fail');
         }
+        self::assertTrue(true);
     }
 
     public function testLoaderLoadClassWithDotDir()
@@ -128,6 +130,7 @@ public function testLoaderLoadClassWithDotDir()
         } catch (Zend_Exception $e) {
             $this->fail('Loading from dot should not fail');
         }
+        self::assertTrue(true);
     }
 
     /**
@@ -173,6 +176,7 @@ public function testLoaderClassSearchDirs()
         // throws exception on failure
         Zend_Loader::loadClass('Class1', $dirs);
         Zend_Loader::loadClass('Class2', $dirs);
+        self::assertTrue(true);
     }
 
     /**
@@ -187,6 +191,7 @@ public function testLoaderClassSearchSubDirs()
 
         // throws exception on failure
         Zend_Loader::loadClass('Class1_Subclass2', $dirs);
+        self::assertTrue(true);
     }
 
     /**
@@ -456,6 +461,7 @@ public function testLoadClassShouldAllowLoadingPhpNamespacedClasses()
             $this->markTestSkipped('PHP < 5.3.0 does not support namespaces');
         }
         Zend_Loader::loadClass('\Zfns\Foo', array(__DIR__ . '/Loader/_files'));
+        self::assertTrue(true);
     }
 
     /**
diff --git a/tests/Zend/Locale/DataTest.php b/tests/Zend/Locale/DataTest.php
index 18de3eff..7eafcd1d 100644
--- a/tests/Zend/Locale/DataTest.php
+++ b/tests/Zend/Locale/DataTest.php
@@ -89,7 +89,7 @@ public function testNoType()
             $value = Zend_Locale_Data::getContent('de','xxxxxxx');
             $this->fail('content should throw an exception');
         } catch (Zend_Locale_Exception $e) {
-            // success
+            self::assertTrue(true);
         }
     }
 
@@ -7214,6 +7214,7 @@ public function testCreateValidCacheIdsInGetContentMethod()
         } catch (Zend_Cache_Exception $e) {
             static::fail($e->getMessage());
         }
+        self::assertTrue(true);
     }
 
     /**
@@ -7226,6 +7227,7 @@ public function testCreateValidCacheIdsInGetListMethod()
         } catch (Zend_Cache_Exception $e) {
             static::fail($e->getMessage());
         }
+        self::assertTrue(true);
     }
 
     /**
diff --git a/tests/Zend/Locale/MathTest.php b/tests/Zend/Locale/MathTest.php
index 46b201b6..989cfa91 100644
--- a/tests/Zend/Locale/MathTest.php
+++ b/tests/Zend/Locale/MathTest.php
@@ -71,1280 +71,22 @@ public function testRound()
         $this->assertEquals(round(3.6), Zend_Locale_Math::round('3.6'));
         $this->assertEquals('4', Zend_Locale_Math::round('3.6', 0));
         $this->assertEquals(round(3.6,0), Zend_Locale_Math::round('3.6', 0));
-        $this->assertEquals('1.96', Zend_Locale_Math::round('1.95583', 2), '', 0.02);
-        $this->assertEquals(round(1.95583,2), Zend_Locale_Math::round('1.95583', 2), '', 0.02);
-        $this->assertEquals(1_242_000, Zend_Locale_Math::round('1241757', -3), '', 250);
-        $this->assertEquals(round(1_241_757, -3), Zend_Locale_Math::round('1241757', -3), '', 250);
-        $this->assertEquals(5.05, Zend_Locale_Math::round('5.045', 2), '', 0.02);
-        $this->assertEquals(round(5.045, 2), Zend_Locale_Math::round('5.045', 2), '', 0.02);
-        $this->assertEquals(5.06, Zend_Locale_Math::round('5.055', 2), '', 0.02);
-        $this->assertEquals(round(5.055, 2), Zend_Locale_Math::round('5.055', 2), '', 0.02);
-    }
-
-    /**
-     * test round()
-     * expect string when BCMath extension is enabled.
-     */
-    public function testRound2()
-    {
-        if (!defined('TESTS_ZEND_I18N_EXTENDED_COVERAGE') || TESTS_ZEND_I18N_EXTENDED_COVERAGE == false) {
-            $this->markTestSkipped('Extended I18N test skipped');
-
-            return;
-        }
-
-        $rounder = array(
-            '0.477051' => -12, '513695.36425' => 1, '89.85' => 4, '533.506' => 3,
-            '0.376139' => -2, '1784212419' => -9, '447878.429296' => -11, '79.31' => -2,
-            '941.543' => -5, '0.396850' => -10, '425271509' => 10, '220820.93233' => -2,
-            '13.36' => 4, '138.281' => -5, '0.289925' => 2, '1519168597' => 12,
-            '23387.294481' => -3, '88.100' => 1, '19.899' => -1, '0.60083' => 11,
-            '1807269979' => 4, '30808.137760' => -5, '16.63' => 0, '682.33' => 5,
-            '0.127627' => -8, '416684519' => 2, '508773.125117' => 11, '89.39' => -3,
-            '803.184' => 4, '0.398620' => 6, '849182084' => -5, '320473.238127' => 3,
-            '99.3' => -4, '946.410' => 4, '0.73955' => 10, '1075981461' => 4,
-            '316913.247175' => -4, '65.46' => -3, '299.308' => 3, '0.20681' => 12,
-            '625539733' => -11, '351290.473192' => -2, '0.88' => 0, '756.511' => 3,
-            '0.351428' => -9, '1709881316' => 4, '517636.210076' => -8, '52.29' => 1,
-            '96.318' => -5, '0.46457' => -4, '856460724' => -4, '415364.36099' => -3,
-            '60.28' => 0, '19.312' => -4, '0.84798' => 5, '714201053' => 12,
-            '80610.167713' => 11, '88.88' => 3, '900.179' => 4, '0.120498' => -7,
-            '1234420216' => -6, '339890.192448' => 3, '4.30' => 4, '470.236' => 1,
-            '0.78949' => 10, '1930996112' => -3, '186792.27756' => 0, '85.69' => 2,
-            '584.490' => 5, '0.419941' => -10, '819232149' => 6, '182934.15610' => -3,
-            '97.79' => 2, '396.818' => -4, '0.163940' => -2, '1745535129' => 12,
-            '236683.88660' => -7, '89.11' => -2, '47.522' => 0, '0.84264' => 12,
-            '1473190621' => -4, '366353.18312' => 1, '8.53' => -1, '711.629' => -1,
-            '0.65511' => -6, '461264361' => 11, '80405.349297' => 11, '92.100' => -1,
-            '466.580' => 4, '0.226480' => -3, '1512143953' => 6, '148397.211241' => -10,
-            '85.23' => 3, '663.98' => -5, '0.476893' => 5, '1390893395' => -7,
-            '84243.419979' => -9, '22.71' => -2, '571.725' => 3, '0.498972' => -4,
-            '156080671' => -9, '144016.186502' => 4, '21.91' => -2, '981.325' => 1,
-            '0.360149' => 5, '1973782312' => -7, '188196.41835' => -4, '35.35' => -3,
-            '106.431' => 1, '0.229880' => -4, '1046448903' => -3, '20467.399497' => 0,
-            '19.7' => -4, '676.982' => 4, '0.195086' => -8, '882554724' => 4,
-            '1780.403663' => -5, '92.72' => -3, '324.601' => 3, '0.343310' => -7,
-            '1277914818' => -12, '288455.332458' => -9, '73.9' => -4, '946.170' => 3,
-            '0.63718' => 5, '823941985' => 1, '437187.202938' => 1, '53.22' => -3,
-            '2.247' => -5, '0.112341' => 3, '1416720336' => 10, '23273.110046' => 8,
-            '63.17' => 4, '909.988' => -4, '0.326807' => -5, '1792810450' => -10,
-            '336225.350597' => -12, '88.92' => 4, '941.168' => 3, '0.294118' => -11,
-            '2032796853' => -3, '100492.519561' => -7, '94.5' => 1, '179.719' => 5,
-            '0.247127' => 12, '166770266' => -4, '183142.376940' => -5, '66.85' => 2,
-            '645.604' => 4, '0.361570' => 12, '813314439' => -8, '202182.299055' => 3,
-            '20.57' => 3, '548.53' => -5, '0.271132' => 6, '166087023' => 1,
-            '435424.223691' => 2, '17.98' => 3, '805.299' => 4, '0.420066' => -2,
-            '1294019654' => 12, '327747.518105' => -8, '81.96' => -2, '972.367' => 2,
-            '0.370667' => 6, '548609247' => 10, '251267.45074' => 7, '90.38' => 3,
-            '214.574' => 0, '0.342039' => 9, '1789816836' => -3, '291202.240426' => -6,
-            '71.4' => -2, '726.233' => 0, '0.239589' => 10, '1678730037' => 11,
-            '380074.136825' => 4, '5.69' => 4, '235.532' => 4, '0.41770' => -3,
-            '1660444329' => -8, '230203.172296' => 10, '64.8' => 2, '613.456' => 4,
-            '0.267306' => -9, '150903984' => 10, '327734.416916' => -5, '73.61' => -1,
-            '430.348' => -5, '0.433954' => 2, '1640566986' => -2, '178906.106444' => 3,
-            '89.56' => 1, '460.408' => 1, '0.309152' => -11, '2111984712' => 10,
-            '109862.319068' => 4, '3.18' => 2, '234.799' => -4, '0.426879' => 0,
-            '1979964791' => 3, '119122.138007' => 2, '98.67' => -3, '281.180' => 3,
-            '0.184761' => -8, '210096321' => 7, '225587.161155' => -4, '7.98' => 3,
-            '122.306' => -1, '0.322883' => -7, '1853238528' => -9, '366172.47285' => 1,
-            '24.78' => 0, '549.428' => 5, '0.382104' => -9, '1972761165' => 7,
-            '60782.182930' => 8, '23.20' => -4, '642.159' => -2, '0.460457' => 3,
-            '1572631121' => 7, '163894.225827' => 6, '91.7' => -3, '46.440' => -5,
-            '0.101855' => 0, '567173959' => -8, '521830.199253' => -10, '44.70' => -3,
-            '2.975' => 0, '0.322017' => 3, '882661445' => 9, '311363.379387' => -4,
-            '84.69' => -1, '744.550' => 3, '0.119550' => -8, '723180551' => 6,
-            '449221.174100' => 0, '46.31' => 3, '790.16' => 3, '0.223467' => 7,
-            '1334151870' => 3, '512572.112795' => 8, '64.40' => 2, '126.186' => -4,
-            '0.154390' => 5, '939837920' => -2, '475325.154386' => 3, '61.42' => 3,
-            '219.882' => 1, '0.517762' => 4, '592690249' => -5, '75942.132984' => 3,
-            '0.46' => 4, '609.230' => -1, '0.158459' => 3, '111563587' => 1,
-            '81793.502563' => 6, '74.65' => -3, '275.763' => 4, '0.482465' => 5,
-            '38064166' => 6, '188392.85235' => -8, '87.46' => -3, '910.256' => 5,
-            '0.286740' => -7, '1561805584' => 1, '156399.463093' => 2, '0.29' => 2,
-            '123.255' => 1, '0.437082' => -5, '129042096' => -8, '195012.219896' => 9,
-            '60.89' => 0, '855.189' => -3, '0.29867' => 0, '139602988' => 6,
-            '175877.190481' => 7, '70.67' => 4, '216.311' => -2, '0.275937' => 11,
-            '230515001' => -9, '522334.251290' => 2, '30.61' => -4, '859.747' => 1,
-            '0.191629' => 7, '1090159168' => 8, '308377.442029' => -2, '74.49' => -2,
-            '166.142' => 5, '0.51124' => -7, '815518430' => 4, '133830.197147' => -7,
-            '39.99' => -2, '567.729' => -2, '0.177050' => -12, '1781759241' => -10,
-            '275013.219089' => 9, '68.42' => -2, '348.975' => 1, '0.305648' => 6,
-            '882222353' => -11, '144939.349216' => 12, '93.73' => 4, '3.513' => 3,
-            '0.15497' => 1, '1330004472' => 9, '364678.75433' => 9, '46.96' => -1,
-            '550.156' => -3, '0.153132' => -6, '678841651' => 6, '368190.310672' => 5,
-            '55.29' => -4, '92.770' => 0, '0.324112' => -12, '1850715381' => 7,
-            '345338.292225' => -7, '95.85' => 4, '114.437' => 3, '0.188012' => 10,
-            '1387145934' => 6, '226297.182561' => 4, '39.82' => 3, '319.189' => -4,
-            '0.173574' => 11, '1556035741' => 8, '23778.200941' => -8, '32.69' => -1,
-            '441.384' => -3, '0.182397' => 4, '796735165' => 6, '219063.420812' => 12,
-            '60.73' => 2, '887.825' => 2, '0.425583' => 10, '1497714427' => -9,
-            '182965.389431' => 1, '17.24' => 4, '444.232' => -1, '0.45383' => 8,
-            '1218890312' => 2, '300990.516644' => -1, '67.87' => 4, '563.534' => -4,
-            '0.237510' => -12, '337619655' => -4, '462448.265391' => -9, '61.6' => 3,
-            '503.485' => -1, '0.171549' => 3, '448643907' => 2, '15061.410523' => 10,
-            '70.55' => -2, '727.716' => -2, '0.381646' => 10, '485956258' => -8,
-            '167378.56802' => 10, '91.100' => -3, '393.778' => 5, '0.11387' => -2,
-            '12977184' => -10, '524273.18229' => -7, '32.71' => 3, '59.157' => 0,
-            '0.492791' => -8, '774557136' => 10, '404139.356479' => -8, '90.18' => -3,
-            '134.552' => -4, '0.298695' => 11, '109079452' => 2, '421718.26616' => 2,
-            '94.94' => 3, '410.590' => -2, '0.315720' => 0, '870440545' => 1,
-            '365067.92361' => 12, '34.54' => 4, '703.290' => 0, '0.339982' => -11,
-            '1337929149' => 9, '228439.224073' => 5, '24.68' => -4, '42.391' => 3,
-            '0.294921' => -3, '1925153138' => 12, '501140.310787' => 12, '56.48' => 1,
-            '980.837' => 2, '0.15171' => -12, '1866705287' => 0, '96693.159889' => 4,
-            '35.32' => 4, '101.658' => -2, '0.245009' => 6, '1536424140' => -7,
-            '98922.351956' => -3, '27.52' => -2, '239.795' => -1, '0.130324' => -6,
-            '1558395489' => 8, '249345.477161' => -10, '85.78' => 0, '105.981' => 0,
-            '0.434193' => -10, '728314599' => -1, '425578.276733' => 1, '86.48' => 2,
-            '889.528' => 2, '0.67736' => -1, '631126221' => 7, '468815.403429' => 9,
-            '32.61' => -2, '69.196' => -3, '0.98505' => -8, '1358601844' => -12,
-            '298028.232980' => 1, '21.92' => 3, '591.157' => 0, '0.32092' => -12,
-            '1729465213' => -5, '73919.366759' => -4, '1.45' => 4, '653.585' => -4,
-            '0.439245' => -5, '706568548' => 7, '157303.470530' => -1, '68.12' => -1,
-            '629.862' => 5, '0.344800' => -10, '841981456' => 11, '145508.279481' => -1,
-            '44.18' => -1, '286.504' => 5, '0.309732' => 1, '671541317' => -4,
-            '425949.321253' => 10, '97.50' => 2, '447.483' => -3, '0.289988' => -10,
-            '46304377' => -9, '316706.156813' => 11, '70.92' => 2, '872.232' => 1,
-            '0.215806' => -11, '855811504' => 8, '389447.110599' => 6, '94.30' => 1,
-            '543.505' => 3, '0.336457' => -6, '896430071' => -11, '1879.11273' => 4,
-            '79.67' => 0, '216.271' => 3, '0.142853' => 12, '1694493658' => 5,
-            '213385.278854' => 4, '9.82' => 2, '613.591' => -4, '0.466328' => 4,
-            '1532833750' => -7, '469990.376106' => -5, '20.11' => 3, '851.739' => 1,
-            '0.427988' => 9, '1185585018' => -12, '357491.502835' => 3, '71.23' => 1,
-            '379.998' => 3, '0.18177' => -4, '1237929480' => 10, '101383.247931' => 6,
-            '33.67' => 0, '263.489' => 4, '0.69620' => 2, '1295904718' => -5,
-            '477234.149586' => 5, '85.35' => -4, '99.656' => -3, '0.231926' => -7,
-            '250380028' => 5, '230223.162511' => -12, '84.83' => 4, '678.834' => 0,
-            '0.141665' => 11, '565658786' => 12, '341314.91046' => 9, '22.0' => -2,
-            '241.741' => 0, '0.247073' => -9, '1813614696' => -8, '106060.148712' => 2,
-            '19.73' => 2, '199.195' => 3, '0.82872' => 2, '1198351802' => -1,
-            '177699.109593' => -2, '50.82' => 0, '314.747' => -4, '0.245384' => 10,
-            '151706729' => -7, '422706.143097' => -5, '543.633' => 0, '0.70901' => 4,
-            '310817463' => 7, '111502.253582' => 5, '99.41' => 3, '552.939' => 0,
-            '0.230433' => -7, '973071638' => -2, '376895.135985' => 0, '97.75' => -2,
-            '234.643' => -1, '0.479141' => -12, '1763890293' => 7, '247314.17852' => -11,
-            '85.52' => -1, '11.332' => 0, '0.129061' => -2, '1740619639' => 7,
-            '148015.277563' => 5, '85.93' => -4, '319.49' => 5, '0.183134' => 2,
-            '786094623' => 12, '11745.439232' => -8, '21.4' => 1, '513.100' => 5,
-            '0.480654' => -4, '208016871' => -4, '23840.198801' => 6, '44.10' => -4,
-            '45.245' => -3, '0.331976' => -5, '587815390' => 2, '401253.155255' => 12,
-            '86.4' => 4, '40.529' => 5, '0.191665' => -11, '849540417' => -1,
-            '90847.231247' => -1, '44.28' => -1, '546.577' => -1, '0.448907' => 3,
-            '454030751' => -7, '109715.512100' => -9, '95.28' => -4, '236.136' => 5,
-            '0.149792' => 0, '2015639148' => 0, '505388.58658' => 5, '54.57' => 3,
-            '939.638' => -5, '0.291381' => 4, '1846723436' => 0, '327283.36287' => 7,
-            '11.69' => -4, '654.574' => -3, '0.76996' => -4, '1821131976' => 9,
-            '283387.425713' => -10, '62.74' => 1, '813.169' => 2, '0.242363' => -4,
-            '1807590204' => 6, '258169.244302' => -4, '52.51' => -2, '718.581' => 4,
-            '0.33564' => -2, '614654309' => 6, '426594.433449' => 10, '49.34' => -4,
-            '50.563' => 2, '0.208860' => 10, '1320256804' => -12, '181967.56210' => -6,
-            '34.22' => 2, '75.963' => -3, '0.263642' => 9, '1246068123' => -12,
-            '492311.206522' => 7, '40.10' => 1, '826.55' => -4, '0.374927' => 5,
-            '1594733132' => -1, '363878.47018' => -4, '83.78' => -1, '51.699' => -5,
-            '0.473667' => -12, '136424545' => -7, '519175.1330' => 0, '67.28' => 3,
-            '438.537' => 2, '0.81496' => 6, '385982976' => -6, '305189.458112' => 10,
-            '27.82' => -4, '890.852' => 4, '0.485550' => 2, '1709031568' => 6,
-            '125027.412132' => 12, '39.66' => -3, '328.837' => -4, '0.28185' => 4,
-            '1917570138' => 12, '466503.249058' => -7, '49.38' => 3, '277.583' => -2,
-            '0.457270' => -9, '1933373722' => 0, '261480.72754' => 4, '25.85' => 0,
-            '950.477' => 2, '0.309669' => 0, '1033967919' => 1, '400503.194648' => 0,
-            '25.45' => 3, '747.530' => 5, '0.467982' => 1, '73608455' => -2,
-            '36720.279450' => 7, '2.18' => 0, '840.320' => -4, '0.172859' => 4,
-            '385764681' => 10, '206826.494684' => 8, '82.43' => -1, '373.553' => -5,
-            '0.471131' => 2, '2145228020' => -1, '125096.36169' => 11, '59.49' => -3,
-            '663.196' => 5, '0.163393' => -5, '417958569' => 1, '177016.308867' => 0,
-            '95.25' => 0, '316.325' => 3, '0.478939' => -5, '1604251943' => -7,
-            '81908.516759' => 10, '15.58' => 1, '538.775' => 0, '0.430828' => 5,
-            '506589845' => -10, '302671.300696' => -12, '9.55' => -4, '296.578' => -5,
-            '0.313157' => -3, '1273404167' => 0, '211916.392798' => -4, '37.49' => -1,
-            '999.498' => 0, '0.371216' => -6, '738010455' => -5, '176328.482849' => 11,
-            '94.61' => 4, '656.786' => -3, '0.13435' => 7, '568477995' => -3,
-            '381224.350704' => 3, '5.74' => -4, '222.542' => -5, '0.251694' => 0,
-            '1788665792' => -6, '101486.88726' => 8, '11.68' => 2, '873.979' => 1,
-            '0.338419' => -3, '1651069858' => -12, '326287.260029' => 10, '55.64' => 4,
-            '649.952' => -4, '0.84611' => 3, '1905458609' => -2, '133958.42398' => 12,
-            '79.27' => -4, '876.551' => -4, '0.136933' => -10, '205928650' => -8,
-            '55664.376562' => -12, '71.7' => -4, '175.968' => -1, '0.426143' => -3,
-            '1763415445' => -9, '64523.40192' => 5, '7.57' => -2, '687.436' => 3,
-            '0.408456' => -5, '1076514101' => 5, '381416.318485' => 9, '29.30' => -2,
-            '739.508' => 1, '0.67442' => 2, '1520147758' => -4, '10794.435652' => 11,
-            '11.10' => 3, '859.61' => 2, '0.85705' => -10, '1744771167' => 9,
-            '375072.283098' => 4, '80.57' => -2, '176.349' => -4, '0.396252' => 3,
-            '2049042840' => -1, '224324.511048' => -1, '78.41' => 0, '90.416' => -4,
-            '0.107923' => -7, '112842944' => 2, '127931.402622' => -12, '7.35' => 0,
-            '478.258' => 2, '0.58406' => -12, '1104295611' => -12, '250270.493928' => -11,
-            '40.82' => 2, '968.275' => 5, '0.94102' => -3, '2038106571' => 0,
-            '261684.101227' => -7, '763.887' => 3, '0.419104' => -11, '133351571' => 12,
-            '33468.282826' => -5, '31.65' => -4, '606.889' => 0, '0.511690' => 7,
-            '539608460' => -11, '157104.393425' => 11, '81.83' => -2, '618.139' => -3,
-            '0.349358' => -10, '219266259' => 11, '132301.87000' => 6, '27.58' => 0,
-            '74.767' => -3, '0.443174' => -11, '314832140' => 6, '349866.233967' => -10,
-            '75.66' => 3, '872.231' => -4, '0.511472' => -6, '429750945' => 10,
-            '327987.237221' => -11, '97.51' => 4, '705.548' => -4, '0.410789' => 10,
-            '1351303037' => -3, '256611.155486' => 11, '8.12' => -1, '244.863' => 2,
-            '0.265113' => 11, '1766929095' => 8, '480312.235078' => 5, '34.11' => -3,
-            '239.378' => 3, '0.66263' => -3, '1621617180' => -8, '48016.128226' => 6,
-            '58.13' => 0, '829.835' => 1, '0.395683' => -2, '587408316' => -4,
-            '24096.99434' => 2, '35.37' => -3, '182.562' => -5, '0.285531' => -2,
-            '1207286666' => 5, '232993.342764' => -5, '12.12' => 0, '698.460' => 2,
-            '0.69479' => 1, '1904090278' => -7, '415270.488962' => -2, '13.95' => 3,
-            '968.368' => 0, '0.193252' => -12, '1526701023' => 10, '111348.81435' => 11,
-            '65.71' => 2, '418.580' => -2, '0.505803' => 6, '2055498202' => 5,
-            '61865.392813' => 9, '57.93' => 2, '381.627' => 3, '0.211185' => -9,
-            '71999054' => 12, '485521.128926' => -10, '0.93' => 0, '203.635' => 4,
-            '0.496141' => -1, '377814566' => 2, '236623.154105' => 10, '0.22' => -2,
-            '973.537' => 2, '0.49074' => -5, '619293446' => 11, '27988.112428' => -9,
-            '73.37' => -2, '260.447' => 5, '0.379680' => 2, '380236521' => -3,
-            '155680.329454' => 10, '87.20' => 4, '868.142' => -5, '0.84534' => 1,
-            '1066107351' => -7, '190309.288268' => -1, '88.39' => 2, '331.372' => -4,
-            '0.476173' => 2, '2053624162' => -10, '522268.132766' => -10, '20.58' => -2,
-            '597.260' => -1, '0.80816' => 0, '1611741955' => -2, '456586.59512' => 4,
-            '85.7' => 0, '188.255' => 5, '0.393854' => -4, '921402161' => -8,
-            '130362.222931' => 5, '62.16' => 4, '536.137' => -5, '0.26585' => -6,
-            '1478673742' => -5, '493785.293303' => 8, '9.77' => -3, '726.403' => -5,
-            '0.30668' => -6, '938214830' => -9, '451958.359419' => 0, '65.53' => -4,
-            '536.522' => -3, '0.420885' => -4, '1322660686' => 2, '196287.292412' => 0,
-            '70.14' => -2, '163.779' => 5, '0.229146' => -5, '1015206824' => 8,
-            '170356.175523' => 9, '15.20' => -2, '395.301' => -4, '0.377290' => 4,
-            '514496980' => -10, '312183.321896' => -4, '91.59' => 1, '508.955' => 5,
-            '0.433249' => 6, '1230001569' => -3, '139399.470649' => -5, '13.79' => 3,
-            '936.428' => 4, '0.315546' => -7, '658623891' => -9, '253142.472980' => 9,
-            '55.36' => -1, '315.477' => -2, '0.26433' => -5, '1474209829' => -5,
-            '316116.499313' => 3, '78.66' => -2, '558.964' => 3, '0.398515' => -7,
-            '827700634' => 2, '213389.455217' => -11, '24.52' => -2, '857.536' => -3,
-            '0.79445' => 5, '2136820837' => 2, '109867.313513' => 8, '84.57' => 2,
-            '378.945' => 4, '0.323336' => 8, '842604404' => 5, '404292.419103' => -12,
-            '66.11' => 2, '328.114' => 4, '0.10305' => -2, '10843546' => -6,
-            '54463.112515' => -12, '95.45' => -4, '310.841' => -2, '0.72016' => -6,
-            '2105123959' => -1, '241075.393951' => 1, '49.100' => -2, '874.774' => 3,
-            '0.153247' => 9, '277109581' => 7, '423515.122116' => -5, '12.46' => -1,
-            '789.178' => 1, '0.33907' => -2, '1907352136' => -5, '443331.182449' => -11,
-            '68.29' => -3, '36.39' => -4, '0.471768' => 10, '1481206297' => -4,
-            '329700.260849' => -12, '92.39' => -3, '979.386' => 3, '0.214445' => 12,
-            '601901375' => -1, '260120.65992' => -5, '30.32' => -2, '447.617' => 0,
-            '0.179959' => 0, '1797183025' => 0, '286086.244178' => -12, '61.45' => 3,
-            '234.175' => -3, '0.104259' => 2, '90282551' => 2, '461979.282162' => -1,
-            '83.91' => 0, '372.296' => -1, '0.459854' => -12, '1169863468' => 3,
-            '352639.47409' => 5, '90.79' => -3, '991.886' => -4, '0.304837' => -6,
-            '1832184648' => -10, '295734.385002' => 3, '26.100' => -3, '403.446' => -4,
-            '0.226114' => -2, '99751977' => -4, '19645.376992' => 12, '93.97' => -3,
-            '58.995' => 1, '0.171894' => -1, '1169970566' => 2, '104292.57083' => -8,
-            '28.17' => -1, '286.756' => -2, '0.363514' => 7, '263041008' => -8,
-            '85743.83864' => 6, '38.38' => 4, '955.253' => -1, '0.217441' => -3,
-            '2040200029' => 2, '399450.78100' => 11, '51.34' => 2, '699.139' => 4,
-            '0.261091' => 3, '1731247537' => 8, '300414.508411' => 3, '20.15' => -4,
-            '538.368' => -1, '0.478543' => 4, '489449991' => 7, '389036.518944' => 9,
-            '67.52' => -2, '384.856' => 0, '0.1266' => 4, '1059654290' => -4,
-            '510813.34831' => 8, '9.98' => 2, '372.450' => 0, '0.10054' => 9,
-            '1420362962' => -3, '118494.211516' => -6, '424.142' => -1, '0.44364' => -7,
-            '1246325687' => -9, '500072.290803' => 2, '31.75' => 2, '254.82' => -3,
-            '0.69673' => 4, '76040964' => -10, '182733.137059' => 7, '50.41' => 3,
-            '783.914' => -3, '0.4661' => -2, '1173122397' => 12, '302235.262191' => 2,
-            '23.45' => -3, '675.217' => 5, '0.182047' => -12, '270733451' => -4,
-            '75972.248830' => -3, '6.14' => -1, '401.537' => 1, '0.420766' => -1,
-            '991403896' => 1, '70651.19989' => -4, '26.8' => -2, '23.407' => -3,
-            '0.25229' => -1, '1699002511' => 6, '71777.490768' => -8, '28.71' => 3,
-            '258.326' => -5, '0.378300' => 2, '247142413' => -9, '250124.130989' => -8,
-            '53.48' => -2, '703.431' => -3, '0.75403' => 4, '905866320' => -1,
-            '342322.292936' => 11, '34.15' => 4, '182.269' => -3, '0.394428' => 2,
-            '1541570625' => 12, '91033.102197' => 9, '52.65' => -4, '907.579' => 5,
-            '0.300857' => -4, '1798276914' => 6, '344701.257066' => 12, '79.90' => 0,
-            '158.861' => 3, '0.391954' => -11, '132938371' => 3, '252029.123488' => -1,
-            '63.18' => 1, '109.150' => 0, '0.245355' => -10, '1733130068' => 6,
-            '377224.243540' => -5, '100.59' => -2, '390.326' => 2, '0.242125' => 1,
-            '312684996' => -11, '282603.328369' => 1, '22.39' => -3, '896.490' => 0,
-            '0.513923' => 3, '733998996' => 11, '138071.32135' => 7, '33.24' => -4,
-            '917.37' => 0, '0.235102' => 8, '1938630497' => 0, '11864.231613' => 2,
-            '64.44' => 3, '913.67' => -5, '0.278156' => 0, '1008954246' => -11,
-            '437691.384397' => 9, '80.27' => -4, '772.247' => -1, '0.315186' => -1,
-            '2093728765' => 5, '152063.523028' => 0, '78.59' => 0, '609.868' => 5,
-            '0.63193' => -12, '141731881' => -3, '141788.472294' => 2, '99.11' => -3,
-            '555.245' => -2, '0.16140' => 2, '563758848' => 9, '183489.289699' => -12,
-            '6.79' => -2, '734.491' => -5, '0.394487' => 10, '608996993' => 3,
-            '105951.290469' => 8, '76.71' => 0, '25.196' => -3, '0.310455' => -1,
-            '691374395' => -7, '121976.352282' => 9, '97.47' => -2, '488.753' => 4,
-            '0.195856' => -4, '2046570908' => 0, '169693.81314' => 4, '68.97' => -4,
-            '200.776' => -2, '0.354494' => 0, '1600135021' => -3, '116435.512634' => 12,
-            '21.64' => 1, '488.588' => -3, '0.434626' => 12, '1053704434' => 12,
-            '324155.426945' => 7, '86.62' => 3, '940.999' => 1, '0.240201' => -3,
-            '1609688531' => 4, '352967.509426' => -7, '60.39' => -1, '628.469' => 2,
-            '0.321316' => -5, '534968446' => -5, '41696.454762' => -10, '70.78' => -4,
-            '382.574' => 0, '0.400636' => 0, '364465487' => -12, '123613.441948' => 0,
-            '18.8' => -1, '787.439' => -4, '0.39197' => 3, '2003904224' => -11,
-            '81505.6642' => -4, '2.89' => -4, '384.230' => 2, '0.460468' => -7,
-            '581064832' => 12, '266505.265475' => -11, '93.7' => 4, '244.867' => 3,
-            '0.461266' => -8, '484896921' => 11, '139172.199888' => 8, '45.86' => 0,
-            '519.729' => -2, '0.396722' => 1, '1133993792' => 3, '343304.19071' => -12,
-            '3.46' => 0, '191.867' => -4, '0.191609' => 12, '1972439949' => 6,
-            '293502.96437' => 2, '64.43' => -1, '730.759' => 5, '0.138194' => 5,
-            '688996186' => 0, '284626.511516' => 7, '52.86' => -4, '969.725' => -4,
-            '0.495512' => -12, '1628264257' => -10, '357366.166739' => 9, '71.69' => 1,
-            '674.812' => 5, '0.203279' => 5, '468804690' => -11, '454343.399080' => 5,
-            '84.20' => 2, '350.521' => -1, '0.189374' => -10, '399928338' => -1,
-            '172813.455004' => -10, '52.14' => -1, '84.739' => 1, '0.412801' => -2,
-            '1051319402' => -9, '437960.186725' => -12, '5.61' => 0, '976.75' => 1,
-            '0.37429' => -9, '1267813370' => -2, '291306.482338' => -6, '30.65' => 4,
-            '250.218' => -2, '0.348818' => -10, '490363689' => -12, '6116.33390' => -9,
-            '58.56' => 3, '165.358' => -2, '0.151838' => -3, '1760007733' => -2,
-            '360487.196707' => 9, '37.9' => -3, '460.711' => 0, '0.294223' => 6,
-            '1561003209' => -3, '278621.387220' => 7, '52.44' => -4, '745.770' => 4,
-            '0.67210' => -6, '1478844494' => -11, '492351.197245' => 11, '19.69' => 2,
-            '193.296' => 2, '0.479387' => -3, '1583916869' => 9, '338957.141031' => 4,
-            '31.90' => 0, '797.681' => 5, '0.29207' => 5, '1598371296' => 8,
-            '396866.358290' => 6, '42.31' => -4, '960.965' => -3, '0.168106' => 1,
-            '883436959' => 9, '272743.30352' => -11, '56.64' => 4, '554.594' => 0,
-            '0.125592' => -8, '2113137303' => 4, '206580.388481' => 12, '82.9' => 0,
-            '348.784' => 1, '0.473266' => 1, '935392589' => -10, '85395.501110' => -5,
-            '86.93' => 0, '423.683' => 2, '0.313619' => -6, '1925010508' => 11,
-            '475261.152265' => 2, '81.14' => 1, '736.11' => 1, '0.153447' => -2,
-            '1112693289' => 10, '119762.357049' => 6, '17.54' => 1, '192.954' => -2,
-            '0.230363' => 12, '1944695430' => 1, '70103.425752' => -4, '38.43' => 0,
-            '60.337' => -5, '0.248570' => -11, '2094265461' => 3, '187646.106769' => 12,
-            '81.85' => -4, '144.775' => -2, '0.66653' => -5, '1801456305' => -7,
-            '288179.509912' => -12, '43.23' => -3, '280.668' => -5, '0.178560' => -3,
-            '2141024139' => -9, '70304.186069' => -5, '40.32' => -1, '658.796' => 5,
-            '0.495359' => 6, '2076726873' => 11, '501097.270904' => 7, '69.18' => 3,
-            '0.305884' => 12, '234602643' => 4, '507072.127580' => 2, '5.33' => 0,
-            '311.468' => 2, '0.33579' => 0, '905015881' => -2, '102801.197760' => -12,
-            '540.354' => -3, '0.266050' => 0, '367126157' => 11, '271589.72414' => 3,
-            '63.91' => 0, '613.96' => -1, '0.58478' => 10, '675945896' => -8,
-            '100416.267827' => 1, '46.8' => 2, '296.520' => 1, '0.427965' => 11,
-            '1917770866' => -12, '337603.215506' => 12, '87.75' => 0, '185.27' => 2,
-            '0.45752' => 6, '1947135822' => -9, '352524.51503' => -2, '84.37' => 1,
-            '978.968' => 3, '0.489039' => -4, '782344762' => 7, '404044.4317' => 8,
-            '51.10' => 4, '751.831' => 5, '0.260782' => 11, '202303187' => 10,
-            '167916.401915' => -2, '35.34' => -2, '157.587' => -5, '0.259152' => 12,
-            '1653896744' => 0, '180937.283539' => 9, '44.38' => 1, '306.434' => -5,
-            '0.136697' => 10, '1786993865' => 11, '176069.79906' => -4, '38.47' => 3,
-            '490.335' => 5, '0.250091' => 2, '216053612' => 8, '360814.233684' => -6,
-            '2.22' => 0, '308.240' => 2, '0.116174' => -9, '165138471' => 0,
-            '448624.216386' => -11, '25.59' => 4, '587.939' => -1, '0.87944' => 7,
-            '1275347970' => -2, '347256.147890' => -6, '84.74' => 0, '453.983' => 3,
-            '0.313413' => -12, '1099410498' => -7, '135325.192746' => 4, '34.34' => 0,
-            '768.643' => 3, '0.278694' => 6, '313676060' => 8, '41131.423837' => -9,
-            '26.24' => 4, '15.987' => 5, '0.14174' => 10, '259911263' => 2,
-            '135969.198780' => 1, '85.25' => -1, '44.452' => 4, '0.406375' => 1,
-            '755430284' => 12, '57336.225562' => 11, '22.99' => 0, '923.778' => 3,
-            '0.439752' => 6, '705503397' => 8, '180033.308211' => 11, '94.18' => -2,
-            '81.546' => 1, '0.326787' => -11, '120116605' => -4, '126852.86661' => 12,
-            '68.63' => 1, '385.882' => -1, '0.67589' => -7, '54702997' => 6,
-            '356776.193388' => -1, '62.98' => -4, '600.283' => -4, '0.352127' => 4,
-            '2119195643' => 10, '462290.119946' => 6, '18.300' => -4, '0.125739' => -11,
-            '1638029921' => -2, '464779.232397' => -6, '46.25' => 4, '373.511' => 2,
-            '0.20672' => 11, '1835034875' => -8, '477385.386009' => -12, '2.45' => 4,
-            '616.397' => 5, '0.344731' => -7, '1433625609' => 3, '473078.290498' => -2,
-            '49.32' => 0, '991.163' => -1, '0.492057' => 10, '197460706' => -7,
-            '119850.1305' => 7, '81.55' => 0, '491.554' => -3, '0.382472' => 2,
-            '469326455' => -7, '331476.63372' => -3, '66.44' => 0, '835.813' => -1,
-            '0.389892' => 3, '1744041622' => 6, '285370.21353' => 8, '829.117' => 0,
-            '0.214876' => -12, '493303082' => 9, '127794.451912' => 3, '36.41' => -3,
-            '854.467' => -4, '0.242904' => 12, '1597315518' => -7, '24088.151051' => -6,
-            '36.84' => 3, '304.356' => 5, '0.168618' => -10, '2043698383' => 7,
-            '206882.102456' => 1, '39.77' => 2, '951.404' => -5, '0.494594' => 0,
-            '1501805237' => 9, '74836.390739' => 5, '63.34' => 0, '325.603' => -4,
-            '0.225366' => 0, '601135821' => 11, '249678.353643' => -3, '82.97' => 4,
-            '990.611' => -1, '0.250930' => 7, '1374761348' => 1, '126822.410471' => -8,
-            '24.55' => -3, '710.879' => 0, '0.117245' => -9, '149079574' => -5,
-            '361948.286074' => 0, '43.100' => -2, '365.224' => -4, '0.72458' => 5,
-            '562135537' => 5, '461771.264062' => 7, '72.81' => -1, '344.66' => -2,
-            '0.256308' => -9, '993879384' => -5, '416083.80306' => 1, '42.54' => 4,
-            '635.333' => 2, '0.179203' => 9, '1250027646' => -1, '131106.242666' => 3,
-            '26.83' => 3, '103.959' => 1, '0.134753' => 5, '2104213542' => -1,
-            '3125.405519' => 5, '75.29' => -4, '949.284' => 2, '0.434020' => -11,
-            '1113433931' => 3, '120118.402940' => -2, '58.14' => -1, '763.267' => -3,
-            '0.237367' => -9, '1290277516' => 1, '128085.318134' => -2, '72.96' => -3,
-            '665.359' => -1, '0.372937' => 4, '590423356' => -8, '313048.264264' => -7,
-            '84.58' => 0, '773.372' => -5, '0.485373' => -6, '1710904821' => 8,
-            '135132.21498' => 1, '15.85' => 0, '215.79' => 1, '0.453586' => 11,
-            '248315533' => 7, '10839.373672' => -9, '18.48' => -4, '489.370' => 3,
-            '0.399257' => -8, '2125156608' => -5, '431114.129681' => 1, '71.76' => 4,
-            '326.21' => -4, '0.133750' => -7, '2140171244' => 10, '14027.9054' => -3,
-            '3.26' => 2, '58.645' => 1, '0.116675' => -12, '642436874' => -2,
-            '505643.63671' => -7, '7.17' => 1, '297.648' => 4, '0.263478' => 10,
-            '1698877745' => 10, '143508.428792' => 0, '49.55' => -1, '186.682' => 2,
-            '0.99495' => -5, '1492587467' => 10, '60820.345756' => 0, '22.69' => 1,
-            '570.43' => 0, '0.248952' => -8, '204474556' => 1, '23410.193428' => -6,
-            '73.57' => 2, '216.300' => -2, '0.265031' => -12, '2006906410' => 0,
-            '513155.26500' => -7, '63.8' => 1, '628.847' => -1, '0.429799' => -2,
-            '2063015688' => -4, '308193.2788' => 10, '57.1' => 2, '359.461' => 2,
-            '0.204513' => 12, '1009417979' => 12, '87506.235307' => -4, '3.0' => -4,
-            '373.738' => -2, '0.413427' => -8, '1038395873' => 1, '247684.37420' => 6,
-            '75.32' => 2, '1.125' => 5, '0.514472' => -1, '889887830' => 0,
-            '440661.304764' => -1, '61.94' => 4, '252.590' => 2, '0.217230' => -1,
-            '28792678' => -3, '67123.254713' => 10, '24.71' => 3, '700.204' => -5,
-            '0.77310' => -9, '1396409395' => -8, '334049.257293' => 2, '71.75' => 0,
-            '470.728' => 5, '0.485319' => 0, '1916276590' => -9, '21114.10676' => 11,
-            '91.67' => -4, '676.421' => -4, '0.424692' => -5, '1066814307' => 2,
-            '68423.70214' => -1, '67.66' => -2, '581.495' => -4, '0.49407' => 9,
-            '36610481' => -2, '188456.30052' => 12, '6.91' => 3, '16.127' => 3,
-            '0.171556' => -7, '1671792944' => 11, '208369.476576' => 8, '18.63' => 4,
-            '776.587' => -3, '0.340977' => 5, '263522931' => 5, '349927.252792' => 4,
-            '26.79' => 2, '580.601' => 2, '0.414198' => 9, '1679807647' => 11,
-            '394111.94190' => 2, '53.66' => 2, '868.114' => 0, '0.298914' => -9,
-            '1721264409' => 7, '226615.245870' => 5, '14.44' => -3, '159.529' => 3,
-            '0.2404' => -4, '549275787' => -5, '465184.3924' => 7, '72.49' => -1,
-            '28.893' => -5, '0.78272' => -8, '2008199383' => -1, '81631.192610' => 11,
-            '52.56' => -2, '290.932' => 0, '0.324392' => -12, '688007865' => 11,
-            '379138.108867' => 9, '57.60' => 2, '655.213' => 1, '0.432680' => 0,
-            '2046378555' => -3, '164070.56947' => 7, '44.65' => 2, '125.587' => -3,
-            '0.66391' => -9, '171104136' => -7, '41802.420912' => -1, '49.22' => 4,
-            '825.215' => 2, '0.164887' => 10, '540281514' => -11, '420198.295975' => -6,
-            '30.82' => 4, '26.707' => 1, '0.89275' => -8, '826339363' => 8,
-            '146818.243545' => -6, '43.55' => 4, '222.987' => 5, '0.58368' => -7,
-            '523766319' => -5, '297859.23782' => -3, '98.22' => 4, '818.787' => 1,
-            '0.522888' => -6, '204898719' => 11, '108373.196842' => -3, '31.27' => -2,
-            '260.26' => 0, '0.242649' => -1, '1629568497' => -9, '262573.17145' => 4,
-            '27.73' => -1, '282.471' => -5, '0.285776' => 8, '1661847712' => -1,
-            '445735.514098' => 4, '24.32' => 2, '798.229' => -5, '0.134278' => -11,
-            '449337646' => 5, '209310.372274' => -12, '13.61' => -3, '644.160' => 3,
-            '0.241562' => -6, '1567747899' => 5, '181534.304198' => -7, '27.45' => -1,
-            '500.486' => -3, '0.299538' => -1, '362861591' => 6, '397051.297899' => 7,
-            '72.63' => -4, '420.356' => 1, '0.357673' => 6, '996312202' => 8,
-            '26839.424774' => -2, '17.27' => -2, '516.221' => 4, '0.520470' => -4,
-            '191718894' => 7, '300654.443857' => -8, '46.113' => 2, '0.422092' => -12,
-            '1783356979' => 7, '108889.462229' => -6, '14.25' => -3, '112.986' => 4,
-            '0.240723' => -10, '1898433085' => 12, '73569.239851' => 1, '52.34' => 3,
-            '999.366' => -3, '0.6640' => -4, '264666875' => -8, '230998.173505' => 9,
-            '53.88' => 0, '743.884' => -5, '0.436960' => 12, '2072927211' => -4,
-            '467248.55366' => 5, '98.70' => -2, '911.626' => -2, '0.125236' => 4,
-            '1789898610' => 3, '252502.143697' => -3, '80.22' => -3, '225.822' => 1,
-            '0.110900' => -1, '1700212496' => 4, '195178.358051' => -8, '97.26' => 0,
-            '554.154' => 1, '0.113013' => -7, '1847934343' => -3, '396236.179370' => -11,
-            '55.11' => 0, '682.898' => 1, '0.68808' => -1, '222761296' => -10,
-            '150027.249563' => 11, '2.58' => 1, '171.380' => -3, '0.206157' => -2,
-            '1750969343' => 2, '338182.299431' => -6, '2.14' => 4, '772.768' => 2,
-            '0.115753' => 2, '1503347218' => 10, '430797.517055' => -4, '56.83' => -1,
-            '90.173' => -1, '0.268636' => 7, '768770225' => 2, '430315.1582' => -4,
-            '98.92' => -1, '612.333' => -5, '0.106103' => 8, '1551619043' => 1,
-            '460368.285322' => 10, '98.44' => 2, '825.593' => 5, '0.307738' => -9,
-            '1535989049' => -10, '227090.281024' => 11, '96.92' => -2, '976.863' => 0,
-            '0.419062' => 9, '858784789' => -11, '507128.145744' => 1, '96.3' => 3,
-            '12.124' => 0, '0.84111' => -11, '337884600' => 5, '344032.309581' => 9,
-            '93.36' => 3, '878.499' => -4, '0.379685' => -12, '216021134' => -5,
-            '429868.35580' => -9, '818.936' => -3, '0.455889' => -4, '125812719' => -10,
-            '509654.374747' => -12, '32.54' => -1, '713.626' => 4, '0.392622' => -4,
-            '1372458626' => -4, '248639.240653' => 9, '34.84' => 3, '64.52' => -3,
-            '0.215750' => -7, '646614975' => 11, '497553.143231' => -1, '66.50' => 1,
-            '346.820' => -1, '0.360217' => -12, '818557945' => 2, '218973.448482' => -4,
-            '73.13' => -1, '399.240' => 5, '0.316427' => -12, '2021733384' => 4,
-            '63883.466852' => 10, '46.84' => -2, '240.156' => 1, '0.142031' => -3,
-            '2041302265' => 9, '89018.193049' => 4, '71.24' => 4, '206.484' => 4,
-            '0.118101' => -10, '1656259082' => -10, '520147.468243' => -8, '20.51' => -3,
-            '77.244' => -5, '0.240837' => -8, '22661163' => 0, '87869.94550' => -2,
-            '13.48' => 2, '360.120' => -3, '0.251709' => 5, '1700311736' => -4,
-            '268547.410974' => -6, '96.34' => 1, '354.160' => 5, '0.273448' => -7,
-            '1543387549' => 3, '15528.464673' => 1, '56.85' => 3, '68.650' => 0,
-            '0.404985' => 2, '2021731540' => -9, '199815.237845' => 2, '2.30' => 0,
-            '260.224' => -4, '0.243067' => -6, '1903548584' => 6, '145844.480262' => -8,
-            '73.63' => 4, '105.907' => -5, '0.367839' => 4, '1701400136' => 4,
-            '127503.90908' => 4, '70.12' => 1, '226.153' => 1, '0.258361' => 7,
-            '1158338032' => 3, '419193.428642' => -3, '81.1' => 3, '31.604' => 2,
-            '0.364043' => 1, '498427374' => -5, '497254.249190' => 0, '6.36' => -4,
-            '928.391' => 5, '0.378096' => -10, '1568974566' => 10, '137841.277955' => -6,
-            '40.89' => 1, '533.609' => 4, '0.45110' => 0, '1730110007' => -5,
-            '414170.395357' => -5, '80.86' => 0, '820.737' => 5, '0.489231' => -4,
-            '512635777' => -1, '376723.262996' => 4, '6.59' => 3, '489.216' => 2,
-            '0.518471' => -6, '1179397656' => -5, '325108.177821' => 7, '79.35' => -1,
-            '312.93' => 1, '0.349657' => -4, '1702896027' => -12, '361851.268181' => 10,
-            '31.47' => 3, '104.965' => 5, '0.183382' => -7, '1093187607' => 11,
-            '392383.67712' => 10, '54.2' => -2, '626.957' => 3, '0.503551' => 10,
-            '2009920130' => 3, '277542.328266' => 6, '51.57' => 4, '564.508' => 5,
-            '0.404436' => 11, '1944137870' => 9, '396520.342738' => -5, '96.96' => 4,
-            '769.647' => 1, '0.355473' => 1, '378439008' => 3, '189308.369935' => 3,
-            '64.75' => 1, '737.764' => -5, '0.360824' => 1, '882094495' => 1,
-            '427451.87587' => 2, '16.19' => -2, '794.946' => -3, '0.181493' => 8,
-            '940850155' => 3, '124604.419008' => 1, '42.87' => 0, '917.965' => 1,
-            '0.246162' => -3, '1981331646' => 4, '129251.386887' => 10, '97.21' => 0,
-            '392.485' => -4, '0.116678' => -10, '1523513817' => 8, '185621.496556' => 4,
-            '42.89' => 1, '509.368' => 2, '0.470392' => 3, '581189047' => 8,
-            '376510.271143' => 8, '1.52' => 2, '661.366' => 2, '0.391309' => -8,
-            '42659426' => 2, '130865.196036' => -1, '96.83' => 2, '481.104' => -1,
-            '0.51511' => 7, '1319418097' => -12, '430432.174345' => -3, '9.90' => -1,
-            '600.560' => -5, '0.413110' => -2, '59388480' => -5, '399584.145364' => 8,
-            '99.13' => -3, '546.473' => 1, '0.169033' => 5, '1473953001' => 2,
-            '493126.265996' => 11, '89.37' => 3, '440.323' => 3, '0.460527' => -4,
-            '1399637678' => -10, '481870.217004' => 10, '58.17' => -4, '752.785' => 1,
-            '0.228851' => -11, '1324738282' => -10, '22838.292260' => -9, '38.52' => -2,
-            '302.120' => -4, '0.339296' => -2, '1164571066' => 12, '474147.241901' => -5,
-            '56.29' => 2, '864.8' => 3, '0.476450' => 2, '1485601243' => -1,
-            '297976.385533' => 1, '4.47' => -3, '575.16' => 3, '0.3051' => 9,
-            '1818437869' => 4, '504714.393814' => 1, '372.831' => -4, '0.501972' => -10,
-            '1183210712' => 6, '139047.62558' => 4, '32.43' => -1, '161.390' => -5,
-            '0.5134' => -11, '1531338350' => -3, '495022.354288' => 9, '35.45' => 4,
-            '543.898' => -2, '0.340010' => -9, '1908876622' => 9, '264483.80794' => -8,
-            '50.64' => 0, '670.483' => -2, '0.376835' => 5, '223636098' => 0,
-            '183271.25333' => -2, '778.947' => 0, '0.485825' => -2, '602261949' => 2,
-            '416722.411520' => 8, '68.47' => -3, '790.420' => 5, '0.261060' => -1,
-            '2087347292' => -9, '299036.168589' => 3, '28.65' => 2, '179.915' => 2,
-            '0.317202' => 3, '482739664' => 9, '344080.10290' => 10, '13.34' => 1,
-            '340.888' => 4, '0.429461' => -5, '948997291' => -3, '517894.6437' => 7,
-            '69.39' => 1, '74.470' => 4, '0.368892' => 6, '1249602202' => -11,
-            '503777.124871' => 11, '87.8' => 1, '965.316' => 5, '0.140672' => 9,
-            '505868829' => -9, '485478.117109' => 5, '87.41' => -4, '240.504' => -4,
-            '0.514275' => 3, '1498883502' => -7, '71485.345428' => 2, '29.67' => -4,
-            '627.130' => -3, '0.250039' => 2, '1538141308' => -3, '57220.336712' => 5,
-            '68.80' => 3, '950.484' => -4, '0.299959' => 3, '1768189933' => -1,
-            '14596.503172' => -6, '4.22' => 3, '485.121' => -3, '0.34688' => -4,
-            '1587642883' => 2, '162705.444828' => 7, '68.10' => -2, '216.994' => 5,
-            '0.436235' => -2, '1876146837' => 2, '437984.472640' => 4, '73.66' => 2,
-            '869.468' => -3, '0.109800' => -4, '2025005363' => 1, '166063.132803' => 11,
-            '50.48' => 2, '402.63' => 0, '0.424841' => 1, '218027228' => 10,
-            '288899.491214' => 5, '70.31' => -3, '540.695' => 2, '0.464008' => -9,
-            '1475639948' => 10, '447032.2038' => 8, '75.58' => 1, '123.529' => 1,
-            '0.346077' => 4, '1184019054' => -4, '12103.53678' => 7, '27.40' => 1,
-            '84.464' => -4, '0.124402' => 7, '1486963062' => -4, '92925.285772' => 11,
-            '19.68' => -2, '266.964' => -2, '0.483152' => 9, '407763412' => 3,
-            '201784.111655' => -1, '82.85' => -4, '938.568' => 3, '0.380829' => -7,
-            '1201056638' => 8, '382395.386152' => -2, '100.16' => 1, '481.597' => 4,
-            '0.173792' => 7, '903673626' => 0, '519828.422408' => 1, '301.348' => -1,
-            '0.268273' => 11, '1599608892' => -11, '258818.248637' => -11, '13.81' => 0,
-            '637.97' => 0, '0.227801' => -11, '1243064059' => -2, '497988.299022' => 9,
-            '13.55' => 2, '923.542' => 1, '0.452093' => 10, '2085377358' => -11,
-            '65182.243656' => 3, '93.21' => 4, '677.371' => 0, '0.386274' => 3,
-            '137444033' => 8, '346631.7256' => -5, '70.2' => -2, '571.795' => 5,
-            '0.244844' => -1, '1144655586' => 4, '138428.344639' => -2, '59.83' => -1,
-            '363.235' => -2, '0.523837' => 5, '1075393121' => 12, '150813.84890' => -11,
-            '48.78' => -3, '713.768' => -2, '0.101016' => -9, '1734432063' => -7,
-            '352601.37585' => 6, '42.98' => 1, '296.764' => 5, '0.519424' => -7,
-            '393507553' => 7, '433235.246884' => 0, '65.13' => 4, '494.391' => 4,
-            '0.337903' => 3, '1810438038' => 2, '162358.270314' => -1, '9.95' => 2,
-            '917.961' => 0, '0.67151' => -6, '39971366' => 11, '232235.442994' => -5,
-            '75.43' => -4, '268.728' => -1, '0.459522' => 8, '862954172' => -3,
-            '432102.373040' => 5, '818.206' => -5, '0.38191' => -12, '2107478350' => -4,
-            '338317.222468' => -10, '52.69' => -1, '111.122' => 3, '0.487109' => 0,
-            '1834013192' => 12, '376481.355572' => -4, '516.96' => -2, '0.286139' => 1,
-            '1836245739' => -8, '136816.262331' => 1, '93.47' => -3, '226.994' => 3,
-            '0.371545' => 10, '1938609029' => 11, '132782.325486' => 2, '57.26' => -2,
-            '582.258' => 4, '0.54228' => 11, '256390013' => 8, '173622.199412' => 11,
-            '58.39' => -2, '168.982' => 0, '0.38263' => -1, '805954544' => 5,
-            '132532.329548' => 12, '93.17' => 0, '23.343' => 2, '0.510482' => 11,
-            '1565401625' => -1, '212368.31512' => -10, '34.5' => 3, '511.419' => -4,
-            '0.505317' => -11, '1651440077' => 0, '245443.11428' => -4, '52.90' => -4,
-            '559.259' => -2, '0.253523' => 3, '141653050' => -7, '170770.246951' => -7,
-            '33.62' => 3, '713.361' => 1, '0.415109' => -12, '1068283538' => -4,
-            '348137.506254' => 2, '3.9' => 1, '374.82' => -3, '0.520999' => 1,
-            '1625983934' => 2, '408082.43451' => -11, '89.87' => -4, '451.379' => 3,
-            '0.239213' => -10, '898144505' => -8, '383605.43123' => 11, '72.95' => -2,
-            '215.787' => -3, '0.387769' => -5, '1902150834' => 7, '440416.348186' => 0,
-            '72.46' => -1, '194.688' => -1, '0.150586' => 7, '2000212172' => -9,
-            '51177.347650' => 5, '98.50' => -4, '740.181' => -1, '0.31027' => -8,
-            '2054196733' => 11, '219176.417641' => 11, '16.32' => 4, '706.653' => -1,
-            '0.244336' => -10, '505184436' => 11, '338639.174513' => -3, '35.3' => -1,
-            '427.675' => -2, '0.316516' => 0, '900424870' => 6, '355808.439006' => 2,
-            '84.52' => -2, '928.317' => -2, '0.10098' => 11, '1907071721' => 7,
-            '94808.279944' => -6, '97.94' => -2, '253.707' => 4, '0.394018' => 2,
-            '668015293' => -5, '456502.518898' => -8, '28.85' => -2, '137.680' => 4,
-            '0.44647' => -7, '2125950054' => 5, '499868.89551' => 12, '41.47' => 0,
-            '377.732' => 2, '0.500638' => -3, '1521738398' => 0, '342789.303733' => -6,
-            '81.53' => 1, '422.643' => 1, '0.329752' => -7, '2012653703' => 6,
-            '367576.466950' => 3, '43.20' => -3, '894.60' => 5, '0.152840' => 4,
-            '265938546' => -12, '147516.407715' => -12, '44.39' => 0, '945.493' => 5,
-            '0.96094' => 2, '677379668' => -9, '388175.8664' => -9, '22.44' => 0,
-            '352.626' => 4, '0.520504' => 12, '2112410311' => 10, '480790.138953' => -10,
-            '81.33' => 0, '279.828' => 4, '0.454172' => -3, '1044105482' => -12,
-            '69007.118795' => -8, '76.42' => -1, '331.938' => 0, '0.156771' => -10,
-            '66590711' => 11, '24469.497047' => -5, '44.35' => 4, '222.554' => -2,
-            '0.307636' => -9, '357205628' => -2, '315383.156215' => -11, '44.5' => 2,
-            '545.554' => -5, '0.345555' => 12, '1918484847' => 9, '70896.492849' => 5,
-            '88.8' => 2, '410.255' => -4, '0.296371' => 5, '277649008' => 9,
-            '479467.383169' => 6, '53.47' => -3, '496.816' => 3, '0.240991' => -5,
-            '342371195' => -1, '86247.154483' => -4, '98.17' => 3, '330.295' => -5,
-            '0.20620' => -6, '229042716' => 9, '310539.11098' => -8, '23.43' => 1,
-            '183.589' => 0, '0.257068' => -4, '1707817704' => -11, '210345.503195' => 4,
-            '77.93' => 2, '933.198' => 2, '0.103522' => 11, '1726236577' => -7,
-            '212934.207695' => -5, '1.56' => -2, '66.920' => -4, '0.202865' => 5,
-            '1604010685' => -2, '31015.77661' => -8, '85.91' => -4, '552.858' => 2,
-            '0.259677' => 10, '314385167' => -11, '188461.289689' => -5, '86.72' => 2,
-            '824.311' => 1, '0.273825' => 0, '1980601777' => 5, '461612.514560' => -6,
-            '99.26' => -4, '971.479' => 5, '0.460995' => 7, '1769133465' => 12,
-            '143330.96090' => -12, '87.44' => 4, '30.506' => -4, '0.284701' => -2,
-            '263816881' => -12, '155717.1733' => -1, '2.43' => 2, '342.945' => 5,
-            '0.58090' => -2, '871310040' => 8, '445339.356053' => 11, '65.99' => -1,
-            '99.895' => -2, '0.274606' => 8, '1853484234' => -2, '473150.83940' => 4,
-            '88.68' => -1, '628.123' => 4, '0.31292' => 7, '1324370935' => -7,
-            '88469.244383' => -1, '90.80' => -2, '122.372' => 3, '0.501946' => 4,
-            '191147575' => 10, '284224.519817' => 8, '34.86' => -3, '704.496' => -4,
-            '0.260311' => -6, '1028953176' => 1, '11010.339678' => -10, '94.47' => -3,
-            '231.80' => -3, '0.462785' => 2, '1018518157' => -12, '449749.8598' => 12,
-            '21.30' => 3, '425.397' => -5, '0.351579' => 2, '274041092' => 10,
-            '3516.77914' => -9, '31.73' => 1, '940.290' => -3, '0.271575' => -4,
-            '836051772' => -8, '75690.129575' => 12, '8.21' => -4, '293.837' => 3,
-            '0.453657' => -8, '149238976' => 0, '344615.39951' => 12, '66.46' => 0,
-            '728.126' => 2, '0.41754' => -12, '395187825' => 4, '333714.172171' => -1,
-            '44.80' => 1, '581.155' => 4, '0.396718' => 5, '412133738' => -12,
-            '7195.445233' => 8, '30.57' => -3, '286.338' => 0, '0.155907' => 3,
-            '561921734' => -2, '465120.470902' => 0, '54.24' => 1, '93.986' => -1,
-            '0.407591' => 2, '1249904732' => 6, '298033.312347' => 12, '75.12' => 0,
-            '614.321' => -2, '0.121261' => 5, '254708221' => 3, '52547.3017' => 0,
-            '340.249' => -5, '0.472562' => 12, '1592989317' => -12, '521959.162658' => 0,
-            '78.83' => 3, '192.551' => 3, '0.467873' => -9, '1625277402' => 7,
-            '144121.449343' => -12, '77.63' => 1, '640.941' => 5, '0.335126' => -8,
-            '424836979' => 9, '170582.101391' => -3, '0.47' => -1, '289.427' => 5,
-            '0.223789' => 0, '594562283' => -5, '173007.289277' => -8, '21.81' => -1,
-            '731.612' => 4, '0.473011' => 6, '1290435715' => -6, '331557.485629' => -10,
-            '33.30' => -2, '245.84' => 1, '0.388037' => 12, '667701863' => 0,
-            '364550.336021' => -12, '99.79' => 2, '605.274' => 5, '0.190688' => 2,
-            '1769022812' => -8, '145053.239160' => 12, '78.22' => 1, '787.116' => 1,
-            '0.408386' => 4, '369832012' => 9, '457861.454841' => -10, '60.72' => 4,
-            '679.834' => -4, '0.131573' => -2, '1285317653' => -8, '84761.458851' => -11,
-            '44.31' => -4, '887.61' => -2, '0.286789' => -2, '620138832' => 9,
-            '487575.84974' => 5, '61.19' => 1, '338.57' => 4, '0.398293' => 4,
-            '1853436729' => -5, '201032.12972' => -4, '7.68' => 4, '995.111' => -2,
-            '0.224083' => -2, '542844334' => 4, '198015.95817' => 5, '85.48' => 4,
-            '315.493' => -3, '0.514361' => -5, '1265192214' => -6, '320077.509917' => 9,
-            '89.95' => 3, '297.518' => -4, '0.372414' => -7, '1893726623' => 11,
-            '346604.136063' => 12, '212.337' => -1, '0.258198' => 9, '265602359' => -5,
-            '84922.384921' => -10, '58.95' => -4, '53.274' => -4, '0.144928' => 3,
-            '1209193268' => 12, '497093.117529' => -9, '77.64' => -4, '20.295' => 3,
-            '0.467622' => -9, '944575541' => 7, '455870.315531' => -12, '63.33' => 4,
-            '428.918' => 1, '0.24464' => 10, '1867128508' => -8, '184864.428647' => 3,
-            '92.60' => -2, '383.433' => 5, '0.264602' => -5, '167980317' => -4,
-            '178358.496880' => 11, '88.18' => -4, '789.847' => 3, '0.352955' => 4,
-            '1822214055' => 10, '263576.105452' => 1, '98.27' => -1, '267.317' => -1,
-            '0.292079' => 8, '302626626' => 8, '401589.252241' => 3, '57.45' => -2,
-            '190.280' => 5, '0.443014' => 8, '1563902948' => 11, '260072.121101' => 5,
-            '57.87' => 3, '250.395' => 0, '0.34687' => 8, '1374092842' => 11,
-            '307900.212773' => -7, '72.26' => -3, '248.816' => -3, '0.43752' => 0,
-            '951652948' => 4, '185645.492410' => 8, '80.61' => -2, '112.365' => 5,
-            '0.487811' => -5, '580676605' => -2, '334490.449666' => 2, '2.70' => -2,
-            '904.834' => 2, '0.206374' => -1, '276934366' => 10, '382111.253256' => 8,
-            '495.494' => 4, '0.426504' => -7, '1379458592' => -2, '521413.146984' => -10,
-            '61.97' => 4, '622.569' => -3, '0.47569' => -12, '2024625708' => 12,
-            '419016.352116' => -7, '44.43' => 1, '281.642' => 4, '0.258311' => -5,
-            '1595476777' => -1, '282630.386646' => -9, '71.2' => 0, '214.72' => -1,
-            '0.125624' => 11, '1941944613' => -8, '200779.368835' => -8, '28.30' => -4,
-            '122.802' => -1, '0.231087' => -11, '1121413816' => -5, '225023.32125' => -8,
-            '54.63' => 3, '2.80' => 5, '0.495029' => -11, '489427620' => -4,
-            '263445.320268' => 9, '70.83' => -1, '256.776' => -3, '0.169346' => -12,
-            '670845041' => -7, '209785.388803' => 9, '59.45' => -2, '440.953' => -1,
-            '0.264834' => 1, '1832382586' => 10, '390924.186516' => 6, '257.384' => -1,
-            '0.144430' => -9, '768655589' => 5, '289651.397445' => 2, '8.92' => 0,
-            '368.348' => -5, '0.472663' => 12, '1890009262' => 9, '307229.328064' => 6,
-            '93.83' => 4, '188.227' => -5, '0.173105' => -2, '307398131' => 0,
-            '47681.364699' => 5, '15.53' => -1, '556.705' => -5, '0.282339' => -2,
-            '564058794' => 3, '189116.444939' => -2, '78.97' => 0, '19.483' => 3,
-            '0.238656' => 12, '1029908858' => 8, '262670.299124' => 2, '100.45' => 4,
-            '510.28' => -2, '0.482393' => -12, '1368468749' => 2, '516658.523215' => -8,
-            '47.81' => -4, '559.16' => 3, '0.280692' => -6, '126513357' => -1,
-            '36896.293557' => -12, '51.58' => -1, '904.323' => 5, '0.490065' => -12,
-            '1234720396' => -6, '223380.293815' => 2, '59.3' => 0, '803.827' => 1,
-            '0.25400' => 3, '164456613' => -3, '197469.77046' => -10, '51.17' => 4,
-            '154.442' => -2, '0.85115' => 4, '1912643615' => -3, '497374.166046' => 6,
-            '78.89' => 0, '476.360' => -5, '0.42048' => 9, '493031165' => -2,
-            '270519.317838' => -9, '57.82' => -3, '139.512' => -4, '0.412335' => 1,
-            '1987751232' => 4, '215733.458377' => 4, '810.72' => 5, '0.355213' => -5,
-            '1544886400' => -9, '162401.123400' => 10, '42.8' => 1, '188.568' => 3,
-            '0.386704' => -5, '2066402694' => -4, '16370.195938' => 4, '8.93' => -4,
-            '881.603' => 2, '0.100530' => 6, '1945153853' => -5, '98182.113004' => 10,
-            '83.57' => 2, '341.971' => -3, '0.330009' => 8, '385060738' => 5,
-            '194901.110379' => 2, '23.4' => 4, '729.721' => -5, '0.252272' => 3,
-            '1957296793' => 10, '431722.51750' => -3, '80.43' => 4, '689.877' => 1,
-            '0.269623' => 1, '560754700' => 0, '51164.331804' => 5, '54.14' => -4,
-            '168.840' => -1, '0.419207' => -10, '31234167' => -4, '371097.439348' => 5,
-            '81.61' => -2, '190.431' => -2, '0.389657' => -7, '1557769604' => 11,
-            '334885.431479' => -12, '89.18' => 0, '561.851' => 5, '0.347717' => 8,
-            '338970112' => 4, '189490.453853' => 4, '17.32' => -3, '667.971' => 5,
-            '0.464637' => -4, '631080581' => 5, '376623.488958' => 3, '48.32' => -1,
-            '318.95' => -4, '0.81195' => -12, '1415732807' => 6, '229014.10840' => -5,
-            '19.35' => 4, '272.943' => 5, '0.325493' => 11, '1410487228' => 8,
-            '231128.196692' => 10, '73.32' => 3, '481.514' => -3, '0.256699' => -3,
-            '258648844' => 4, '514580.292161' => -9, '51.36' => -3, '333.787' => 3,
-            '0.144779' => 6, '1198953939' => -2, '168742.523841' => 11, '88.3' => -3,
-            '304.973' => -5, '0.349067' => 2, '543917380' => -1, '320446.123084' => 7,
-            '39.86' => 3, '640.475' => 4, '0.193186' => 5, '219655785' => 6,
-            '358909.222369' => 11, '59.80' => 4, '871.336' => -5, '0.238886' => -11,
-            '1117326039' => -12, '413109.68943' => 5, '92.34' => -3, '247.624' => -5,
-            '0.494013' => 1, '604388635' => 12, '482024.506465' => -11, '96.6' => 3,
-            '147.517' => 5, '0.107571' => -4, '703997261' => 12, '357315.60695' => 6,
-            '24.77' => 1, '824.210' => -3, '0.185287' => 9, '1822528982' => -9,
-            '103514.402689' => 3, '61.56' => 1, '550.876' => -3, '0.459206' => 7,
-            '1608014464' => -10, '422553.225608' => -7, '5.57' => 1, '799.255' => -5,
-            '0.343237' => -7, '821588891' => 3, '127917.304097' => 0, '24.89' => 3,
-            '144.955' => 5, '0.482459' => 9, '1997193157' => 8, '17663.385861' => 4,
-            '40.15' => -1, '174.719' => 4, '0.211591' => -10, '1494458060' => -3,
-            '459503.492775' => 7, '79.61' => -3, '587.176' => -3, '0.228626' => -9,
-            '2090041883' => -10, '401566.3639' => -3, '36.50' => 3, '332.194' => -2,
-            '0.219563' => 12, '797537412' => 2, '201185.129926' => -10, '39.84' => 2,
-            '28.949' => -1, '0.90017' => 3, '1507444163' => -3, '393697.245306' => -9,
-            '33.51' => 3, '792.686' => -2, '0.414281' => 1, '310944923' => -10,
-            '115040.277099' => -8, '28.81' => -2, '233.141' => 2, '0.439580' => 2,
-            '2092212441' => -5, '240345.380203' => 1, '58.34' => 1, '695.915' => 5,
-            '0.126809' => 3, '1552125996' => 5, '453985.493977' => -3, '21.19' => -2,
-            '835.314' => -2, '0.222151' => -1, '1685322602' => -9, '363098.127513' => -3,
-            '86.70' => 2, '634.737' => 5, '0.131834' => 10, '1276312123' => 12,
-            '191584.241297' => 12, '74.13' => -2, '462.308' => 3, '0.489398' => -9,
-            '605075305' => 6, '68278.510821' => 5, '68.82' => -2, '791.588' => 2,
-            '0.356921' => -1, '929919464' => 8, '426669.418615' => -6, '7.47' => 2,
-            '287.325' => 1, '0.218276' => 9, '1275754734' => -6, '512048.379741' => 5,
-            '98.35' => 4, '65.544' => 5, '0.272214' => 1, '773380702' => -7,
-            '262015.91195' => 11, '91.83' => -2, '383.993' => 3, '0.128372' => -10,
-            '752359425' => -2, '56159.171441' => 8, '26.54' => 3, '473.192' => -5,
-            '0.521075' => 2, '1689479013' => 5, '347839.150197' => -4, '52.43' => -1,
-            '199.627' => -3, '0.152574' => -7, '1351329243' => 9, '372598.386073' => 4,
-            '52.23' => -2, '251.288' => 2, '0.426629' => 8, '1172920955' => -5,
-            '333459.109908' => 3, '63.41' => -3, '636.795' => 4, '0.448941' => 0,
-            '786612913' => -10, '381432.40354' => 0, '35.74' => 2, '381.181' => -4,
-            '0.113118' => -1, '1580207428' => 12, '312052.194964' => 7, '54.60' => 0,
-            '463.527' => -4, '0.502017' => 11, '28421197' => -3, '455359.388371' => -4,
-            '44.75' => -4, '918.209' => -1, '0.194597' => 1, '1163350661' => -2,
-            '97917.71785' => -10, '62.1' => -3, '146.216' => 0, '0.38631' => -12,
-            '900569107' => -8, '261095.150936' => -10, '38.26' => 4, '630.568' => -3,
-            '0.92956' => -2, '1804971260' => 11, '24094.14296' => 5, '18.47' => 0,
-            '985.686' => 5, '0.11043' => -9, '708948475' => 6, '443943.434178' => -1,
-            '73.10' => 3, '313.569' => -1, '0.382185' => 11, '1898592770' => 6,
-            '243998.487618' => 2, '45.79' => -2, '722.781' => 5, '0.460099' => 5,
-            '945769609' => 8, '127141.150556' => -7, '97.77' => 4, '140.391' => 4,
-            '0.44704' => -1, '463388026' => -10, '361326.357130' => 12, '0.35' => -2,
-            '349.790' => 3, '0.15362' => 2, '820198660' => 4, '458826.327385' => -1,
-            '619.814' => 2, '0.46267' => -11, '393398368' => 10, '455329.457371' => -5,
-            '15.99' => 3, '787.471' => -3, '0.192102' => -12, '1468529827' => 0,
-            '508533.293066' => 6, '47.97' => 2, '641.64' => -4, '0.369226' => 11,
-            '1839566271' => -9, '239288.380153' => 10, '49.92' => -1, '144.216' => 1,
-            '0.84409' => -10, '1259217342' => 2, '173336.291671' => 9, '28.88' => 2,
-            '17.312' => 3, '0.511154' => 7, '2029269530' => -12, '473889.210427' => 8,
-            '85.5' => 1, '665.727' => -3, '0.393714' => 0, '151233890' => 10,
-            '383876.210258' => -4, '10.17' => -3, '906.27' => 3, '0.365852' => -10,
-            '224382563' => -12, '437109.4381' => 4, '67.89' => -1, '159.104' => -3,
-            '0.339486' => 12, '1862914143' => 9, '101239.314401' => 5, '74.22' => -4,
-            '1000.168' => 3, '0.45778' => 7, '1663878468' => 9, '267035.319042' => -8,
-            '100.88' => 0, '126.600' => -1, '0.55631' => 1, '857937515' => -6,
-            '506127.310697' => 12, '68.31' => -4, '54.307' => 5, '0.433604' => -10,
-            '2100668704' => -3, '307303.255605' => 3, '4.21' => 3, '648.785' => 0,
-            '0.100605' => -10, '706157416' => 10, '453071.154241' => 2, '38.87' => -1,
-            '807.801' => 2, '0.481221' => 12, '832432926' => 3, '120398.510533' => 10,
-            '906.297' => -1, '0.517726' => -7, '200952545' => 0, '42316.502132' => -5,
-            '675.935' => -4, '0.350550' => 11, '1224345436' => 9, '392278.419310' => -11,
-            '24.79' => -3, '208.462' => 4, '0.215814' => -8, '1451226453' => -1,
-            '401728.396619' => 0, '2.86' => -1, '1000.41' => -4, '0.493887' => -10,
-            '2009460819' => 5, '401594.358581' => 0, '82.55' => 3, '441.795' => -1,
-            '0.328834' => 8, '610865731' => -7, '373058.26577' => -5, '43.8' => -3,
-            '230.32' => 3, '0.164383' => 8, '1168333968' => 12, '255056.162543' => -6,
-            '10.75' => 3, '121.791' => 2, '0.500997' => 0, '1488546354' => -2,
-            '378017.212184' => -6, '58.72' => 3, '511.91' => 1, '0.181246' => 4,
-            '1328228167' => -2, '342848.55043' => 10, '91.30' => 1, '998.457' => -3,
-            '0.254136' => -11, '992870908' => -2, '342217.96130' => -8, '97.16' => 4,
-            '774.173' => 4, '0.219060' => 10, '688916804' => 0, '214139.511040' => -12,
-            '56.4' => 1, '298.912' => 4, '0.179565' => -4, '1648744440' => -3,
-            '301225.220454' => 8, '36.96' => -3, '777.92' => -5, '0.363420' => -8,
-            '1540254552' => 0, '286658.65890' => -12, '74.55' => 2, '448.30' => 2,
-            '0.421306' => 1, '2054049169' => -3, '93475.278413' => 2, '69.35' => -3,
-            '381.896' => -5, '0.304011' => -10, '1310287670' => 2, '315980.82265' => -5,
-            '85.15' => 1, '805.591' => 1, '0.191051' => 3, '2109206142' => -3,
-            '506142.84130' => -4, '33.54' => 4, '547.694' => -1, '0.339179' => -4,
-            '1996535939' => -6, '299486.279127' => -6, '12.26' => 4, '837.956' => -3,
-            '0.233547' => 9, '537470584' => -5, '335813.113073' => -2, '17.92' => 0,
-            '360.580' => 0, '0.367785' => -8, '975514236' => -7, '253630.13361' => 3,
-            '1.29' => 4, '553.994' => -4, '0.214617' => -9, '955561142' => -2,
-            '454321.44816' => 4, '58.4' => 0, '534.730' => 1, '0.374423' => -8,
-            '895237981' => -2, '32973.472194' => -8, '80.21' => -2, '383.67' => 5,
-            '0.266785' => 11, '832156768' => -1, '71293.133197' => 11, '71.62' => -4,
-            '227.594' => -5, '0.219087' => 8, '515978774' => -5, '249592.158944' => 8,
-            '53.53' => 2, '489.267' => -5, '0.229370' => -10, '1260314162' => 7,
-            '382476.378986' => 8, '74.79' => 2, '867.614' => 3, '0.353751' => -3,
-            '1491936863' => -12, '454214.89546' => 10, '84.75' => 1, '792.625' => 2,
-            '0.472840' => 12, '1646314706' => -11, '464997.260120' => 0, '26.95' => 4,
-            '740.620' => 2, '0.66293' => -6, '636315921' => -5, '109877.85276' => 8,
-            '77.84' => -1, '557.967' => 4, '0.287182' => 1, '1258982012' => 9,
-            '187442.248077' => -5, '44.7' => 4, '727.254' => -3, '0.519671' => 8,
-            '230346146' => -3, '105834.166114' => -5, '75.21' => -3, '114.583' => 5,
-            '0.334914' => 10, '1623042297' => -9, '233591.59404' => -7, '68.13' => -2,
-            '330.58' => -3, '0.74911' => -1, '1787196074' => -11, '176538.17873' => -6,
-            '23.31' => 3, '231.115' => -3, '0.62236' => 8, '2081067983' => 6,
-            '513664.217376' => 9, '67.67' => 2, '868.145' => -5, '0.167298' => -11,
-            '235063451' => -5, '282355.233927' => -9, '23.41' => -4, '668.649' => -3,
-            '0.265170' => -4, '225569705' => 7, '336582.44447' => -1, '77.56' => 1,
-            '562.167' => 1, '0.326419' => 6, '25752866' => 0, '334487.288642' => 6,
-            '66.41' => 3, '646.905' => -5, '0.522260' => 6, '1051048962' => -2,
-            '464112.68898' => -10, '76.95' => 2, '527.898' => -5, '0.131253' => -7,
-            '1536377413' => 0, '132027.185291' => -6, '17.47' => -1, '542.487' => -1,
-            '0.138450' => -5, '1564553396' => 0, '306411.321795' => 6, '39.65' => 2,
-            '708.246' => 2, '0.490782' => 3, '301106405' => 0, '397681.205539' => 4,
-            '83.18' => 1, '595.583' => 2, '0.478934' => -9, '1361154939' => 9,
-            '314604.114436' => 4, '99.65' => 0, '367.839' => 2, '0.517998' => 11,
-            '965803321' => 7, '223362.109185' => -9, '78.34' => -1, '5.208' => 4,
-            '0.81985' => -2, '534815524' => -9, '400342.445174' => 7, '33.100' => -4,
-            '705.31' => 0, '0.345202' => -5, '167708690' => -12, '77320.264306' => -10,
-            '94.9' => 2, '916.15' => 1, '0.167018' => 6, '1884242836' => -8,
-            '504611.336074' => 2, '66.75' => 4, '216.673' => -2, '0.272397' => -4,
-            '804534093' => -4, '230442.273740' => 2, '19.3' => -2, '585.768' => -3,
-            '0.178557' => -7, '833374022' => -10, '343018.183783' => -7, '32.52' => -4,
-            '844.37' => -2, '0.104299' => 12, '631164853' => 1, '81230.384535' => 2,
-            '49.28' => -4, '485.879' => -2, '0.367677' => -10, '421212287' => -7,
-            '229033.445853' => -10, '93.76' => -2, '51.659' => 3, '0.7081' => 7,
-            '726125328' => 9, '226146.258507' => -5, '75.53' => 0, '872.298' => -5,
-            '0.514402' => 11, '301733263' => 12, '46503.302698' => -8, '88.95' => 0,
-            '692.341' => 2, '0.247996' => -4, '440384341' => -4, '347016.333662' => 8,
-            '16.5' => 2, '97.104' => 5, '0.9960' => -6, '587145931' => -10,
-            '137925.189849' => -9, '89.61' => -2, '298.932' => -4, '0.338602' => 1,
-            '1881453802' => -2, '113315.282068' => 9, '24.65' => 0, '627.672' => 0,
-            '0.472303' => 2, '1426268683' => 5, '445735.486135' => -8, '22.43' => 1,
-            '608.496' => 0, '0.67854' => -3, '1706716161' => -9, '520276.5705' => -12,
-            '53.79' => 0, '258.757' => -4, '0.438510' => 7, '1004776687' => 4,
-            '436364.166754' => 0, '91.65' => -1, '103.403' => -4, '0.258641' => 2,
-            '1587482095' => 1, '282317.383557' => -5, '21.83' => -4, '936.124' => -2,
-            '0.373783' => -10, '1625426089' => 12, '241840.308909' => -8, '96.40' => 4,
-            '506.639' => 3, '0.54486' => -9, '1481879732' => -9, '220079.119816' => 9,
-            '31.79' => 2, '127.485' => -4, '0.118745' => -5, '562468606' => -8,
-            '198378.379161' => 12, '61.53' => 3, '284.788' => -4, '0.231304' => 7,
-            '1969544595' => 10, '385061.176637' => -9, '5.67' => -2, '848.223' => 1,
-            '0.77794' => -10, '615691954' => -1, '226840.348693' => -2, '54.75' => -4,
-            '893.820' => 4, '0.355600' => 3, '1078526925' => -6, '205610.124085' => 2,
-            '55.99' => 2, '593.269' => 2, '0.357361' => 9, '672306509' => -2,
-            '434174.390977' => 12, '75.17' => 4, '1000.600' => -2, '0.319940' => -10,
-            '788933660' => -6, '458134.398221' => -10, '51.90' => 3, '536.386' => 5,
-            '0.209606' => -7, '1333578221' => -11, '19114.235467' => 5, '41.21' => 0,
-            '496.845' => -4, '0.315981' => 5, '2140386144' => -1, '297586.456401' => 12,
-            '68.24' => 4, '175.348' => 0, '0.198181' => 9, '1987222384' => 6,
-            '241378.504276' => 12, '63.86' => 4, '977.625' => 0, '0.364493' => -4,
-            '1669268745' => -7, '103573.180834' => 5, '710.343' => -5, '0.297275' => -2,
-            '362208538' => 6, '377524.329808' => 0, '55.8' => -3, '563.3' => 2,
-            '0.464184' => -5, '1135770879' => 5, '205055.380861' => 4, '66.27' => 4,
-            '342.903' => 4, '0.400438' => -8, '1902658601' => -1, '504249.317753' => 11,
-            '78.11' => -1, '786.65' => 3, '0.45893' => 8, '1083352314' => 11,
-            '321446.469545' => 3, '85.100' => 1, '819.232' => -5, '0.515486' => 11,
-            '888046360' => 12, '486962.196769' => 9, '79.25' => 0, '50.386' => -2,
-            '0.448836' => -4, '662933581' => -1, '47159.483295' => -3, '54.10' => -1,
-            '147.247' => -1, '0.47789' => 4, '1420380237' => -7, '52410.309447' => 0,
-            '8.67' => 1, '965.876' => 2, '0.169213' => -11, '1159443878' => 6,
-            '48355.330226' => 3, '6.9' => -1, '528.601' => 0, '0.101339' => 6,
-            '2083533883' => 5, '103030.36798' => 9, '206.712' => 0, '0.142726' => -4,
-            '166291914' => -12, '349423.88954' => 8, '52.50' => -3, '997.844' => 5,
-            '0.385892' => 2, '567429324' => -12, '467533.241563' => 5, '54.42' => -1,
-            '892.68' => -2, '0.124688' => 12, '69447445' => -4, '79880.366378' => -5,
-            '92.0' => -1, '975.95' => -3, '0.286829' => -11, '246664446' => 8,
-            '281997.3466' => 8, '34.81' => -2, '94.628' => -3, '0.48059' => -6,
-            '1317798191' => 9, '95061.401608' => -9, '36.74' => 1, '976.644' => 0,
-            '0.27918' => 1, '830145843' => -8, '1207.484669' => -8, '724.178' => 5,
-            '0.522648' => 3, '1007597492' => -6, '206406.341057' => 3, '31.74' => -3,
-            '196.934' => 5, '0.393853' => 3, '1762818530' => 12, '81088.431583' => -9,
-            '9.30' => -2, '276.571' => -4, '0.460856' => -4, '1350580999' => 2,
-            '93449.11849' => -4, '24.31' => 0, '301.488' => -3, '0.488295' => -9,
-            '250903215' => -7, '197613.142344' => 6, '60.67' => -1, '855.15' => -1,
-            '0.111877' => -12, '1260264928' => 10, '127501.401131' => 9, '32.10' => -2,
-            '301.859' => 1, '0.226112' => -10, '727090804' => 7, '284397.375125' => 1,
-            '15.42' => -3, '869.645' => 4, '0.465527' => 10, '1730135295' => 9,
-            '367342.25609' => -1, '29.56' => 1, '171.971' => 4, '0.141928' => 5,
-            '1067855866' => -2, '498043.20816' => 3, '15.48' => 2, '374.58' => 5,
-            '0.149323' => 2, '969946418' => 11, '221008.79857' => -10, '72.43' => 1,
-            '278.392' => -1, '0.516575' => -4, '1631715279' => 4, '142822.372123' => 0,
-            '48.68' => 1, '628.451' => 2, '0.116123' => 6, '1449499030' => 6,
-            '433070.50602' => 4, '76.54' => 4, '931.674' => 5, '0.151400' => -3,
-            '74388227' => 4, '74188.160983' => -11, '91.24' => 1, '907.972' => 5,
-            '0.333071' => -2, '358908368' => -8, '454233.520694' => -5, '96.16' => 2,
-            '143.166' => -2, '0.270170' => -12, '1474258062' => -1, '263898.434114' => 1,
-            '49.76' => -2, '742.406' => 4, '0.91057' => 8, '640336' => -11,
-            '184561.454389' => -4, '646.67' => 3, '0.353302' => 11, '890011967' => 2,
-            '69500.481186' => -3, '18.68' => 4, '515.493' => 2, '0.169110' => -10,
-            '273070130' => 4, '3876.251228' => -4, '24.75' => -1, '542.280' => -4,
-            '0.262921' => -7, '1742471373' => 11, '164807.494908' => 10, '94.1' => 0,
-            '692.699' => 2, '0.407652' => -8, '1812106610' => -12, '180231.446285' => 10,
-            '19.62' => 0, '784.823' => 4, '0.6358' => -10, '129737024' => -4,
-            '126119.196481' => 8, '88.70' => -4, '385.780' => -5, '0.294964' => 6,
-            '1674263192' => 1, '242150.64699' => -2, '66.45' => 3, '276.251' => 5,
-            '0.200806' => 7, '184299841' => -6, '45397.171114' => -1, '40.70' => 3,
-            '756.941' => 0, '0.269884' => -6, '1771565159' => 0, '476831.150373' => -5,
-            '13.7' => -3, '12.894' => 1, '0.405670' => 9, '245118583' => -6,
-            '377666.105240' => 9, '5.59' => 0, '74.991' => 1, '0.179576' => 1,
-            '114722185' => 0, '419113.504839' => -8, '13.59' => -3, '187.304' => 3,
-            '0.19958' => 4, '1971862231' => -11, '491572.334790' => -9, '17.41' => -3,
-            '17.785' => -1, '0.297809' => -2, '1946685997' => -9, '154595.370090' => 3,
-            '93.72' => 2, '462.523' => -3, '0.54041' => 0, '1282241176' => 2,
-            '373945.280331' => -12, '66.84' => -4, '248.492' => -1, '0.340641' => -9,
-            '602753459' => -11, '357078.301751' => 1, '32.18' => -2, '400.442' => 2,
-            '0.481857' => -8, '1599180253' => 1, '296730.240082' => 0, '52.71' => -2,
-            '77.311' => 5, '0.120984' => 0, '1179534686' => 12, '271019.120762' => 0,
-            '72.364' => 0, '0.134213' => 10, '991808417' => -5, '419154.14583' => -12,
-            '25.99' => 3, '981.637' => -2, '0.246613' => 3, '1262950106' => 9,
-            '198756.55068' => -12, '89.75' => 0, '221.951' => 4, '0.72611' => -7,
-            '1064876135' => -7, '108406.154846' => 3, '14.89' => 1, '198.629' => 2,
-            '0.432856' => -4, '450209192' => -10, '62292.308670' => -2, '5.40' => -1,
-            '251.336' => 5, '0.243109' => 10, '190677574' => -1, '39160.154958' => 11,
-            '97.40' => 2, '105.783' => 1, '0.234700' => -7, '723572270' => 3,
-            '11631.238945' => 4, '83.30' => 0, '233.195' => 5, '0.60889' => -6,
-            '1609060270' => 4, '324092.431997' => -7, '53.46' => 3, '70.379' => -4,
-            '0.161560' => 10, '1079758822' => 8, '253900.275244' => 4, '6.93' => 2,
-            '865.264' => -5, '0.73080' => -7, '1853635520' => -3, '307076.252351' => 10,
-            '35.24' => -4, '351.618' => 1, '0.128587' => -12, '1791732556' => 11,
-            '299489.167047' => 6, '4.34' => 2, '349.462' => -5, '0.290050' => -4,
-            '1558058269' => 3, '256893.163173' => -2, '40.25' => -3, '881.793' => 5,
-            '0.465314' => 2, '1050433131' => -12, '412265.31655' => 6, '169.747' => -2,
-            '0.269635' => 7, '844311209' => -5, '375718.463024' => -7, '8.95' => 1,
-            '894.747' => 0, '0.239334' => -4, '771235551' => 3, '186636.76267' => 11,
-            '20.74' => -1, '68.656' => 1, '0.451009' => -4, '1396818915' => -8,
-            '214698.192451' => -6, '99.22' => 4, '750.803' => 4, '0.37243' => 2,
-            '490909289' => -6, '107286.306487' => -2, '99.78' => -3, '384.17' => 0,
-            '0.384777' => -9, '627042627' => 9, '68753.367784' => -3, '66.74' => -2,
-            '581.240' => 1, '0.91844' => -3, '1358390352' => -5, '388694.438925' => -2,
-            '4.97' => -2, '436.481' => 5, '0.292863' => -12, '1915994911' => -7,
-            '314286.12237' => 9, '29.21' => -1, '785.665' => 3, '0.83220' => -12,
-            '713828588' => 8, '127598.38681' => 7, '39.68' => -2, '673.638' => 0,
-            '0.360560' => 12, '396425761' => -8, '24423.411070' => 2, '13.90' => 1,
-            '675.598' => -3, '0.365168' => 10, '1551896366' => 6, '287288.506478' => -12,
-            '19.49' => -3, '982.526' => -1, '0.498741' => -12, '498842326' => -7,
-            '416076.146210' => -9, '88.5' => -1, '273.967' => 2, '0.82083' => -5,
-            '96507945' => 4, '362738.310849' => 9, '77.4' => 3, '442.270' => 1,
-            '0.250705' => -9, '776729985' => -7, '187149.81419' => 5, '55.87' => -2,
-            '557.605' => 4, '0.443261' => 8, '1015175741' => 7, '336085.86296' => 10,
-            '96.25' => 0, '875.972' => -3, '0.11882' => 0, '1585025947' => -1,
-            '83806.49831' => -3, '936.573' => 2, '0.390534' => -5, '151911157' => -2,
-            '162070.373172' => -7, '20.34' => 3, '589.920' => 3, '0.55338' => 5,
-            '317649471' => 11, '171289.161357' => 9, '14.894' => 0, '0.169460' => -11,
-            '998696332' => 3, '448682.405892' => -3, '57.30' => -2, '31.168' => 1,
-            '0.382562' => 1, '1017199412' => -6, '61394.419628' => 9, '67.64' => -4,
-            '115.381' => 1, '0.84776' => 0, '335831848' => 5, '51310.6384' => 3,
-            '25.97' => -3, '579.539' => 4, '0.57923' => 12, '581829645' => -6,
-            '76440.203443' => 2, '676.88' => 3, '0.101913' => -8, '1921580350' => -6,
-            '459965.520446' => -4, '19.61' => -2, '443.825' => 2, '0.230763' => -6,
-            '1096029721' => 11, '272402.34425' => 5, '99.54' => 4, '353.632' => 5,
-            '0.285236' => -11, '644786723' => 8, '92638.93095' => -2, '46.63' => 0,
-            '331.596' => 2, '0.300748' => 1, '992008167' => -12, '391472.514592' => -10,
-            '89.73' => 3, '689.742' => 4, '0.386946' => -1, '640884548' => -5,
-            '379991.249104' => -12, '1.67' => -3, '373.115' => -4, '0.471745' => 7,
-            '1714925717' => 5, '405376.285867' => -3, '39.23' => 0, '69.930' => 3,
-            '0.284324' => 1, '1734248167' => 4, '369934.279103' => 9, '69.33' => 4,
-            '498.967' => 0, '0.136923' => 2, '595889189' => 9, '119482.26568' => -11,
-            '56.100' => 1, '776.870' => 3, '0.155946' => 6, '862253778' => -2,
-            '132540.56157' => -10, '2.32' => 1, '799.397' => 1, '0.202929' => 2,
-            '975505082' => 4, '376640.357642' => 4, '25.28' => -2, '84.95' => -5,
-            '0.429104' => 11, '719501086' => -3, '260910.308200' => -7, '15.35' => -3,
-            '978.260' => -5, '0.296448' => -1, '240455431' => 4, '163252.435345' => -12,
-            '15.96' => -4, '8.390' => 0, '0.488281' => 2, '2063595465' => -7,
-            '224670.240429' => -6, '59.1' => 2, '66.88' => -5, '0.272565' => -5,
-            '2064240053' => 4, '353224.142929' => 3, '30.62' => -1, '89.339' => 1,
-            '0.344641' => 12, '437521483' => -6, '281381.331487' => 3, '39.67' => -1,
-            '725.468' => 0, '0.20699' => 2, '519210309' => 12, '325015.479985' => -12,
-            '29.57' => -4, '177.787' => 1, '0.90600' => 12, '496186991' => -1,
-            '32893.402520' => -3, '16.40' => -3, '896.535' => 1, '0.253518' => -12,
-            '35522617' => 2, '301654.333687' => 6, '72.94' => 3, '554.599' => -1,
-            '0.269657' => -7, '1391964796' => 7, '77705.372729' => 6, '85.67' => -3,
-            '232.449' => 2, '0.136599' => -8, '1654464260' => 11, '345178.181287' => -6,
-            '19.63' => -2, '48.785' => 1, '0.132377' => -7, '2117933516' => -5,
-            '23278.70491' => 10, '29.46' => 1, '122.461' => 4, '0.167001' => -5,
-            '489022220' => 6, '523772.464568' => -10, '245.594' => -1, '0.240900' => -7,
-            '1073876604' => 9, '391436.285454' => -1, '10.88' => -1, '717.944' => -2,
-            '0.6014' => 7, '1105176714' => -6, '183800.269302' => -7, '43.31' => 3,
-            '727.660' => 5, '0.486536' => 2, '881050931' => -10, '296020.82249' => -2,
-            '52.7' => -3, '406.733' => -2, '0.104091' => -6, '1159938485' => 6,
-            '515845.466988' => 5, '68.65' => -4, '624.146' => -5, '0.98714' => 6,
-            '1865766716' => -11, '263588.227241' => 2, '58.27' => 0, '606.956' => 1,
-            '0.463708' => -4, '155865207' => -9, '454735.29610' => -2, '16.100' => -4,
-            '81.371' => 1, '0.436074' => 6, '1732624335' => 1, '82834.162304' => 5,
-            '79.71' => 4, '307.790' => -2, '0.332778' => -5, '954404878' => 4,
-            '51864.163456' => 5, '40.93' => -1, '515.487' => -4, '0.129485' => 1,
-            '179865788' => -5, '10314.126747' => -11, '15.14' => -3, '483.172' => -2,
-            '0.405335' => -9, '1725134882' => 8, '269876.473040' => -7, '31.94' => -2,
-            '88.723' => 2, '0.321245' => -7, '1134932876' => 12, '12366.287397' => 5,
-            '70.9' => -1, '432.18' => 1, '0.294402' => 6, '1176528959' => 7,
-            '4544.32826' => -3, '34.58' => 0, '305.562' => 1, '0.270004' => -6,
-            '519119598' => -8, '456581.139104' => -11, '65.29' => 3, '862.335' => -3,
-            '0.315414' => -7, '2140092333' => 10, '137059.2740' => -9, '54.55' => 0,
-            '102.418' => -5, '0.196226' => 2, '1615928903' => 11, '511813.326807' => 3,
-            '43.53' => 1, '721.723' => -2, '0.485730' => 4, '1216632514' => -4,
-            '248307.434089' => 11, '36.47' => 2, '488.341' => 0, '0.34604' => 10,
-            '1758910663' => 5, '173818.416947' => 8, '36.88' => -3, '209.467' => -3,
-            '0.460928' => 11, '582273698' => -3, '166175.390463' => -1, '43.63' => -2,
-            '98.204' => 2, '0.516467' => -12, '1559365444' => -6, '46679.30234' => 8,
-            '27.97' => 0, '187.614' => -5, '0.70257' => 0, '1886354324' => 0,
-            '492363.102423' => -2, '44.58' => -3, '249.942' => -4, '0.136477' => -3,
-            '1357889353' => 11, '383185.378195' => 12, '25.31' => -2, '331.480' => 2,
-            '0.427866' => -6, '1642764933' => 3, '9938.369141' => 5, '92.33' => -3,
-            '488.999' => 3, '0.445313' => 5, '1348858011' => -6, '128791.188208' => 0,
-            '69.45' => -2, '112.936' => 5, '0.201364' => -1, '162495054' => 6,
-            '234154.49610' => -9, '26.77' => -1, '530.154' => -5, '0.121155' => -12,
-            '581488470' => -12, '254555.270756' => 9, '81.91' => 2, '890.256' => -1,
-            '0.184203' => -4, '212067454' => 4, '413890.285928' => -2, '89.79' => 1,
-            '798.943' => 1, '0.424338' => 5, '1518296227' => -8, '17044.100945' => -10,
-            '88.40' => -2, '814.47' => -5, '0.83877' => -5, '1979121881' => -3,
-            '433033.372786' => -6, '35.69' => -1, '234.931' => 3, '0.491675' => 5,
-            '1893353723' => 6, '429908.479289' => 4, '16.72' => -1, '744.633' => -2,
-            '0.12874' => -3, '1652500606' => 7, '26939.312188' => 11, '95.1' => 3,
-            '777.776' => -5, '0.254411' => -12, '1602139214' => 5, '188034.296767' => -3,
-            '99.45' => -3, '769.658' => 3, '0.73128' => -2, '487927630' => 5,
-            '329514.146062' => 10, '13.45' => -2, '523.73' => 2, '0.277560' => -1,
-            '355146425' => 1, '485252.274739' => -6, '72.83' => -3, '626.421' => 1,
-            '0.31743' => -5, '2092908655' => 2, '246392.316190' => -5, '89.70' => 4,
-            '376.946' => -3, '0.433827' => -6, '1755052572' => -1, '393176.389443' => 12,
-            '95.23' => 1, '872.41' => 1, '0.85765' => -12, '1255127494' => -10,
-            '204365.28532' => -9, '2.63' => 4, '816.32' => -1, '0.38750' => -3,
-            '1868771565' => 9, '447108.325131' => 10, '21.58' => -1, '185.478' => 1,
-            '0.109531' => 4, '1654866032' => 4, '408753.84097' => 7, '11.88' => 0,
-            '327.967' => 3, '0.379086' => 8, '1429295707' => -11, '488263.271769' => 2,
-            '89.42' => 1, '52.334' => 0, '0.377803' => 12, '1318328164' => 1,
-            '176363.206322' => 0, '92.77' => -3, '541.388' => -5, '0.181873' => -12,
-            '153912328' => -10, '369317.1551' => -12, '57.42' => 4, '914.395' => 2,
-            '0.464426' => -11, '1275606463' => -10, '318052.487790' => 0, '11.81' => -2,
-            '873.568' => -4, '0.474255' => 2, '1448766956' => 10, '486044.198732' => 12,
-            '29.55' => 0, '264.790' => 2, '0.165316' => -12, '321934385' => 4,
-            '92094.396649' => 10, '1.96' => -4, '129.750' => -5, '0.363401' => 3,
-            '1124207770' => 4, '330513.236221' => -3, '91.4' => 1, '684.421' => 3,
-            '0.376355' => 2, '539466993' => 6, '338682.223800' => 9, '680.570' => -1,
-            '0.151635' => -9, '1666663786' => -6, '330571.213126' => 8, '1.17' => -1,
-            '957.104' => -4, '0.278996' => 2, '711170694' => 8, '361748.512307' => 7,
-            '46.71' => -2, '78.634' => 4, '0.104999' => -1, '1578756048' => 11,
-            '385689.191722' => 12, '75.40' => 4, '572.127' => -4, '0.87360' => -6,
-            '194691078' => 4, '232264.409280' => 0, '9.94' => 1, '841.437' => -5,
-            '0.164100' => 5, '1299079227' => 3, '322013.178559' => -11, '321.969' => 0,
-            '0.308985' => 3, '638463866' => -9, '331670.388139' => 5, '39.56' => -4,
-            '604.886' => 3, '0.149885' => -8, '1778392533' => -8, '129537.231903' => 10,
-            '44.57' => 1, '81.138' => 4, '0.376795' => 8, '2015329247' => 6,
-            '213926.299406' => -12, '68.15' => 3, '903.28' => 2, '0.48715' => 3,
-            '1736838292' => -5, '107381.29281' => 11, '638.88' => 0, '0.231656' => 4,
-            '861705318' => 8, '431381.424303' => -3, '354.632' => -4, '0.505326' => -9,
-            '954188025' => 6, '338440.340337' => 7, '8.55' => -4, '79.450' => -4,
-            '0.394793' => -8, '2120370310' => 10, '142616.424762' => -9, '39.64' => -2,
-            '744.207' => -4, '0.458267' => 6, '1018468383' => -8, '494834.62802' => -5,
-            '12.5' => 2, '145.397' => 5, '0.170869' => -3, '605361750' => -9,
-            '159681.290410' => -5, '78.51' => -2, '631.654' => 1, '0.199611' => 8,
-            '19995477' => 1, '443496.499715' => 9, '43.11' => -5, '0.227522' => -1,
-            '1268123310' => -4, '341246.469282' => 5, '16.4' => 2, '678.918' => -5,
-            '0.270488' => 6, '545052123' => -5, '80589.52277' => 1, '92.20' => -3,
-            '246.275' => 3, '0.360145' => 7, '276565302' => 5, '223106.408766' => -6,
-            '55.33' => 2, '409.420' => 4, '0.70752' => 6, '124029482' => 11,
-            '241885.110870' => -3, '34.40' => 4, '181.390' => 1, '0.509781' => 9,
-            '1196793147' => -11, '185890.515292' => -10, '68.43' => 0, '276.271' => -1,
-            '0.18264' => 9, '1668393853' => -2, '416898.124919' => -10, '17.65' => -2,
-            '216.867' => -2, '0.33306' => 5, '1693925058' => 8, '492757.75158' => 3,
-            '703.531' => 0, '0.284773' => 8, '453410602' => 2, '345315.3306' => -4,
-            '29.74' => 4, '57.823' => 5, '0.403424' => 9, '1461090654' => 10,
-            '265804.325180' => 1, '44.37' => -4, '906.94' => 2, '0.372266' => -7,
-            '1704091169' => 3, '502320.237065' => 11, '192.310' => -5, '0.17973' => 9,
-            '1568440410' => -10, '334644.124436' => 5, '35.78' => -1, '472.617' => 3,
-            '0.366749' => 8, '1016580040' => -4, '130283.226220' => 0, '95.36' => -3,
-            '382.586' => -3, '0.118419' => 0, '1269661192' => 3, '175634.120332' => 11,
-            '57.54' => 2, '282.918' => -2, '0.61553' => 10, '485269598' => 3,
-            '57798.248757' => 2, '65.97' => -4, '171.797' => -5, '0.357599' => 3,
-            '537426709' => -12, '513433.306841' => -6, '25.7' => -3, '353.997' => 2,
-            '0.132257' => 3, '506054940' => -10, '369460.181347' => -1, '40.60' => 2,
-            '647.868' => 3, '0.145186' => 3, '1368273320' => 1, '431677.323196' => 1,
-            '79.37' => -2, '68.752' => 0, '0.360084' => 0, '1318911357' => -12,
-            '252973.167172' => 11, '4.67' => -1, '487.686' => 3, '0.52781' => 3,
-            '345767518' => 12, '256618.516093' => 6, '31.14' => 1, '648.37' => 2,
-            '0.77394' => -1, '999084791' => 6, '339257.496890' => 7, '38.12' => 4,
-            '870.71' => -1, '0.251847' => -10, '148064284' => -8, '477213.292766' => 4,
-            '16.94' => -2, '645.55' => -4, '0.55673' => -8, '1916008879' => -7,
-            '505851.282744' => 2, '45.91' => -4, '323.41' => -5, '0.225493' => -10,
-            '609795303' => 1, '85495.101800' => 0, '46.21' => 3, '347.370' => 4,
-            '0.270065' => 11, '268889639' => -1, '25129.47210' => -2, '13.40' => 1,
-            '441.793' => -2, '0.289805' => -4, '1869358233' => -7, '378422.17593' => 8,
-            '83.49' => 3, '356.344' => 1, '0.145979' => 10, '846724011' => 9,
-            '139953.231849' => -2, '0.63' => -3, '937.56' => 0, '0.149658' => -6,
-            '1060686659' => 3, '233601.113091' => -9, '100.1' => 0, '559.322' => 5,
-            '0.250137' => -4, '421031725' => 3, '2274.242744' => 9, '68.32' => 0,
-            '802.63' => -2, '0.38081' => -4, '2053778662' => -4, '264919.210724' => 2,
-            '88.78' => 2, '769.266' => 4, '0.55346' => -8, '1647797972' => 6,
-            '322154.404569' => -5, '27.44' => 4, '733.52' => -1, '0.42017' => -1,
-            '1739861744' => -9, '362615.165402' => -12, '1.31' => 0, '161.20' => 2,
-            '0.171853' => 12, '1559012266' => -9, '224083.178484' => -10, '27.13' => -3,
-            '533.366' => 0, '0.521246' => 2, '1496801953' => -1, '252953.203757' => 8,
-            '87.13' => 4, '847.399' => -4, '0.435135' => -9, '557542360' => 6,
-            '430835.360202' => 1, '88.16' => 2, '685.358' => 0, '0.134357' => 9,
-            '695881783' => -4, '82260.422846' => 11, '73.20' => -2, '318.254' => 5,
-            '0.236925' => -3, '194660861' => -10, '335458.478360' => 5, '790.385' => -1,
-            '0.350204' => 7, '293539387' => 4, '311913.153924' => 12, '57.53' => 4,
-            '491.459' => 5, '0.448296' => -7, '676702556' => 10, '326500.500669' => 11,
-            '49.46' => -4, '885.88' => -3, '0.350773' => 2, '470837535' => 6,
-            '392572.426864' => 8, '75.67' => 0, '647.564' => 4, '0.460393' => -4,
-            '564421582' => -2, '191396.464298' => -8, '91.64' => -2, '832.567' => -3,
-            '0.214503' => -5, '110339611' => -7, '21932.419510' => 3, '35.19' => -3,
-            '85.458' => -1, '0.229354' => 12, '868322234' => -4, '277420.403389' => 5,
-            '100.49' => 2, '699.148' => 2, '0.520712' => -6, '1026256589' => 1,
-            '97377.272483' => -11, '66.19' => 1, '613.908' => 0, '0.313438' => 11,
-            '569881040' => -4, '23839.416551' => -12, '47.77' => 1, '439.823' => 3,
-            '0.356877' => 11, '1061041043' => 8, '451095.356420' => -9, '31.34' => 2,
-            '811.510' => -4, '0.388167' => -12, '822243100' => -10, '57744.224582' => -12,
-            '6.27' => 3, '60.84' => -3, '0.522899' => -12, '1765824910' => 7,
-            '484461.357917' => 0, '39.48' => 1, '609.753' => -2, '0.339243' => 7,
-            '1939477099' => 0, '261367.6961' => -12, '90.52' => -2, '702.632' => 0,
-            '0.371310' => 3, '839896957' => 3, '63058.165226' => 1, '886.380' => 4,
-            '0.357139' => 3, '223717296' => -12, '30014.315986' => 2, '91.49' => 0,
-            '33.736' => 0, '0.345573' => -10, '1573364975' => -1, '510675.447180' => -11,
-            '14.28' => -3, '141.674' => 5, '0.394923' => -5, '693454176' => -4,
-            '492663.199315' => 9, '90.36' => 0, '834.63' => 5, '0.491651' => 4,
-            '232172289' => 6, '405139.43069' => 4, '27.67' => -3, '583.563' => -5,
-            '0.460724' => 6, '186884682' => -5, '90980.14001' => -7, '407.830' => 1,
-            '0.37423' => 4, '815554087' => 7, '229295.79961' => -8, '29.53' => 4,
-            '589.211' => 2, '0.167863' => -6, '1268234610' => -10, '153127.400608' => -2,
-            '40.100' => 3, '592.759' => -1, '0.130577' => -7, '2124172267' => 8,
-            '4789.223603' => 3, '39.7' => -2, '784.390' => -5, '0.30447' => -7,
-            '682184859' => 5, '61682.319676' => 4, '48.81' => 0, '203.141' => 4,
-            '0.223201' => 2, '908398046' => -3, '10030.226566' => -2, '70.23' => 3,
-            '244.656' => 0, '0.247178' => 10, '1300114146' => 5, '190199.379092' => 7,
-            '27.89' => 2, '718.790' => 4, '0.163032' => 12, '763697413' => -7,
-            '330370.196479' => 6, '17.87' => 0, '374.945' => -5, '0.140864' => 5,
-            '897384185' => -2, '107363.409287' => 9, '56.88' => 1, '696.203' => -4,
-            '0.346641' => 11, '315672920' => 0, '130368.407439' => -12, '25.57' => -1,
-            '615.658' => 5, '0.166828' => 10, '662500778' => 11, '419572.269106' => 6,
-            '11.7' => -1, '215.966' => 1, '0.76981' => 8, '690359917' => 3,
-            '337115.298913' => -5, '99.32' => -4, '268.215' => -3, '0.84442' => 11,
-            '1830461013' => 1, '141583.342174' => -1, '5.10' => 3, '703.74' => -2,
-            '0.267173' => -5, '1955300868' => -7, '270237.290195' => 8, '59.38' => 1,
-            '655.174' => -3, '0.304600' => -2, '2016725871' => -4, '421952.109660' => -2,
-            '100.13' => 3, '455.590' => 4, '0.387782' => 11, '326443094' => -10,
-            '488051.349935' => 4, '25.79' => -2, '982.373' => -4, '0.202479' => -4,
-            '1437185531' => 11, '203056.248539' => -4, '26.53' => 0, '386.64' => -4,
-            '0.165902' => 6, '1802089567' => 8, '238281.403726' => -1, '10.39' => 1,
-            '550.431' => 4, '0.463228' => -8, '316156841' => 8, '74656.280243' => 1,
-            '438.593' => 1, '0.92801' => 5, '1044193208' => 10, '198279.493211' => -12,
-            '709.453' => -5, '0.472872' => -1, '637081832' => -4, '466448.230194' => -11,
-            '11.59' => 4, '208.643' => -2, '0.466927' => 10, '1774366832' => 8,
-            '438243.107186' => -3, '72.92' => 1, '966.219' => 1, '0.233141' => -11,
-            '886071886' => -9, '89226.158486' => 6, '22.29' => 2, '620.554' => -1,
-            '0.281044' => -11, '1903262225' => -1, '430692.378619' => -3, '34.28' => -3,
-            '908.20' => 4, '0.515546' => -11, '418400225' => -1, '108313.191374' => -3,
-            '12.92' => -1, '341.303' => 0, '0.213615' => -12, '994161677' => 8,
-            '105500.149119' => -5, '42.36' => 2, '215.961' => 0, '0.151327' => 0,
-            '2071739529' => 11, '178325.89821' => 0, '56.97' => -4, '432.296' => -3,
-            '0.235877' => 1, '823459397' => 5, '522933.306540' => 10, '35.62' => -4,
-            '99.588' => -1, '0.314118' => -3, '667770832' => 9, '188929.341355' => 2,
-            '69.29' => -3, '535.608' => 2, '0.41781' => 11, '1384659835' => -11,
-            '508848.336697' => -1, '66.40' => -3, '807.889' => -5, '0.90774' => 3,
-            '1060976301' => 0, '26839.447957' => 0, '6.83' => 3, '469.615' => -3,
-            '0.215229' => 9, '1943408411' => 5, '82774.459025' => -11, '4.35' => -3,
-            '382.412' => 4, '0.523800' => 6, '445411727' => 2, '36591.135582' => 0,
-            '4.41' => -3, '650.499' => -4, '0.260833' => 6, '933383067' => 10,
-            '505854.310651' => -2, '80.32' => 1, '153.397' => -1, '0.457857' => 8,
-            '864716751' => -3, '466315.247704' => -10, '68.38' => -2, '509.298' => 2,
-            '0.130576' => -7, '248206334' => 7, '103785.42163' => 5, '75.7' => 0,
-            '479.951' => 3, '0.155093' => -9, '1184600251' => 8, '474211.231236' => 5,
-            '68.85' => -2, '555.137' => -2, '0.399205' => 3, '900285806' => -3,
-            '36693.323581' => 9, '9.70' => -1, '458.900' => 4, '0.321701' => 9,
-            '1427377228' => -8, '468605.298404' => -8, '82.28' => -4, '610.468' => -1,
-            '0.122567' => 2, '2071388762' => -7, '56055.1825' => 3, '38.36' => -4,
-            '253.223' => 3, '0.49607' => 5, '1924595010' => 8, '849.414189' => 6,
-            '86.14' => 1, '583.502' => 3, '0.84266' => -7, '1001248538' => 6,
-            '203942.300501' => -9, '64.54' => 1, '342.276' => -1, '0.22490' => 3,
-            '990502631' => -3, '68229.242671' => 11, '7.58' => 0, '352.182' => 5,
-            '0.308290' => -1, '431852030' => -4, '245610.309375' => -11, '25.26' => 1,
-            '667.511' => -3, '0.152985' => 1, '1973200073' => 1, '258426.25679' => 6,
-            '51.28' => -3, '249.157' => -4, '0.374691' => -5, '1359777331' => 6,
-            '419342.53299' => 10, '73.76' => 2, '26.359' => 4, '0.301405' => -2,
-            '2069275744' => 4, '211798.239332' => 0, '68.5' => 1, '158.156' => 0,
-            '0.234814' => 4, '832155923' => 9, '412347.98217' => -10, '62.92' => -2,
-            '812.74' => -2, '0.116050' => 4, '680424040' => 4, '74953.377917' => -8,
-            '34.32' => 2, '805.894' => -3, '0.233956' => -2, '588372584' => -4,
-            '221640.31705' => 8, '35.64' => 1, '943.330' => -1, '0.318948' => -1,
-            '265975454' => 1, '385887.139888' => 11, '96.99' => -1, '234.502' => 2,
-            '0.334051' => 2, '1984107482' => 11, '409812.181753' => 10, '96.32' => 3,
-            '725.381' => 0, '0.104498' => 8, '754079843' => 12, '479393.45700' => -4,
-            '46.54' => 1, '231.781' => -4, '0.426330' => 4, '1313355869' => -2,
-            '172630.206167' => 6, '506.350' => 1, '0.160569' => -12, '9374862' => 1,
-            '457426.481681' => 4, '48.21' => 0, '371.236' => -5, '0.18262' => 8,
-            '483859935' => -11, '412138.290760' => 4, '86.23' => 3, '870.412' => 0,
-            '0.464076' => 8, '816125629' => 5, '196928.132387' => 10, '72.29' => -3,
-            '313.701' => 2, '0.63312' => 11, '10216986' => 6, '200164.414633' => -4,
-            '66.76' => -1, '237.527' => 1, '0.35438' => 12, '1495884017' => -2,
-            '158165.37846' => -1, '19.41' => -4, '135.711' => 0, '0.47582' => -7,
-            '2056545177' => 8, '93175.177962' => -10, '76.55' => -4, '113.71' => -1,
-            '0.48159' => 11, '766776723' => -9, '307529.345367' => 7, '77.5' => -2,
-            '575.837' => -4, '0.417865' => 9, '1521506019' => 11, '12107.464637' => 6,
-            '97.86' => 4, '273.570' => 3, '0.114173' => 9, '20096671' => 4,
-            '236082.312435' => 2, '89.0' => -2, '168.939' => 1, '0.23631' => -2,
-            '749143830' => 6, '257069.195003' => 6, '28.61' => 1, '403.712' => 3,
-            '0.143607' => -5, '2082566916' => 11, '264692.220233' => -5, '346.909' => -4,
-            '0.402410' => -12, '1651766620' => 11, '370943.136044' => -10, '85.77' => -1,
-            '508.355' => -2, '0.427580' => 12, '1987714863' => 3, '478356.225686' => 7,
-            '17.94' => 3, '31.900' => 5, '0.33942' => 8, '1658612685' => 4,
-            '410829.251590' => 8, '83.94' => -2, '220.549' => 3, '0.113337' => -9,
-            '1639086102' => -3, '78713.354235' => -9, '47.74' => -1, '651.323' => -5,
-            '0.245932' => 11, '1261711612' => -3, '116253.194576' => -6, '64.55' => -2,
-            '327.473' => 2, '0.241987' => -7, '1285865121' => 5, '435672.392645' => -7,
-            '10.37' => -1, '388.795' => -1, '0.161827' => 5, '230244765' => -6,
-            '265038.172466' => 10, '65.91' => -2, '595.102' => 4, '0.434638' => -3,
-            '126129840' => 2, '413719.466465' => -2, '29.28' => 2, '678.446' => -1,
-            '0.208034' => -7, '1065944072' => 6, '341032.990' => 0, '23.48' => 4,
-            '373.423' => -5, '0.389585' => -10, '1441107220' => -6, '356509.241264' => 8,
-            '422.816' => -3, '0.342884' => 4, '873838463' => -7, '375403.30084' => -9,
-            '98.38' => 0, '385.399' => 3, '0.257833' => -7, '1028034561' => -9,
-            '495168.83206' => -8, '1.78' => 1, '980.42' => -4, '0.331573' => 12,
-            '387462598' => 5, '443818.469998' => -12, '876.765' => 0, '0.53328' => 9,
-            '29407914' => -6, '219873.502347' => 2, '60.76' => -4, '908.795' => -3,
-            '0.459345' => -6, '2046247729' => -2, '244695.419102' => -11, '80.40' => 1,
-            '870.511' => -4, '0.388478' => 11, '427727793' => 3, '101019.324298' => 6,
-            '66.31' => 4, '522.594' => 0, '0.408007' => -6, '1499912745' => -1,
-            '276166.86597' => 6, '73.33' => 0, '506.748' => -1, '0.235478' => 9,
-            '1045213811' => 0, '127791.356198' => 4, '61.93' => 4, '404.785' => -2,
-            '0.353893' => 10, '776947132' => 2, '154285.465851' => -3, '37.26' => 3,
-            '631.660' => -3, '0.265100' => 12, '1038752775' => -10, '397025.381393' => 12,
-            '69.28' => -4, '581.356' => 5, '0.247522' => 6, '635005176' => -12,
-            '211983.309316' => 8, '41.9' => 4, '337.842' => 1, '0.173992' => -7,
-            '723221456' => -4, '177913.49305' => 8, '11.22' => -4, '174.875' => -5,
-            '0.475533' => -2, '981140567' => -4, '94672.451519' => -7, '81.20' => 4,
-            '776.331' => -5, '0.1686' => 9, '435229915' => 4, '250840.284170' => -4,
-            '55.55' => -4, '622.423' => 4, '0.25344' => 6, '146835656' => -4,
-            '279294.130521' => 0, '15.17' => -2, '185.308' => -4, '0.21281' => -1,
-            '299802106' => -5, '341504.324034' => -6, '64.34' => -4, '185.260' => 4,
-            '0.475653' => -5, '1376528125' => -5, '426514.91072' => 12, '50.38' => -3,
-            '522.535' => -5, '0.523764' => -4, '1398866761' => 2, '429538.158736' => -9,
-            '39.40' => 1, '284.128' => -5, '0.312023' => -5, '1275671412' => -12,
-            '5929.213670' => -7, '59.91' => -2, '941.134' => 5, '0.147235' => -1,
-            '106169053' => -9, '142750.455458' => 11, '47.62' => -4, '649.709' => -1,
-            '0.490043' => 1, '1246299209' => -5, '283381.310201' => 1, '83.52' => 4,
-            '462.800' => -1, '0.490291' => 2, '1520998937' => -10, '6895.514087' => 12,
-            '0.32' => -2, '743.520' => -1, '0.150701' => -9, '962438429' => -1,
-            '515717.518352' => 9, '94.28' => 4, '727.906' => 3, '0.158088' => 2,
-            '1458866058' => 9, '432610.363063' => -12, '95.100' => 2, '434.748' => 3,
-            '0.303128' => -4, '1690353126' => -12, '473459.404113' => -12, '69.96' => -1,
-            '753.376' => -4, '0.183909' => -12, '1890384328' => 4, '360580.369842' => -12,
-            '38.66' => 2, '475.112' => -1, '0.423296' => -9, '369343490' => 5,
-            '375810.39343' => 2, '190.438' => -5, '0.120623' => -1, '303710229' => 7,
-            '429459.434728' => -10, '51.20' => 0, '589.680' => -3, '0.380255' => -5,
-            '2121572252' => 0, '43009.369484' => 10, '44.41' => 0, '497.694' => -4,
-            '0.503517' => 2, '750917862' => 11, '17861.88501' => -10, '71.44' => 3,
-            '624.638' => 5, '0.482829' => 2, '178657038' => -3, '136615.86626' => 10,
-            '61.5' => -2, '172.139' => -4, '0.384425' => 8, '1574595991' => -10,
-            '105825.402284' => -10, '62.97' => -3, '878.194' => 2, '0.248212' => -5,
-            '1434390361' => -10, '12755.486808' => 1, '16.33' => 1, '450.861' => 3,
-            '0.136195' => 11, '94135708' => 2, '354832.128808' => 12, '44.769' => 5,
-            '0.182803' => -9, '557554733' => -6, '418674.148877' => -12, '93.10' => 0,
-            '911.305' => 1, '0.447984' => -1, '138482844' => 2, '292468.388641' => 10,
-            '472.740' => 1, '0.323103' => -4, '1226149205' => -10, '54987.193739' => 9,
-            '89.8' => -4, '692.67' => 3, '0.85097' => -11, '1319943123' => 11,
-            '429890.90431' => -7, '49.64' => 4, '198.959' => -3, '0.276511' => 11,
-            '30177090' => 2, '236303.62355' => -10, '17.36' => 1, '102.384' => -2,
-            '0.79893' => -3, '674979790' => 1, '405348.70392' => 7, '9.43' => 2,
-            '616.578' => 1, '0.284218' => 1, '253346959' => -10, '106539.298155' => 1,
-            '18.85' => 2, '169.131' => 4, '0.294728' => -6, '1722210543' => -5,
-            '26708.301522' => 9, '31.11' => 4, '694.36' => 2, '0.124103' => -6,
-            '810995233' => 2, '70871.304536' => -4, '25.10' => 3, '975.824' => -2,
-            '0.120505' => -2, '1495393117' => -3, '137570.391794' => -12, '74.93' => -2,
-            '619.75' => -4, '0.467372' => -8, '1662762076' => -5, '349689.476819' => -6,
-            '72.10' => 1, '383.667' => -1, '0.416946' => -8, '1253560206' => 10,
-            '486994.443615' => 0, '12.98' => 0, '135.77' => 0, '0.173148' => 2,
-            '1909493874' => 12, '124884.291587' => -10, '14.74' => -4, '107.573' => 4,
-            '0.160192' => 0, '867063434' => -3, '450761.174392' => 10, '87.86' => -4,
-            '356.210' => -2, '0.489071' => -2, '803631773' => 1, '338212.321083' => 8,
-            '70.52' => 1, '364.501' => 4, '0.456586' => -1, '1785975209' => 8,
-            '364576.362502' => -6, '79.48' => -1, '803.642' => 4, '0.109176' => -11,
-            '1323336416' => 2, '207735.137004' => 2, '92.90' => 2, '786.663' => -2,
-            '0.130848' => 8, '1331158018' => 1, '424006.165278' => -10, '75.56' => -1,
-            '428.695' => -5, '0.264127' => 4, '530578942' => 10, '254527.337271' => -9,
-            '42.30' => 2, '615.362' => 2, '0.224771' => -3, '1962960365' => 3,
-            '363152.378956' => -11, '14.11' => 0, '141.456' => -5, '0.426860' => 6,
-            '1349110264' => 11, '41910.59612' => -11, '80.12' => 0, '839.378' => -1,
-            '0.114787' => 6, '736831764' => 8, '448394.18754' => -9, '50.100' => -3,
-            '25.470' => 0, '0.393347' => 12, '2029781516' => -5, '181227.13175' => -3,
-            '656.11' => -3, '0.203296' => 3, '931979866' => -7, '190494.151640' => 6,
-            '51.27' => -3, '797.239' => 4, '0.410048' => -5, '1271106666' => 12,
-            '192689.491556' => 6, '99.24' => 3, '488.802' => -4, '0.60574' => -8,
-            '863081313' => -8, '482679.401208' => 1, '99.35' => 2, '184.752' => -3,
-            '0.257832' => -2, '914827407' => 1, '136969.416036' => -10, '65.0' => -4,
-            '169.741' => 3, '0.178673' => 3, '1698545278' => 9, '212734.373075' => 6,
-            '40.49' => -2, '691.776' => -2, '0.66820' => -10, '1373687051' => -6,
-            '184194.472342' => 1, '800.551' => -4, '0.210012' => 10, '1640724691' => 10,
-        );
-        if (!Zend_Locale_Math::isBcmathDisabled()) {
-            // If no BCMath extension, the round below falls through to PHP's round(),
-            // which actually produces incorrect results, and fails these tests.
-            // There are many such examples ...
-            $this->assertEquals('56055.1812', Zend_Locale_Math::round('56055.18115', 4));
-            $this->assertEquals('639.80', Zend_Locale_Math::round('639.795',     2));
-            $this->assertEquals('267.84', Zend_Locale_Math::round('267.835',     2));
-            $this->assertEquals('0.30252', Zend_Locale_Math::round('0.302515',    5));
-            $this->assertEquals('0.3667', Zend_Locale_Math::round('0.36665',     4));
-        }
-
-        foreach ($rounder as $val => $precision);
-//            $this->assertEquals((string) round($val, $precision), (string)Zend_Locale_Math::round($val, $precision));
+        $this->assertEquals('1.96', Zend_Locale_Math::round('1.95583', 2), '');
+        $this->assertEqualsWithDelta('1.96', Zend_Locale_Math::round('1.95583', 2), 0.02, '');
+        $this->assertEquals(round(1.95583,2), Zend_Locale_Math::round('1.95583', 2), '');
+        $this->assertEqualsWithDelta(round(1.95583,2), Zend_Locale_Math::round('1.95583', 2), 0.02, '');
+        $this->assertEquals(1_242_000, Zend_Locale_Math::round('1241757', -3), '');
+        $this->assertEqualsWithDelta(1_242_000, Zend_Locale_Math::round('1241757', -3), 250, '');
+        $this->assertEquals(round(1_241_757, -3), Zend_Locale_Math::round('1241757', -3), '');
+        $this->assertEqualsWithDelta(round(1_241_757, -3), Zend_Locale_Math::round('1241757', -3), 250, '');
+        $this->assertEquals(5.05, Zend_Locale_Math::round('5.045', 2), '');
+        $this->assertEqualsWithDelta(5.05, Zend_Locale_Math::round('5.045', 2), 0.02, '');
+        $this->assertEquals(round(5.045, 2), Zend_Locale_Math::round('5.045', 2), '');
+        $this->assertEqualsWithDelta(round(5.045, 2), Zend_Locale_Math::round('5.045', 2), 0.02, '');
+        $this->assertEquals(5.06, Zend_Locale_Math::round('5.055', 2), '');
+        $this->assertEqualsWithDelta(5.06, Zend_Locale_Math::round('5.055', 2), 0.02, '');
+        $this->assertEquals(round(5.055, 2), Zend_Locale_Math::round('5.055', 2), '');
+        $this->assertEqualsWithDelta(round(5.055, 2), Zend_Locale_Math::round('5.055', 2), 0.02, '');
     }
 
     public function testAdd()
@@ -1648,13 +390,21 @@ public function testNegativeRounding()
         $this->assertEquals(round(-3.6), Zend_Locale_Math::round('-3.6'));
         $this->assertEquals('-4', Zend_Locale_Math::round('-3.6', 0));
         $this->assertEquals(round(-3.6,0), Zend_Locale_Math::round('-3.6', 0));
-        $this->assertEquals('-1.96', Zend_Locale_Math::round('-1.95583', 2), '', 0.02);
-        $this->assertEquals(round(-1.95583,2), Zend_Locale_Math::round('-1.95583', 2), '', 0.02);
-        $this->assertEquals(-1_242_000, Zend_Locale_Math::round('-1241757', -3), '', 250);
-        $this->assertEquals(round(-1_241_757, -3), Zend_Locale_Math::round('-1241757', -3), '', 250);
-        $this->assertEquals(-5.05, Zend_Locale_Math::round('-5.045', 2), '', 0.02);
-        $this->assertEquals(round(-5.045, 2), Zend_Locale_Math::round('-5.045', 2), '', 0.02);
-        $this->assertEquals(-5.06, Zend_Locale_Math::round('-5.055', 2), '', 0.02);
-        $this->assertEquals(round(-5.055, 2), Zend_Locale_Math::round('-5.055', 2), '', 0.02);
+        $this->assertEquals('-1.96', Zend_Locale_Math::round('-1.95583', 2), '');
+        $this->assertEqualsWithDelta('-1.96', Zend_Locale_Math::round('-1.95583', 2), 0.02, '');
+        $this->assertEquals(round(-1.95583,2), Zend_Locale_Math::round('-1.95583', 2), '');
+        $this->assertEqualsWithDelta(round(-1.95583,2), Zend_Locale_Math::round('-1.95583', 2), 0.02, '');
+        $this->assertEquals(-1_242_000, Zend_Locale_Math::round('-1241757', -3), '');
+        $this->assertEqualsWithDelta(-1_242_000, Zend_Locale_Math::round('-1241757', -3), 250, '');
+        $this->assertEquals(round(-1_241_757, -3), Zend_Locale_Math::round('-1241757', -3), '');
+        $this->assertEqualsWithDelta(round(-1_241_757, -3), Zend_Locale_Math::round('-1241757', -3), 250, '');
+        $this->assertEquals(-5.05, Zend_Locale_Math::round('-5.045', 2), '');
+        $this->assertEqualsWithDelta(-5.05, Zend_Locale_Math::round('-5.045', 2), 0.02, '');
+        $this->assertEquals(round(-5.045, 2), Zend_Locale_Math::round('-5.045', 2), '');
+        $this->assertEqualsWithDelta(round(-5.045, 2), Zend_Locale_Math::round('-5.045', 2), 0.02, '');
+        $this->assertEquals(-5.06, Zend_Locale_Math::round('-5.055', 2), '');
+        $this->assertEqualsWithDelta(-5.06, Zend_Locale_Math::round('-5.055', 2), 0.02, '');
+        $this->assertEquals(round(-5.055, 2), Zend_Locale_Math::round('-5.055', 2), '');
+        $this->assertEqualsWithDelta(round(-5.055, 2), Zend_Locale_Math::round('-5.055', 2), 0.02, '');
     }
 }
diff --git a/tests/Zend/LocaleTest.php b/tests/Zend/LocaleTest.php
index b3670749..19a141e3 100644
--- a/tests/Zend/LocaleTest.php
+++ b/tests/Zend/LocaleTest.php
@@ -132,14 +132,14 @@ public function testObjectCreation()
             $this->assertTrue($locale instanceof Zend_Locale);
         } catch (Zend_Locale_Exception $e) {
             // ignore environments where the locale can not be detected
-            $this->assertContains('Autodetection', $e->getMessage());
+            $this->assertStringContainsString('Autodetection', $e->getMessage());
         }
 
         try {
             $this->assertTrue(new Zend_LocaleTestHelper(Zend_Locale::BROWSER) instanceof Zend_Locale);
         } catch (Zend_Locale_Exception $e) {
             // ignore environments where the locale can not be detected
-            $this->assertContains('Autodetection', $e->getMessage());
+            $this->assertStringContainsString('Autodetection', $e->getMessage());
         }
 
         $locale = new Zend_LocaleTestHelper('de');
@@ -277,7 +277,7 @@ public function testsetLocale()
             $this->assertTrue(is_string($value->toString()));
         } catch (Zend_Locale_Exception $e) {
             // ignore environments where the locale can not be detected
-            $this->assertContains('Autodetection', $e->getMessage());
+            $this->assertStringContainsString('Autodetection', $e->getMessage());
         }
 
         try {
@@ -285,7 +285,7 @@ public function testsetLocale()
             $this->assertTrue(is_string($value->toString()));
         } catch (Zend_Locale_Exception $e) {
             // ignore environments where the locale can not be detected
-            $this->assertContains('Autodetection', $e->getMessage());
+            $this->assertStringContainsString('Autodetection', $e->getMessage());
         }
     }
 
@@ -412,7 +412,7 @@ public function testgetTranslation()
             $temp = Zend_LocaleTestHelper::getTranslation('xx');
             $this->fail();
         } catch (Zend_Locale_Exception $e) {
-            $this->assertContains('Unknown detail (', $e->getMessage());
+            $this->assertStringContainsString('Unknown detail (', $e->getMessage());
         }
 
         $this->assertEquals('Deutsch', Zend_LocaleTestHelper::getTranslation('de', 'language', 'de_DE'));
@@ -503,7 +503,7 @@ public function testgetTranslationList()
             $temp = Zend_LocaleTestHelper::getTranslationList();
             $this->fail();
         } catch (Zend_Locale_Exception $e) {
-            $this->assertContains('Unknown list (', $e->getMessage());
+            $this->assertStringContainsString('Unknown list (', $e->getMessage());
         }
 
         $this->assertTrue(in_array('Deutsch', Zend_LocaleTestHelper::getTranslationList('language', 'de_DE')));
@@ -607,13 +607,13 @@ public function testgetQuestion()
         try {
             $this->assertTrue(is_array(Zend_LocaleTestHelper::getQuestion('browser')));
         } catch (Zend_Locale_Exception $e) {
-            $this->assertContains('Autodetection', $e->getMessage());
+            $this->assertStringContainsString('Autodetection', $e->getMessage());
         }
 
         try {
             $this->assertTrue(is_array(Zend_LocaleTestHelper::getQuestion('environment')));
         } catch (Zend_Locale_Exception $e) {
-            $this->assertContains('ocale', $e->getMessage());
+            $this->assertStringContainsString('ocale', $e->getMessage());
         }
     }
 
@@ -718,7 +718,7 @@ public function testsetDefault()
             Zend_LocaleTestHelper::setDefault('auto');
             $this->fail();
         } catch (Zend_Locale_Exception $e) {
-            $this->assertContains('full qualified locale', $e->getMessage());
+            $this->assertStringContainsString('full qualified locale', $e->getMessage());
         }
 
         try {
@@ -733,14 +733,14 @@ public function testsetDefault()
             Zend_LocaleTestHelper::setDefault('xy_ZZ');
             $this->fail();
         } catch (Zend_Locale_Exception $e) {
-            $this->assertContains('Unknown locale', $e->getMessage());
+            $this->assertStringContainsString('Unknown locale', $e->getMessage());
         }
 
         try {
             Zend_LocaleTestHelper::setDefault('de', 101);
             $this->fail();
         } catch (Zend_Locale_Exception $e) {
-            $this->assertContains('Quality must be between', $e->getMessage());
+            $this->assertStringContainsString('Quality must be between', $e->getMessage());
         }
 
         try {
@@ -804,7 +804,7 @@ public function testFindingTheProperLocale()
             $locale = Zend_LocaleTestHelper::findLocale('xx_YY');
             $this->fail();
         } catch (Zend_Locale_Exception $e) {
-            $this->assertContains('is no known locale', $e->getMessage());
+            $this->assertStringContainsString('is no known locale', $e->getMessage());
         }
 
         Zend_Registry::set(\Zend_Locale::class, 'de');
diff --git a/tests/Zend/Navigation/ContainerTest.php b/tests/Zend/Navigation/ContainerTest.php
index 21c013fa..f9e0c3b5 100644
--- a/tests/Zend/Navigation/ContainerTest.php
+++ b/tests/Zend/Navigation/ContainerTest.php
@@ -95,7 +95,7 @@ public function testConstructorShouldThrowExceptionOnInvalidArgument()
             $this->fail('An invalid argument was given to the constructor, '
                         . 'but a Zend_Navigation_Exception was not thrown');
         } catch (Zend_Navigation_Exception $e) {
-            $this->assertContains('Invalid argument: $pages', $e->getMessage());
+            $this->assertStringContainsString('Invalid argument: $pages', $e->getMessage());
         }
 
         try {
@@ -103,7 +103,7 @@ public function testConstructorShouldThrowExceptionOnInvalidArgument()
             $this->fail('An invalid argument was given to the constructor, '
                         . 'but a Zend_Navigation_Exception was not thrown');
         } catch (Zend_Navigation_Exception $e) {
-            $this->assertContains('Invalid argument: $pages', $e->getMessage());
+            $this->assertStringContainsString('Invalid argument: $pages', $e->getMessage());
         }
 
         try {
@@ -111,7 +111,7 @@ public function testConstructorShouldThrowExceptionOnInvalidArgument()
             $this->fail('An invalid argument was given to the constructor, '
                         . 'but a Zend_Navigation_Exception was not thrown');
         } catch (Zend_Navigation_Exception $e) {
-            $this->assertContains('Invalid argument: $pages', $e->getMessage());
+            $this->assertStringContainsString('Invalid argument: $pages', $e->getMessage());
         }
     }
 
@@ -383,7 +383,7 @@ public function testAddPagesShouldThrowExceptionWhenGivenString()
             $this->fail('An invalid argument was given to addPages(), '
                         . 'but a Zend_Navigation_Exception was not thrown');
         } catch (Zend_Navigation_Exception $e) {
-            $this->assertContains('Invalid argument: $pages must be', $e->getMessage());
+            $this->assertStringContainsString('Invalid argument: $pages must be', $e->getMessage());
         }
     }
 
@@ -396,7 +396,7 @@ public function testAddPagesShouldThrowExceptionWhenGivenAnArbitraryObject()
             $this->fail('An invalid argument was given to addPages(), '
                         . 'but a Zend_Navigation_Exception was not thrown');
         } catch (Zend_Navigation_Exception $e) {
-            $this->assertContains('Invalid argument: $pages must be', $e->getMessage());
+            $this->assertStringContainsString('Invalid argument: $pages must be', $e->getMessage());
         }
     }
 
@@ -1039,7 +1039,7 @@ public function testInvalidMagicFinderMethodShouldThrowException()
             $this->fail('An invalid magic finder method was used, '
                         . 'but a Zend_Navigation_Exception was not thrown');
         } catch (Zend_Navigation_Exception $e) {
-            $this->assertContains('Bad method call', $e->getMessage());
+            $this->assertStringContainsString('Bad method call', $e->getMessage());
         }
     }
 
@@ -1052,7 +1052,7 @@ public function testInvalidMagicMethodShouldThrowException()
             $this->fail('An invalid magic finder method was used, '
                         . 'but a Zend_Navigation_Exception was not thrown');
         } catch (Zend_Navigation_Exception $e) {
-            $this->assertContains('Bad method call', $e->getMessage());
+            $this->assertStringContainsString('Bad method call', $e->getMessage());
         }
     }
 
@@ -1211,7 +1211,7 @@ public function testCurrentShouldThrowExceptionIfIndexIsInvalid()
             $this->fail('Container index is invalid, '
                         . 'but a Zend_Navigation_Exception was not thrown');
         } catch (Zend_Navigation_Exception $e) {
-            $this->assertContains('Corruption detected', $e->getMessage());
+            $this->assertStringContainsString('Corruption detected', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Navigation/Page/UriTest.php b/tests/Zend/Navigation/Page/UriTest.php
index ee6e0ca9..34f569c8 100644
--- a/tests/Zend/Navigation/Page/UriTest.php
+++ b/tests/Zend/Navigation/Page/UriTest.php
@@ -54,6 +54,7 @@ public function testUriOptionAsInteger()
                         . 'a Zend_Navigation_Exception was not thrown');
         } catch (Zend_Navigation_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testUriOptionAsObject()
@@ -67,6 +68,7 @@ public function testUriOptionAsObject()
                         . 'a Zend_Navigation_Exception was not thrown');
         } catch (Zend_Navigation_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testSetAndGetUri()
diff --git a/tests/Zend/Navigation/PageFactoryTest.php b/tests/Zend/Navigation/PageFactoryTest.php
index d1acd639..03047d5c 100644
--- a/tests/Zend/Navigation/PageFactoryTest.php
+++ b/tests/Zend/Navigation/PageFactoryTest.php
@@ -125,6 +125,8 @@ public function testShouldFailForInvalidType()
                 'label' => 'My Invalid Page',
             ));
         } catch (Zend_Navigation_Exception $e) {
+            self::assertTrue(true);
+
             return;
         }
 
diff --git a/tests/Zend/Navigation/PageTest.php b/tests/Zend/Navigation/PageTest.php
index a87adea4..dde88c22 100644
--- a/tests/Zend/Navigation/PageTest.php
+++ b/tests/Zend/Navigation/PageTest.php
@@ -145,7 +145,7 @@ public function testSetAndGetLabel()
                 $this->fail('An invalid value was set, but a '
                             . 'Zend_Navigation_Exception was not thrown');
             } catch (Zend_Navigation_Exception $e) {
-                $this->assertContains('Invalid argument: $label', $e->getMessage());
+                $this->assertStringContainsString('Invalid argument: $label', $e->getMessage());
             }
         }
     }
@@ -172,7 +172,7 @@ public function testSetAndGetFragmentIdentifier()
                 $this->fail('An invalid value was set, but a '
                             . 'Zend_Navigation_Exception was not thrown');
             } catch (Zend_Navigation_Exception $e) {
-                $this->assertContains(
+                $this->assertStringContainsString(
                     'Invalid argument: $fragment', $e->getMessage()
                 );
             }
@@ -198,7 +198,7 @@ public function testSetAndGetId()
                 $this->fail('An invalid value was set, but a '
                             . 'Zend_Navigation_Exception was not thrown');
             } catch (Zend_Navigation_Exception $e) {
-                $this->assertContains('Invalid argument: $id', $e->getMessage());
+                $this->assertStringContainsString('Invalid argument: $id', $e->getMessage());
             }
         }
     }
@@ -232,7 +232,7 @@ public function testSetAndGetClass()
                 $this->fail('An invalid value was set, but a '
                             . 'Zend_Navigation_Exception was not thrown');
             } catch (Zend_Navigation_Exception $e) {
-                $this->assertContains('Invalid argument: $class', $e->getMessage());
+                $this->assertStringContainsString('Invalid argument: $class', $e->getMessage());
             }
         }
     }
@@ -255,7 +255,7 @@ public function testSetAndGetTitle()
                 $this->fail('An invalid value was set, but a '
                             . 'Zend_Navigation_Exception was not thrown');
             } catch (Zend_Navigation_Exception $e) {
-                $this->assertContains('Invalid argument: $title', $e->getMessage());
+                $this->assertStringContainsString('Invalid argument: $title', $e->getMessage());
             }
         }
     }
@@ -278,7 +278,7 @@ public function testSetAndGetTarget()
                 $this->fail('An invalid value was set, but a '
                             . 'Zend_Navigation_Exception was not thrown');
             } catch (Zend_Navigation_Exception $e) {
-                $this->assertContains('Invalid argument: $target', $e->getMessage());
+                $this->assertStringContainsString('Invalid argument: $target', $e->getMessage());
             }
         }
     }
@@ -304,7 +304,7 @@ public function testSetAndGetAccesskey()
                 $this->fail('An invalid value was set, but a '
                             . 'Zend_Navigation_Exception was not thrown');
             } catch (Zend_Navigation_Exception $e) {
-                $this->assertContains(
+                $this->assertStringContainsString(
                     'Invalid argument: $character',
                     $e->getMessage()
                 );
@@ -427,7 +427,7 @@ public function testSetAndGetOrder()
                 $this->fail('An invalid value was set, but a '
                             . 'Zend_Navigation_Exception was not thrown');
             } catch (Zend_Navigation_Exception $e) {
-                $this->assertContains('Invalid argument: $order', $e->getMessage());
+                $this->assertStringContainsString('Invalid argument: $order', $e->getMessage());
             }
         }
     }
@@ -493,7 +493,7 @@ public function testSetResourceShouldThrowExceptionWhenGivenInteger()
             $this->fail('An invalid value was set, but a '
                         . 'Zend_Navigation_Exception was not thrown');
         } catch (Zend_Navigation_Exception $e) {
-            $this->assertContains('Invalid argument: $resource', $e->getMessage());
+            $this->assertStringContainsString('Invalid argument: $resource', $e->getMessage());
         }
     }
 
@@ -509,7 +509,7 @@ public function testSetResourceShouldThrowExceptionWhenGivenObject()
             $this->fail('An invalid value was set, but a '
                         . 'Zend_Navigation_Exception was not thrown');
         } catch (Zend_Navigation_Exception $e) {
-            $this->assertContains('Invalid argument: $resource', $e->getMessage());
+            $this->assertStringContainsString('Invalid argument: $resource', $e->getMessage());
         }
     }
 
@@ -771,7 +771,7 @@ public function testMagicOverLoadsShouldCheckNativeProperties()
             unset($page->uri);
             $this->fail('Should not be possible to unset native properties');
         } catch (Zend_Navigation_Exception $e) {
-            static::assertContains('Unsetting native property', $e->getMessage());
+            static::assertStringContainsString('Unsetting native property', $e->getMessage());
         }
     }
 
@@ -1006,7 +1006,7 @@ public function testSetRelShouldThrowExceptionWhenNotNullOrArrayOrConfig()
             $this->fail('An invalid value was set, but a '
                         . 'Zend_Navigation_Exception was not thrown');
         } catch (Zend_Navigation_Exception $e) {
-            $this->assertContains('Invalid argument: $relations', $e->getMessage());
+            $this->assertStringContainsString('Invalid argument: $relations', $e->getMessage());
         }
     }
 
@@ -1064,7 +1064,7 @@ public function testSetRevShouldThrowExceptionWhenNotNullOrArrayOrConfig()
             $this->fail('An invalid value was set, but a '
                         . 'Zend_Navigation_Exception was not thrown');
         } catch (Zend_Navigation_Exception $e) {
-            $this->assertContains('Invalid argument: $relations', $e->getMessage());
+            $this->assertStringContainsString('Invalid argument: $relations', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Paginator/Adapter/IteratorTest.php b/tests/Zend/Paginator/Adapter/IteratorTest.php
index fe3693b7..a142f963 100644
--- a/tests/Zend/Paginator/Adapter/IteratorTest.php
+++ b/tests/Zend/Paginator/Adapter/IteratorTest.php
@@ -107,6 +107,7 @@ public function testDoesNotThrowOutOfBoundsExceptionIfIteratorIsEmpty()
         } catch (OutOfBoundsException $e) {
             static::fail('Empty iterator caused in an OutOfBoundsException');
         }
+        self::assertTrue(true);
     }
 
     /**
diff --git a/tests/Zend/RegistryTest.php b/tests/Zend/RegistryTest.php
index 7138cf4d..6d12b8b6 100644
--- a/tests/Zend/RegistryTest.php
+++ b/tests/Zend/RegistryTest.php
@@ -69,7 +69,7 @@ public function testRegistryUninitGet()
             Zend_Registry::get('foo');
             $this->fail('Expected exception when trying to fetch a non-existent key.');
         } catch (Zend_Exception $e) {
-            $this->assertContains('No entry is registered for key', $e->getMessage());
+            $this->assertStringContainsString('No entry is registered for key', $e->getMessage());
         }
         $registry = Zend_Registry::getInstance();
         $this->assertTrue($registry instanceof Zend_Registry);
@@ -135,7 +135,7 @@ public function testRegistryExceptionInvalidClassname()
             $registry = Zend_Registry::setClassName(new StdClass());
             $this->fail('Expected exception, because setClassName() wants a string');
         } catch (Zend_Exception $e) {
-            $this->assertContains('Argument is not a class name', $e->getMessage());
+            $this->assertStringContainsString('Argument is not a class name', $e->getMessage());
         }
     }
 
@@ -151,7 +151,7 @@ public function testRegistryExceptionNoEntry()
             $foo = Zend_Registry::get('foo');
             $this->fail('Expected exception when trying to fetch a non-existent key.');
         } catch (Zend_Exception $e) {
-            $this->assertContains('No entry is registered for key', $e->getMessage());
+            $this->assertStringContainsString('No entry is registered for key', $e->getMessage());
         }
     }
 
@@ -163,14 +163,14 @@ public function testRegistryExceptionAlreadyInitialized()
             Zend_Registry::setClassName('anyclass');
             $this->fail('Expected exception, because we cannot initialize the registry if it is already initialized.');
         } catch (Zend_Exception $e) {
-            $this->assertContains('Registry is already initialized', $e->getMessage());
+            $this->assertStringContainsString('Registry is already initialized', $e->getMessage());
         }
 
         try {
             Zend_Registry::setInstance(new Zend_Registry());
             $this->fail('Expected exception, because we cannot initialize the registry if it is already initialized.');
         } catch (Zend_Exception $e) {
-            $this->assertContains('Registry is already initialized', $e->getMessage());
+            $this->assertStringContainsString('Registry is already initialized', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Rest/ClientTest.php b/tests/Zend/Rest/ClientTest.php
index 40ae69d5..b0024001 100644
--- a/tests/Zend/Rest/ClientTest.php
+++ b/tests/Zend/Rest/ClientTest.php
@@ -116,7 +116,7 @@ public function testRestGetThrowsExceptionWithNoUri()
             $response = $rest->restGet('/rest/');
             $this->fail('Should throw exception if no URI in object');
         } catch (Exception $e) {
-            // success
+            self::assertTrue(true);
         }
     }
 
@@ -138,7 +138,7 @@ public function testRestFixesPathWithMissingSlashes()
 
         $response = $rest->restGet('rest');
         $this->assertTrue($response instanceof Zend_Http_Response);
-        $this->assertContains($expXml, $response->getBody());
+        $this->assertStringContainsString($expXml, $response->getBody());
     }
 
     public function testRestGet()
@@ -181,7 +181,7 @@ public function testRestPost()
         $this->assertContains($expXml, $response->getBody());
 
         $request = Zend_Rest_Client::getHttpClient()->getLastRequest();
-        $this->assertContains($reqXml, $request, $request);
+        $this->assertStringContainsString($reqXml, $request, $request);
     }
 
     public function testRestPostWithArrayData()
@@ -204,7 +204,7 @@ public function testRestPostWithArrayData()
         $this->assertContains($expXml, $response->getBody());
 
         $request = Zend_Rest_Client::getHttpClient()->getLastRequest();
-        $this->assertContains('foo=bar&baz=bat', $request, $request);
+        $this->assertStringContainsString('foo=bar&baz=bat', $request, $request);
     }
 
     public function testRestPut()
@@ -228,7 +228,7 @@ public function testRestPut()
         $this->assertContains($expXml, $response->getBody());
 
         $request = Zend_Rest_Client::getHttpClient()->getLastRequest();
-        $this->assertContains($reqXml, $request, $request);
+        $this->assertStringContainsString($reqXml, $request, $request);
     }
 
     public function testRestDelete()
@@ -252,7 +252,7 @@ public function testRestDelete()
         $this->assertContains($expXml, $response->getBody());
 
         $request = Zend_Rest_Client::getHttpClient()->getLastRequest();
-        $this->assertContains($reqXml, $request, $request);
+        $this->assertStringContainsString($reqXml, $request, $request);
     }
 
     public function testCallWithHttpMethod()
@@ -324,6 +324,7 @@ public function testInvalidXmlInClientResultLeadsToException()
             $this->fail();
         } catch (Zend_Rest_Client_Result_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     /**
diff --git a/tests/Zend/Test/PHPUnit/ControllerTestCaseTest.php b/tests/Zend/Test/PHPUnit/ControllerTestCaseTest.php
index 495f5d5a..8f1554ea 100644
--- a/tests/Zend/Test/PHPUnit/ControllerTestCaseTest.php
+++ b/tests/Zend/Test/PHPUnit/ControllerTestCaseTest.php
@@ -143,21 +143,21 @@ public function testOverloadingShouldPreventSettingRequestResponseAndFrontContro
             $this->testCase->request = new Zend_Controller_Request_Http();
             $this->fail('Setting request object as public property should raise exception');
         } catch (Exception $e) {
-            $this->assertContains('not allow', $e->getMessage());
+            $this->assertStringContainsString('not allow', $e->getMessage());
         }
 
         try {
             $this->testCase->response = new Zend_Controller_Response_Http();
             $this->fail('Setting response object as public property should raise exception');
         } catch (Exception $e) {
-            $this->assertContains('not allow', $e->getMessage());
+            $this->assertStringContainsString('not allow', $e->getMessage());
         }
 
         try {
             $this->testCase->frontController = Zend_Controller_Front::getInstance();
             $this->fail('Setting front controller as public property should raise exception');
         } catch (Exception $e) {
-            $this->assertContains('not allow', $e->getMessage());
+            $this->assertStringContainsString('not allow', $e->getMessage());
         }
     }
 
@@ -265,6 +265,7 @@ public function testModuleAssertionShouldDoNothingForValidComparison()
         $this->testCase->dispatch('/zend-test-php-unit-foo/baz');
         $this->testCase->assertModule('default');
         $this->testCase->assertNotModule('zend-test-php-unit-foo');
+        self::assertTrue(true);
     }
 
     public function testModuleAssertionShouldThrowExceptionForInvalidComparison()
@@ -282,6 +283,7 @@ public function testControllerAssertionShouldDoNothingForValidComparison()
         $this->testCase->dispatch('/zend-test-php-unit-foo/baz');
         $this->testCase->assertController('zend-test-php-unit-foo');
         $this->testCase->assertNotController('baz');
+        self::assertTrue(true);
     }
 
     public function testControllerAssertionShouldThrowExceptionForInvalidComparison()
@@ -299,6 +301,7 @@ public function testActionAssertionShouldDoNothingForValidComparison()
         $this->testCase->dispatch('/zend-test-php-unit-foo/baz');
         $this->testCase->assertAction('baz');
         $this->testCase->assertNotAction('zend-test-php-unit-foo');
+        self::assertTrue(true);
     }
 
     public function testActionAssertionShouldThrowExceptionForInvalidComparison()
@@ -316,6 +319,7 @@ public function testRouteAssertionShouldDoNothingForValidComparison()
         $this->testCase->dispatch('/zend-test-php-unit-foo/baz');
         $this->testCase->assertRoute('default');
         $this->testCase->assertNotRoute('zend-test-php-unit-foo');
+        self::assertTrue(true);
     }
 
     public function testRouteAssertionShouldThrowExceptionForInvalidComparison()
diff --git a/tests/Zend/Translate/Adapter/ArrayTest.php b/tests/Zend/Translate/Adapter/ArrayTest.php
index 431ade95..c52ddb27 100644
--- a/tests/Zend/Translate/Adapter/ArrayTest.php
+++ b/tests/Zend/Translate/Adapter/ArrayTest.php
@@ -71,14 +71,14 @@ public function testCreate()
             $adapter = new Zend_Translate_Adapter_Array('hastofail', 'en');
             $this->fail('Exception expected');
         } catch (Zend_Translate_Exception $e) {
-            $this->assertContains('Error including array or file', $e->getMessage());
+            $this->assertStringContainsString('Error including array or file', $e->getMessage());
         }
 
         try {
             $adapter = new Zend_Translate_Adapter_Array(__DIR__ . '/_files/failed.php', 'en');
             $this->fail('Exception expected');
         } catch (Zend_Translate_Exception $e) {
-            $this->assertContains('Error including array or file', $e->getMessage());
+            $this->assertStringContainsString('Error including array or file', $e->getMessage());
         }
     }
 
@@ -125,7 +125,7 @@ public function testLoadTranslationData()
             $adapter->addTranslation(__DIR__ . '/_files/translation_en.php', 'xx');
             $this->fail('exception expected');
         } catch (Zend_Translate_Exception $e) {
-            $this->assertContains('does not exist', $e->getMessage());
+            $this->assertStringContainsString('does not exist', $e->getMessage());
         }
 
         $adapter->addTranslation(__DIR__ . '/_files/translation_en2.php', 'de', array('clear' => true));
@@ -184,7 +184,7 @@ public function testLocale()
             $adapter->setLocale('nolocale');
             $this->fail('exception expected');
         } catch (Zend_Translate_Exception $e) {
-            $this->assertContains('does not exist', $e->getMessage());
+            $this->assertStringContainsString('does not exist', $e->getMessage());
         }
 
         set_error_handler(array($this, 'errorHandlerIgnore'));
diff --git a/tests/Zend/TranslateTest.php b/tests/Zend/TranslateTest.php
index 989cbb48..c976c34f 100644
--- a/tests/Zend/TranslateTest.php
+++ b/tests/Zend/TranslateTest.php
@@ -198,7 +198,7 @@ public function testExceptionWhenNoAdapterClassWasSet()
             $lang = new Zend_Translate(\Zend_Locale::class, __DIR__ . '/Translate/_files/test2', null, array('scan' => Zend_Translate::LOCALE_FILENAME));
             $this->fail('Exception due to false adapter class expected');
         } catch (Throwable $e) {
-            $this->assertContains('Cannot assign Zend_Locale to property Zend_Translate::$_adapter of type Zend_Translate_Adapter', $e->getMessage());
+            $this->assertStringContainsString('Cannot assign Zend_Locale to property Zend_Translate::$_adapter of type Zend_Translate_Adapter', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Uri/HttpTest.php b/tests/Zend/Uri/HttpTest.php
index 923f61f0..cc9a75e4 100644
--- a/tests/Zend/Uri/HttpTest.php
+++ b/tests/Zend/Uri/HttpTest.php
@@ -70,11 +70,10 @@ public function testSimpleFromString()
      * non-HTTP scheme.
      *
      * @group ZF-4395
-     *
-     * @expectedException Zend_Uri_Exception
      */
     public function testFromStringInvalidScheme()
     {
+        $this->expectException(\Zend_Uri_Exception::class);
         Zend_Uri_Http::fromString('ftp://example.com/file');
     }
 
@@ -136,6 +135,7 @@ public function testUsernamePasswordValidCharacters()
     public function testUsernameInvalidCharacter()
     {
         $this->_testInvalidUri('http://an`di:password@www.zend.com');
+        self::assertTrue(true);
     }
 
     public function testNoUsernamePassword()
@@ -292,6 +292,7 @@ protected function _testInvalidUri($uri)
             $this->fail('Zend_Uri_Exception was expected but not thrown');
         } catch (Zend_Uri_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testSetGetUsername()
diff --git a/tests/Zend/UriTest.php b/tests/Zend/UriTest.php
index eef5c2e6..04a90c4f 100644
--- a/tests/Zend/UriTest.php
+++ b/tests/Zend/UriTest.php
@@ -93,6 +93,7 @@ public function testSchemeMailto()
     public function testSetConfigWithArray()
     {
         Zend_Uri::setConfig(array('allow_unwise' => true));
+        self::assertTrue(true);
     }
 
     /**
@@ -103,6 +104,7 @@ public function testSetConfigWithArray()
     public function testSetConfigWithZendConfig()
     {
         Zend_Uri::setConfig(new Zend_Config(array('allow_unwise' => true)));
+        self::assertTrue(true);
     }
 
     /**
@@ -110,10 +112,10 @@ public function testSetConfigWithZendConfig()
      * nor Zend_Config is given as first parameter.
      *
      * @group ZF-5578
-     * @expectedException Zend_Uri_Exception
      */
     public function testSetConfigInvalid()
     {
+        $this->expectException(\Zend_Uri_Exception::class);
         Zend_Uri::setConfig('This should cause an exception');
     }
 
diff --git a/tests/Zend/Validate/BarcodeTest.php b/tests/Zend/Validate/BarcodeTest.php
index 6f440a88..01d1b642 100644
--- a/tests/Zend/Validate/BarcodeTest.php
+++ b/tests/Zend/Validate/BarcodeTest.php
@@ -143,7 +143,7 @@ public function testInvalidAdapter()
             $barcode->setAdapter('MyBarcode5');
             $this->fails('Exception expected');
         } catch (Exception $e) {
-            $this->assertContains('does not implement', $e->getMessage());
+            $this->assertStringContainsString('does not implement', $e->getMessage());
         }
     }
 
@@ -160,7 +160,7 @@ public function testInvalidArrayConstructAdapter()
             $barcode = new Zend_Validate_Barcode(array('options' => 'unknown', 'checksum' => false));
             $this->fails('Exception expected');
         } catch (Exception $e) {
-            $this->assertContains('Missing option', $e->getMessage());
+            $this->assertStringContainsString('Missing option', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Validate/CallbackTest.php b/tests/Zend/Validate/CallbackTest.php
index 91df262a..7805a0b4 100644
--- a/tests/Zend/Validate/CallbackTest.php
+++ b/tests/Zend/Validate/CallbackTest.php
@@ -83,7 +83,7 @@ public function testInvalidCallback()
             $valid->setCallback('invalidcallback');
             $this->fail('Exception expected');
         } catch (Zend_Exception $e) {
-            $this->assertContains('Invalid callback given', $e->getMessage());
+            $this->assertStringContainsString('Invalid callback given', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Validate/CreditCardTest.php b/tests/Zend/Validate/CreditCardTest.php
index 1a9d05d3..471ef636 100644
--- a/tests/Zend/Validate/CreditCardTest.php
+++ b/tests/Zend/Validate/CreditCardTest.php
@@ -180,7 +180,7 @@ public function testInvalidServiceClass()
             $validator->setService(array('Zend_Validate_CreditCardTest', 'nocallback'));
             $this->fail('Exception expected');
         } catch (Zend_Exception $e) {
-            $this->assertContains('Invalid callback given', $e->getMessage());
+            $this->assertStringContainsString('Invalid callback given', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Validate/File/CountTest.php b/tests/Zend/Validate/File/CountTest.php
index 9621891f..1a299339 100644
--- a/tests/Zend/Validate/File/CountTest.php
+++ b/tests/Zend/Validate/File/CountTest.php
@@ -87,7 +87,7 @@ public function testGetMin()
             $validator = new Zend_Validate_File_Count(array('min' => 5, 'max' => 1));
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('greater than or equal', $e->getMessage());
+            $this->assertStringContainsString('greater than or equal', $e->getMessage());
         }
 
         $validator = new Zend_Validate_File_Count(array('min' => 1, 'max' => 5));
@@ -97,7 +97,7 @@ public function testGetMin()
             $validator = new Zend_Validate_File_Count(array('min' => 5, 'max' => 1));
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('greater than or equal', $e->getMessage());
+            $this->assertStringContainsString('greater than or equal', $e->getMessage());
         }
     }
 
@@ -114,7 +114,7 @@ public function testSetMin()
             $validator->setMin(20000);
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('less than or equal', $e->getMessage());
+            $this->assertStringContainsString('less than or equal', $e->getMessage());
         }
     }
 
@@ -130,7 +130,7 @@ public function testGetMax()
             $validator = new Zend_Validate_File_Count(array('min' => 5, 'max' => 1));
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('greater than or equal', $e->getMessage());
+            $this->assertStringContainsString('greater than or equal', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Validate/File/FilesSizeTest.php b/tests/Zend/Validate/File/FilesSizeTest.php
index bf09c646..5f63f163 100644
--- a/tests/Zend/Validate/File/FilesSizeTest.php
+++ b/tests/Zend/Validate/File/FilesSizeTest.php
@@ -100,7 +100,7 @@ public function testGetMin()
             $validator = new Zend_Validate_File_FilesSize(array('min' => 100, 'max' => 1));
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('greater than or equal', $e->getMessage());
+            $this->assertStringContainsString('greater than or equal', $e->getMessage());
         }
 
         $validator = new Zend_Validate_File_FilesSize(array('min' => 1, 'max' => 100));
@@ -120,7 +120,7 @@ public function testSetMin()
             $validator->setMin(20000);
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('less than or equal', $e->getMessage());
+            $this->assertStringContainsString('less than or equal', $e->getMessage());
         }
     }
 
@@ -136,7 +136,7 @@ public function testGetMax()
             $validator = new Zend_Validate_File_FilesSize(array('min' => 100, 'max' => 1));
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('greater than or equal', $e->getMessage());
+            $this->assertStringContainsString('greater than or equal', $e->getMessage());
         }
 
         $validator = new Zend_Validate_File_FilesSize(array('min' => 1, 'max' => 100000));
@@ -166,6 +166,7 @@ public function testConstructorShouldRaiseErrorWhenPassedMultipleOptions()
         $handler = set_error_handler(array($this, 'errorHandler'), E_USER_NOTICE);
         $validator = new Zend_Validate_File_FilesSize(1000, 10000);
         restore_error_handler();
+        self::assertTrue(true);
     }
 
     /**
diff --git a/tests/Zend/Validate/File/ImageSizeTest.php b/tests/Zend/Validate/File/ImageSizeTest.php
index 71242152..6f84afb1 100644
--- a/tests/Zend/Validate/File/ImageSizeTest.php
+++ b/tests/Zend/Validate/File/ImageSizeTest.php
@@ -92,7 +92,7 @@ public function testGetImageMin()
             $validator = new Zend_Validate_File_ImageSize(array('minwidth' => 1000, 'minheight' => 100, 'maxwidth' => 10, 'maxheight' => 1));
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('greater than or equal', $e->getMessage());
+            $this->assertStringContainsString('greater than or equal', $e->getMessage());
         }
     }
 
@@ -112,7 +112,7 @@ public function testSetImageMin()
             $validator->setImageMin(array('minwidth' => 20000, 'minheight' => 20000));
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('less than or equal', $e->getMessage());
+            $this->assertStringContainsString('less than or equal', $e->getMessage());
         }
     }
 
@@ -128,7 +128,7 @@ public function testGetImageMax()
             $validator = new Zend_Validate_File_ImageSize(array('minwidth' => 10000, 'minheight' => 1000, 'maxwidth' => 100, 'maxheight' => 10));
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('greater than or equal', $e->getMessage());
+            $this->assertStringContainsString('greater than or equal', $e->getMessage());
         }
     }
 
@@ -154,7 +154,7 @@ public function testSetImageMax()
             $validator->setImageMax(array('maxwidth' => 10000, 'maxheight' => 1));
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('greater than or equal', $e->getMessage());
+            $this->assertStringContainsString('greater than or equal', $e->getMessage());
         }
     }
 
@@ -180,7 +180,7 @@ public function testSetImageWidth()
             $validator->setImageWidth(array('minwidth' => 20000, 'maxwidth' => 200));
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('less than or equal', $e->getMessage());
+            $this->assertStringContainsString('less than or equal', $e->getMessage());
         }
     }
 
@@ -206,7 +206,7 @@ public function testSetImageHeight()
             $validator->setImageHeight(array('minheight' => 20000, 'maxheight' => 200));
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('less than or equal', $e->getMessage());
+            $this->assertStringContainsString('less than or equal', $e->getMessage());
         }
     }
 }
diff --git a/tests/Zend/Validate/File/MimeTypeTest.php b/tests/Zend/Validate/File/MimeTypeTest.php
index ec965b53..fc7abf65 100644
--- a/tests/Zend/Validate/File/MimeTypeTest.php
+++ b/tests/Zend/Validate/File/MimeTypeTest.php
@@ -148,7 +148,7 @@ public function testSetAndGetMagicFile()
         try {
             $validator->setMagicFile('/unknown/magic/file');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('can not be', $e->getMessage());
+            $this->assertStringContainsString('can not be', $e->getMessage());
         }
     }
 
@@ -162,6 +162,7 @@ public function testSetMagicFileWithinConstructor()
         } catch (Zend_Validate_Exception $e) {
             // @ZF-9320: False Magic File is not allowed to be set
         }
+        self::assertTrue(true);
     }
 
     public function testOptionsAtConstructor()
diff --git a/tests/Zend/Validate/File/SizeTest.php b/tests/Zend/Validate/File/SizeTest.php
index 4a41e4df..a9617621 100644
--- a/tests/Zend/Validate/File/SizeTest.php
+++ b/tests/Zend/Validate/File/SizeTest.php
@@ -78,7 +78,7 @@ public function testGetMin()
             $validator = new Zend_Validate_File_Size(array('min' => 100, 'max' => 1));
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('greater than or equal', $e->getMessage());
+            $this->assertStringContainsString('greater than or equal', $e->getMessage());
         }
 
         $validator = new Zend_Validate_File_Size(array('min' => 1, 'max' => 100, 'bytestring' => false));
@@ -98,7 +98,7 @@ public function testSetMin()
             $validator->setMin(20000);
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('less than or equal', $e->getMessage());
+            $this->assertStringContainsString('less than or equal', $e->getMessage());
         }
 
         $validator = new Zend_Validate_File_Size(array('min' => 1000, 'max' => 10000, 'bytestring' => false));
@@ -118,7 +118,7 @@ public function testGetMax()
             $validator = new Zend_Validate_File_Size(array('min' => 100, 'max' => 1));
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('greater than or equal', $e->getMessage());
+            $this->assertStringContainsString('greater than or equal', $e->getMessage());
         }
 
         $validator = new Zend_Validate_File_Size(array('min' => 1, 'max' => 100000));
diff --git a/tests/Zend/Validate/File/UploadTest.php b/tests/Zend/Validate/File/UploadTest.php
index 027ceade..11f68a23 100644
--- a/tests/Zend/Validate/File/UploadTest.php
+++ b/tests/Zend/Validate/File/UploadTest.php
@@ -192,7 +192,7 @@ public function testGetFiles()
             $this->assertEquals(array(), $validator->getFiles('test5'));
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('was not found', $e->getMessage());
+            $this->assertStringContainsString('was not found', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Validate/File/WordCountTest.php b/tests/Zend/Validate/File/WordCountTest.php
index 1060096c..23dbb1d4 100644
--- a/tests/Zend/Validate/File/WordCountTest.php
+++ b/tests/Zend/Validate/File/WordCountTest.php
@@ -71,7 +71,7 @@ public function testGetMin()
             $validator = new Zend_Validate_File_WordCount(array('min' => 5, 'max' => 1));
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('greater than or equal', $e->getMessage());
+            $this->assertStringContainsString('greater than or equal', $e->getMessage());
         }
 
         $validator = new Zend_Validate_File_WordCount(array('min' => 1, 'max' => 5));
@@ -81,7 +81,7 @@ public function testGetMin()
             $validator = new Zend_Validate_File_WordCount(array('min' => 5, 'max' => 1));
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('greater than or equal', $e->getMessage());
+            $this->assertStringContainsString('greater than or equal', $e->getMessage());
         }
     }
 
@@ -98,7 +98,7 @@ public function testSetMin()
             $validator->setMin(20000);
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('less than or equal', $e->getMessage());
+            $this->assertStringContainsString('less than or equal', $e->getMessage());
         }
     }
 
@@ -114,7 +114,7 @@ public function testGetMax()
             $validator = new Zend_Validate_File_WordCount(array('min' => 5, 'max' => 1));
             $this->fail('Missing exception');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('greater than or equal', $e->getMessage());
+            $this->assertStringContainsString('greater than or equal', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Validate/IbanTest.php b/tests/Zend/Validate/IbanTest.php
index 3804835f..6d6a6a9a 100644
--- a/tests/Zend/Validate/IbanTest.php
+++ b/tests/Zend/Validate/IbanTest.php
@@ -54,7 +54,7 @@ public function testSettingAndGettingLocale()
             $validator->setLocale('de_QA');
             $this->fail();
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('IBAN validation', $e->getMessage());
+            $this->assertStringContainsString('IBAN validation', $e->getMessage());
         }
 
         $validator->setLocale('de_DE');
diff --git a/tests/Zend/Validate/IpTest.php b/tests/Zend/Validate/IpTest.php
index e3c9dcd7..e2d4b423 100644
--- a/tests/Zend/Validate/IpTest.php
+++ b/tests/Zend/Validate/IpTest.php
@@ -89,7 +89,7 @@ public function testNoValidation()
             $this->_validator->setOptions(array('allowipv4' => false, 'allowipv6' => false));
             $this->fail();
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('Nothing to validate', $e->getMessage());
+            $this->assertStringContainsString('Nothing to validate', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Validate/NotEmptyTest.php b/tests/Zend/Validate/NotEmptyTest.php
index 096e9244..c590343a 100644
--- a/tests/Zend/Validate/NotEmptyTest.php
+++ b/tests/Zend/Validate/NotEmptyTest.php
@@ -463,7 +463,7 @@ public function testSettingFalseType()
             $this->_validator->setType(true);
             $this->fail();
         } catch (Zend_Exception $e) {
-            $this->assertContains('Unknown', $e->getMessage());
+            $this->assertStringContainsString('Unknown', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Validate/PostCodeTest.php b/tests/Zend/Validate/PostCodeTest.php
index d46b6c4f..28165509 100644
--- a/tests/Zend/Validate/PostCodeTest.php
+++ b/tests/Zend/Validate/PostCodeTest.php
@@ -94,7 +94,7 @@ public function testSettingLocalesWithoutRegion()
             $this->_validator->setLocale('de');
             $this->fail();
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('Unable to detect a region', $e->getMessage());
+            $this->assertStringContainsString('Unable to detect a region', $e->getMessage());
         }
     }
 
@@ -107,7 +107,7 @@ public function testSettingLocalesWithoutPostalCodes()
             $this->_validator->setLocale('nus_SD');
             $this->fail();
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('Unable to detect a postcode format', $e->getMessage());
+            $this->assertStringContainsString('Unable to detect a postcode format', $e->getMessage());
         }
     }
 
@@ -140,14 +140,14 @@ public function testSetGetFormat()
             $this->_validator->setFormat(null);
             $this->fail();
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('A postcode-format string has to be given', $e->getMessage());
+            $this->assertStringContainsString('A postcode-format string has to be given', $e->getMessage());
         }
 
         try {
             $this->_validator->setFormat('');
             $this->fail();
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('A postcode-format string has to be given', $e->getMessage());
+            $this->assertStringContainsString('A postcode-format string has to be given', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Validate/RegexTest.php b/tests/Zend/Validate/RegexTest.php
index 450c238f..ea682c6b 100644
--- a/tests/Zend/Validate/RegexTest.php
+++ b/tests/Zend/Validate/RegexTest.php
@@ -79,7 +79,7 @@ public function testBadPattern()
             $validator->isValid('anything');
             $this->fail('Expected Zend_Validate_Exception not thrown for bad pattern');
         } catch (Zend_Validate_Exception $e) {
-            $this->assertContains('Internal error while', $e->getMessage());
+            $this->assertStringContainsString('Internal error while', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/Validate/StringLengthTest.php b/tests/Zend/Validate/StringLengthTest.php
index 8d8960d4..6e48609c 100644
--- a/tests/Zend/Validate/StringLengthTest.php
+++ b/tests/Zend/Validate/StringLengthTest.php
@@ -157,11 +157,11 @@ public function testDifferentEncodingWithValidator()
     }
 
     /**
-     * @expectedException Zend_Validate_Exception
      * @group GH-634
      */
     public function testWrongEncoding()
     {
+        $this->expectException(\Zend_Validate_Exception::class);
         $this->_validator->setEncoding('');
     }
 
diff --git a/tests/Zend/ValidateTest.php b/tests/Zend/ValidateTest.php
index 3040f802..be0b93b1 100644
--- a/tests/Zend/ValidateTest.php
+++ b/tests/Zend/ValidateTest.php
@@ -132,10 +132,10 @@ public function testStaticFactoryWithConstructorArguments()
      * Refactored to conform with ZF-2724.
      *
      * @group  ZF-2724
-     * @expectedException Zend_Validate_Exception
      */
     public function testStaticFactoryClassNotFound()
     {
+        $this->expectException(\Zend_Validate_Exception::class);
         Zend_Validate::is('1234', 'UnknownValidator');
     }
 
diff --git a/tests/Zend/View/Helper/ActionTest.php b/tests/Zend/View/Helper/ActionTest.php
index dd7b9cb4..7f948968 100644
--- a/tests/Zend/View/Helper/ActionTest.php
+++ b/tests/Zend/View/Helper/ActionTest.php
@@ -136,20 +136,20 @@ public function testResetObjectsClearsResponseHeaders()
     public function testActionReturnsContentFromDefaultModule()
     {
         $value = $this->helper->action('bar', 'action-foo');
-        $this->assertContains('In default module, FooController::barAction()', $value);
+        $this->assertStringContainsString('In default module, FooController::barAction()', $value);
     }
 
     public function testActionReturnsContentFromSpecifiedModule()
     {
         $value = $this->helper->action('bar', 'foo', 'foo');
-        $this->assertContains('In foo module, Foo_FooController::barAction()', $value);
+        $this->assertStringContainsString('In foo module, Foo_FooController::barAction()', $value);
     }
 
     public function testActionReturnsContentReflectingPassedParams()
     {
         $value = $this->helper->action('baz', 'action-foo', null, array('bat' => 'This is my message'));
-        $this->assertNotContains('BOGUS', $value, var_export($this->helper->request->getUserParams(), 1));
-        $this->assertContains('This is my message', $value);
+        $this->assertStringNotContainsString('BOGUS', $value, var_export($this->helper->request->getUserParams(), 1));
+        $this->assertStringContainsString('This is my message', $value);
     }
 
     public function testActionReturnsEmptyStringWhenForwardDetected()
@@ -173,6 +173,7 @@ public function testConstructorThrowsExceptionWithNoControllerDirsInFrontControl
             $this->fail('Empty front controller should cause action helper to throw exception');
         } catch (Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testConstructorThrowsExceptionWithNoRequestInFrontController()
@@ -190,6 +191,7 @@ public function testConstructorThrowsExceptionWithNoRequestInFrontController()
             $this->fail('No request in front controller should cause action helper to throw exception');
         } catch (Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testConstructorThrowsExceptionWithNoResponseInFrontController()
@@ -206,12 +208,13 @@ public function testConstructorThrowsExceptionWithNoResponseInFrontController()
             $this->fail('No response in front controller should cause action helper to throw exception');
         } catch (Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testViewObjectRemainsUnchangedAfterAction()
     {
         $value = $this->helper->action('bar', 'foo', 'foo');
-        $this->assertContains('In foo module, Foo_FooController::barAction()', $value);
+        $this->assertStringContainsString('In foo module, Foo_FooController::barAction()', $value);
         $this->assertNull($this->view->bar);
     }
 
@@ -219,9 +222,9 @@ public function testNestingActionsDoesNotBreakPlaceholderHelpers()
     {
         $html = $this->helper->action('nest', 'foo', 'foo');
         $title = $this->view->headTitle()->toString();
-        $this->assertContains(' - ', $title, $title);
-        $this->assertContains('Foo Nest', $title);
-        $this->assertContains('Nested Stuff', $title);
+        $this->assertStringContainsString(' - ', $title, $title);
+        $this->assertStringContainsString('Foo Nest', $title);
+        $this->assertStringContainsString('Nested Stuff', $title);
     }
 
     /**
diff --git a/tests/Zend/View/Helper/DoctypeTest.php b/tests/Zend/View/Helper/DoctypeTest.php
index cc1e5059..862f2742 100644
--- a/tests/Zend/View/Helper/DoctypeTest.php
+++ b/tests/Zend/View/Helper/DoctypeTest.php
@@ -190,6 +190,7 @@ public function testMalformedCustomDoctypeRaisesException()
             $this->fail('Malformed doctype should raise exception');
         } catch (Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testStringificationReturnsDoctypeString()
diff --git a/tests/Zend/View/Helper/FieldsetTest.php b/tests/Zend/View/Helper/FieldsetTest.php
index 8aa056dd..53ba07a9 100644
--- a/tests/Zend/View/Helper/FieldsetTest.php
+++ b/tests/Zend/View/Helper/FieldsetTest.php
@@ -62,8 +62,8 @@ public function testFieldsetHelperCreatesFieldsetWithProvidedContent()
     {
         $html = $this->helper->fieldset('foo', 'foobar');
         $this->assertRegexp('#<fieldset[^>]+id="foo".*?>#', $html);
-        $this->assertContains('</fieldset>', $html);
-        $this->assertContains('foobar', $html);
+        $this->assertStringContainsString('</fieldset>', $html);
+        $this->assertStringContainsString('foobar', $html);
     }
 
     public function testProvidingLegendOptionToFieldsetCreatesLegendTag()
@@ -79,7 +79,7 @@ public function testEmptyLegendShouldNotRenderLegendTag()
     {
         foreach (array(null, '', ' ', false) as $legend) {
             $html = $this->helper->fieldset('foo', 'foobar', array('legend' => $legend));
-            $this->assertNotContains('<legend>', $html, 'Failed with value ' . var_export($legend, 1) . ': ' . $html);
+            $this->assertStringNotContainsString('<legend>', $html, 'Failed with value ' . var_export($legend, 1) . ': ' . $html);
         }
     }
 
diff --git a/tests/Zend/View/Helper/FormButtonTest.php b/tests/Zend/View/Helper/FormButtonTest.php
index f5b9487c..2c0c7d24 100644
--- a/tests/Zend/View/Helper/FormButtonTest.php
+++ b/tests/Zend/View/Helper/FormButtonTest.php
@@ -64,29 +64,29 @@ public function testFormButtonRendersButtonXhtml()
         $this->assertRegexp('/<button[^>]*?value="bar"/', $button);
         $this->assertRegexp('/<button[^>]*?name="foo"/', $button);
         $this->assertRegexp('/<button[^>]*?id="foo"/', $button);
-        $this->assertContains('</button>', $button);
+        $this->assertStringContainsString('</button>', $button);
     }
 
     public function testCanPassContentViaContentAttribKey()
     {
         $button = $this->helper->formButton('foo', 'bar', array('content' => 'Display this'));
-        $this->assertContains('>Display this<', $button);
-        $this->assertContains('<button', $button);
-        $this->assertContains('</button>', $button);
+        $this->assertStringContainsString('>Display this<', $button);
+        $this->assertStringContainsString('<button', $button);
+        $this->assertStringContainsString('</button>', $button);
     }
 
     public function testCanDisableContentEscaping()
     {
         $button = $this->helper->formButton('foo', 'bar', array('content' => '<b>Display this</b>', 'escape' => false));
-        $this->assertContains('><b>Display this</b><', $button);
+        $this->assertStringContainsString('><b>Display this</b><', $button);
 
         $button = $this->helper->formButton(array('name' => 'foo', 'value' => 'bar', 'attribs' => array('content' => '<b>Display this</b>', 'escape' => false)));
-        $this->assertContains('><b>Display this</b><', $button);
+        $this->assertStringContainsString('><b>Display this</b><', $button);
 
         $button = $this->helper->formButton(array('name' => 'foo', 'value' => 'bar', 'escape' => false, 'attribs' => array('content' => '<b>Display this</b>')));
-        $this->assertContains('><b>Display this</b><', $button);
-        $this->assertContains('<button', $button);
-        $this->assertContains('</button>', $button);
+        $this->assertStringContainsString('><b>Display this</b><', $button);
+        $this->assertStringContainsString('<button', $button);
+        $this->assertStringContainsString('</button>', $button);
     }
 
     public function testValueUsedForContentWhenNoContentProvided()
@@ -98,18 +98,18 @@ public function testValueUsedForContentWhenNoContentProvided()
     public function testButtonTypeIsButtonByDefault()
     {
         $button = $this->helper->formButton(array('name' => 'foo', 'value' => 'bar'));
-        $this->assertContains('type="button"', $button);
+        $this->assertStringContainsString('type="button"', $button);
     }
 
     public function testButtonTypeMayOnlyBeValidXhtmlButtonType()
     {
         $button = $this->helper->formButton(array('name' => 'foo', 'value' => 'bar', 'attribs' => array('type' => 'submit')));
-        $this->assertContains('type="submit"', $button);
+        $this->assertStringContainsString('type="submit"', $button);
         $button = $this->helper->formButton(array('name' => 'foo', 'value' => 'bar', 'attribs' => array('type' => 'reset')));
-        $this->assertContains('type="reset"', $button);
+        $this->assertStringContainsString('type="reset"', $button);
         $button = $this->helper->formButton(array('name' => 'foo', 'value' => 'bar', 'attribs' => array('type' => 'button')));
-        $this->assertContains('type="button"', $button);
+        $this->assertStringContainsString('type="button"', $button);
         $button = $this->helper->formButton(array('name' => 'foo', 'value' => 'bar', 'attribs' => array('type' => 'bogus')));
-        $this->assertContains('type="button"', $button);
+        $this->assertStringContainsString('type="button"', $button);
     }
 }
diff --git a/tests/Zend/View/Helper/FormCheckboxTest.php b/tests/Zend/View/Helper/FormCheckboxTest.php
index e89030f6..6b334414 100644
--- a/tests/Zend/View/Helper/FormCheckboxTest.php
+++ b/tests/Zend/View/Helper/FormCheckboxTest.php
@@ -56,15 +56,15 @@ public function setUp(): void
     public function testIdSetFromName()
     {
         $element = $this->helper->formCheckbox('foo');
-        $this->assertContains('name="foo"', $element);
-        $this->assertContains('id="foo"', $element);
+        $this->assertStringContainsString('name="foo"', $element);
+        $this->assertStringContainsString('id="foo"', $element);
     }
 
     public function testSetIdFromAttribs()
     {
         $element = $this->helper->formCheckbox('foo', null, array('id' => 'bar'));
-        $this->assertContains('name="foo"', $element);
-        $this->assertContains('id="bar"', $element);
+        $this->assertStringContainsString('name="foo"', $element);
+        $this->assertStringContainsString('id="bar"', $element);
     }
 
     /**
@@ -90,7 +90,7 @@ public function testCheckboxNotDisabled()
             'value' => 'bar',
             'attribs' => array('disable' => false),
         ));
-        $this->assertNotContains('disabled="disabled"', $html);
+        $this->assertStringNotContainsString('disabled="disabled"', $html);
     }
 
     public function testCanSelectCheckbox()
@@ -204,13 +204,13 @@ public function testShouldRenderHiddenElementShowingUncheckedOptionForNonArrayNa
     public function testCheckedAttributeNotRenderedIfItEvaluatesToFalse()
     {
         $test = $this->helper->formCheckbox('foo', 'value', array('checked' => false));
-        $this->assertNotContains('checked', $test);
+        $this->assertStringNotContainsString('checked', $test);
     }
 
     public function testCanSpecifyValue()
     {
         $test = $this->helper->formCheckbox('foo', 'bar');
-        $this->assertContains('value="bar"', $test);
+        $this->assertStringContainsString('value="bar"', $test);
     }
 
     /**
@@ -219,12 +219,12 @@ public function testCanSpecifyValue()
     public function testShouldCheckValueIfValueMatchesCheckedOption()
     {
         $test = $this->helper->formCheckbox('foo', 'bar', array(), array('bar', 'baz'));
-        $this->assertContains('value="bar"', $test);
-        $this->assertContains('checked', $test);
+        $this->assertStringContainsString('value="bar"', $test);
+        $this->assertStringContainsString('checked', $test);
 
         $test = $this->helper->formCheckbox('foo', 'bar', array(), array('checked' => 'bar', 'unChecked' => 'baz'));
-        $this->assertContains('value="bar"', $test);
-        $this->assertContains('checked', $test);
+        $this->assertStringContainsString('value="bar"', $test);
+        $this->assertStringContainsString('checked', $test);
     }
 
     /**
@@ -233,7 +233,7 @@ public function testShouldCheckValueIfValueMatchesCheckedOption()
     public function testShouldOnlySetValueIfValueMatchesCheckedOption()
     {
         $test = $this->helper->formCheckbox('foo', 'baz', array(), array('bar', 'baz'));
-        $this->assertContains('value="bar"', $test);
+        $this->assertStringContainsString('value="bar"', $test);
     }
 
     /**
@@ -242,21 +242,21 @@ public function testShouldOnlySetValueIfValueMatchesCheckedOption()
     public function testShouldNotCheckValueIfValueDoesNotMatchCheckedOption()
     {
         $test = $this->helper->formCheckbox('foo', 'baz', array(), array('bar', 'baz'));
-        $this->assertContains('value="bar"', $test);
-        $this->assertNotContains('checked', $test);
+        $this->assertStringContainsString('value="bar"', $test);
+        $this->assertStringNotContainsString('checked', $test);
     }
 
     public function testRendersAsHtmlByDefault()
     {
         $test = $this->helper->formCheckbox('foo', 'bar');
-        $this->assertNotContains(' />', $test, $test);
+        $this->assertStringNotContainsString(' />', $test, $test);
     }
 
     public function testCanRendersAsXHtml()
     {
         $this->view->doctype('XHTML1_STRICT');
         $test = $this->helper->formCheckbox('foo', 'bar');
-        $this->assertContains(' />', $test);
+        $this->assertStringContainsString(' />', $test);
     }
 
     /**
@@ -265,28 +265,28 @@ public function testCanRendersAsXHtml()
     public function testShouldNotShowHiddenFieldIfDisableIsTrue()
     {
         $test = $this->helper->formCheckbox('foo', 'bar', array('disable' => true));
-        $this->assertNotContains('type="hidden"', $test);
+        $this->assertStringNotContainsString('type="hidden"', $test);
     }
 
     public function testIntValueIsChecked()
     {
         $test = $this->helper->formCheckbox('foo', '1', array(), array('checked' => 1, 'unchecked' => 0));
-        $this->assertContains('checked="checked"', $test);
+        $this->assertStringContainsString('checked="checked"', $test);
 
         $test = $this->helper->formCheckbox('foo', '1', array(), array(1,0));
-        $this->assertContains('checked="checked"', $test);
+        $this->assertStringContainsString('checked="checked"', $test);
 
         $test = $this->helper->formCheckbox('foo', 1, array(), array('checked' => 1, 'unchecked' => 0));
-        $this->assertContains('checked="checked"', $test);
+        $this->assertStringContainsString('checked="checked"', $test);
 
         $test = $this->helper->formCheckbox('foo', 1, array(), array(1,0));
-        $this->assertContains('checked="checked"', $test);
+        $this->assertStringContainsString('checked="checked"', $test);
 
         $test = $this->helper->formCheckbox('foo', 0, array(), array('checked' => 1, 'unchecked' => 0));
-        $this->assertNotContains('checked="checked"', $test);
+        $this->assertStringNotContainsString('checked="checked"', $test);
 
         $test = $this->helper->formCheckbox('foo', 0, array(), array(1,0));
-        $this->assertNotContains('checked="checked"', $test);
+        $this->assertStringNotContainsString('checked="checked"', $test);
     }
 
     /**
diff --git a/tests/Zend/View/Helper/FormErrorsTest.php b/tests/Zend/View/Helper/FormErrorsTest.php
index 0f4aa16b..9984a561 100644
--- a/tests/Zend/View/Helper/FormErrorsTest.php
+++ b/tests/Zend/View/Helper/FormErrorsTest.php
@@ -98,11 +98,11 @@ public function testFormErrorsRendersUnorderedListByDefault()
     {
         $errors = array('foo', 'bar', 'baz');
         $html = $this->helper->formErrors($errors);
-        $this->assertContains('<ul', $html);
+        $this->assertStringContainsString('<ul', $html);
         foreach ($errors as $error) {
-            $this->assertContains('<li>' . $error . '</li>', $html);
+            $this->assertStringContainsString('<li>' . $error . '</li>', $html);
         }
-        $this->assertContains('</ul>', $html);
+        $this->assertStringContainsString('</ul>', $html);
     }
 
     public function testFormErrorsRendersWithSpecifiedStrings()
@@ -112,11 +112,11 @@ public function testFormErrorsRendersWithSpecifiedStrings()
             ->setElementEnd('</dt></dl>');
         $errors = array('foo', 'bar', 'baz');
         $html = $this->helper->formErrors($errors);
-        $this->assertContains('<dl>', $html);
+        $this->assertStringContainsString('<dl>', $html);
         foreach ($errors as $error) {
-            $this->assertContains('<dt>' . $error . '</dt>', $html);
+            $this->assertStringContainsString('<dt>' . $error . '</dt>', $html);
         }
-        $this->assertContains('</dl>', $html);
+        $this->assertStringContainsString('</dl>', $html);
     }
 
     public function testFormErrorsPreventsXssAttacks()
@@ -125,8 +125,8 @@ public function testFormErrorsPreventsXssAttacks()
             'bad' => '\"><script>alert("xss");</script>',
         );
         $html = $this->helper->formErrors($errors);
-        $this->assertNotContains($errors['bad'], $html);
-        $this->assertContains('&', $html);
+        $this->assertStringNotContainsString($errors['bad'], $html);
+        $this->assertStringContainsString('&', $html);
     }
 
     public function testCanDisableEscapingErrorMessages()
@@ -136,8 +136,8 @@ public function testCanDisableEscapingErrorMessages()
             'bar' => '<a href="/help">Please click here for more information</a>',
         );
         $html = $this->helper->formErrors($errors, array('escape' => false));
-        $this->assertContains($errors['foo'], $html);
-        $this->assertContains($errors['bar'], $html);
+        $this->assertStringContainsString($errors['foo'], $html);
+        $this->assertStringContainsString($errors['bar'], $html);
     }
 
     /**
diff --git a/tests/Zend/View/Helper/FormFileTest.php b/tests/Zend/View/Helper/FormFileTest.php
index 30953e75..1ee99656 100644
--- a/tests/Zend/View/Helper/FormFileTest.php
+++ b/tests/Zend/View/Helper/FormFileTest.php
@@ -98,7 +98,7 @@ public function testRendersAsHtmlByDefault()
         $test = $this->helper->formFile(array(
             'name' => 'foo',
         ));
-        $this->assertNotContains(' />', $test);
+        $this->assertStringNotContainsString(' />', $test);
     }
 
     public function testCanRendersAsXHtml()
@@ -107,7 +107,7 @@ public function testCanRendersAsXHtml()
         $test = $this->helper->formFile(array(
             'name' => 'foo',
         ));
-        $this->assertContains(' />', $test);
+        $this->assertStringContainsString(' />', $test);
     }
 
     /**
diff --git a/tests/Zend/View/Helper/FormImageTest.php b/tests/Zend/View/Helper/FormImageTest.php
index 650999d1..a4e76068 100644
--- a/tests/Zend/View/Helper/FormImageTest.php
+++ b/tests/Zend/View/Helper/FormImageTest.php
@@ -85,7 +85,7 @@ public function testRendersAsHtmlByDefault()
         $test = $this->helper->formImage(array(
             'name' => 'foo',
         ));
-        $this->assertNotContains(' />', $test);
+        $this->assertStringNotContainsString(' />', $test);
     }
 
     /**
@@ -97,6 +97,6 @@ public function testCanRendersAsXHtml()
         $test = $this->helper->formImage(array(
             'name' => 'foo',
         ));
-        $this->assertContains(' />', $test);
+        $this->assertStringContainsString(' />', $test);
     }
 }
diff --git a/tests/Zend/View/Helper/FormLabelTest.php b/tests/Zend/View/Helper/FormLabelTest.php
index a401d946..8900c3d9 100644
--- a/tests/Zend/View/Helper/FormLabelTest.php
+++ b/tests/Zend/View/Helper/FormLabelTest.php
@@ -97,11 +97,11 @@ public function testNameAndIdForZF2154()
     public function testCanDisableEscapingLabelValue()
     {
         $label = $this->helper->formLabel('foo', '<b>Label This!</b>', array('escape' => false));
-        $this->assertContains('<b>Label This!</b>', $label);
+        $this->assertStringContainsString('<b>Label This!</b>', $label);
         $label = $this->helper->formLabel(array('name' => 'foo', 'value' => '<b>Label This!</b>', 'escape' => false));
-        $this->assertContains('<b>Label This!</b>', $label);
+        $this->assertStringContainsString('<b>Label This!</b>', $label);
         $label = $this->helper->formLabel(array('name' => 'foo', 'value' => '<b>Label This!</b>', 'attribs' => array('escape' => false)));
-        $this->assertContains('<b>Label This!</b>', $label);
+        $this->assertStringContainsString('<b>Label This!</b>', $label);
     }
 
     /**
@@ -110,7 +110,7 @@ public function testCanDisableEscapingLabelValue()
     public function testHelperShouldAllowSuppressionOfForAttribute()
     {
         $label = $this->helper->formLabel('foo', 'bar', array('disableFor' => true));
-        $this->assertNotContains('for="foo"', $label);
+        $this->assertStringNotContainsString('for="foo"', $label);
     }
 
     /**
@@ -119,6 +119,6 @@ public function testHelperShouldAllowSuppressionOfForAttribute()
     public function testShouldNotRenderDisableForAttributeIfForIsSuppressed()
     {
         $label = $this->helper->formLabel('foo', 'bar', array('disableFor' => true));
-        $this->assertNotContains('disableFor=', $label, 'Output contains disableFor attribute!');
+        $this->assertStringNotContainsString('disableFor=', $label, 'Output contains disableFor attribute!');
     }
 }
diff --git a/tests/Zend/View/Helper/FormPasswordTest.php b/tests/Zend/View/Helper/FormPasswordTest.php
index c499be32..97d39051 100644
--- a/tests/Zend/View/Helper/FormPasswordTest.php
+++ b/tests/Zend/View/Helper/FormPasswordTest.php
@@ -88,20 +88,20 @@ public function testDisablingElementDoesNotRenderHiddenElements()
     public function testShouldRenderAsHtmlByDefault()
     {
         $test = $this->helper->formPassword('foo', 'bar');
-        $this->assertNotContains(' />', $test);
+        $this->assertStringNotContainsString(' />', $test);
     }
 
     public function testShouldAllowRenderingAsXhtml()
     {
         $this->view->doctype('XHTML1_STRICT');
         $test = $this->helper->formPassword('foo', 'bar');
-        $this->assertContains(' />', $test);
+        $this->assertStringContainsString(' />', $test);
     }
 
     public function testShouldNotRenderValueByDefault()
     {
         $test = $this->helper->formPassword('foo', 'bar');
-        $this->assertNotContains('bar', $test);
+        $this->assertStringNotContainsString('bar', $test);
     }
 
     /**
@@ -110,7 +110,7 @@ public function testShouldNotRenderValueByDefault()
     public function testShouldRenderValueWhenRenderPasswordFlagPresentAndTrue()
     {
         $test = $this->helper->formPassword('foo', 'bar', array('renderPassword' => true));
-        $this->assertContains('value="bar"', $test);
+        $this->assertStringContainsString('value="bar"', $test);
     }
 
     /**
@@ -119,8 +119,8 @@ public function testShouldRenderValueWhenRenderPasswordFlagPresentAndTrue()
     public function testRenderPasswordAttribShouldNeverBeRendered()
     {
         $test = $this->helper->formPassword('foo', 'bar', array('renderPassword' => true));
-        $this->assertNotContains('renderPassword', $test);
+        $this->assertStringNotContainsString('renderPassword', $test);
         $test = $this->helper->formPassword('foo', 'bar', array('renderPassword' => false));
-        $this->assertNotContains('renderPassword', $test);
+        $this->assertStringNotContainsString('renderPassword', $test);
     }
 }
diff --git a/tests/Zend/View/Helper/FormRadioTest.php b/tests/Zend/View/Helper/FormRadioTest.php
index fb8a64bf..2d531b49 100644
--- a/tests/Zend/View/Helper/FormRadioTest.php
+++ b/tests/Zend/View/Helper/FormRadioTest.php
@@ -148,7 +148,7 @@ public function testCanSpecifyRadioSeparator()
             'listsep' => '--FunkySep--',
         ));
 
-        $this->assertContains('--FunkySep--', $html);
+        $this->assertStringContainsString('--FunkySep--', $html);
         $count = substr_count($html, '--FunkySep--');
         $this->assertEquals(2, $count);
     }
@@ -232,8 +232,8 @@ public function testLabelsAreEscapedByDefault()
             'options' => $options,
         ));
 
-        $this->assertNotContains($options['bar'], $html);
-        $this->assertContains('&lt;b&gt;Bar&lt;/b&gt;', $html);
+        $this->assertStringNotContainsString($options['bar'], $html);
+        $this->assertStringContainsString('&lt;b&gt;Bar&lt;/b&gt;', $html);
     }
 
     public function testXhtmlLabelsAreAllowed()
@@ -247,7 +247,7 @@ public function testXhtmlLabelsAreAllowed()
             'attribs' => array('escape' => false),
         ));
 
-        $this->assertContains($options['bar'], $html);
+        $this->assertStringContainsString($options['bar'], $html);
     }
 
     /**
@@ -366,7 +366,7 @@ public function testRadioLabelDoesNotContainHardCodedStyle()
             'value' => 'bar',
             'options' => $options,
         ));
-        $this->assertNotContains('style="white-space: nowrap;"', $html);
+        $this->assertStringNotContainsString('style="white-space: nowrap;"', $html);
     }
 
     /**
@@ -430,9 +430,9 @@ public function testRendersAsHtmlByDefault()
             'options' => $options,
         ));
 
-        $this->assertContains('value="foo">', $html);
-        $this->assertContains('value="bar">', $html);
-        $this->assertContains('value="baz">', $html);
+        $this->assertStringContainsString('value="foo">', $html);
+        $this->assertStringContainsString('value="bar">', $html);
+        $this->assertStringContainsString('value="baz">', $html);
     }
 
     /**
@@ -450,9 +450,9 @@ public function testCanRendersAsXHtml()
             'name' => 'foo',
             'options' => $options,
         ));
-        $this->assertContains('value="foo" />', $html);
-        $this->assertContains('value="bar" />', $html);
-        $this->assertContains('value="baz" />', $html);
+        $this->assertStringContainsString('value="foo" />', $html);
+        $this->assertStringContainsString('value="bar" />', $html);
+        $this->assertStringContainsString('value="baz" />', $html);
     }
 
     /**
@@ -472,7 +472,7 @@ public function testSeparatorCanRendersAsXhtmlByDefault()
             'options' => $options,
         ));
 
-        $this->assertContains('<br />', $html);
+        $this->assertStringContainsString('<br />', $html);
         $count = substr_count($html, '<br />');
         $this->assertEquals(2, $count);
     }
@@ -494,7 +494,7 @@ public function testeparatorCanRendersAsHtml()
             'options' => $options,
         ));
 
-        $this->assertContains('<br>', $html);
+        $this->assertStringContainsString('<br>', $html);
         $count = substr_count($html, '<br>');
         $this->assertEquals(2, $count);
     }
diff --git a/tests/Zend/View/Helper/FormResetTest.php b/tests/Zend/View/Helper/FormResetTest.php
index ee20f20a..eb69329c 100644
--- a/tests/Zend/View/Helper/FormResetTest.php
+++ b/tests/Zend/View/Helper/FormResetTest.php
@@ -87,13 +87,13 @@ public function testShouldAllowDisabling()
     public function testShouldRenderAsHtmlByDefault()
     {
         $test = $this->helper->formReset('foo', 'bar');
-        $this->assertNotContains(' />', $test);
+        $this->assertStringNotContainsString(' />', $test);
     }
 
     public function testShouldAllowRenderingAsXHtml()
     {
         $this->view->doctype('XHTML1_STRICT');
         $test = $this->helper->formReset('foo', 'bar');
-        $this->assertContains(' />', $test);
+        $this->assertStringContainsString(' />', $test);
     }
 }
diff --git a/tests/Zend/View/Helper/FormSelectTest.php b/tests/Zend/View/Helper/FormSelectTest.php
index 6642788f..992f3c55 100644
--- a/tests/Zend/View/Helper/FormSelectTest.php
+++ b/tests/Zend/View/Helper/FormSelectTest.php
@@ -87,15 +87,15 @@ public function testFormSelectWithNameOnlyCreatesEmptySelect()
     {
         $html = $this->helper->formSelect('foo');
         $this->assertRegExp('#<select[^>]+name="foo"#', $html);
-        $this->assertContains('</select>', $html);
-        $this->assertNotContains('<option', $html);
+        $this->assertStringContainsString('</select>', $html);
+        $this->assertStringNotContainsString('<option', $html);
     }
 
     public function testFormSelectWithOptionsCreatesPopulatedSelect()
     {
         $html = $this->helper->formSelect('foo', null, null, array('foo' => 'Foobar', 'baz' => 'Bazbat'));
         $this->assertRegExp('#<select[^>]+name="foo"#', $html);
-        $this->assertContains('</select>', $html);
+        $this->assertStringContainsString('</select>', $html);
         $this->assertRegExp('#<option[^>]+value="foo".*?>Foobar</option>#', $html);
         $this->assertRegExp('#<option[^>]+value="baz".*?>Bazbat</option>#', $html);
         $this->assertEquals(2, substr_count($html, '<option'));
diff --git a/tests/Zend/View/Helper/FormSubmitTest.php b/tests/Zend/View/Helper/FormSubmitTest.php
index 34c5a968..2e3a3992 100644
--- a/tests/Zend/View/Helper/FormSubmitTest.php
+++ b/tests/Zend/View/Helper/FormSubmitTest.php
@@ -99,14 +99,14 @@ public function testValueAttributeIsAlwaysRendered()
     public function testRendersAsHtmlByDefault()
     {
         $test = $this->helper->formSubmit('foo', 'bar');
-        $this->assertNotContains(' />', $test);
+        $this->assertStringNotContainsString(' />', $test);
     }
 
     public function testCanRendersAsXHtml()
     {
         $this->view->doctype('XHTML1_STRICT');
         $test = $this->helper->formSubmit('foo', 'bar');
-        $this->assertContains(' />', $test);
+        $this->assertStringContainsString(' />', $test);
     }
 
     /**
@@ -115,6 +115,6 @@ public function testCanRendersAsXHtml()
     public function testDoesNotOutputEmptyId()
     {
         $test = $this->helper->formSubmit('', 'bar');
-        $this->assertNotContains('id=""', $test);
+        $this->assertStringNotContainsString('id=""', $test);
     }
 }
diff --git a/tests/Zend/View/Helper/FormTextTest.php b/tests/Zend/View/Helper/FormTextTest.php
index e91b5fb6..f512449f 100644
--- a/tests/Zend/View/Helper/FormTextTest.php
+++ b/tests/Zend/View/Helper/FormTextTest.php
@@ -60,28 +60,28 @@ protected function setUp(): void
     public function testIdSetFromName()
     {
         $element = $this->helper->formText('foo');
-        $this->assertContains('name="foo"', $element);
-        $this->assertContains('id="foo"', $element);
+        $this->assertStringContainsString('name="foo"', $element);
+        $this->assertStringContainsString('id="foo"', $element);
     }
 
     public function testSetIdFromAttribs()
     {
         $element = $this->helper->formText('foo', null, array('id' => 'bar'));
-        $this->assertContains('name="foo"', $element);
-        $this->assertContains('id="bar"', $element);
+        $this->assertStringContainsString('name="foo"', $element);
+        $this->assertStringContainsString('id="bar"', $element);
     }
 
     public function testSetValue()
     {
         $element = $this->helper->formText('foo', 'bar');
-        $this->assertContains('name="foo"', $element);
-        $this->assertContains('value="bar"', $element);
+        $this->assertStringContainsString('name="foo"', $element);
+        $this->assertStringContainsString('value="bar"', $element);
     }
 
     public function testReadOnlyAttribute()
     {
         $element = $this->helper->formText('foo', null, array('readonly' => 'readonly'));
-        $this->assertContains('readonly="readonly"', $element);
+        $this->assertStringContainsString('readonly="readonly"', $element);
     }
 
     /**
@@ -115,13 +115,13 @@ public function testDisablingElementDoesNotRenderHiddenElements()
     public function testRendersAsHtmlByDefault()
     {
         $test = $this->helper->formText('foo', 'bar');
-        $this->assertNotContains(' />', $test);
+        $this->assertStringNotContainsString(' />', $test);
     }
 
     public function testCanRendersAsXHtml()
     {
         $this->view->doctype('XHTML1_STRICT');
         $test = $this->helper->formText('foo', 'bar');
-        $this->assertContains(' />', $test);
+        $this->assertStringContainsString(' />', $test);
     }
 }
diff --git a/tests/Zend/View/Helper/GravatarTest.php b/tests/Zend/View/Helper/GravatarTest.php
index 34aa394c..fdb74bb0 100644
--- a/tests/Zend/View/Helper/GravatarTest.php
+++ b/tests/Zend/View/Helper/GravatarTest.php
@@ -272,7 +272,6 @@ public function testInvalidKeyPassedToSetOptionsMethod()
             'unknown' => array('val' => 1),
         );
         $this->_object->gravatar()->setOptions($options);
+        self::assertTrue(true);
     }
 }
-
-// Call Zend_View_Helper_BaseUrlTest::main() if this source file is executed directly.
diff --git a/tests/Zend/View/Helper/HeadLinkTest.php b/tests/Zend/View/Helper/HeadLinkTest.php
index c4a9d8c3..42f17a21 100644
--- a/tests/Zend/View/Helper/HeadLinkTest.php
+++ b/tests/Zend/View/Helper/HeadLinkTest.php
@@ -108,6 +108,7 @@ public function testPrependThrowsExceptionWithoutArrayArgument()
             $this->fail('prepend should raise exception without array argument');
         } catch (Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testAppendThrowsExceptionWithoutArrayArgument()
@@ -117,6 +118,7 @@ public function testAppendThrowsExceptionWithoutArrayArgument()
             $this->fail('append should raise exception without array argument');
         } catch (Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testSetThrowsExceptionWithoutArrayArgument()
@@ -126,6 +128,7 @@ public function testSetThrowsExceptionWithoutArrayArgument()
             $this->fail('set should raise exception without array argument');
         } catch (Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testOffsetSetThrowsExceptionWithoutArrayArgument()
@@ -135,6 +138,7 @@ public function testOffsetSetThrowsExceptionWithoutArrayArgument()
             $this->fail('set should raise exception without array argument');
         } catch (Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testCreatingLinkStackViaHeadScriptCreatesAppropriateOutput()
@@ -156,11 +160,11 @@ public function testCreatingLinkStackViaHeadScriptCreatesAppropriateOutput()
 
         foreach ($links as $link) {
             $substr = ' href="' . $link['href'] . '"';
-            $this->assertContains($substr, $string);
+            $this->assertStringContainsString($substr, $string);
             $substr = ' rel="' . $link['rel'] . '"';
-            $this->assertContains($substr, $string);
+            $this->assertStringContainsString($substr, $string);
             $substr = ' type="' . $link['type'] . '"';
-            $this->assertContains($substr, $string);
+            $this->assertStringContainsString($substr, $string);
         }
 
         $order = array();
@@ -192,11 +196,11 @@ public function testCreatingLinkStackViaStyleSheetMethodsCreatesAppropriateOutpu
 
         foreach ($links as $link) {
             $substr = ' href="' . $link['href'] . '"';
-            $this->assertContains($substr, $string);
+            $this->assertStringContainsString($substr, $string);
             $substr = ' rel="' . $link['rel'] . '"';
-            $this->assertContains($substr, $string);
+            $this->assertStringContainsString($substr, $string);
             $substr = ' type="' . $link['type'] . '"';
-            $this->assertContains($substr, $string);
+            $this->assertStringContainsString($substr, $string);
         }
 
         $order = array();
@@ -233,11 +237,11 @@ public function testCreatingLinkStackViaAlternateMethodsCreatesAppropriateOutput
 
         foreach ($links as $link) {
             $substr = ' href="' . $link['href'] . '"';
-            $this->assertContains($substr, $string);
+            $this->assertStringContainsString($substr, $string);
             $substr = ' title="' . $link['title'] . '"';
-            $this->assertContains($substr, $string);
+            $this->assertStringContainsString($substr, $string);
             $substr = ' type="' . $link['type'] . '"';
-            $this->assertContains($substr, $string);
+            $this->assertStringContainsString($substr, $string);
         }
 
         $order = array();
@@ -257,6 +261,7 @@ public function testOverloadingThrowsExceptionWithNoArguments()
             $this->fail('Helper should expect at least one argument');
         } catch (Zend_View_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testOverloadingShouldAllowSingleArrayArgument()
@@ -273,6 +278,7 @@ public function testOverloadingUsingSingleArrayArgumentWithInvalidValuesThrowsEx
             $this->fail('Invalid attribute values should raise exception');
         } catch (Zend_View_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testOverloadingOffsetSetWorks()
@@ -291,6 +297,7 @@ public function testOverloadingThrowsExceptionWithInvalidMethod()
             $this->fail('Invalid method should raise exception');
         } catch (Zend_View_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testStylesheetAttributesGetSet()
@@ -312,10 +319,10 @@ public function testConditionalStylesheetNotCreatedByDefault()
         $this->assertFalse($item->conditionalStylesheet);
 
         $string = $this->helper->toString();
-        $this->assertContains('/styles.css', $string);
-        $this->assertNotContains('<!--[if', $string);
-        $this->assertNotContains(']>', $string);
-        $this->assertNotContains('<![endif]-->', $string);
+        $this->assertStringContainsString('/styles.css', $string);
+        $this->assertStringNotContainsString('<!--[if', $string);
+        $this->assertStringNotContainsString(']>', $string);
+        $this->assertStringNotContainsString('<![endif]-->', $string);
     }
 
     public function testConditionalStylesheetCreationOccursWhenRequested()
@@ -326,9 +333,9 @@ public function testConditionalStylesheetCreationOccursWhenRequested()
         $this->assertEquals('ie6', $item->conditionalStylesheet);
 
         $string = $this->helper->toString();
-        $this->assertContains('/styles.css', $string);
-        $this->assertContains('<!--[if ie6]>', $string);
-        $this->assertContains('<![endif]-->', $string);
+        $this->assertStringContainsString('/styles.css', $string);
+        $this->assertStringContainsString('<!--[if ie6]>', $string);
+        $this->assertStringContainsString('<![endif]-->', $string);
     }
 
     public function testSettingAlternateWithTooFewArgsRaisesException()
@@ -344,6 +351,7 @@ public function testSettingAlternateWithTooFewArgsRaisesException()
             $this->fail('Setting alternate with fewer than 3 args should raise exception');
         } catch (Zend_View_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testIndentationIsHonored()
@@ -363,7 +371,7 @@ public function testLinkRendersAsPlainHtmlIfDoctypeNotXhtml()
         $this->helper->headLink(array('rel' => 'icon', 'src' => '/foo/bar'))
             ->headLink(array('rel' => 'foo', 'href' => '/bar/baz'));
         $test = $this->helper->toString();
-        $this->assertNotContains(' />', $test);
+        $this->assertStringNotContainsString(' />', $test);
     }
 
     public function testDoesNotAllowDuplicateStylesheets()
@@ -380,7 +388,7 @@ public function testBooleanStylesheet()
     {
         $this->helper->appendStylesheet(array('href' => '/bar/baz', 'conditionalStylesheet' => false));
         $test = $this->helper->toString();
-        $this->assertNotContains('[if false]', $test);
+        $this->assertStringNotContainsString('[if false]', $test);
     }
 
     /**
@@ -390,8 +398,8 @@ public function testBooleanTrueConditionalStylesheet()
     {
         $this->helper->appendStylesheet(array('href' => '/bar/baz', 'conditionalStylesheet' => true));
         $test = $this->helper->toString();
-        $this->assertNotContains('[if 1]', $test);
-        $this->assertNotContains('[if true]', $test);
+        $this->assertStringNotContainsString('[if 1]', $test);
+        $this->assertStringNotContainsString('[if true]', $test);
     }
 
     /**
@@ -402,28 +410,28 @@ public function testBooleanTrueConditionalStylesheet()
     public function testTurnOffAutoEscapeDoesNotEncodeAmpersand()
     {
         $this->helper->setAutoEscape(false)->appendStylesheet('/css/rules.css?id=123&foo=bar');
-        $this->assertContains('id=123&foo=bar', $this->helper->toString());
+        $this->assertStringContainsString('id=123&foo=bar', $this->helper->toString());
     }
 
     public function testSetAlternateWithExtras()
     {
         $this->helper->setAlternate('/mydocument.pdf', 'application/pdf', 'foo', array('media' => array('print','screen')));
         $test = $this->helper->toString();
-        $this->assertContains('media="print,screen"', $test);
+        $this->assertStringContainsString('media="print,screen"', $test);
     }
 
     public function testAppendStylesheetWithExtras()
     {
         $this->helper->appendStylesheet(array('href' => '/bar/baz', 'conditionalStylesheet' => false, 'extras' => array('id' => 'my_link_tag')));
         $test = $this->helper->toString();
-        $this->assertContains('id="my_link_tag"', $test);
+        $this->assertStringContainsString('id="my_link_tag"', $test);
     }
 
     public function testSetStylesheetWithMediaAsArray()
     {
         $this->helper->appendStylesheet('/bar/baz', array('screen','print'));
         $test = $this->helper->toString();
-        $this->assertContains(' media="screen,print"', $test);
+        $this->assertStringContainsString(' media="screen,print"', $test);
     }
 
     /**
@@ -452,7 +460,7 @@ public function testContainerMaintainsCorrectOrderOfItems()
     public function testIdAttributeIsSupported()
     {
         $this->helper->appendStylesheet(array('href' => '/bar/baz', 'id' => 'foo'));
-        $this->assertContains('id="foo"', $this->helper->toString());
+        $this->assertStringContainsString('id="foo"', $this->helper->toString());
     }
 
     /**
@@ -462,7 +470,7 @@ public function testHeadLinkAllowsOverrideOfRelAttribute()
     {
         $this->helper->appendStylesheet('/css/auth.less', 'all', null, array('rel' => 'stylesheet/less'));
         $this->assertEquals(1, substr_count($this->helper->toString(), 'rel="'));
-        $this->assertContains('rel="stylesheet/less"', $this->helper->toString());
+        $this->assertStringContainsString('rel="stylesheet/less"', $this->helper->toString());
     }
 
     /**
@@ -494,9 +502,9 @@ public function testConditionalStylesheetCreationNoIE()
         $this->assertObjectHasAttribute('conditionalStylesheet', $item);
         $this->assertEquals('!IE', $item->conditionalStylesheet);
         $string = $this->helper->toString();
-        $this->assertContains('/styles.css', $string);
-        $this->assertContains('<!--[if !IE]><!--><', $string);
-        $this->assertContains('<!--<![endif]-->', $string);
+        $this->assertStringContainsString('/styles.css', $string);
+        $this->assertStringContainsString('<!--[if !IE]><!--><', $string);
+        $this->assertStringContainsString('<!--<![endif]-->', $string);
     }
 
     /**
@@ -509,8 +517,8 @@ public function testConditionalStylesheetCreationNoIEWidthSpaces()
         $this->assertObjectHasAttribute('conditionalStylesheet', $item);
         $this->assertEquals('! IE', $item->conditionalStylesheet);
         $string = $this->helper->toString();
-        $this->assertContains('/styles.css', $string);
-        $this->assertContains('<!--[if ! IE]><!--><', $string);
-        $this->assertContains('<!--<![endif]-->', $string);
+        $this->assertStringContainsString('/styles.css', $string);
+        $this->assertStringContainsString('<!--[if ! IE]><!--><', $string);
+        $this->assertStringContainsString('<!--<![endif]-->', $string);
     }
 }
diff --git a/tests/Zend/View/Helper/HeadMetaTest.php b/tests/Zend/View/Helper/HeadMetaTest.php
index b63ab3c2..ca69db83 100644
--- a/tests/Zend/View/Helper/HeadMetaTest.php
+++ b/tests/Zend/View/Helper/HeadMetaTest.php
@@ -133,6 +133,7 @@ public function testAppendPrependAndSetThrowExceptionsWhenNonMetaValueProvided()
             $this->fail('Non-meta value should not set');
         } catch (Zend_View_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     protected function _inflectAction($type)
@@ -243,6 +244,7 @@ public function testOverloadingThrowsExceptionWithFewerThanTwoArgs()
             $this->fail('Overloading should require at least two arguments');
         } catch (Zend_View_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testOverloadingThrowsExceptionWithInvalidMethodType()
@@ -252,6 +254,7 @@ public function testOverloadingThrowsExceptionWithInvalidMethodType()
             $this->fail('Overloading should only work for (set|prepend|append)(Name|HttpEquiv)');
         } catch (Zend_View_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testCanBuildMetaTagsWithAttributes()
@@ -283,13 +286,13 @@ public function testToStringReturnsValidHtml()
         $metas = substr_count($string, 'http-equiv="');
         $this->assertEquals(1, $metas);
 
-        $this->assertContains('http-equiv="screen" content="projection"', $string);
-        $this->assertContains('name="keywords" content="foo bar"', $string);
-        $this->assertContains('lang="us_en"', $string);
-        $this->assertContains('scheme="foo"', $string);
-        $this->assertNotContains('bogus', $string);
-        $this->assertNotContains('unused', $string);
-        $this->assertContains('name="title" content="boo bah"', $string);
+        $this->assertStringContainsString('http-equiv="screen" content="projection"', $string);
+        $this->assertStringContainsString('name="keywords" content="foo bar"', $string);
+        $this->assertStringContainsString('lang="us_en"', $string);
+        $this->assertStringContainsString('scheme="foo"', $string);
+        $this->assertStringNotContainsString('bogus', $string);
+        $this->assertStringNotContainsString('unused', $string);
+        $this->assertStringContainsString('name="title" content="boo bah"', $string);
     }
 
     /**
@@ -343,9 +346,9 @@ public function testStringRepresentationReflectsDoctype()
         $this->view->doctype('HTML4_STRICT');
         $this->helper->headMeta('some content', 'foo');
         $test = $this->helper->toString();
-        $this->assertNotContains('/>', $test);
-        $this->assertContains('some content', $test);
-        $this->assertContains('foo', $test);
+        $this->assertStringNotContainsString('/>', $test);
+        $this->assertStringContainsString('some content', $test);
+        $this->assertStringContainsString('foo', $test);
     }
 
     /**
@@ -369,7 +372,7 @@ public function testPropertyIsNotSupportedByDefaultDoctype()
             $this->helper->headMeta('foo', 'og:title', 'property');
             $this->fail('meta property attribute should not be supported on default doctype');
         } catch (Zend_View_Exception $e) {
-            $this->assertContains('Invalid value passed', $e->getMessage());
+            $this->assertStringContainsString('Invalid value passed', $e->getMessage());
         }
     }
 
@@ -488,6 +491,7 @@ public function testCharsetValidateFail()
             $this->fail('Should not be able to set charset for a HTML4 doctype');
         } catch (Zend_View_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     /**
@@ -538,8 +542,8 @@ public function testStandaloneInstantiationWithoutViewDoesNotCauseFatalError()
     public function testConditionalNoIE()
     {
         $html = $this->helper->appendHttpEquiv('foo', 'bar', array('conditional' => '!IE'))->toString();
-        $this->assertContains('<!--[if !IE]><!--><', $html);
-        $this->assertContains('<!--<![endif]-->', $html);
+        $this->assertStringContainsString('<!--[if !IE]><!--><', $html);
+        $this->assertStringContainsString('<!--<![endif]-->', $html);
     }
 
     /**
@@ -548,7 +552,7 @@ public function testConditionalNoIE()
     public function testConditionalNoIEWidthSpace()
     {
         $html = $this->helper->appendHttpEquiv('foo', 'bar', array('conditional' => '! IE'))->toString();
-        $this->assertContains('<!--[if ! IE]><!--><', $html);
-        $this->assertContains('<!--<![endif]-->', $html);
+        $this->assertStringContainsString('<!--[if ! IE]><!--><', $html);
+        $this->assertStringContainsString('<!--<![endif]-->', $html);
     }
 }
diff --git a/tests/Zend/View/Helper/HeadScriptTest.php b/tests/Zend/View/Helper/HeadScriptTest.php
index 6f8d2f81..e23912f1 100644
--- a/tests/Zend/View/Helper/HeadScriptTest.php
+++ b/tests/Zend/View/Helper/HeadScriptTest.php
@@ -120,6 +120,7 @@ public function testSetPrependAppendAndOffsetSetThrowExceptionsOnInvalidItems()
             $this->fail('Set should throw exception with invalid item');
         } catch (Zend_View_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     protected function _inflectAction($type)
@@ -245,6 +246,7 @@ public function testOverloadingThrowsExceptionWithInvalidMethod()
             $this->fail('Invalid method should raise exception');
         } catch (Zend_View_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testOverloadingWithTooFewArgumentsRaisesException()
@@ -260,6 +262,7 @@ public function testOverloadingWithTooFewArgumentsRaisesException()
             $this->fail('Too few arguments should raise exception');
         } catch (Zend_View_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testHeadScriptAppropriatelySetsScriptItems()
@@ -307,9 +310,9 @@ public function testToStringRendersValidHtml()
         $scripts = substr_count($string, '><');
         $this->assertEquals(1, $scripts);
 
-        $this->assertContains('src="foo"', $string);
-        $this->assertContains('bar', $string);
-        $this->assertContains('baz', $string);
+        $this->assertStringContainsString('src="foo"', $string);
+        $this->assertStringContainsString('bar', $string);
+        $this->assertStringContainsString('baz', $string);
 
         $doc = new DOMDocument();
         $dom = $doc->loadHtml($string);
@@ -340,10 +343,10 @@ public function testIndentationIsHonored()
 
         $scripts = substr_count($string, '    <script');
         $this->assertEquals(2, $scripts);
-        $this->assertContains('    //', $string);
-        $this->assertContains('var', $string);
-        $this->assertContains('document', $string);
-        $this->assertContains('    document', $string);
+        $this->assertStringContainsString('    //', $string);
+        $this->assertStringContainsString('var', $string);
+        $this->assertStringContainsString('document', $string);
+        $this->assertStringContainsString('    document', $string);
     }
 
     public function testDoesNotAllowDuplicateFiles()
@@ -357,7 +360,7 @@ public function testRenderingDoesNotRenderArbitraryAttributesByDefault()
     {
         $this->helper->headScript()->appendFile('/js/foo.js', 'text/javascript', array('bogus' => 'deferred'));
         $test = $this->helper->headScript()->toString();
-        $this->assertNotContains('bogus="deferred"', $test);
+        $this->assertStringNotContainsString('bogus="deferred"', $test);
     }
 
     public function testCanRenderArbitraryAttributesOnRequest()
@@ -365,7 +368,7 @@ public function testCanRenderArbitraryAttributesOnRequest()
         $this->helper->headScript()->appendFile('/js/foo.js', 'text/javascript', array('bogus' => 'deferred'))
             ->setAllowArbitraryAttributes(true);
         $test = $this->helper->headScript()->toString();
-        $this->assertContains('bogus="deferred"', $test);
+        $this->assertStringContainsString('bogus="deferred"', $test);
     }
 
     public function testCanPerformMultipleSerialCaptures()
@@ -381,6 +384,7 @@ public function testCanPerformMultipleSerialCaptures()
         }
         echo 'this is something else captured';
         $this->helper->headScript()->captureEnd();
+        self::assertTrue(true);
     }
 
     public function testCannotNestCaptures()
@@ -394,7 +398,7 @@ public function testCannotNestCaptures()
             $this->fail('Should not be able to nest captures');
         } catch (Zend_View_Exception $e) {
             $this->helper->headScript()->captureEnd();
-            $this->assertContains('Cannot nest', $e->getMessage());
+            $this->assertStringContainsString('Cannot nest', $e->getMessage());
         }
     }
 
@@ -413,7 +417,7 @@ public function testConditionalScript()
     {
         $this->helper->headScript()->appendFile('/js/foo.js', 'text/javascript', array('conditional' => 'lt IE 7'));
         $test = $this->helper->headScript()->toString();
-        $this->assertContains('<!--[if lt IE 7]>', $test);
+        $this->assertStringContainsString('<!--[if lt IE 7]>', $test);
     }
 
     public function testConditionalScriptWidthIndentation()
@@ -421,7 +425,7 @@ public function testConditionalScriptWidthIndentation()
         $this->helper->headScript()->appendFile('/js/foo.js', 'text/javascript', array('conditional' => 'lt IE 7'));
         $this->helper->headScript()->setIndent(4);
         $test = $this->helper->headScript()->toString();
-        $this->assertContains('    <!--[if lt IE 7]>', $test);
+        $this->assertStringContainsString('    <!--[if lt IE 7]>', $test);
     }
 
     /**
@@ -469,7 +473,7 @@ public function testConditionalWithAllowArbitraryAttributesDoesNotIncludeConditi
         );
         $test = $this->helper->toString();
 
-        $this->assertNotContains('conditional', $test);
+        $this->assertStringNotContainsString('conditional', $test);
     }
 
     /**
@@ -483,7 +487,7 @@ public function testNoEscapeWithAllowArbitraryAttributesDoesNotIncludeNoEscapeSc
         );
         $test = $this->helper->toString();
 
-        $this->assertNotContains('noescape', $test);
+        $this->assertStringNotContainsString('noescape', $test);
     }
 
     /**
@@ -496,8 +500,8 @@ public function testNoEscapeDefaultsToFalse()
         );
         $test = $this->helper->toString();
 
-        $this->assertContains('//<!--', $test);
-        $this->assertContains('//-->', $test);
+        $this->assertStringContainsString('//<!--', $test);
+        $this->assertStringContainsString('//-->', $test);
     }
 
     /**
@@ -510,8 +514,8 @@ public function testNoEscapeTrue()
         );
         $test = $this->helper->toString();
 
-        $this->assertNotContains('//<!--', $test);
-        $this->assertNotContains('//-->', $test);
+        $this->assertStringNotContainsString('//<!--', $test);
+        $this->assertStringNotContainsString('//-->', $test);
     }
 
     /**
@@ -524,7 +528,7 @@ public function testConditionalScriptNoIE()
             '/js/foo.js', 'text/javascript', array('conditional' => '!IE')
         );
         $test = $this->helper->toString();
-        $this->assertContains('<!--[if !IE]><!--><', $test);
-        $this->assertContains('<!--<![endif]-->', $test);
+        $this->assertStringContainsString('<!--[if !IE]><!--><', $test);
+        $this->assertStringContainsString('<!--<![endif]-->', $test);
     }
 }
diff --git a/tests/Zend/View/Helper/HeadStyleTest.php b/tests/Zend/View/Helper/HeadStyleTest.php
index e1a090fc..01c94a65 100644
--- a/tests/Zend/View/Helper/HeadStyleTest.php
+++ b/tests/Zend/View/Helper/HeadStyleTest.php
@@ -120,6 +120,7 @@ public function testAppendPrependAndSetThrowExceptionsWhenNonStyleValueProvided(
             $this->fail('Non-style value should not set');
         } catch (Zend_View_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testOverloadAppendStyleAppendsStyleToStack()
@@ -210,8 +211,8 @@ public function testRenderedStyleTagsContainHtmlEscaping()
             'bogus' => 'unused',
         ));
         $value = $this->helper->toString();
-        $this->assertContains('<!--' . PHP_EOL, $value);
-        $this->assertContains(PHP_EOL . '-->', $value);
+        $this->assertStringContainsString('<!--' . PHP_EOL, $value);
+        $this->assertStringContainsString(PHP_EOL . '-->', $value);
     }
 
     public function testRenderedStyleTagsContainsDefaultMedia()
@@ -229,7 +230,7 @@ public function testMediaAttributeCanHaveSpaceInCommaSeparatedString()
     {
         $this->helper->appendStyle('a { }', array('media' => 'screen, projection'));
         $string = $this->helper->toString();
-        $this->assertContains('media="screen,projection"', $string);
+        $this->assertStringContainsString('media="screen,projection"', $string);
     }
 
     public function testHeadStyleProxiesProperly()
@@ -266,9 +267,9 @@ public function testToStyleGeneratesValidHtml()
         $this->assertEquals(3, $styles);
         $styles = substr_count($html, '</style>');
         $this->assertEquals(3, $styles);
-        $this->assertContains($style3, $html);
-        $this->assertContains($style2, $html);
-        $this->assertContains($style1, $html);
+        $this->assertStringContainsString($style3, $html);
+        $this->assertStringContainsString($style2, $html);
+        $this->assertStringContainsString($style1, $html);
     }
 
     public function testCapturingCapturesToObject()
@@ -299,6 +300,7 @@ public function testInvalidMethodRaisesException()
             $this->fail('Invalid method should raise exception');
         } catch (Zend_View_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testTooFewArgumentsRaisesException()
@@ -308,6 +310,7 @@ public function testTooFewArgumentsRaisesException()
             $this->fail('Too few arguments should raise exception');
         } catch (Zend_View_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testIndentationIsHonored()
@@ -325,12 +328,12 @@ public function testIndentationIsHonored()
 
         $scripts = substr_count($string, '    <style');
         $this->assertEquals(2, $scripts);
-        $this->assertContains('    <!--', $string);
-        $this->assertContains('    a {', $string);
-        $this->assertContains('    h1 {', $string);
-        $this->assertContains('        display', $string);
-        $this->assertContains('        font-weight', $string);
-        $this->assertContains('    }', $string);
+        $this->assertStringContainsString('    <!--', $string);
+        $this->assertStringContainsString('    a {', $string);
+        $this->assertStringContainsString('    h1 {', $string);
+        $this->assertStringContainsString('        display', $string);
+        $this->assertStringContainsString('        font-weight', $string);
+        $this->assertStringContainsString('    }', $string);
     }
 
     public function testSerialCapturingWorks()
@@ -345,6 +348,7 @@ public function testSerialCapturingWorks()
             $this->fail('Serial capturing should work');
         }
         $this->helper->headStyle()->captureEnd();
+        self::assertTrue(true);
     }
 
     public function testNestedCapturingFails()
@@ -358,7 +362,7 @@ public function testNestedCapturingFails()
             $this->fail('Nested capturing should fail');
         } catch (Zend_View_Exception $e) {
             $this->helper->headStyle()->captureEnd();
-            $this->assertContains('Cannot nest', $e->getMessage());
+            $this->assertStringContainsString('Cannot nest', $e->getMessage());
         }
     }
 
@@ -373,9 +377,9 @@ public function testMediaAttributeAsArray()
 
         $scripts = substr_count($string, '    <style');
         $this->assertEquals(1, $scripts);
-        $this->assertContains('    <!--', $string);
-        $this->assertContains('    a {', $string);
-        $this->assertContains(' media="screen,projection"', $string);
+        $this->assertStringContainsString('    <!--', $string);
+        $this->assertStringContainsString('    a {', $string);
+        $this->assertStringContainsString(' media="screen,projection"', $string);
     }
 
     public function testMediaAttributeAsCommaSeperatedString()
@@ -389,9 +393,9 @@ public function testMediaAttributeAsCommaSeperatedString()
 
         $scripts = substr_count($string, '    <style');
         $this->assertEquals(1, $scripts);
-        $this->assertContains('    <!--', $string);
-        $this->assertContains('    a {', $string);
-        $this->assertContains(' media="screen,projection"', $string);
+        $this->assertStringContainsString('    <!--', $string);
+        $this->assertStringContainsString('    a {', $string);
+        $this->assertStringContainsString(' media="screen,projection"', $string);
     }
 
     public function testConditionalScript()
@@ -401,7 +405,7 @@ public function testConditionalScript()
     display: none;
 }', array('media' => 'screen,projection', 'conditional' => 'lt IE 7'));
         $test = $this->helper->toString();
-        $this->assertContains('<!--[if lt IE 7]>', $test);
+        $this->assertStringContainsString('<!--[if lt IE 7]>', $test);
     }
 
     /**
@@ -441,8 +445,8 @@ public function testRenderConditionalCommentsShouldNotContainHtmlEscaping()
         ));
         $value = $this->helper->toString();
 
-        $this->assertNotContains('<!--' . PHP_EOL, $value);
-        $this->assertNotContains(PHP_EOL . '-->', $value);
+        $this->assertStringNotContainsString('<!--' . PHP_EOL, $value);
+        $this->assertStringNotContainsString(PHP_EOL . '-->', $value);
     }
 
     /**
@@ -455,8 +459,8 @@ public function testConditionalScriptNoIE()
     display: none;
 }', array('media' => 'screen,projection', 'conditional' => '!IE'));
         $test = $this->helper->toString();
-        $this->assertContains('<!--[if !IE]><!--><', $test);
-        $this->assertContains('<!--<![endif]-->', $test);
+        $this->assertStringContainsString('<!--[if !IE]><!--><', $test);
+        $this->assertStringContainsString('<!--<![endif]-->', $test);
     }
 
     /**
@@ -469,7 +473,7 @@ public function testConditionalScriptNoIEWidthSpace()
     display: none;
 }', array('media' => 'screen,projection', 'conditional' => '! IE'));
         $test = $this->helper->toString();
-        $this->assertContains('<!--[if ! IE]><!--><', $test);
-        $this->assertContains('<!--<![endif]-->', $test);
+        $this->assertStringContainsString('<!--[if ! IE]><!--><', $test);
+        $this->assertStringContainsString('<!--<![endif]-->', $test);
     }
 }
diff --git a/tests/Zend/View/Helper/HeadTitleTest.php b/tests/Zend/View/Helper/HeadTitleTest.php
index d46cc4dc..e56ba98a 100644
--- a/tests/Zend/View/Helper/HeadTitleTest.php
+++ b/tests/Zend/View/Helper/HeadTitleTest.php
@@ -98,21 +98,21 @@ public function testHeadTitleReturnsObjectInstance()
     public function testCanSetTitleViaHeadTitle()
     {
         $placeholder = $this->helper->headTitle('Foo Bar', 'SET');
-        $this->assertContains('Foo Bar', $placeholder->toString());
+        $this->assertStringContainsString('Foo Bar', $placeholder->toString());
     }
 
     public function testCanAppendTitleViaHeadTitle()
     {
         $placeholder = $this->helper->headTitle('Foo');
         $placeholder = $this->helper->headTitle('Bar');
-        $this->assertContains('FooBar', $placeholder->toString());
+        $this->assertStringContainsString('FooBar', $placeholder->toString());
     }
 
     public function testCanPrependTitleViaHeadTitle()
     {
         $placeholder = $this->helper->headTitle('Foo');
         $placeholder = $this->helper->headTitle('Bar', 'PREPEND');
-        $this->assertContains('BarFoo', $placeholder->toString());
+        $this->assertStringContainsString('BarFoo', $placeholder->toString());
     }
 
     public function testReturnedPlaceholderToStringContainsFullTitleElement()
@@ -126,8 +126,8 @@ public function testToStringEscapesEntries()
     {
         $this->helper->headTitle('<script type="text/javascript">alert("foo");</script>');
         $string = $this->helper->toString();
-        $this->assertNotContains('<script', $string);
-        $this->assertNotContains('</script>', $string);
+        $this->assertStringNotContainsString('<script', $string);
+        $this->assertStringNotContainsString('</script>', $string);
     }
 
     public function testToStringEscapesSeparator()
@@ -136,10 +136,10 @@ public function testToStringEscapesSeparator()
             ->headTitle('Bar')
             ->setSeparator(' <br /> ');
         $string = $this->helper->toString();
-        $this->assertNotContains('<br />', $string);
-        $this->assertContains('Foo', $string);
-        $this->assertContains('Bar', $string);
-        $this->assertContains('br /', $string);
+        $this->assertStringNotContainsString('<br />', $string);
+        $this->assertStringContainsString('Foo', $string);
+        $this->assertStringContainsString('Bar', $string);
+        $this->assertStringContainsString('br /', $string);
     }
 
     public function testIndentationIsHonored()
@@ -148,7 +148,7 @@ public function testIndentationIsHonored()
         $this->helper->headTitle('foo');
         $string = $this->helper->toString();
 
-        $this->assertContains('    <title>', $string);
+        $this->assertStringContainsString('    <title>', $string);
     }
 
     public function testAutoEscapeIsHonored()
@@ -217,7 +217,7 @@ public function testCanPrependTitlesUsingDefaultAttachOrder()
         $this->helper->setDefaultAttachOrder('PREPEND');
         $placeholder = $this->helper->headTitle('Foo');
         $placeholder = $this->helper->headTitle('Bar');
-        $this->assertContains('BarFoo', $placeholder->toString());
+        $this->assertStringContainsString('BarFoo', $placeholder->toString());
     }
 
     /**
diff --git a/tests/Zend/View/Helper/HtmlFlashTest.php b/tests/Zend/View/Helper/HtmlFlashTest.php
index e9b0a9b2..306f35f1 100644
--- a/tests/Zend/View/Helper/HtmlFlashTest.php
+++ b/tests/Zend/View/Helper/HtmlFlashTest.php
@@ -64,7 +64,7 @@ public function testMakeHtmlFlash()
 
         $objectStartElement = '<object data="/path/to/flash.swf" type="application/x-shockwave-flash">';
 
-        $this->assertContains($objectStartElement, $htmlFlash);
-        $this->assertContains('</object>', $htmlFlash);
+        $this->assertStringContainsString($objectStartElement, $htmlFlash);
+        $this->assertStringContainsString('</object>', $htmlFlash);
     }
 }
diff --git a/tests/Zend/View/Helper/HtmlListTest.php b/tests/Zend/View/Helper/HtmlListTest.php
index 2a6139fb..883b8d2e 100644
--- a/tests/Zend/View/Helper/HtmlListTest.php
+++ b/tests/Zend/View/Helper/HtmlListTest.php
@@ -64,10 +64,10 @@ public function testMakeUnorderedList()
 
         $list = $this->helper->htmlList($items);
 
-        $this->assertContains('<ul>', $list);
-        $this->assertContains('</ul>', $list);
+        $this->assertStringContainsString('<ul>', $list);
+        $this->assertStringContainsString('</ul>', $list);
         foreach ($items as $item) {
-            $this->assertContains('<li>' . $item . '</li>', $list);
+            $this->assertStringContainsString('<li>' . $item . '</li>', $list);
         }
     }
 
@@ -77,10 +77,10 @@ public function testMakeOrderedList()
 
         $list = $this->helper->htmlList($items, true);
 
-        $this->assertContains('<ol>', $list);
-        $this->assertContains('</ol>', $list);
+        $this->assertStringContainsString('<ol>', $list);
+        $this->assertStringContainsString('</ol>', $list);
         foreach ($items as $item) {
-            $this->assertContains('<li>' . $item . '</li>', $list);
+            $this->assertStringContainsString('<li>' . $item . '</li>', $list);
         }
     }
 
@@ -91,12 +91,12 @@ public function testMakeUnorderedListWithAttribs()
 
         $list = $this->helper->htmlList($items, false, $attribs);
 
-        $this->assertContains('<ul', $list);
-        $this->assertContains('class="selected"', $list);
-        $this->assertContains('name="list"', $list);
-        $this->assertContains('</ul>', $list);
+        $this->assertStringContainsString('<ul', $list);
+        $this->assertStringContainsString('class="selected"', $list);
+        $this->assertStringContainsString('name="list"', $list);
+        $this->assertStringContainsString('</ul>', $list);
         foreach ($items as $item) {
-            $this->assertContains('<li>' . $item . '</li>', $list);
+            $this->assertStringContainsString('<li>' . $item . '</li>', $list);
         }
     }
 
@@ -107,12 +107,12 @@ public function testMakeOrderedListWithAttribs()
 
         $list = $this->helper->htmlList($items, true, $attribs);
 
-        $this->assertContains('<ol', $list);
-        $this->assertContains('class="selected"', $list);
-        $this->assertContains('name="list"', $list);
-        $this->assertContains('</ol>', $list);
+        $this->assertStringContainsString('<ol', $list);
+        $this->assertStringContainsString('class="selected"', $list);
+        $this->assertStringContainsString('name="list"', $list);
+        $this->assertStringContainsString('</ol>', $list);
         foreach ($items as $item) {
-            $this->assertContains('<li>' . $item . '</li>', $list);
+            $this->assertStringContainsString('<li>' . $item . '</li>', $list);
         }
     }
 
@@ -123,10 +123,10 @@ public function testMakeNestedUnorderedList()
 
         $list = $this->helper->htmlList($items);
 
-        $this->assertContains('<ul>' . Zend_View_Helper_HtmlList::EOL, $list);
-        $this->assertContains('</ul>' . Zend_View_Helper_HtmlList::EOL, $list);
-        $this->assertContains('one<ul>' . Zend_View_Helper_HtmlList::EOL . '<li>four', $list);
-        $this->assertContains('<li>six</li>' . Zend_View_Helper_HtmlList::EOL . '</ul>'
+        $this->assertStringContainsString('<ul>' . Zend_View_Helper_HtmlList::EOL, $list);
+        $this->assertStringContainsString('</ul>' . Zend_View_Helper_HtmlList::EOL, $list);
+        $this->assertStringContainsString('one<ul>' . Zend_View_Helper_HtmlList::EOL . '<li>four', $list);
+        $this->assertStringContainsString('<li>six</li>' . Zend_View_Helper_HtmlList::EOL . '</ul>'
             . Zend_View_Helper_HtmlList::EOL . '</li>' . Zend_View_Helper_HtmlList::EOL . '<li>two', $list);
     }
 
@@ -137,11 +137,11 @@ public function testMakeNestedDeepUnorderedList()
 
         $list = $this->helper->htmlList($items);
 
-        $this->assertContains('<ul>' . Zend_View_Helper_HtmlList::EOL, $list);
-        $this->assertContains('</ul>' . Zend_View_Helper_HtmlList::EOL, $list);
-        $this->assertContains('one<ul>' . Zend_View_Helper_HtmlList::EOL . '<li>four', $list);
-        $this->assertContains('<li>four<ul>' . Zend_View_Helper_HtmlList::EOL . '<li>six', $list);
-        $this->assertContains('<li>five</li>' . Zend_View_Helper_HtmlList::EOL . '</ul>'
+        $this->assertStringContainsString('<ul>' . Zend_View_Helper_HtmlList::EOL, $list);
+        $this->assertStringContainsString('</ul>' . Zend_View_Helper_HtmlList::EOL, $list);
+        $this->assertStringContainsString('one<ul>' . Zend_View_Helper_HtmlList::EOL . '<li>four', $list);
+        $this->assertStringContainsString('<li>four<ul>' . Zend_View_Helper_HtmlList::EOL . '<li>six', $list);
+        $this->assertStringContainsString('<li>five</li>' . Zend_View_Helper_HtmlList::EOL . '</ul>'
             . Zend_View_Helper_HtmlList::EOL . '</li>' . Zend_View_Helper_HtmlList::EOL . '<li>two', $list);
     }
 
@@ -151,12 +151,12 @@ public function testListWithValuesToEscapeForZF2283()
 
         $list = $this->helper->htmlList($items);
 
-        $this->assertContains('<ul>', $list);
-        $this->assertContains('</ul>', $list);
+        $this->assertStringContainsString('<ul>', $list);
+        $this->assertStringContainsString('</ul>', $list);
 
-        $this->assertContains('<li>one &lt;small&gt; test</li>', $list);
-        $this->assertContains('<li>second &amp; third</li>', $list);
-        $this->assertContains('<li>And \'some\' &quot;final&quot; test</li>', $list);
+        $this->assertStringContainsString('<li>one &lt;small&gt; test</li>', $list);
+        $this->assertStringContainsString('<li>second &amp; third</li>', $list);
+        $this->assertStringContainsString('<li>And \'some\' &quot;final&quot; test</li>', $list);
     }
 
     public function testListEscapeSwitchedOffForZF2283()
@@ -165,10 +165,10 @@ public function testListEscapeSwitchedOffForZF2283()
 
         $list = $this->helper->htmlList($items, false, false, false);
 
-        $this->assertContains('<ul>', $list);
-        $this->assertContains('</ul>', $list);
+        $this->assertStringContainsString('<ul>', $list);
+        $this->assertStringContainsString('</ul>', $list);
 
-        $this->assertContains('<li>one <b>small</b> test</li>', $list);
+        $this->assertStringContainsString('<li>one <b>small</b> test</li>', $list);
     }
 
     /**
@@ -181,7 +181,7 @@ public function testEscapeFlagHonoredForMultidimensionalLists()
         $list = $this->helper->htmlList($items, false, false, false);
 
         foreach ($items[1] as $item) {
-            $this->assertContains($item, $list);
+            $this->assertStringContainsString($item, $list);
         }
     }
 
diff --git a/tests/Zend/View/Helper/HtmlObjectTest.php b/tests/Zend/View/Helper/HtmlObjectTest.php
index ce210cdc..b11b47fd 100644
--- a/tests/Zend/View/Helper/HtmlObjectTest.php
+++ b/tests/Zend/View/Helper/HtmlObjectTest.php
@@ -67,8 +67,8 @@ public function testMakeHtmlObjectWithoutAttribsWithoutParams()
     {
         $htmlObject = $this->helper->htmlObject('datastring', 'typestring');
 
-        $this->assertContains('<object data="datastring" type="typestring">', $htmlObject);
-        $this->assertContains('</object>', $htmlObject);
+        $this->assertStringContainsString('<object data="datastring" type="typestring">', $htmlObject);
+        $this->assertStringContainsString('</object>', $htmlObject);
     }
 
     public function testMakeHtmlObjectWithAttribsWithoutParams()
@@ -78,8 +78,8 @@ public function testMakeHtmlObjectWithAttribsWithoutParams()
 
         $htmlObject = $this->helper->htmlObject('datastring', 'typestring', $attribs);
 
-        $this->assertContains('<object data="datastring" type="typestring" attribkey1="attribvalue1" attribkey2="attribvalue2">', $htmlObject);
-        $this->assertContains('</object>', $htmlObject);
+        $this->assertStringContainsString('<object data="datastring" type="typestring" attribkey1="attribvalue1" attribkey2="attribvalue2">', $htmlObject);
+        $this->assertStringContainsString('</object>', $htmlObject);
     }
 
     public function testMakeHtmlObjectWithoutAttribsWithParamsHtml()
@@ -91,13 +91,13 @@ public function testMakeHtmlObjectWithoutAttribsWithParamsHtml()
 
         $htmlObject = $this->helper->htmlObject('datastring', 'typestring', array(), $params);
 
-        $this->assertContains('<object data="datastring" type="typestring">', $htmlObject);
-        $this->assertContains('</object>', $htmlObject);
+        $this->assertStringContainsString('<object data="datastring" type="typestring">', $htmlObject);
+        $this->assertStringContainsString('</object>', $htmlObject);
 
         foreach ($params as $key => $value) {
             $param = '<param name="' . $key . '" value="' . $value . '">';
 
-            $this->assertContains($param, $htmlObject);
+            $this->assertStringContainsString($param, $htmlObject);
         }
     }
 
@@ -110,13 +110,13 @@ public function testMakeHtmlObjectWithoutAttribsWithParamsXhtml()
 
         $htmlObject = $this->helper->htmlObject('datastring', 'typestring', array(), $params);
 
-        $this->assertContains('<object data="datastring" type="typestring">', $htmlObject);
-        $this->assertContains('</object>', $htmlObject);
+        $this->assertStringContainsString('<object data="datastring" type="typestring">', $htmlObject);
+        $this->assertStringContainsString('</object>', $htmlObject);
 
         foreach ($params as $key => $value) {
             $param = '<param name="' . $key . '" value="' . $value . '" />';
 
-            $this->assertContains($param, $htmlObject);
+            $this->assertStringContainsString($param, $htmlObject);
         }
     }
 
@@ -124,8 +124,8 @@ public function testMakeHtmlObjectWithContent()
     {
         $htmlObject = $this->helper->htmlObject('datastring', 'typestring', array(), array(), 'testcontent');
 
-        $this->assertContains('<object data="datastring" type="typestring">', $htmlObject);
-        $this->assertContains('testcontent', $htmlObject);
-        $this->assertContains('</object>', $htmlObject);
+        $this->assertStringContainsString('<object data="datastring" type="typestring">', $htmlObject);
+        $this->assertStringContainsString('testcontent', $htmlObject);
+        $this->assertStringContainsString('</object>', $htmlObject);
     }
 }
diff --git a/tests/Zend/View/Helper/HtmlPageTest.php b/tests/Zend/View/Helper/HtmlPageTest.php
index cfb128b4..21fd509f 100644
--- a/tests/Zend/View/Helper/HtmlPageTest.php
+++ b/tests/Zend/View/Helper/HtmlPageTest.php
@@ -66,7 +66,7 @@ public function testMakeHtmlPage()
                             . ' type="text/html"'
                             . ' classid="clsid:25336920-03F9-11CF-8FD0-00AA00686F13">';
 
-        $this->assertContains($objectStartElement, $htmlPage);
-        $this->assertContains('</object>', $htmlPage);
+        $this->assertStringContainsString($objectStartElement, $htmlPage);
+        $this->assertStringContainsString('</object>', $htmlPage);
     }
 }
diff --git a/tests/Zend/View/Helper/HtmlQuicktimeTest.php b/tests/Zend/View/Helper/HtmlQuicktimeTest.php
index c56ba8ab..9dc0348b 100644
--- a/tests/Zend/View/Helper/HtmlQuicktimeTest.php
+++ b/tests/Zend/View/Helper/HtmlQuicktimeTest.php
@@ -67,7 +67,7 @@ public function testMakeHtmlQuicktime()
                             . ' classid="clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B"'
                             . ' codebase="http://www.apple.com/qtactivex/qtplugin.cab">';
 
-        $this->assertContains($objectStartElement, $htmlQuicktime);
-        $this->assertContains('</object>', $htmlQuicktime);
+        $this->assertStringContainsString($objectStartElement, $htmlQuicktime);
+        $this->assertStringContainsString('</object>', $htmlQuicktime);
     }
 }
diff --git a/tests/Zend/View/Helper/Navigation/BreadcrumbsTest.php b/tests/Zend/View/Helper/Navigation/BreadcrumbsTest.php
index ea1cfa9f..44d40742 100644
--- a/tests/Zend/View/Helper/Navigation/BreadcrumbsTest.php
+++ b/tests/Zend/View/Helper/Navigation/BreadcrumbsTest.php
@@ -226,6 +226,7 @@ public function testRenderingPartialShouldFailOnInvalidPartialArray()
                 '$partial was invalid, but no Zend_View_Exception was thrown');
         } catch (Zend_View_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testLastBreadcrumbShouldBeEscaped()
diff --git a/tests/Zend/View/Helper/Navigation/LinksTest.php b/tests/Zend/View/Helper/Navigation/LinksTest.php
index 8d5c176a..f7284ed7 100644
--- a/tests/Zend/View/Helper/Navigation/LinksTest.php
+++ b/tests/Zend/View/Helper/Navigation/LinksTest.php
@@ -523,7 +523,7 @@ public function testFindRelationMustSpecifyRelOrRev()
             $this->fail('An invalid value was given, but a '
                         . 'Zend_View_Exception was not thrown');
         } catch (Zend_View_Exception $e) {
-            $this->assertContains('Invalid argument: $rel', $e->getMessage());
+            $this->assertStringContainsString('Invalid argument: $rel', $e->getMessage());
         }
     }
 
@@ -536,7 +536,7 @@ public function testRenderLinkMustSpecifyRelOrRev()
             $this->fail('An invalid value was given, but a '
                         . 'Zend_View_Exception was not thrown');
         } catch (Zend_View_Exception $e) {
-            $this->assertContains('Invalid relation attribute', $e->getMessage());
+            $this->assertStringContainsString('Invalid relation attribute', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/View/Helper/Navigation/MenuTest.php b/tests/Zend/View/Helper/Navigation/MenuTest.php
index f9275ba3..e4d98ec6 100644
--- a/tests/Zend/View/Helper/Navigation/MenuTest.php
+++ b/tests/Zend/View/Helper/Navigation/MenuTest.php
@@ -333,6 +333,7 @@ public function testRenderingPartialShouldFailOnInvalidPartialArray()
             $this->fail('invalid $partial should throw Zend_View_Exception');
         } catch (Zend_View_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testSetMaxDepth()
@@ -652,7 +653,7 @@ public function testRenderingWithUlId()
     {
         $this->_helper->setUlId('foo');
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<ul class="navigation" id="foo">',
             $this->_helper->renderMenu()
         );
@@ -663,7 +664,7 @@ public function testRenderingWithUlId()
      */
     public function testRenderingWithUlIdPerOptions()
     {
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<ul class="navigation" id="foo">',
             $this->_helper->renderMenu(null, array('ulId' => 'foo'))
         );
@@ -678,7 +679,7 @@ public function testRenderingOnlyActiveBranchWithUlId()
             ->setOnlyActiveBranch()
             ->setRenderParents();
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<ul class="navigation" id="foo">',
             $this->_helper->renderMenu()
         );
@@ -689,7 +690,7 @@ public function testRenderingOnlyActiveBranchWithUlId()
      */
     public function testRenderingSubMenuWithUlId()
     {
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<ul class="navigation" id="foo">',
             $this->_helper->renderSubMenu(null, null, null, 'foo')
         );
@@ -700,7 +701,7 @@ public function testRenderingSubMenuWithUlId()
      */
     public function testRenderingDeepestMenuWithUlId()
     {
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<ul class="navigation" id="foo">',
             $this->_helper->renderMenu(null, array('ulId' => 'foo'))
         );
@@ -727,11 +728,11 @@ public function testRenderingWithPageClassToLi()
         $container->findBy('href', 'page1')->setClass('foo');
 
         // Tests
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<li class="foo">',
             $this->_helper->renderMenu()
         );
-        $this->assertNotContains(
+        $this->assertStringNotContainsString(
             '<a class="foo" href="page1">Page 1</a>',
             $this->_helper->renderMenu()
         );
@@ -753,11 +754,11 @@ public function testRenderDeepestMenuWithPageClassToLi()
             'addPageClassToLi' => true,
         );
 
-        $this->assertContains(
+        $this->assertStringContainsString(
             '<li class="active foo">',
             $this->_helper->renderMenu(null, $options)
         );
-        $this->assertNotContains(
+        $this->assertStringNotContainsString(
             '<a class="foo" href="page1">Page 1</a>',
             $this->_helper->renderMenu(null, $options)
         );
@@ -792,8 +793,8 @@ public function testRenderDeepestMenuWithCustomActiveClass()
 
         $html = $this->_helper->renderMenu(null, $options);
 
-        $this->assertContains('<li class="current">', $html);
-        $this->assertNotContains('<li class="active">', $html);
+        $this->assertStringContainsString('<li class="current">', $html);
+        $this->assertStringNotContainsString('<li class="active">', $html);
     }
 
     /**
diff --git a/tests/Zend/View/Helper/Navigation/NavigationTest.php b/tests/Zend/View/Helper/Navigation/NavigationTest.php
index 3ca4e390..72e9bf55 100644
--- a/tests/Zend/View/Helper/Navigation/NavigationTest.php
+++ b/tests/Zend/View/Helper/Navigation/NavigationTest.php
@@ -257,7 +257,7 @@ public function testSetRoleThrowsExceptionWhenGivenAnInt()
             $this->fail('An invalid argument was given, but a '
                         . 'Zend_View_Exception was not thrown');
         } catch (Zend_View_Exception $e) {
-            $this->assertContains('$role must be a string', $e->getMessage());
+            $this->assertStringContainsString('$role must be a string', $e->getMessage());
         }
     }
 
@@ -268,7 +268,7 @@ public function testSetRoleThrowsExceptionWhenGivenAnArbitraryObject()
             $this->fail('An invalid argument was given, but a '
                         . 'Zend_View_Exception was not thrown');
         } catch (Zend_View_Exception $e) {
-            $this->assertContains('$role must be a string', $e->getMessage());
+            $this->assertStringContainsString('$role must be a string', $e->getMessage());
         }
     }
 
@@ -309,7 +309,7 @@ public function testSetDefaultRoleThrowsExceptionWhenGivenAnInt()
             $this->fail('An invalid argument was given, but a '
                         . 'Zend_View_Exception was not thrown');
         } catch (Zend_View_Exception $e) {
-            $this->assertContains('$role must be', $e->getMessage());
+            $this->assertStringContainsString('$role must be', $e->getMessage());
         }
     }
 
@@ -320,7 +320,7 @@ public function testSetDefaultRoleThrowsExceptionWhenGivenAnArbitraryObject()
             $this->fail('An invalid argument was given, but a '
                         . 'Zend_View_Exception was not thrown');
         } catch (Zend_View_Exception $e) {
-            $this->assertContains('$role must be', $e->getMessage());
+            $this->assertStringContainsString('$role must be', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/View/Helper/Navigation/SitemapTest.php b/tests/Zend/View/Helper/Navigation/SitemapTest.php
index 87c0c3e9..4c309226 100644
--- a/tests/Zend/View/Helper/Navigation/SitemapTest.php
+++ b/tests/Zend/View/Helper/Navigation/SitemapTest.php
@@ -246,7 +246,7 @@ public function testSetServerUrlRequiresValidUri()
             $this->fail('An invalid server URL was given, but a '
                         . 'Zend_Uri_Exception was not thrown');
         } catch (Zend_Uri_Exception $e) {
-            $this->assertContains('Illegal scheme', $e->getMessage());
+            $this->assertStringContainsString('Illegal scheme', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/View/Helper/PaginationControlTest.php b/tests/Zend/View/Helper/PaginationControlTest.php
index 44177f16..58eff931 100644
--- a/tests/Zend/View/Helper/PaginationControlTest.php
+++ b/tests/Zend/View/Helper/PaginationControlTest.php
@@ -83,7 +83,7 @@ public function testUsesDefaultViewPartialIfNoneSupplied()
     {
         Zend_View_Helper_PaginationControl::setDefaultViewPartial('testPagination.phtml');
         $output = $this->_viewHelper->paginationControl($this->_paginator);
-        $this->assertContains('pagination control', $output, $output);
+        $this->assertStringContainsString('pagination control', $output, $output);
         Zend_View_Helper_PaginationControl::setDefaultViewPartial(null);
     }
 
@@ -104,15 +104,15 @@ public function testUsesDefaultScrollingStyleIfNoneSupplied()
     {
         // First we'll make sure the base case works
         $output = $this->_viewHelper->paginationControl($this->_paginator, 'All', 'testPagination.phtml');
-        $this->assertContains('page count (11) equals pages in range (11)', $output, $output);
+        $this->assertStringContainsString('page count (11) equals pages in range (11)', $output, $output);
 
         Zend_Paginator::setDefaultScrollingStyle('All');
         $output = $this->_viewHelper->paginationControl($this->_paginator, null, 'testPagination.phtml');
-        $this->assertContains('page count (11) equals pages in range (11)', $output, $output);
+        $this->assertStringContainsString('page count (11) equals pages in range (11)', $output, $output);
 
         Zend_View_Helper_PaginationControl::setDefaultViewPartial('testPagination.phtml');
         $output = $this->_viewHelper->paginationControl($this->_paginator);
-        $this->assertContains('page count (11) equals pages in range (11)', $output, $output);
+        $this->assertStringContainsString('page count (11) equals pages in range (11)', $output, $output);
     }
 
     /**
@@ -130,7 +130,7 @@ public function testUsesPaginatorFromViewIfNoneSupplied()
             $this->fail('Could not find paginator in the view instance');
         }
 
-        $this->assertContains('pagination control', $output, $output);
+        $this->assertStringContainsString('pagination control', $output, $output);
     }
 
     /**
@@ -174,7 +174,7 @@ public function testUsesPaginatorFromViewOnlyIfNoneSupplied()
         Zend_View_Helper_PaginationControl::setDefaultViewPartial('testPagination.phtml');
 
         $output = $this->_viewHelper->paginationControl($paginator);
-        $this->assertContains('page count (3)', $output, $output);
+        $this->assertStringContainsString('page count (3)', $output, $output);
     }
 
     /**
@@ -191,6 +191,6 @@ public function testCanUseObjectForScrollingStyle()
             $this->fail('Could not use object for sliding style');
         }
 
-        $this->assertContains('page count (11) equals pages in range (11)', $output, $output);
+        $this->assertStringContainsString('page count (11) equals pages in range (11)', $output, $output);
     }
 }
diff --git a/tests/Zend/View/Helper/PartialLoopTest.php b/tests/Zend/View/Helper/PartialLoopTest.php
index 5dfe2707..40ab9a0a 100644
--- a/tests/Zend/View/Helper/PartialLoopTest.php
+++ b/tests/Zend/View/Helper/PartialLoopTest.php
@@ -91,7 +91,7 @@ public function testPartialLoopIteratesOverArray()
         $result = $this->helper->partialLoop('partialLoop.phtml', $data);
         foreach ($data as $item) {
             $string = 'This is an iteration: ' . $item['message'];
-            $this->assertContains($string, $result);
+            $this->assertStringContainsString($string, $result);
         }
     }
 
@@ -113,7 +113,7 @@ public function testPartialLoopIteratesOverIterator()
         $result = $this->helper->partialLoop('partialLoop.phtml', $o);
         foreach ($data as $item) {
             $string = 'This is an iteration: ' . $item['message'];
-            $this->assertContains($string, $result);
+            $this->assertStringContainsString($string, $result);
         }
     }
 
@@ -135,7 +135,7 @@ public function testPartialLoopIteratesOverRecursiveIterator()
         $result = $this->helper->partialLoop('partialLoop.phtml', $rIterator);
         foreach ($rIterator as $item) {
             foreach ($item as $key => $value) {
-                $this->assertContains($value, $result, var_export($value, 1));
+                $this->assertStringContainsString($value, $result, var_export($value, 1));
             }
         }
     }
@@ -160,6 +160,7 @@ public function testPartialLoopThrowsExceptionWithBadIterator()
             $this->fail('PartialLoop should only work with arrays and iterators');
         } catch (Exception) {
         }
+        self::assertTrue(true);
     }
 
     public function testPartialLoopFindsModule()
@@ -180,7 +181,7 @@ public function testPartialLoopFindsModule()
         $result = $this->helper->partialLoop('partialLoop.phtml', 'foo', $data);
         foreach ($data as $item) {
             $string = 'This is an iteration in the foo module: ' . $item['message'];
-            $this->assertContains($string, $result);
+            $this->assertStringContainsString($string, $result);
         }
     }
 
@@ -208,7 +209,7 @@ public function testShouldAllowIteratingOverTraversableObjects()
         $result = $this->helper->partialLoop('partialLoop.phtml', $o);
         foreach ($data as $item) {
             $string = 'This is an iteration: ' . $item['message'];
-            $this->assertContains($string, $result);
+            $this->assertStringContainsString($string, $result);
         }
     }
 
@@ -230,7 +231,7 @@ public function testShouldAllowIteratingOverObjectsImplementingToArray()
         $result = $this->helper->partialLoop('partialLoop.phtml', $o);
         foreach ($data as $item) {
             $string = 'This is an iteration: ' . $item['message'];
-            $this->assertContains($string, $result, $result);
+            $this->assertStringContainsString($string, $result, $result);
         }
     }
 
@@ -257,7 +258,7 @@ public function testShouldNotCastToArrayIfObjectIsTraversable()
         $result = $this->helper->partialLoop('partialLoopObject.phtml', $o);
         foreach ($data as $item) {
             $string = 'This is an iteration: ' . $item->message;
-            $this->assertContains($string, $result, $result);
+            $this->assertStringContainsString($string, $result, $result);
         }
     }
 
@@ -282,6 +283,7 @@ public function testEmptyArrayPassedToPartialLoopShouldNotThrowException()
         } catch (Exception) {
             $this->fail('Empty array should not cause partialLoop to throw exception');
         }
+        self::assertTrue(true);
     }
 
     /**
@@ -306,7 +308,7 @@ public function testPartialLoopIncramentsPartialCounter()
         $result = $this->helper->partialLoop('partialLoopCouter.phtml', $data);
         foreach ($data as $key => $item) {
             $string = 'This is an iteration: ' . $item['message'] . ', pointer at ' . ($key + 1);
-            $this->assertContains($string, $result);
+            $this->assertStringContainsString($string, $result);
         }
     }
 
@@ -332,13 +334,13 @@ public function testPartialLoopPartialCounterResets()
         $result = $this->helper->partialLoop('partialLoopCouter.phtml', $data);
         foreach ($data as $key => $item) {
             $string = 'This is an iteration: ' . $item['message'] . ', pointer at ' . ($key + 1);
-            $this->assertContains($string, $result);
+            $this->assertStringContainsString($string, $result);
         }
 
         $result = $this->helper->partialLoop('partialLoopCouter.phtml', $data);
         foreach ($data as $key => $item) {
             $string = 'This is an iteration: ' . $item['message'] . ', pointer at ' . ($key + 1);
-            $this->assertContains($string, $result);
+            $this->assertStringContainsString($string, $result);
         }
     }
 
@@ -364,7 +366,7 @@ public function testPartialLoopSetsTotalCount()
         $result = $this->helper->partialLoop('partialLoopCouter.phtml', $data);
         foreach ($data as $key => $item) {
             $string = 'Total count: ' . count($data);
-            $this->assertContains($string, $result);
+            $this->assertStringContainsString($string, $result);
         }
     }
 }
diff --git a/tests/Zend/View/Helper/PartialTest.php b/tests/Zend/View/Helper/PartialTest.php
index c690626f..838956ce 100644
--- a/tests/Zend/View/Helper/PartialTest.php
+++ b/tests/Zend/View/Helper/PartialTest.php
@@ -81,7 +81,7 @@ public function testPartialRendersScript()
         ));
         $this->helper->setView($view);
         $return = $this->helper->partial('partialOne.phtml');
-        $this->assertContains('This is the first test partial', $return);
+        $this->assertStringContainsString('This is the first test partial', $return);
     }
 
     public function testPartialRendersScriptWithVars()
@@ -92,8 +92,8 @@ public function testPartialRendersScriptWithVars()
         $view->message = 'This should never be read';
         $this->helper->setView($view);
         $return = $this->helper->partial('partialThree.phtml', array('message' => 'This message should be read'));
-        $this->assertNotContains($view->message, $return);
-        $this->assertContains('This message should be read', $return, $return);
+        $this->assertStringNotContainsString($view->message, $return);
+        $this->assertStringContainsString('This message should be read', $return, $return);
     }
 
     public function testPartialRendersScriptInDifferentModuleWhenRequested()
@@ -104,7 +104,7 @@ public function testPartialRendersScriptInDifferentModuleWhenRequested()
         ));
         $this->helper->setView($view);
         $return = $this->helper->partial('partialTwo.phtml', 'foo');
-        $this->assertContains('This is the second partial', $return, $return);
+        $this->assertStringContainsString('This is the second partial', $return, $return);
     }
 
     public function testPartialThrowsExceptionWithInvalidModule()
@@ -120,6 +120,7 @@ public function testPartialThrowsExceptionWithInvalidModule()
             $this->fail('Partial should throw exception if module does not exist');
         } catch (Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testSetViewSetsViewProperty()
@@ -165,7 +166,7 @@ public function testObjectModelWithPublicPropertiesSetsViewVariables()
 
         foreach (get_object_vars($model) as $key => $value) {
             $string = sprintf('%s: %s', $key, $value);
-            $this->assertContains($string, $return);
+            $this->assertStringContainsString($string, $return);
         }
     }
 
@@ -181,7 +182,7 @@ public function testObjectModelWithToArraySetsViewVariables()
 
         foreach ($model->toArray() as $key => $value) {
             $string = sprintf('%s: %s', $key, $value);
-            $this->assertContains($string, $return);
+            $this->assertStringContainsString($string, $return);
         }
     }
 
@@ -198,11 +199,11 @@ public function testObjectModelSetInObjectKeyWhenKeyPresent()
         $this->helper->setView($view);
         $return = $this->helper->partial('partialObj.phtml', $model);
 
-        $this->assertNotContains('No object model passed', $return);
+        $this->assertStringNotContainsString('No object model passed', $return);
 
         foreach (get_object_vars($model) as $key => $value) {
             $string = sprintf('%s: %s', $key, $value);
-            $this->assertContains($string, $return, "Checking for '$return' containing '$string'");
+            $this->assertStringContainsString($string, $return, "Checking for '$return' containing '$string'");
         }
     }
 
diff --git a/tests/Zend/View/Helper/Placeholder/ContainerTest.php b/tests/Zend/View/Helper/Placeholder/ContainerTest.php
index 5c0a0aa1..d041ee19 100644
--- a/tests/Zend/View/Helper/Placeholder/ContainerTest.php
+++ b/tests/Zend/View/Helper/Placeholder/ContainerTest.php
@@ -223,7 +223,7 @@ public function testCapturingToPlaceholderKeyUsingSetReplacesContentAtKey()
         $this->assertEquals(1, count($this->container));
         $this->assertTrue(isset($this->container['key']));
         $value = $this->container['key'];
-        $this->assertContains('This is content intended for capture', $value);
+        $this->assertStringContainsString('This is content intended for capture', $value);
     }
 
     public function testCapturingToPlaceholderKeyUsingAppendAppendsContentAtKey()
@@ -236,7 +236,7 @@ public function testCapturingToPlaceholderKeyUsingAppendAppendsContentAtKey()
         $this->assertEquals(1, count($this->container));
         $this->assertTrue(isset($this->container['key']));
         $value = $this->container['key'];
-        $this->assertContains('Foobar This is content intended for capture', $value);
+        $this->assertStringContainsString('Foobar This is content intended for capture', $value);
     }
 
     public function testNestedCapturesThrowsException()
diff --git a/tests/Zend/View/Helper/Placeholder/RegistryTest.php b/tests/Zend/View/Helper/Placeholder/RegistryTest.php
index 312dd0a1..a6c95a55 100644
--- a/tests/Zend/View/Helper/Placeholder/RegistryTest.php
+++ b/tests/Zend/View/Helper/Placeholder/RegistryTest.php
@@ -118,6 +118,7 @@ public function testSetContainerClassThrowsExceptionWithInvalidContainerClass()
             $this->fail('Invalid container classes should not be accepted');
         } catch (Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testDeletingContainerRemovesFromRegistry()
diff --git a/tests/Zend/View/Helper/Placeholder/StandaloneContainerTest.php b/tests/Zend/View/Helper/Placeholder/StandaloneContainerTest.php
index 2c0f1cb2..6ba6cc13 100644
--- a/tests/Zend/View/Helper/Placeholder/StandaloneContainerTest.php
+++ b/tests/Zend/View/Helper/Placeholder/StandaloneContainerTest.php
@@ -88,9 +88,9 @@ public function testContainersPersistBetweenInstances()
         $foo2->append('Bar');
 
         $test = $foo1->toString();
-        $this->assertContains('Foo', $test);
-        $this->assertContains(' - ', $test);
-        $this->assertContains('Bar', $test);
+        $this->assertStringContainsString('Foo', $test);
+        $this->assertStringContainsString(' - ', $test);
+        $this->assertStringContainsString('Bar', $test);
     }
 }
 
diff --git a/tests/Zend/View/Helper/TranslateTest.php b/tests/Zend/View/Helper/TranslateTest.php
index 93576709..fa62c1bf 100644
--- a/tests/Zend/View/Helper/TranslateTest.php
+++ b/tests/Zend/View/Helper/TranslateTest.php
@@ -120,7 +120,7 @@ public function testPassingNonNullNonTranslationObjectToConstructorThrowsExcepti
         try {
             $helper = new Zend_View_Helper_Translate('something');
         } catch (Zend_View_Exception $e) {
-            $this->assertContains('must set an instance of Zend_Translate', $e->getMessage());
+            $this->assertStringContainsString('must set an instance of Zend_Translate', $e->getMessage());
         }
     }
 
@@ -129,7 +129,7 @@ public function testPassingNonTranslationObjectToSetTranslatorThrowsException()
         try {
             $this->helper->setTranslator('something');
         } catch (Zend_View_Exception $e) {
-            $this->assertContains('must set an instance of Zend_Translate', $e->getMessage());
+            $this->assertStringContainsString('must set an instance of Zend_Translate', $e->getMessage());
         }
     }
 
@@ -138,7 +138,7 @@ public function testRetrievingLocaleWhenNoTranslationObjectSetThrowsException()
         try {
             $this->helper->getLocale();
         } catch (Zend_View_Exception $e) {
-            $this->assertContains('must set an instance of Zend_Translate', $e->getMessage());
+            $this->assertStringContainsString('must set an instance of Zend_Translate', $e->getMessage());
         }
     }
 
@@ -147,7 +147,7 @@ public function testSettingLocaleWhenNoTranslationObjectSetThrowsException()
         try {
             $this->helper->setLocale('de');
         } catch (Zend_View_Exception $e) {
-            $this->assertContains('must set an instance of Zend_Translate', $e->getMessage());
+            $this->assertStringContainsString('must set an instance of Zend_Translate', $e->getMessage());
         }
     }
 
diff --git a/tests/Zend/ViewTest.php b/tests/Zend/ViewTest.php
index a7097cd6..7123d7fc 100644
--- a/tests/Zend/ViewTest.php
+++ b/tests/Zend/ViewTest.php
@@ -252,7 +252,7 @@ public function testLoadHelperNonexistantFile()
             $view->nonexistantHelper();
             // @todo  fail if no exception?
         } catch (Zend_Exception $e) {
-            $this->assertContains('not found', $e->getMessage());
+            $this->assertStringContainsString('not found', $e->getMessage());
         }
     }
 
@@ -272,7 +272,7 @@ public function testLoadHelperNonexistantClass()
             $view->stubEmpty();
             // @todo  fail if no exception?
         } catch (Zend_Exception $e) {
-            $this->assertContains('not found', $e->getMessage());
+            $this->assertStringContainsString('not found', $e->getMessage());
         }
     }
 
@@ -381,8 +381,7 @@ public function testNoPath()
             $view->render('somefootemplate.phtml');
             $this->fail('Rendering a template when no script path is set should raise an exception');
         } catch (Exception $e) {
-            // success...
-            // @todo  assert something?
+            self::assertTrue(true);
         }
     }
 
@@ -517,7 +516,7 @@ public function testUnset()
     {
         $view = new Zend_View();
         unset($view->_path);
-        // @todo  assert something?
+        self::assertTrue(true);
     }
 
     public function testSetProtectedThrowsException()
@@ -528,8 +527,7 @@ public function testSetProtectedThrowsException()
             $view->_path = 'bar';
             $this->fail('Should not be able to set protected properties');
         } catch (Exception $e) {
-            // success
-            // @todo  assert something?
+            self::assertTrue(true);
         }
     }
 
@@ -602,6 +600,7 @@ public function testAssignThrowsExceptionsOnBadValues()
             // success
             // @todo  assert something?
         }
+        self::assertTrue(true);
     }
 
     public function testEscape()
@@ -840,7 +839,7 @@ public function testGetHelperPath()
         $view = new Zend_View();
         $view->declareVars();
         $helperPath = $view->getHelperPath('declareVars');
-        $this->assertContains($expected, $helperPath);
+        $this->assertStringContainsString($expected, $helperPath);
     }
 
     public function testGetFilter()
@@ -893,7 +892,7 @@ public function testMissingViewScriptExceptionText()
             $view->render('bazbatNotExists.php.tpl');
             $this->fail('Non-existent view script should cause an exception');
         } catch (Exception $e) {
-            $this->assertContains($base . '_templates', $e->getMessage());
+            $this->assertStringContainsString($base . '_templates', $e->getMessage());
         }
     }
 
@@ -901,7 +900,7 @@ public function testGetHelperIsCaseInsensitive()
     {
         $view = new Zend_View();
         $hidden = $view->formHidden('foo', 'bar');
-        $this->assertContains('<input type="hidden"', $hidden);
+        $this->assertStringContainsString('<input type="hidden"', $hidden);
 
         $hidden = $view->getHelper('formHidden')->formHidden('foo', 'bar');
         $this->assertContains('<input type="hidden"', $hidden);
@@ -932,20 +931,20 @@ public function testGetHelperWorksWithPredefinedClassNames()
             $view->setHelperPath(__DIR__ . '/View/_stubs/HelperDir1', null);
             $this->fail('Exception for empty prefix was expected.');
         } catch (Exception $e) {
-            $this->assertContains('only takes strings', $e->getMessage());
+            $this->assertStringContainsString('only takes strings', $e->getMessage());
         }
 
         try {
             $view->setHelperPath(__DIR__ . '/View/_stubs/HelperDir1', null);
             $this->fail('Exception for empty prefix was expected.');
         } catch (Exception $e) {
-            $this->assertContains('only takes strings', $e->getMessage());
+            $this->assertStringContainsString('only takes strings', $e->getMessage());
         }
 
         try {
             $helper = $view->getHelper('Datetime');
         } catch (Exception $e) {
-            $this->assertContains('not found', $e->getMessage());
+            $this->assertStringContainsString('not found', $e->getMessage());
         }
     }
 
@@ -975,21 +974,21 @@ public function testRenderShouldNotAllowScriptPathsContainingParentDirectoryTrav
             $view->render('../foobar.html');
             $this->fail('Should not allow parent directory traversal');
         } catch (Zend_View_Exception $e) {
-            $this->assertContains('parent directory traversal', $e->getMessage());
+            $this->assertStringContainsString('parent directory traversal', $e->getMessage());
         }
 
         try {
             $view->render('foo/../foobar.html');
             $this->fail('Should not allow parent directory traversal');
         } catch (Zend_View_Exception $e) {
-            $this->assertContains('parent directory traversal', $e->getMessage());
+            $this->assertStringContainsString('parent directory traversal', $e->getMessage());
         }
 
         try {
             $view->render('foo/..\foobar.html');
             $this->fail('Should not allow parent directory traversal');
         } catch (Zend_View_Exception $e) {
-            $this->assertContains('parent directory traversal', $e->getMessage());
+            $this->assertStringContainsString('parent directory traversal', $e->getMessage());
         }
     }
 
@@ -1033,7 +1032,7 @@ public function testDisablingLfiProtectionAllowsParentDirectoryTraversal()
 
         try {
             $test = $view->render('../_stubs/scripts/LfiProtectionCheck.phtml');
-            $this->assertContains('LFI', $test);
+            $this->assertStringContainsString('LFI', $test);
         } catch (Zend_View_Exception $e) {
             $this->fail('LFI attack failed: ' . $e->getMessage());
         }
@@ -1084,20 +1083,20 @@ public function testRegisterHelperShouldRegisterHelperWithView()
 
     /**
      * @group ZF-8177
-     * @expectedException Zend_View_Exception
      */
     public function testRegisterHelperShouldThrowExceptionIfNotProvidedAnObject()
     {
+        $this->expectException(\Zend_View_Exception::class);
         $view = new Zend_View();
         $view->registerHelper('Foo', 'foo');
     }
 
     /**
      * @group ZF-8177
-     * @expectedException Zend_View_Exception
      */
     public function testRegisterHelperShouldThrowExceptionIfProvidedANonHelperObject()
     {
+        $this->expectException(\Zend_View_Exception::class);
         $view = new Zend_View();
         $helper = new stdClass();
         $view->registerHelper($helper, 'foo');
diff --git a/tests/Zend/Xml/SecurityTest.php b/tests/Zend/Xml/SecurityTest.php
index fda63b3f..daddee6b 100644
--- a/tests/Zend/Xml/SecurityTest.php
+++ b/tests/Zend/Xml/SecurityTest.php
@@ -69,6 +69,7 @@ public function testScanForXXE()
             $result = Zend_Xml_Security::scan($xml);
         } catch (Zend_Xml_Exception $e) {
             unlink($file);
+            self::assertTrue(true);
 
             return;
         }
diff --git a/tests/ZendX/JQuery/Form/DecoratorTest.php b/tests/ZendX/JQuery/Form/DecoratorTest.php
index 02aa8546..8494d7a7 100644
--- a/tests/ZendX/JQuery/Form/DecoratorTest.php
+++ b/tests/ZendX/JQuery/Form/DecoratorTest.php
@@ -71,7 +71,7 @@ public function testUiWidgetElementDecoratorRender()
         $ac->setView($view);
         $output = $ac->render();
 
-        $this->assertContains('ac1', $output);
+        $this->assertStringContainsString('ac1', $output);
     }
 
     public function testUiWidgetElementJQueryParams()
@@ -141,6 +141,7 @@ public function testUiWidgetPaneRenderingThrowsExceptionWithoutContainerIdOption
             $this->fail();
         } catch (Zend_Form_Decorator_Exception $e) {
         }
+        self::assertTrue(true);
     }
 
     public function testUiWidgetPaneRenderingThrowsExceptionWithoutTitleOption()
@@ -212,9 +213,9 @@ public function testUiWidgetContainerRender()
         $form->addSubForm($subForm1, 'form1');
 
         $output = $form->render($view);
-        $this->assertContains('id="tabContainer"', $output);
-        $this->assertContains('href="#tabContainer-frag-1"', $output);
-        $this->assertContains('id="tabContainer-frag-1"', $output);
+        $this->assertStringContainsString('id="tabContainer"', $output);
+        $this->assertStringContainsString('href="#tabContainer-frag-1"', $output);
+        $this->assertStringContainsString('id="tabContainer-frag-1"', $output);
     }
 
     /**
@@ -356,7 +357,7 @@ public function testUiWidgetDialogContainerRenderBug()
 
         $output = $form->render($view);
 
-        $this->assertContains('<div id="tabContainer" style="width: 600px;"><form', $output);
+        $this->assertStringContainsString('<div id="tabContainer" style="width: 600px;"><form', $output);
     }
 
     public function testRenderWidgetElementShouldEnableJQueryHelper()
@@ -384,10 +385,10 @@ public function testSettingWidgetPlacement()
 
         $widget->getDecorator('UiWidgetElement')->setOption('placement', 'APPEND');
         $html = $widget->render();
-        $this->assertContains('[SEP]<input type="text" name="spinner1" id="spinner1" value="">', $html);
+        $this->assertStringContainsString('[SEP]<input type="text" name="spinner1" id="spinner1" value="">', $html);
 
         $widget->getDecorator('UiWidgetElement')->setOption('placement', 'PREPEND');
         $html = $widget->render();
-        $this->assertContains('<input type="text" name="spinner1" id="spinner1" value="">[SEP]', $html);
+        $this->assertStringContainsString('<input type="text" name="spinner1" id="spinner1" value="">[SEP]', $html);
     }
 }
diff --git a/tests/ZendX/JQuery/Form/ElementTest.php b/tests/ZendX/JQuery/Form/ElementTest.php
index 99ea5a33..63322c8f 100644
--- a/tests/ZendX/JQuery/Form/ElementTest.php
+++ b/tests/ZendX/JQuery/Form/ElementTest.php
@@ -110,6 +110,7 @@ public function testJQueryElementWithOnlyViewHelperIsNotAllowedToDieZf4694()
         } catch (Exception $e) {
             $this->fail();
         }
+        self::assertTrue(true);
     }
 
     /**
@@ -138,6 +139,7 @@ public function testJQueryElementHasToImplementMarkerInterface()
         } catch (ZendX_JQuery_Form_Exception $e) {
             $this->fail();
         }
+        self::assertTrue(true);
     }
 
     /**
@@ -188,8 +190,8 @@ public function testFormWithoutIdButSubformsProducesArrayNotationWhichWontWork()
 
         $form = $form->render($view);
         $jquery = $view->jQuery()->__toString();
-        $this->assertContains('sf1[dp1]', $form);
-        $this->assertNotContains('$("#sf1[dp1]")', $jquery);
+        $this->assertStringContainsString('sf1[dp1]', $form);
+        $this->assertStringNotContainsString('$("#sf1[dp1]")', $jquery);
     }
 
     /**
@@ -205,7 +207,7 @@ public function testDatePickerWithDescriptionDecorator()
 
         $html = $datePicker->render($view);
 
-        $this->assertContains('<p class="description">foo</p>', $html);
+        $this->assertStringContainsString('<p class="description">foo</p>', $html);
     }
 
     public function testGetDefaultDecorators()
diff --git a/tests/ZendX/JQuery/View/AutoCompleteTest.php b/tests/ZendX/JQuery/View/AutoCompleteTest.php
index 2728d443..de72b03e 100644
--- a/tests/ZendX/JQuery/View/AutoCompleteTest.php
+++ b/tests/ZendX/JQuery/View/AutoCompleteTest.php
@@ -35,15 +35,13 @@ public function testShouldAppendToJqueryHelper()
         $element = $this->view->autoComplete('elem1', 'Default', array('option' => 'true', 'data' => array('test')), array());
 
         $jquery = $this->view->jQuery()->__toString();
-        $this->assertContains('autocomplete(', $jquery);
-        $this->assertContains('"option":"true"', $jquery);
+        $this->assertStringContainsString('autocomplete(', $jquery);
+        $this->assertStringContainsString('"option":"true"', $jquery);
     }
 
-    /**
-     * @expectedException ZendX_JQuery_Exception
-     */
     public function testShouldAllowAutoCompleteOnlyWithSourceOption()
     {
+        $this->expectException(\ZendX_JQuery_Exception::class);
         $element = $this->view->autoComplete('elem1');
     }
 
@@ -52,8 +50,8 @@ public function testShouldCreateInputField()
         $element = $this->view->autoComplete('elem1', 'Default', array('source' => array('Test')));
 
         $this->assertEquals(array('$("#elem1").autocomplete({"source":["Test"]});'), $this->view->jQuery()->getOnLoadActions());
-        $this->assertContains('<input', $element);
-        $this->assertContains('id="elem1"', $element);
-        $this->assertContains('value="Default"', $element);
+        $this->assertStringContainsString('<input', $element);
+        $this->assertStringContainsString('id="elem1"', $element);
+        $this->assertStringContainsString('value="Default"', $element);
     }
 }
diff --git a/tests/ZendX/JQuery/View/DialogContainerTest.php b/tests/ZendX/JQuery/View/DialogContainerTest.php
index 98add424..465313db 100644
--- a/tests/ZendX/JQuery/View/DialogContainerTest.php
+++ b/tests/ZendX/JQuery/View/DialogContainerTest.php
@@ -34,8 +34,8 @@ public function testShouldAppendToJqueryHelper()
         $element = $this->view->dialogContainer('elem1', '', array('option' => 'true'));
 
         $jquery = $this->jquery->__toString();
-        $this->assertContains('dialog(', $jquery);
-        $this->assertContains('"option":"true"', $jquery);
+        $this->assertStringContainsString('dialog(', $jquery);
+        $this->assertStringContainsString('"option":"true"', $jquery);
     }
 
     public function testShouldCreateDivContainer()
@@ -43,9 +43,9 @@ public function testShouldCreateDivContainer()
         $element = $this->view->dialogContainer('elem1', '', array(), array());
 
         $this->assertEquals(array('$("#elem1").dialog({});'), $this->jquery->getOnLoadActions());
-        $this->assertContains('<div', $element);
-        $this->assertContains('id="elem1"', $element);
-        $this->assertContains('</div>', $element);
+        $this->assertStringContainsString('<div', $element);
+        $this->assertStringContainsString('id="elem1"', $element);
+        $this->assertStringContainsString('</div>', $element);
     }
 
     /**
diff --git a/tests/ZendX/JQuery/View/TabContainerTest.php b/tests/ZendX/JQuery/View/TabContainerTest.php
index eba02e9c..f7da1ee5 100644
--- a/tests/ZendX/JQuery/View/TabContainerTest.php
+++ b/tests/ZendX/JQuery/View/TabContainerTest.php
@@ -35,8 +35,8 @@ public function testShouldAppendToJqueryHelper()
         $element = $this->view->tabContainer('elem1', array('option' => 'true'), array());
 
         $jquery = $this->view->jQuery()->__toString();
-        $this->assertContains('tabs(', $jquery);
-        $this->assertContains('"option":"true"', $jquery);
+        $this->assertStringContainsString('tabs(', $jquery);
+        $this->assertStringContainsString('"option":"true"', $jquery);
     }
 
     public function testShouldAllowAddingTabs()
@@ -46,12 +46,12 @@ public function testShouldAllowAddingTabs()
             ->tabContainer('container1', array(), array());
 
         $this->assertEquals(array('$("#container1").tabs({});'), $this->jquery->getOnLoadActions());
-        $this->assertContains('elem1', $tabs);
-        $this->assertContains('Text1', $tabs);
-        $this->assertContains('elem2', $tabs);
-        $this->assertContains('Text2', $tabs);
-        $this->assertContains('href="#container1-frag-1"', $tabs);
-        $this->assertContains('href="#container1-frag-2"', $tabs);
+        $this->assertStringContainsString('elem1', $tabs);
+        $this->assertStringContainsString('Text1', $tabs);
+        $this->assertStringContainsString('elem2', $tabs);
+        $this->assertStringContainsString('Text2', $tabs);
+        $this->assertStringContainsString('href="#container1-frag-1"', $tabs);
+        $this->assertStringContainsString('href="#container1-frag-2"', $tabs);
     }
 
     public function testShoudAllowAddingTabsFromUrls()
@@ -61,10 +61,10 @@ public function testShoudAllowAddingTabsFromUrls()
             ->tabContainer('container1', array(), array());
 
         $this->assertEquals(array('$("#container1").tabs({});'), $this->jquery->getOnLoadActions());
-        $this->assertContains('elem1', $tabs);
-        $this->assertContains('elem2', $tabs);
-        $this->assertContains('href="blub.html"', $tabs);
-        $this->assertContains('href="cookie.html"', $tabs);
+        $this->assertStringContainsString('elem1', $tabs);
+        $this->assertStringContainsString('elem2', $tabs);
+        $this->assertStringContainsString('href="blub.html"', $tabs);
+        $this->assertStringContainsString('href="cookie.html"', $tabs);
     }
 
     public function testShouldAllowCaptureTabContent()
@@ -80,10 +80,10 @@ public function testShouldAllowCaptureTabContent()
         $tabs = $this->view->tabContainer('container1', array(), array());
 
         $this->assertEquals(array('$("#container1").tabs({});'), $this->jquery->getOnLoadActions());
-        $this->assertContains('elem1', $tabs);
-        $this->assertContains('elem2', $tabs);
-        $this->assertContains('Lorem Ipsum!', $tabs);
-        $this->assertContains('href="foo.html"', $tabs);
+        $this->assertStringContainsString('elem1', $tabs);
+        $this->assertStringContainsString('elem2', $tabs);
+        $this->assertStringContainsString('Lorem Ipsum!', $tabs);
+        $this->assertStringContainsString('href="foo.html"', $tabs);
         $this->assertNotContains('This is captured, but not displayed: contentUrl overrides this output.', $tabs);
     }
 
@@ -95,10 +95,10 @@ public function testShouldAllowUsingTabPane()
         $tabs = $this->view->tabContainer('container1', array(), array());
 
         $this->assertEquals(array('$("#container1").tabs({});'), $this->jquery->getOnLoadActions());
-        $this->assertContains('elem1', $tabs);
-        $this->assertContains('elem2', $tabs);
-        $this->assertContains('Lorem Ipsum!', $tabs);
-        $this->assertContains('href="foo.html"', $tabs);
+        $this->assertStringContainsString('elem1', $tabs);
+        $this->assertStringContainsString('elem2', $tabs);
+        $this->assertStringContainsString('Lorem Ipsum!', $tabs);
+        $this->assertStringContainsString('href="foo.html"', $tabs);
         $this->assertNotContains('This is captured, but not displayed: contentUrl overrides this output.', $tabs);
     }
 
@@ -120,5 +120,6 @@ public function testPaneCaptureLockExceptionNoEndWithoutStartPossible()
             $this->fail();
         } catch (ZendX_JQuery_View_Exception $e) {
         }
+        self::assertTrue(true);
     }
 }
diff --git a/tests/ZendX/JQuery/View/jQueryTest.php b/tests/ZendX/JQuery/View/jQueryTest.php
index 8805e1fa..5db0f019 100644
--- a/tests/ZendX/JQuery/View/jQueryTest.php
+++ b/tests/ZendX/JQuery/View/jQueryTest.php
@@ -24,13 +24,12 @@ public function testHelperSuccessfulCallForward()
     {
         $jquery = new ZendX_JQuery_View_Helper_JQuery();
         $jquery->addJavascript('alert();');
+        self::assertTrue(true);
     }
 
-    /**
-     * @expectedException Zend_View_Exception
-     */
     public function testHelperFailingCallForward()
     {
+        $this->expectException(\Zend_View_Exception::class);
         $jquery = new ZendX_JQuery_View_Helper_JQuery();
         $jquery->addAsdf();
     }
@@ -75,10 +74,10 @@ public function testUsingLocalPath()
         $this->assertFalse($this->jquery->useCDN());
         $this->assertFalse($this->jquery->isEnabled());
         $this->assertTrue($this->jquery->useLocalPath());
-        $this->assertContains('/js/jquery.min.js', $this->jquery->getLocalPath());
+        $this->assertStringContainsString('/js/jquery.min.js', $this->jquery->getLocalPath());
 
         $render = $this->jquery->__toString();
-        $this->assertNotContains('/js/jquery.min.js', $render);
+        $this->assertStringNotContainsString('/js/jquery.min.js', $render);
     }
 
     public function testUiDisabledDefault()
@@ -104,14 +103,14 @@ public function testShouldAllowEnableUi()
         $this->jquery->uiEnable();
 
         $render = $this->jquery->__toString();
-        $this->assertContains('jquery-ui', $render);
-        $this->assertContains($this->jquery->getUiVersion(), $render);
+        $this->assertStringContainsString('jquery-ui', $render);
+        $this->assertStringContainsString($this->jquery->getUiVersion(), $render);
     }
 
     public function testShouldAllowSetUiVersion()
     {
         $this->jquery->setUiVersion('1.5.1');
-        $this->assertContains('1.5.1', $this->jquery->getUiVersion());
+        $this->assertStringContainsString('1.5.1', $this->jquery->getUiVersion());
     }
 
     public function testShouldAllowSetLocalUiPath()
@@ -120,7 +119,7 @@ public function testShouldAllowSetLocalUiPath()
 
         $this->assertTrue($this->jquery->useUiLocal());
         $this->assertFalse($this->jquery->useUiCdn());
-        $this->assertContains('/js/jquery-ui.min.js', $this->jquery->getUiPath());
+        $this->assertStringContainsString('/js/jquery-ui.min.js', $this->jquery->getUiPath());
     }
 
     public function testNoConflictShouldBeDisabledDefault()
@@ -135,7 +134,7 @@ public function testUsingNoConflictMode()
         $this->jquery->enable();
         $render = $this->jquery->__toString();
 
-        $this->assertContains('var $j = jQuery.noConflict();', $render);
+        $this->assertStringContainsString('var $j = jQuery.noConflict();', $render);
     }
 
     public function testDefaultRenderModeShouldIncludeAllBlocks()
@@ -192,20 +191,16 @@ public function testShouldAllowCaptureJavascript()
         $this->assertEquals(array(), $this->jquery->getJavascript());
     }
 
-    /**
-     * @expectedException Zend_Exception
-     */
     public function testShouldDisallowNestingCapturesWithException()
     {
+        $this->expectException(\Zend_Exception::class);
         $this->jquery->javascriptCaptureStart();
         $this->jquery->javascriptCaptureStart();
     }
 
-    /**
-     * @expectedException Zend_Exception
-     */
     public function testShouldDisallowNestingCapturesWithException2()
     {
+        $this->expectException(\Zend_Exception::class);
         $this->jquery->onLoadCaptureStart();
         $this->jquery->onLoadCaptureStart();
 
@@ -240,9 +235,9 @@ public function testAddedJavascriptFilesRender()
         $this->jquery->enable();
 
         $render = $this->jquery->__toString();
-        $this->assertContains('src="/js/test.js"', $render);
-        $this->assertContains('src="/js/test2.js"', $render);
-        $this->assertContains('src="http://example.com/test3.js', $render);
+        $this->assertStringContainsString('src="/js/test.js"', $render);
+        $this->assertStringContainsString('src="/js/test2.js"', $render);
+        $this->assertStringContainsString('src="http://example.com/test3.js', $render);
     }
 
     public function testAddStylesheet()
@@ -270,10 +265,10 @@ public function testShouldAllowBasicSetupWithCDN()
         $render = $this->jquery->__toString();
 
         $this->assertTrue($this->jquery->useCDN());
-        $this->assertContains('jquery.min.js', $render);
-        $this->assertContains('1.2.3', $render);
-        $this->assertContains('test.js', $render);
-        $this->assertContains('<script type="text/javascript"', $render);
+        $this->assertStringContainsString('jquery.min.js', $render);
+        $this->assertStringContainsString('1.2.3', $render);
+        $this->assertStringContainsString('test.js', $render);
+        $this->assertStringContainsString('<script type="text/javascript"', $render);
     }
 
     public function testShouldAllowUseRenderMode()
@@ -295,56 +290,56 @@ public function testShouldAllowUseRenderMode()
         // Test Render Only Library
         $this->jquery->setRenderMode(ZendX_JQuery::RENDER_LIBRARY);
         $render = $this->jquery->__toString();
-        $this->assertContains('1.2.3/jquery.min.js', $render);
-        $this->assertNotContains('test.css', $render);
-        $this->assertNotContains('test.js', $render);
-        $this->assertNotContains('alert();', $render);
-        $this->assertNotContains('helloWorld();', $render);
+        $this->assertStringContainsString('1.2.3/jquery.min.js', $render);
+        $this->assertStringNotContainsString('test.css', $render);
+        $this->assertStringNotContainsString('test.js', $render);
+        $this->assertStringNotContainsString('alert();', $render);
+        $this->assertStringNotContainsString('helloWorld();', $render);
 
         // Test Render Only AddOnLoad
         $this->jquery->setRenderMode(ZendX_JQuery::RENDER_JQUERY_ON_LOAD);
         $render = $this->jquery->__toString();
-        $this->assertNotContains('1.2.3/jquery.min.js', $render);
-        $this->assertNotContains('test.css', $render);
-        $this->assertNotContains('test.js', $render);
-        $this->assertContains('alert();', $render);
-        $this->assertNotContains('helloWorld();', $render);
+        $this->assertStringNotContainsString('1.2.3/jquery.min.js', $render);
+        $this->assertStringNotContainsString('test.css', $render);
+        $this->assertStringNotContainsString('test.js', $render);
+        $this->assertStringContainsString('alert();', $render);
+        $this->assertStringNotContainsString('helloWorld();', $render);
 
         // Test Render Only Javascript
         $this->jquery->setRenderMode(ZendX_JQuery::RENDER_SOURCES);
         $render = $this->jquery->__toString();
-        $this->assertNotContains('1.2.3/jquery.min.js', $render);
-        $this->assertNotContains('test.css', $render);
-        $this->assertContains('test.js', $render);
-        $this->assertNotContains('alert();', $render);
-        $this->assertNotContains('helloWorld();', $render);
+        $this->assertStringNotContainsString('1.2.3/jquery.min.js', $render);
+        $this->assertStringNotContainsString('test.css', $render);
+        $this->assertStringContainsString('test.js', $render);
+        $this->assertStringNotContainsString('alert();', $render);
+        $this->assertStringNotContainsString('helloWorld();', $render);
 
         // Test Render Only Javascript
         $this->jquery->setRenderMode(ZendX_JQuery::RENDER_STYLESHEETS);
         $render = $this->jquery->__toString();
-        $this->assertNotContains('1.2.3/jquery.min.js', $render);
-        $this->assertContains('test.css', $render);
-        $this->assertNotContains('test.js', $render);
-        $this->assertNotContains('alert();', $render);
-        $this->assertNotContains('helloWorld();', $render);
+        $this->assertStringNotContainsString('1.2.3/jquery.min.js', $render);
+        $this->assertStringContainsString('test.css', $render);
+        $this->assertStringNotContainsString('test.js', $render);
+        $this->assertStringNotContainsString('alert();', $render);
+        $this->assertStringNotContainsString('helloWorld();', $render);
 
         // Test Render Library and AddOnLoad
         $this->jquery->setRenderMode(ZendX_JQuery::RENDER_LIBRARY | ZendX_JQuery::RENDER_JQUERY_ON_LOAD);
         $render = $this->jquery->__toString();
-        $this->assertContains('1.2.3/jquery.min.js', $render);
-        $this->assertNotContains('test.css', $render);
-        $this->assertNotContains('test.js', $render);
-        $this->assertContains('alert();', $render);
-        $this->assertNotContains('helloWorld();', $render);
+        $this->assertStringContainsString('1.2.3/jquery.min.js', $render);
+        $this->assertStringNotContainsString('test.css', $render);
+        $this->assertStringNotContainsString('test.js', $render);
+        $this->assertStringContainsString('alert();', $render);
+        $this->assertStringNotContainsString('helloWorld();', $render);
 
         // Test Render All
         $this->jquery->setRenderMode(ZendX_JQuery::RENDER_ALL);
         $render = $this->jquery->__toString();
-        $this->assertContains('1.2.3/jquery.min.js', $render);
-        $this->assertContains('test.css', $render);
-        $this->assertContains('test.js', $render);
-        $this->assertContains('alert();', $render);
-        $this->assertContains('helloWorld();', $render);
+        $this->assertStringContainsString('1.2.3/jquery.min.js', $render);
+        $this->assertStringContainsString('test.css', $render);
+        $this->assertStringContainsString('test.js', $render);
+        $this->assertStringContainsString('alert();', $render);
+        $this->assertStringContainsString('helloWorld();', $render);
     }
 
     /**
@@ -373,12 +368,12 @@ public function testNoConflictModeIsRecognizedInRenderingOnLoadStackEvent()
         $this->jquery->enable();
 
         $jQueryStack = $this->jquery->__toString();
-        $this->assertContains('$j(document).ready(function()', $jQueryStack);
+        $this->assertStringContainsString('$j(document).ready(function()', $jQueryStack);
 
         ZendX_JQuery_View_Helper_JQuery::disableNoConflictMode();
 
         $jQueryStack = $this->jquery->__toString();
-        $this->assertNotContains('$j(document).ready(function()', $jQueryStack);
+        $this->assertStringNotContainsString('$j(document).ready(function()', $jQueryStack);
     }
 
     /**
@@ -391,7 +386,7 @@ public function testStylesheetShouldRenderCorrectClosingBracketBasedOnHtmlDoctyp
 
         $assert = '<link rel="stylesheet" href="test.css" type="text/css" media="screen">';
         $this->jquery->enable();
-        $this->assertContains($assert, $this->jquery->__toString());
+        $this->assertStringContainsString($assert, $this->jquery->__toString());
     }
 
     /**
@@ -404,7 +399,7 @@ public function testStylesheetShouldRenderCorrectClosingBracketBasedOnXHtmlDocty
 
         $assert = '<link rel="stylesheet" href="test.css" type="text/css" media="screen" />';
         $this->jquery->enable();
-        $this->assertContains($assert, $this->jquery->__toString());
+        $this->assertStringContainsString($assert, $this->jquery->__toString());
     }
 
     /**
@@ -428,7 +423,7 @@ public function testIncludeJQueryLibraryFromSslPath()
         $this->jquery->setCdnSsl(true);
         $this->jquery->enable();
 
-        $this->assertContains(ZendX_JQuery::CDN_BASE_GOOGLE_SSL, $this->jquery->__toString());
+        $this->assertStringContainsString(ZendX_JQuery::CDN_BASE_GOOGLE_SSL, $this->jquery->__toString());
     }
 
     /**
@@ -440,7 +435,7 @@ public function testJQueryGoogleCdnPathIsBuiltCorrectly()
         $this->jquery->setVersion('1.3.1');
         $this->jquery->enable();
 
-        $this->assertContains($jQueryCdnPath, $this->jquery->__toString());
+        $this->assertStringContainsString($jQueryCdnPath, $this->jquery->__toString());
     }
 
     /**
@@ -454,7 +449,7 @@ public function testJQueryUiGoogleCdnPathIsBuiltCorrectly()
         $this->jquery->setUiVersion('1.7.1');
         $this->jquery->uiEnable();
 
-        $this->assertContains($jQueryCdnPath, $this->jquery->__toString());
+        $this->assertStringContainsString($jQueryCdnPath, $this->jquery->__toString());
     }
 
     /**
@@ -467,7 +462,7 @@ public function testJQueryGoogleCdnSslPathIsBuiltCorrectly()
         $this->jquery->setVersion('1.3.1');
         $this->jquery->enable();
 
-        $this->assertContains($jQueryCdnPath, $this->jquery->__toString());
+        $this->assertStringContainsString($jQueryCdnPath, $this->jquery->__toString());
     }
 
     /**
@@ -482,6 +477,6 @@ public function testJQueryUiGoogleCdnSslPathIsBuiltCorrectly()
         $this->jquery->setUiVersion('1.7.1');
         $this->jquery->uiEnable();
 
-        $this->assertContains($jQueryCdnPath, $this->jquery->__toString());
+        $this->assertStringContainsString($jQueryCdnPath, $this->jquery->__toString());
     }
 }