diff --git a/modules/chatbot_api_entities/src/Form/EntityCollectionForm.php b/modules/chatbot_api_entities/src/Form/EntityCollectionForm.php
index 3a447d8..20d3b41 100644
--- a/modules/chatbot_api_entities/src/Form/EntityCollectionForm.php
+++ b/modules/chatbot_api_entities/src/Form/EntityCollectionForm.php
@@ -130,7 +130,7 @@ class EntityCollectionForm extends EntityForm {
       '#type' => 'select',
       '#options' => $options,
       '#title' => $this->t('Entity Type'),
-      '#description' => $this->t('Choose the entity type for the entities to comprise this collection.'),
+      '#description' => $this->t('Choose the entity type for the entities to comprise this collection. Creating and update entities of this time will queue the collection to be sent to the remote endpoint during the next cron run.'),
       '#default_value' => $default_entity_type,
       '#ajax' => [
         'wrapper' => 'edit-configuration-container',
@@ -281,13 +281,13 @@ class EntityCollectionForm extends EntityForm {
 
     switch ($status) {
       case SAVED_NEW:
-        drupal_set_message($this->t('Created the %label collection.', [
+        drupal_set_message($this->t('Created the %label collection. The collection has been queued for sending during the next cron run.', [
           '%label' => $chatbot_api_entities_collection->label(),
         ]));
         break;
 
       default:
-        drupal_set_message($this->t('Saved the %label collection.', [
+        drupal_set_message($this->t('Saved the %label collection. The collection has been queued for sending during the next cron run.', [
           '%label' => $chatbot_api_entities_collection->label(),
         ]));
     }
diff --git a/modules/chatbot_api_entities/src/Plugin/QueryHandlerBase.php b/modules/chatbot_api_entities/src/Plugin/QueryHandlerBase.php
index c11df8e..a1d2438 100644
--- a/modules/chatbot_api_entities/src/Plugin/QueryHandlerBase.php
+++ b/modules/chatbot_api_entities/src/Plugin/QueryHandlerBase.php
@@ -8,12 +8,4 @@ use Drupal\Component\Plugin\PluginBase;
  * Base class for Query handler plugins.
  */
 abstract class QueryHandlerBase extends PluginBase implements QueryHandlerInterface {
-
-  /**
-   * {@inheritdoc}
-   */
-  public function isEnabled() {
-    return !empty($this->configuration['status']);
-  }
-
 }
diff --git a/modules/chatbot_api_entities/src/Plugin/QueryHandlerInterface.php b/modules/chatbot_api_entities/src/Plugin/QueryHandlerInterface.php
index b6b80c2..d289e34 100644
--- a/modules/chatbot_api_entities/src/Plugin/QueryHandlerInterface.php
+++ b/modules/chatbot_api_entities/src/Plugin/QueryHandlerInterface.php
@@ -37,12 +37,4 @@ interface QueryHandlerInterface extends PluginInspectionInterface {
    */
   public function applies($entity_type_id);
 
-  /**
-   * Check if plugin is enabled.
-   *
-   * @return bool
-   *   TRUE if enabled.
-   */
-  public function isEnabled();
-
 }
diff --git a/modules/chatbot_api_entities/tests/src/Functional/ChatbotApiEntitiesFunctionalTest.php b/modules/chatbot_api_entities/tests/src/Functional/ChatbotApiEntitiesFunctionalTest.php
index 40293d1..e7fea59 100644
--- a/modules/chatbot_api_entities/tests/src/Functional/ChatbotApiEntitiesFunctionalTest.php
+++ b/modules/chatbot_api_entities/tests/src/Functional/ChatbotApiEntitiesFunctionalTest.php
@@ -11,6 +11,8 @@ use Drupal\Tests\chatbot_api_entities\Traits\ChatbotApiEntitiesTestTrait;
 
 /**
  * Tests Chatbot API Entities UI functionality.
+ *
+ * @group chatbot_api
  */
 class ChatbotApiEntitiesFunctionalTest extends BrowserTestBase {
 
diff --git a/modules/chatbot_api_entities/tests/src/Kernel/ChatbotApiEntityIntegrationTest.php b/modules/chatbot_api_entities/tests/src/Kernel/ChatbotApiEntityIntegrationTest.php
index 2e23de1..034e1bd 100644
--- a/modules/chatbot_api_entities/tests/src/Kernel/ChatbotApiEntityIntegrationTest.php
+++ b/modules/chatbot_api_entities/tests/src/Kernel/ChatbotApiEntityIntegrationTest.php
@@ -14,7 +14,7 @@ use Drupal\Tests\chatbot_api_entities\Traits\ChatbotApiEntitiesTestTrait;
 /**
  * Tests chatbot api integration with entity hooks.
  *
- * @group chatbot_api_entities
+ * @group chatbot_api
  */
 class ChatbotApiEntityIntegrationTest extends KernelTestBase {