diff --git a/src/Core/Language/LanguageManagerTrait.php b/src/Core/Language/LanguageManagerTrait.php
index b0547fd..d22c17d 100644
--- a/src/Core/Language/LanguageManagerTrait.php
+++ b/src/Core/Language/LanguageManagerTrait.php
@@ -42,4 +42,4 @@ public function getLanguageManager() {
     return $this->languageManager;
   }
 
-}
\ No newline at end of file
+}
diff --git a/tests/src/Core/Extension/ModuleHandlerTraitTest.php b/tests/src/Core/Extension/ModuleHandlerTraitTest.php
index ff45caf..26d808c 100644
--- a/tests/src/Core/Extension/ModuleHandlerTraitTest.php
+++ b/tests/src/Core/Extension/ModuleHandlerTraitTest.php
@@ -2,6 +2,7 @@
 
 namespace drunomics\ServiceUtils\Tests\Core\Extension;
 
+use PHPUnit\Framework\TestCase;
 use drunomics\ServiceUtils\Core\Extension\ModuleHandlerTrait;
 use Drupal\Core\DependencyInjection\Container;
 use Drupal\Core\Extension\ModuleHandlerInterface;
@@ -10,7 +11,7 @@
  * @coversDefaultClass \drunomics\ServiceUtils\Core\Extension\ModuleHandlerTrait
  * @group ServiceUtils
  */
-class ModuleHandlerTraitTest extends \PHPUnit\Framework\TestCase {
+class ModuleHandlerTraitTest extends TestCase {
 
   use ModuleHandlerTrait;
 
diff --git a/tests/src/Core/Path/AliasManagerTraitTest.php b/tests/src/Core/Path/AliasManagerTraitTest.php
index 7bd4293..bba4c35 100644
--- a/tests/src/Core/Path/AliasManagerTraitTest.php
+++ b/tests/src/Core/Path/AliasManagerTraitTest.php
@@ -39,7 +39,7 @@ public function testGetter() {
    * @covers ::setAliasManager
    */
   public function testSetter() {
-//     Verify the set service is returned.
+    // Verify the set service is returned.
     $this->mockContainerWithFakeService(['calls' => 0]);
     $service = $this->prophesize()
       ->willImplement(AliasManagerInterface::class)