diff --git a/src/Form/ContentAccessPageForm.php b/src/Form/ContentAccessPageForm.php
index 6604f58..7e45191 100644
--- a/src/Form/ContentAccessPageForm.php
+++ b/src/Form/ContentAccessPageForm.php
@@ -73,7 +73,7 @@ class ContentAccessPageForm extends FormBase {
         $update = (int) ($op == 'update');
         acl_node_add_acl($node->id(), $acl_id, $view, $update, (int) ($op == 'delete'), content_access_get_settings('priority', $node->getType()));
 
-        $form['acl'][$op] = acl_edit_form($form_state, $acl_id, t('Grant !op access', ['!op' => $op]));
+        $form['acl'][$op] = acl_edit_form($form_state, $acl_id, t('Grant @op access', ['@op' => $op]));
 
         $post_acl_id = \Drupal::request()->request->get('acl_' . $acl_id, NULL);
         $form['acl'][$op]['#collapsed'] = !isset($post_acl_id) && !unserialize($form['acl'][$op]['user_list']['#default_value']);
diff --git a/src/Tests/ContentAccessAclTestCase.php b/src/Tests/ContentAccessAclTestCase.php
index aecb909..2ab9374 100644
--- a/src/Tests/ContentAccessAclTestCase.php
+++ b/src/Tests/ContentAccessAclTestCase.php
@@ -2,23 +2,29 @@
 
 namespace Drupal\content_access\Tests;
 
+use Drupal\Core\Session\AccountInterface;
+use Drupal\simpletest\WebTestBase;
+
 /**
  * Automated SimpleTest Case for using content access module with acl module.
  *
  * @group Access
  */
-class ContentAccessAclTestCase extends ContentAccessTestHelp {
+class ContentAccessAclTestCase extends WebTestBase {
+
+  use ContentAccessTestHelperTrait;
 
   /**
-   * Implementation of getInfo() for information.
+   * Modules to enable.
+   *
+   * @var array
    */
-  public static function getInfo() {
-    return array(
-      'name' => t('Content Access Module with ACL Module Tests'),
-      'description' => t('Various tests to check the combination of content access and ACL module.'),
-      'group' => 'Content Access',
-    );
-  }
+  public static $modules = ['content_access', 'acl'];
+
+  protected $test_user;
+  protected $admin_user;
+  protected $content_type;
+  protected $node1;
 
   /**
    * Setup configuration before each test.
@@ -31,6 +37,36 @@ class ContentAccessAclTestCase extends ContentAccessTestHelp {
       return;
     }
 
+    // Create test user with separate role.
+    $this->test_user = $this->drupalCreateUser();
+
+    // Get the value of the new role.
+    // @see drupalCreateUser().
+    $test_user_roles = $this->test_user->getRoles();
+    foreach ($test_user_roles as $role) {
+      if (!in_array($role, [AccountInterface::AUTHENTICATED_ROLE])) {
+        $this->rid = $role;
+        break;
+      }
+    }
+
+    // Create admin user.
+    $this->admin_user = $this->drupalCreateUser([
+      'access content',
+      'administer content types',
+      'grant content access',
+      'grant own content access',
+      'administer nodes',
+      'access administration pages'
+    ]);
+    $this->drupalLogin($this->admin_user);
+
+    // Rebuild content access permissions.
+    node_access_rebuild();
+
+    // Create test content type.
+    $this->content_type = $this->drupalCreateContentType();
+
     // Create test node.
     $this->node1 = $this->drupalCreateNode(['type' => $this->content_type->id()]);
   }
diff --git a/src/Tests/ContentAccessModuleTestCase.php b/src/Tests/ContentAccessModuleTestCase.php
index 741e7ad..2c2afb6 100644
--- a/src/Tests/ContentAccessModuleTestCase.php
+++ b/src/Tests/ContentAccessModuleTestCase.php
@@ -2,32 +2,57 @@
 
 namespace Drupal\content_access\Tests;
 
+use Drupal\Core\Session\AccountInterface;
+use Drupal\simpletest\WebTestBase;
+
 /**
  * Automated SimpleTest Case for content access module.
  *
  * @group Access
  */
-class ContentAccessModuleTestCase extends ContentAccessTestHelp {
+class ContentAccessModuleTestCase extends WebTestBase {
+
+  use ContentAccessTestHelperTrait;
 
   /**
-   * Implementation of get_info() for information.
+   * Modules to enable.
+   *
+   * @var array
    */
-  public static function getInfo() {
-    return [
-      'name' => t('Content Access Module Tests'),
-      'description' => t(
-        'Various tests to check permission settings on nodes.'
-      ),
-      'group' => t('Content Access'),
-    ];
-  }
+  public static $modules = ['content_access'];
+
+  protected $test_user;
+  protected $admin_user;
+  protected $content_type;
+  protected $node1;
+  protected $node2;
 
   /**
    * {@inheritdoc}
    */
-  public function setUp() {
+  function setUp() {
     parent::setUp();
 
+    // Create test user with separate role.
+    $this->test_user = $this->drupalCreateUser();
+
+    // Create admin user.
+    $this->admin_user = $this->drupalCreateUser([
+      'access content',
+      'administer content types',
+      'grant content access',
+      'grant own content access',
+      'administer nodes',
+      'access administration pages'
+    ]);
+    $this->drupalLogin($this->admin_user);
+
+    // Rebuild content access permissions.
+    node_access_rebuild();
+
+    // Create test content type.
+    $this->content_type = $this->drupalCreateContentType();
+
     // Create test nodes.
     $this->node1 = $this->drupalCreateNode(['type' => $this->content_type->id()]);
     $this->node2 = $this->drupalCreateNode(['type' => $this->content_type->id()]);
diff --git a/src/Tests/ContentAccessTestHelperTrait.php b/src/Tests/ContentAccessTestHelperTrait.php
index 2171df7..01cf1be 100644
--- a/src/Tests/ContentAccessTestHelperTrait.php
+++ b/src/Tests/ContentAccessTestHelperTrait.php
@@ -5,65 +5,13 @@ namespace Drupal\content_access\Tests;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\node\NodeInterface;
 use Drupal\user\Entity\Role;
-use Drupal\simpletest\WebTestBase;
 
 /**
  * Helper class with auxiliary functions for content access module tests.
  */
-class ContentAccessTestHelp extends WebTestBase {
+trait ContentAccessTestHelperTrait {
 
-  protected $test_user;
   protected $rid = AccountInterface::AUTHENTICATED_ROLE;
-  protected $admin_user;
-  protected $content_type;
-  protected $url_content_type_name;
-  protected $node1;
-  protected $node2;
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = ['content_access', 'acl'];
-
-  /**
-   * Preparation work that is done before each test.
-   * Test users, content types, nodes etc. are created.
-   */
-  public function setUp() {
-    parent::setUp();
-
-    // Create test user with separate role.
-    $this->test_user = $this->drupalCreateUser();
-
-    // Get the value of the new role.
-    // @see drupalCreateUser().
-    $test_user_roles = $this->test_user->getRoles();
-    foreach ($test_user_roles as $role) {
-      if (!in_array($role, [AccountInterface::AUTHENTICATED_ROLE])) {
-        $this->rid = $role;
-        break;
-      }
-    }
-
-    // Create admin user.
-    $this->admin_user = $this->drupalCreateUser([
-      'access content',
-      'administer content types',
-      'grant content access',
-      'grant own content access',
-      'administer nodes',
-      'access administration pages'
-    ]);
-    $this->drupalLogin($this->admin_user);
-
-    // Rebuild content access permissions.
-    node_access_rebuild();
-
-    // Create test content type.
-    $this->content_type = $this->drupalCreateContentType();
-  }
 
   /**
    * Change access permissions for a content type.