diff --git a/src/Engine/RulesComponent.php b/src/Engine/RulesComponent.php
index d997d2a1a10b2430c2cf2edd41dbf678bcf85a16..814cf4014e449bc4cd08bf05b25d8fdd0783e1f5 100644
--- a/src/Engine/RulesComponent.php
+++ b/src/Engine/RulesComponent.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\rules\Engine;
 
-use Drupal\Core\TypedData\TypedDataManagerInterface;
 use Drupal\rules\Context\ContextDefinitionInterface;
 
 /**
@@ -61,7 +60,7 @@ class RulesComponent {
    * @param \Drupal\rules\Engine\ExpressionInterface $expression
    *   The expression of the component.
    */
-  protected function __construct($expression) {
+  protected function __construct(ExpressionInterface $expression) {
     $this->state = RulesState::create();
     $this->expression = $expression;
   }
@@ -89,7 +88,7 @@ class RulesComponent {
   /**
    * Adds a context definition.
    *
-   * @param $name
+   * @param string $name
    *   The name of the context to add.
    * @param \Drupal\rules\Context\ContextDefinitionInterface $definition
    *   The definition to add.
diff --git a/src/Engine/RulesStateInterface.php b/src/Engine/RulesStateInterface.php
index a59d05f3e18eec772567a252e5be859a2cb7486d..3ab6597af06363c5eb569dc3207459caba0901ca 100644
--- a/src/Engine/RulesStateInterface.php
+++ b/src/Engine/RulesStateInterface.php
@@ -19,7 +19,7 @@ interface RulesStateInterface {
   /**
    * Adds a state variable based on its definition and value.
    *
-   * @param $name
+   * @param string $name
    *   The context variable name.
    * @param \Drupal\rules\Context\ContextDefinitionInterface $definition
    *   The context definition of the variable.
diff --git a/tests/src/Integration/Engine/RulesComponentTest.php b/tests/src/Integration/Engine/RulesComponentTest.php
index 4947cae37215888ba650868ca76aabd16353071b..e0bb292633a543a3e5e4152a31e765164514e0a4 100644
--- a/tests/src/Integration/Engine/RulesComponentTest.php
+++ b/tests/src/Integration/Engine/RulesComponentTest.php
@@ -16,6 +16,7 @@ use Drupal\Tests\rules\Integration\RulesIntegrationTestBase;
  * Tests the Rules component class.
  *
  * @group rules
+ *
  * @cover RulesComponent
  */
 class RulesComponentTest extends RulesIntegrationTestBase {
@@ -39,4 +40,5 @@ class RulesComponentTest extends RulesIntegrationTestBase {
     // Ensure the provided context is returned.
     // $this->assertTrue(isset($result['concatenated']) && $result['concatenated'] == 'foo.foo');
   }
+
 }
diff --git a/tests/src/Kernel/ConfigEntityDefaultsTest.php b/tests/src/Kernel/ConfigEntityDefaultsTest.php
index cf0f50a9c53f72b1444c9fe860ed61d8f25acc60..7c73ed46fff0bafe5124fa5d1e183cb6014cbf48 100644
--- a/tests/src/Kernel/ConfigEntityDefaultsTest.php
+++ b/tests/src/Kernel/ConfigEntityDefaultsTest.php
@@ -65,7 +65,6 @@ class ConfigEntityDefaultsTest extends RulesDrupalTestBase {
     $user = $this->entityTypeManager->getStorage('user')
       ->create(array('mail' => 'test@example.com'));
 
-    /** @var $config_entity \Drupal\rules\Entity\RulesComponent */
     $config_entity
       ->getComponent()
       ->setContextValue('user', $user)
diff --git a/tests/src/Unit/RuleTest.php b/tests/src/Unit/RuleTest.php
index e69b37c846f9bb13b8d5177146eca9eabd196c18..e6c481b5e87ff909f8252e731e924bede451e2f6 100644
--- a/tests/src/Unit/RuleTest.php
+++ b/tests/src/Unit/RuleTest.php
@@ -7,13 +7,7 @@
 
 namespace Drupal\Tests\rules\Unit;
 
-use Drupal\Core\DependencyInjection\ContainerBuilder;
-use Drupal\Core\Entity\EntityInterface;
-use Drupal\rules\Context\ContextDefinitionInterface;
-use Drupal\rules\Engine\ConditionExpressionInterface;
-use Drupal\Core\TypedData\TypedDataManagerInterface;
 use Drupal\rules\Engine\ExpressionManagerInterface;
-use Drupal\rules\Engine\RulesComponent;
 use Drupal\rules\Engine\RulesStateInterface;
 use Drupal\rules\Plugin\RulesExpression\Rule;
 use Drupal\rules\Plugin\RulesExpression\RulesAnd;