diff --git a/tests/src/Unit/EntityTypeBundleInfoTest.php b/tests/src/Unit/EntityTypeBundleInfoTest.php
index f084062..ed2d109 100644
--- a/tests/src/Unit/EntityTypeBundleInfoTest.php
+++ b/tests/src/Unit/EntityTypeBundleInfoTest.php
@@ -1,12 +1,14 @@
 <?php
 
 namespace Drupal\Tests\eck\Unit;
+
 use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Extension\ModuleHandlerInterface;
+use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\TypedData\TypedDataManagerInterface;
 use Drupal\eck\EckEntityTypeBundleInfo;
 use PHPUnit_Framework_MockObject_MockObject;
@@ -14,14 +16,19 @@ use PHPUnit_Framework_MockObject_MockObject;
 /**
  * Tests the form element implementation.
  *
- * @group eck
+ * @group Eck
  */
 class EntityTypeBundleInfoTest extends UnitTestBase {
 
+  /** @var EntityTypeManagerInterface */
   protected $entityTypeManagerMock;
+  /** @var LanguageManagerInterface */
   protected $languageManagerMock;
+  /** @var ModuleHandlerInterface */
   protected $moduleHandlerMock;
+  /** @var TypedDataManagerInterface */
   protected $typedDataManagerMock;
+  /** @var CacheBackendInterface */
   protected $cacheBackendMock;
 
   /**
@@ -51,8 +58,8 @@ class EntityTypeBundleInfoTest extends UnitTestBase {
   /**
    * @test
    */
-  public function cachesData() {
-    $this->cacheBackendMock = $this->cacheBackendMock = $this->getMockForAbstractClass(CacheBackendInterface::class);
+  public function entityTypeHasBundlesMethodCachesData() {
+    $this->cacheBackendMock = $this->getMockForAbstractClass(CacheBackendInterface::class);
     $this->cacheBackendMock->expects($this->once())->method('set');
     $sut = $this->createNewTestSubject();
     $sut->entityTypeHasBundles('test');
@@ -63,10 +70,10 @@ class EntityTypeBundleInfoTest extends UnitTestBase {
    */
   public function usesCachedDataWhenAvailable() {
     $this->cacheBackendMock = $this->cacheBackendMock = $this->getMockForAbstractClass(CacheBackendInterface::class);
-    $this->cacheBackendMock->expects($this->once())->method('get')->willReturn((object) ['data' =>'test']);
+    $this->cacheBackendMock->expects($this->once())->method('get')->willReturn((object) ['data' =>'obviously not normal bundle info']);
 
     $sut = $this->createNewTestSubject();
-    $this->assertSame('test', $sut->getAllBundleInfo());
+    $this->assertSame('obviously not normal bundle info', $sut->getAllBundleInfo());
   }
 
   /**
@@ -74,7 +81,7 @@ class EntityTypeBundleInfoTest extends UnitTestBase {
    */
   public function returnsNoMachineNamesIfEntityTypeDoesNotExist() {
     $sut = $this->createNewTestSubject();
-    $this->assertSame([], $sut->getEntityTypeBundleMachineNames('non_existing_entity_type'));
+    $this->assertEmpty($sut->getEntityTypeBundleMachineNames('non_existing_entity_type'));
   }
 
   /**
@@ -82,7 +89,7 @@ class EntityTypeBundleInfoTest extends UnitTestBase {
    */
   public function returnsNoMachineNamesIfEntityTypeHasNoBundles() {
     $sut = $this->createNewTestSubjectWithEntityType();
-    $this->assertSame([], $sut->getEntityTypeBundleMachineNames('existing_entity_type'));
+    $this->assertEmpty($sut->getEntityTypeBundleMachineNames('existing_entity_type'));
   }
 
   /**
@@ -123,20 +130,20 @@ class EntityTypeBundleInfoTest extends UnitTestBase {
    * @return EckEntityTypeBundleInfo
    */
   protected function createNewTestSubject() {
-    if (!isset($this->entityTypeManagerMock)) {
+    if (empty($this->entityTypeManagerMock)) {
       $this->entityTypeManagerMock = $this->getMockForAbstractClass(EntityTypeManagerInterface::class);
       $this->entityTypeManagerMock->method('getDefinitions')->willReturn([]);
     }
-    if (!isset($this->languageManagerMock)) {
+    if (empty($this->languageManagerMock)) {
       $this->languageManagerMock = $this->createLanguageManagerMock();
     }
-    if (!isset($this->moduleHandlerMock)) {
+    if (empty($this->moduleHandlerMock)) {
       $this->moduleHandlerMock = $this->getMockForAbstractClass(ModuleHandlerInterface::class);
     }
-    if (!isset($this->typedDataManagerMock)) {
+    if (empty($this->typedDataManagerMock)) {
       $this->typedDataManagerMock = $this->getMockForAbstractClass(TypedDataManagerInterface::class);
     }
-    if (!isset($this->cacheBackendMock)) {
+    if (empty($this->cacheBackendMock)) {
       $this->cacheBackendMock = $this->getMockForAbstractClass(CacheBackendInterface::class);
     }
 
@@ -144,48 +151,48 @@ class EntityTypeBundleInfoTest extends UnitTestBase {
   }
 
   /**
-   * @param PHPUnit_Framework_MockObject_MockObject $entity_type_mock
-   * @param PHPUnit_Framework_MockObject_MockObject $entity_storage_mock
+   * @param PHPUnit_Framework_MockObject_MockObject $entityTypeMock
+   * @param PHPUnit_Framework_MockObject_MockObject $entityStorageMock
    *
    * @return EckEntityTypeBundleInfo
    */
-  protected function createNewTestSubjectWithEntityType(PHPUnit_Framework_MockObject_MockObject $entity_type_mock = NULL, PHPUnit_Framework_MockObject_MockObject$entity_storage_mock = NULL) {
-    if (!isset($entity_type_mock)) {
-      $entity_type_mock = $this->getMockForAbstractClass(EntityTypeInterface::class);
-      $entity_type_mock->method('getBundleEntityType')
+  protected function createNewTestSubjectWithEntityType(PHPUnit_Framework_MockObject_MockObject $entityTypeMock = NULL, PHPUnit_Framework_MockObject_MockObject$entityStorageMock = NULL) {
+    if (empty($entityTypeMock)) {
+      $entityTypeMock = $this->getMockForAbstractClass(EntityTypeInterface::class);
+      $entityTypeMock->method('getBundleEntityType')
         ->willReturn('eck_entity_bundle');
     }
-    if (!isset($entity_storage_mock)) {
-      $entity_storage_mock = $this->getMockForAbstractClass(EntityStorageInterface::class);
-      $entity_storage_mock->method('loadMultiple')->willReturn([]);
+    if (empty($entityStorageMock)) {
+      $entityStorageMock = $this->getMockForAbstractClass(EntityStorageInterface::class);
+      $entityStorageMock->method('loadMultiple')->willReturn([]);
     }
 
     $this->entityTypeManagerMock = $this->getMockForAbstractClass(EntityTypeManagerInterface::class);
     $this->entityTypeManagerMock->method('getDefinitions')
-      ->willReturn(['existing_entity_type' => $entity_type_mock]);
+      ->willReturn(['existing_entity_type' => $entityTypeMock]);
     $this->entityTypeManagerMock->method('getStorage')
-      ->willReturn($entity_storage_mock);
+      ->willReturn($entityStorageMock);
 
     return $this->createNewTestSubject();
   }
 
   /**
-   * @param int $number_of_bundles
+   * @param int $numberOfBundlesToCreate
    *
    * @return EckEntityTypeBundleInfo
    */
-  protected function createNewTestSubjectWithEntityTypeAndBundles($number_of_bundles = 1) {
+  protected function createNewTestSubjectWithEntityTypeAndBundles($numberOfBundlesToCreate = 1) {
     $bundles = [];
-    for ($i = 0; $i < $number_of_bundles; $i++) {
-      $machine_name = $this->randomMachineName();
-      $bundle_mock = $this->getMockForAbstractClass(EntityInterface::class);
-      $bundle_mock->method('id')->willReturn(strtolower($machine_name));
-      $bundle_mock->method('label')->willReturn($machine_name);
-      $bundles[strtolower($machine_name)] = $bundle_mock;
+    for ($i = 0; $i < $numberOfBundlesToCreate; $i++) {
+      $machineName = $this->randomMachineName();
+      $bundleMock = $this->getMockForAbstractClass(EntityInterface::class);
+      $bundleMock->method('id')->willReturn(strtolower($machineName));
+      $bundleMock->method('label')->willReturn($machineName);
+      $bundles[strtolower($machineName)] = $bundleMock;
     }
-    $entity_storage_mock = $this->getMockForAbstractClass(EntityStorageInterface::class);
-    $entity_storage_mock->method('loadMultiple')->willReturn($bundles);
-    return $this->createNewTestSubjectWithEntityType(NULL, $entity_storage_mock);
+    $entityStorageMock = $this->getMockForAbstractClass(EntityStorageInterface::class);
+    $entityStorageMock->method('loadMultiple')->willReturn($bundles);
+    return $this->createNewTestSubjectWithEntityType(NULL, $entityStorageMock);
   }
 
 }