diff --git a/php.module b/php.module
index 6637ce7..b88e4ad 100644
--- a/php.module
+++ b/php.module
@@ -15,7 +15,7 @@ function php_help($route_name, RouteMatchInterface $route_match) {
     case 'help.page.php':
       $output = '';
       $output .= '<h3>' . t('About') . '</h3>';
-      $output .= '<p>' . t('The PHP Filter module adds a PHP filter to your site, for use with <a href=":filter">text formats</a>. This filter adds the ability to execute PHP code in any text field that uses a text format (such as the body of a content item or the text of a comment). <a href=":php-net">PHP</a> is a general-purpose scripting language widely-used for web development, and is the language with which Drupal has been developed. For more information, see the online handbook entry for the <a href=":php">PHP Filter module</a>.', [':filter' => \Drupal::url('filter.admin_overview'), ':php-net' => 'http://www.php.net', ':php' => 'http://drupal.org/documentation/modules/php']) . '</p>';
+      $output .= '<p>' . t('The PHP Filter module adds a PHP filter to your site, for use with <a href=":filter">text formats</a>. This filter adds the ability to execute PHP code in any text field that uses a text format (such as the body of a content item or the text of a comment). <a href=":php-net">PHP</a> is a general-purpose scripting language widely-used for web development, and is the language with which Drupal has been developed. For more information, see the online handbook entry for the <a href=":php">PHP Filter module</a>.', [':filter' => \Drupal\Core\Url::fromRoute('filter.admin_overview'), ':php-net' => 'http://www.php.net', ':php' => 'http://drupal.org/documentation/modules/php']) . '</p>';
       $output .= '<h3>' . t('Uses') . '</h3>';
       $output .= '<dl>';
       $output .= '<dt>' . t('Enabling execution of PHP in text fields') . '</dt>';
diff --git a/src/Plugin/Condition/Php.php b/src/Plugin/Condition/Php.php
index a803a49..ffdc981 100644
--- a/src/Plugin/Condition/Php.php
+++ b/src/Plugin/Condition/Php.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\php\Plugin\Condition;
 
-use Drupal\Core\Annotation\Translation;
-use Drupal\Core\Condition\Annotation\Condition;
 use Drupal\Core\Condition\ConditionPluginBase;
 use Drupal\Core\Form\FormStateInterface;
 
diff --git a/src/Plugin/Filter/Php.php b/src/Plugin/Filter/Php.php
index be394c9..496bce8 100644
--- a/src/Plugin/Filter/Php.php
+++ b/src/Plugin/Filter/Php.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\php\Plugin\Filter;
 
-use Drupal\Core\Annotation\Translation;
-use Drupal\filter\Annotation\Filter;
 use Drupal\filter\FilterProcessResult;
 use Drupal\filter\Plugin\FilterBase;
 
diff --git a/src/Plugin/views/argument_default/Php.php b/src/Plugin/views/argument_default/Php.php
index b65e7f8..c0bb9b2 100644
--- a/src/Plugin/views/argument_default/Php.php
+++ b/src/Plugin/views/argument_default/Php.php
@@ -7,9 +7,7 @@
 
 namespace Drupal\php\Plugin\views\argument_default;
 
-use Drupal\Core\Annotation\Translation;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\views\Annotation\ViewsArgumentDefault;
 use Drupal\views\Plugin\views\argument_default\ArgumentDefaultPluginBase;
 
 
diff --git a/src/Plugin/views/argument_validator/Php.php b/src/Plugin/views/argument_validator/Php.php
index f077853..c02a5a9 100644
--- a/src/Plugin/views/argument_validator/Php.php
+++ b/src/Plugin/views/argument_validator/Php.php
@@ -7,9 +7,7 @@
 
 namespace Drupal\php\Plugin\views\argument_validator;
 
-use Drupal\Core\Annotation\Translation;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\views\Annotation\ViewsArgumentValidator;
 use Drupal\views\Plugin\views\argument_validator\ArgumentValidatorPluginBase;
 
 
diff --git a/src/Tests/Condition/PhpConditionTest.php b/src/Tests/Condition/PhpConditionTest.php
index f55cbae..84476ed 100644
--- a/src/Tests/Condition/PhpConditionTest.php
+++ b/src/Tests/Condition/PhpConditionTest.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\php\Tests\Condition;
 
-use Drupal\simpletest\KernelTestBase;
+use \Drupal\KernelTests\KernelTestBase;
 
 /**
  * Tests that the PHP Condition, provided by php module, is working properly.
@@ -48,7 +48,7 @@ class PhpConditionTest extends KernelTestBase {
       ->setConfig('php', '<?php return TRUE; ?>');
     $this->assertTrue($condition->execute(), 'PHP condition passes as expected.');
     // Check for the proper summary.
-    $this->assertEqual($condition->summary(), 'When the given PHP evaluates as TRUE.');
+    self::assertEquals($condition->summary(), 'When the given PHP evaluates as TRUE.');
 
     // Set the PHP snippet to return FALSE.
     $condition->setConfig('php', '<?php return FALSE; ?>');
@@ -57,14 +57,14 @@ class PhpConditionTest extends KernelTestBase {
     // Negate the condition.
     $condition->setConfig('negate', TRUE);
     // Check for the proper summary.
-    $this->assertEqual($condition->summary(), 'When the given PHP evaluates as FALSE.');
+    self::assertEquals($condition->summary(), 'When the given PHP evaluates as FALSE.');
 
     // Reverse the negation.
     $condition->setConfig('negate', FALSE);
     // Set and empty snippet.
     $condition->setConfig('php', FALSE);
     // Check for the proper summary.
-    $this->assertEqual($condition->summary(), 'No PHP code has been provided.');
+    self::assertEquals($condition->summary(), 'No PHP code has been provided.');
   }
 
 }
diff --git a/src/Tests/PhpFilterTest.php b/src/Tests/PhpFilterTest.php
index 7175e86..20001fc 100644
--- a/src/Tests/PhpFilterTest.php
+++ b/src/Tests/PhpFilterTest.php
@@ -7,8 +7,6 @@
 
 namespace Drupal\php\Tests;
 
-use Drupal\Core\Language\Language;
-
 /**
  * Tests to make sure the PHP filter actually evaluates PHP code when used.
  *
diff --git a/src/Tests/PhpTestBase.php b/src/Tests/PhpTestBase.php
index aeba9fc..129e487 100644
--- a/src/Tests/PhpTestBase.php
+++ b/src/Tests/PhpTestBase.php
@@ -41,7 +41,8 @@ abstract class PhpTestBase extends WebTestBase {
 
     // Verify that the PHP code text format was inserted.
     $php_format_id = 'php_code';
-    $this->phpCodeFormat = entity_load('filter_format', $php_format_id);
+    $this->phpCodeFormat = \Drupal::entityTypeManager()->getStorage('filter_format')->load($php_format_id);
+
     $this->assertEqual($this->phpCodeFormat->label(), 'PHP code', 'PHP code text format was created.');
 
     // Verify that the format has the PHP code filter enabled.