diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index cc1e9b7..751a4c1 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -11,9 +11,8 @@ taxonomy_permissions 7.x-1.1 (2016-07-27):
   - Add a dummy test that never fails, to keep d.o's testbot happy.
 
 taxonomy_permissions 7.x-1.0 (2015-06-11):
-  - #2022707: After two years and 513 known installations it's time to create a
-    release (no functional change in this commit).
+  - #2022707: After two years and 513 known installations it's time to create a release (no functional change in this commit).
 
 taxonomy_permissions 7.x-1.0-rc1 (2013-06-18):
-  - Initial commit of Taxonomy Permissions, a module to add more permissions to
-    the Taxonomy core module.
+  - Initial commit of Taxonomy Permissions, a module to add more permissions to the Taxonomy core module.
+
diff --git a/README.txt b/README.txt
index 3ccef73..2bb547e 100644
--- a/README.txt
+++ b/README.txt
@@ -59,3 +59,4 @@ For paid support and customizations of this module or other Drupal work
 contact the maintainer through his contact form:
 
    http://drupal.org/user/82964
+
diff --git a/src/TaxonomyPermissionsControlHandler.php b/src/TaxonomyPermissionsControlHandler.php
index e512ce2..39ddf88 100644
--- a/src/TaxonomyPermissionsControlHandler.php
+++ b/src/TaxonomyPermissionsControlHandler.php
@@ -19,8 +19,8 @@ class TaxonomyPermissionsControlHandler extends EntityAccessControlHandler {
    */
   protected function checkAccess(EntityInterface $entity, $operation, AccountInterface $account) {
     switch ($operation) {
-      case 'view':
 
+      case 'view':
         return AccessResult::allowedIfHasPermissions(
             $account,
             [
@@ -30,7 +30,6 @@ class TaxonomyPermissionsControlHandler extends EntityAccessControlHandler {
             'OR');
 
       case 'create':
-
         return AccessResult::allowedIfHasPermissions(
             $account,
             [
@@ -40,7 +39,6 @@ class TaxonomyPermissionsControlHandler extends EntityAccessControlHandler {
             'OR');
 
       case 'update':
-
         return AccessResult::allowedIfHasPermissions(
             $account,
             [
@@ -50,7 +48,6 @@ class TaxonomyPermissionsControlHandler extends EntityAccessControlHandler {
             'OR');
 
       case 'delete':
-
         return AccessResult::allowedIfHasPermissions(
             $account,
             [
@@ -62,7 +59,6 @@ class TaxonomyPermissionsControlHandler extends EntityAccessControlHandler {
       default:
         // No opinion.
         return AccessResult::neutral();
-
     }
   }
 
diff --git a/tests/src/Functional/TaxonomyPermissionsTestBase.php b/src/Tests/TaxonomyPermissionsTestBase.php
similarity index 99%
rename from tests/src/Functional/TaxonomyPermissionsTestBase.php
rename to src/Tests/TaxonomyPermissionsTestBase.php
index 4224296..508bbda 100644
--- a/tests/src/Functional/TaxonomyPermissionsTestBase.php
+++ b/src/Tests/TaxonomyPermissionsTestBase.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Drupal\Tests\taxonomy_permissions\Functional;
+namespace Drupal\taxonomy_permissions\Tests;
 
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
@@ -9,7 +9,7 @@ use Drupal\Core\Entity\Display\EntityFormDisplayInterface;
 use Drupal\Core\Entity\Entity\EntityViewDisplay;
 use Drupal\Core\Entity\Display\EntityViewDisplayInterface;
 use Drupal\Tests\BrowserTestBase;
-use Drupal\taxonomy\Tests\TaxonomyTestTrait;
+use Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait;
 use Drupal\Core\Session\AccountInterface;
 
 /**