diff --git a/masquerade.info.yml b/masquerade.info.yml
index e37e56d..d75fb49 100644
--- a/masquerade.info.yml
+++ b/masquerade.info.yml
@@ -2,7 +2,5 @@ name: Masquerade
 type: module
 description: 'Allows privileged users to masquerade as another user.'
 core: 8.x
-dependencies:
-  - user
 tags:
   - admin
diff --git a/masquerade.module b/masquerade.module
index 1d79acf..01b7b88 100644
--- a/masquerade.module
+++ b/masquerade.module
@@ -253,8 +253,8 @@ function masquerade_switch_user_validate(UserInterface $target_account) {
   $user = \Drupal::currentUser();
 
   if (\Drupal::service('masquerade')->isMasquerading()) {
-    return t('You are masquerading already. Please <a href="@unmasquerade-url">switch back</a> to your account to masquerade as another user.', array(
-      '@unmasquerade-url' => Url::fromRoute('masquerade.unmasquerade')->toString(),
+    return t('You are masquerading already. Please <a href=":unmasquerade-url">switch back</a> to your account to masquerade as another user.', array(
+      ':unmasquerade-url' => Url::fromRoute('masquerade.unmasquerade')->toString(),
     ));
   }
   if ($target_account->id() == $user->id()) {
diff --git a/src/Tests/MasqueradeTest.php b/src/Tests/MasqueradeTest.php
index af29618..eacdcc2 100644
--- a/src/Tests/MasqueradeTest.php
+++ b/src/Tests/MasqueradeTest.php
@@ -46,4 +46,3 @@ class MasqueradeTest extends MasqueradeWebTestBase {
   }
 
 }
-
diff --git a/src/Tests/MasqueradeWebTestBase.php b/src/Tests/MasqueradeWebTestBase.php
index 7f55415..b7d3ea2 100644
--- a/src/Tests/MasqueradeWebTestBase.php
+++ b/src/Tests/MasqueradeWebTestBase.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\masquerade\Tests;
 
+use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Component\Utility\Crypt;
 use Drupal\Core\Site\Settings;
 use Drupal\simpletest\WebTestBase;
@@ -147,7 +148,7 @@ abstract class MasqueradeWebTestBase extends WebTestBase {
    *   The user account to unmasquerade from.
    */
   protected function unmasquerade(UserInterface $account) {
-    $this->drupalGet('/user/' . $account->id());
+    $this->drupalGet('user/' . $account->id());
     $this->clickLink('Unmasquerade');
     // @todo Fix when crsfTokenSeed is avalable.
 //    $this->drupalGet('unmasquerade', array(
@@ -179,11 +180,11 @@ abstract class MasqueradeWebTestBase extends WebTestBase {
    *   The session record from {sessions}, if any.
    */
   protected function assertSessionByUid($uid, $expected_masquerading_uid = NULL) {
-    $result = db_query('SELECT * FROM {sessions} WHERE uid = :uid', array(
+    $result = db_query('SELECT * FROM {sessions} WHERE uid = :uid', [
       ':uid' => $uid,
-    ))->fetchAll();
+    ])->fetchAll();
     if (empty($result)) {
-      $this->fail(format_string('No session found for uid @uid', array('@uid' => $uid)));
+      $this->fail(new FormattableMarkup('No session found for uid @uid', ['@uid' => $uid]));
     }
     elseif (count($result) > 1) {
       // If there is more than one session, then that must be unexpected.
@@ -206,12 +207,12 @@ abstract class MasqueradeWebTestBase extends WebTestBase {
         // @see drupal_session_start()
         @session_start();
         // In any case, ensure that it is empty.
-        $_SESSION = array();
+        $_SESSION = [];
 
         if (!session_decode($session->session)) {
-          $this->fail(format_string('Failed to decode session data: @data', array('@data' => $session->session)));
+          $this->fail(new FormattableMarkup('Failed to decode session data: @data', ['@data' => $session->session]));
         }
-        $session->session = isset($_SESSION) ? $_SESSION : array();
+        $session->session = isset($_SESSION) ? $_SESSION : [];
 
         // Restore the original global session.
         $_SESSION = NULL;
@@ -221,14 +222,14 @@ abstract class MasqueradeWebTestBase extends WebTestBase {
       }
       else {
         $session = new \stdClass();
-        $session->session = array();
+        $session->session = [];
       }
 
       if (isset($expected_masquerading_uid)) {
         if ($expected_masquerading_uid !== FALSE) {
-          $this->assertEqual($session->session['masquerading'], $expected_masquerading_uid, format_string('$_SESSION[\'masquerading\'] equals @uid.', array(
+          $this->assertEqual($session->session['masquerading'], $expected_masquerading_uid, new FormattableMarkup('$_SESSION[\'masquerading\'] equals @uid.', [
             '@uid' => $expected_masquerading_uid,
-          )));
+          ]));
         }
         else {
           $this->assert(!isset($session->session['masquerading']), '$_SESSION[\'masquerading\'] is not set.');
@@ -245,9 +246,9 @@ abstract class MasqueradeWebTestBase extends WebTestBase {
    *   The user ID to assert.
    */
   protected function assertNoSessionByUid($uid) {
-    $result = db_query('SELECT * FROM {sessions} WHERE uid = :uid', array(
+    $result = db_query('SELECT * FROM {sessions} WHERE uid = :uid', [
       ':uid' => $uid,
-    ))->fetchAll();
+    ])->fetchAll();
     $this->assert(empty($result), "No session for uid $uid found.");
   }
 
@@ -267,4 +268,3 @@ abstract class MasqueradeWebTestBase extends WebTestBase {
   }
 
 }
-