diff --git a/modules/demo/config/install/search_api.index.demo.yml b/modules/demo/config/install/search_api.index.demo.yml
index e6d5e0b..cde4f69 100644
--- a/modules/demo/config/install/search_api.index.demo.yml
+++ b/modules/demo/config/install/search_api.index.demo.yml
@@ -5,14 +5,14 @@ read_only: false
 options:
   index_directly: true
   cron_limit: 50
-  processors:
-    language:
-      processor_id: language
-      weights: {  }
-      settings: {  }
-  fields:
-    search_api_language:
-      type: string
+processors:
+  language:
+    processor_id: language
+    weights: {  }
+    settings: {  }
+fields:
+  search_api_language:
+    type: string
 datasources:
   - 'entity:node'
 datasource_configs:
diff --git a/src/Tests/MonitoringSearchAPITest.php b/src/Tests/MonitoringSearchAPITest.php
index f064ea4..a54b5b5 100644
--- a/src/Tests/MonitoringSearchAPITest.php
+++ b/src/Tests/MonitoringSearchAPITest.php
@@ -42,7 +42,7 @@ class MonitoringSearchAPITest extends MonitoringUnitTestBase {
     parent::setUp();
     // Install required database tables for each module.
     $this->installSchema('search_api', ['search_api_item', 'search_api_task']);
-    $this->installSchema('system', ['router']);
+    $this->installSchema('system', ['router', 'queue', 'key_value_expire']);
     $this->installSchema('user', ['users_data']);
 
     // Install the schema for entity entity_test.
@@ -55,7 +55,7 @@ class MonitoringSearchAPITest extends MonitoringUnitTestBase {
 
     // @todo Remove workaround for outdated SearchAPI Version on testbot.
     if (\Drupal::hasService('search_api.index_task_manager')) {
-      Utility::getIndexTaskManager()
+      \Drupal::service('search_api.index_task_manager')
         ->addItemsAll(Index::load('database_search_index'));
     }
   }
@@ -77,7 +77,7 @@ class MonitoringSearchAPITest extends MonitoringUnitTestBase {
 
     // Update the index to test sensor result.
     $index = Index::load('database_search_index');
-    $index->index();
+    $index->indexItems();
 
     $entity = EntityTest::create(array('type' => 'article'));
     $entity->save();
@@ -91,7 +91,7 @@ class MonitoringSearchAPITest extends MonitoringUnitTestBase {
     $this->assertEqual($result->getValue(), 3);
 
     $index = Index::load('database_search_index');
-    $index->index();
+    $index->indexItems();
 
     // Everything should be indexed.
     $result = $this->runSensor('search_api_database_search_index');