diff -u b/admin_toolbar_search/admin_toolbar_search.services.yml b/admin_toolbar_search/admin_toolbar_search.services.yml
--- b/admin_toolbar_search/admin_toolbar_search.services.yml
+++ b/admin_toolbar_search/admin_toolbar_search.services.yml
@@ -7,4 +7,4 @@
      - '@router.route_provider'
      - '@cache_contexts_manager'
      - '@cache.toolbar'
-     - 'config.factory'
+     - '@config.factory'
diff -u b/admin_toolbar_search/src/SearchLinks.php b/admin_toolbar_search/src/SearchLinks.php
--- b/admin_toolbar_search/src/SearchLinks.php
+++ b/admin_toolbar_search/src/SearchLinks.php
@@ -99,7 +99,6 @@
    */
   public function getLinks() {
     $max_bundle_number = $this->config->get('max_bundle_number');
-    $i = 0;
     $additional_keys = $this->cacheContextManager->convertTokensToKeys([
       'languages:' . LanguageInterface::TYPE_INTERFACE,
       'user.permissions',
diff -u b/admin_toolbar_search/tests/src/FunctionalJavascript/AdminToolbarToolsSearchTest.php b/admin_toolbar_search/tests/src/FunctionalJavascript/AdminToolbarToolsSearchTest.php
--- b/admin_toolbar_search/tests/src/FunctionalJavascript/AdminToolbarToolsSearchTest.php
+++ b/admin_toolbar_search/tests/src/FunctionalJavascript/AdminToolbarToolsSearchTest.php
@@ -67,6 +67,16 @@
       'ruby' => 'Ruby',
       'teddy' => 'Teddy',
       'toby' => 'Toby',
+      'tonga' => 'Tonga',
+      'tracey' => 'Tracey',
+      'tuna' => 'Tuna',
+      'uno' => 'Uno',
+      'venus' => 'Venus',
+      'vicky' => 'Vicky',
+      'wimpy' => 'Wimpy',
+      'yellow' => 'Yellow',
+      'zac' => 'zac',
+      'zora' => 'zora',
     ];
 
     foreach ($dog_names as $machine_name => $label) {
@@ -118,15 +128,6 @@
     $this->drupalGet('/admin/admin-toolbar-search');
 
     $search_menus = [
-      'cora',
-      'eleanor',
-      'eloise',
-      'felix',
-      'freya',
-      'genevieve',
-      'isla',
-      'jasper',
-      'luna',
       'maeve',
       'milo',
       'nora',
@@ -185,11 +186,11 @@
     $this->assertSuggestionContains('lola', 'admin/structure/media/manage/lola/fields');
 
     // Assert that a link after the limit doesn't appear in admin toolbar.
-    $toby_url = '/admin/structure/media/manage/toby/fields';
-    $assert_session->elementNotContains('css', '#toolbar-administration', $toby_url);
+    $zora_url = '/admin/structure/media/manage/zora/fields';
+    $assert_session->elementNotContains('css', '#toolbar-administration', $zora_url);
 
     // Assert that a link excluded from admin toolbar appears in search.
-    $this->assertSuggestionContains('toby', $toby_url);
+    $this->assertSuggestionContains('zora', $zora_url);
 
     // Test that adding a new bundle updates the extra links loaded from
     // admin_toolbar.search route.
@@ -204,12 +205,12 @@
 
     // Test that deleting a bundle updates the extra links loaded from
     // admin_toolbar.search route.
-    $toby = MediaType::load('toby');
-    $toby->delete();
+    $zora = MediaType::load('zora');
+    $zora->delete();
 
     $this->getSession()->reload();
     $assert_session->waitForElementVisible('css', $search_tray);
-    $this->assertSuggestionNotContains('toby', $toby_url);
+    $this->assertSuggestionNotContains('zora', $zora);
   }
 
 }
only in patch2:
unchanged:
--- a/tests/src/Functional/AdminToolbarToolsSortTest.php
+++ b/tests/src/Functional/AdminToolbarToolsSortTest.php
@@ -120,18 +120,23 @@ class AdminToolbarToolsSortTest extends BrowserTestBase {
     ]);
 
     $menus = [
-      'aaa' => 'lll',
-      'bbb' => 'kkk',
-      'ccc' => 'jjj',
-      'ddd' => 'iii',
-      'eee' => 'hhh',
-      'fff' => 'ggg',
-      'ggg' => 'fff',
-      'hhh' => 'eee',
-      'iii' => 'ddd',
-      'jjj' => 'ccc',
-      'kkk' => 'bbb',
-      'lll' => 'aaa',
+      'aaa' => 'qqq',
+      'bbb' => 'ppp',
+      'ccc' => 'ooo',
+      'ddd' => 'nnn',
+      'eee' => 'mmm',
+      'fff' => 'lll',
+      'ggg' => 'kkk',
+      'hhh' => 'jjj',
+      'iii' => 'iii',
+      'jjj' => 'hhh',
+      'kkk' => 'ggg',
+      'lll' => 'fff',
+      'mmm' => 'eee',
+      'nnn' => 'ddd',
+      'ooo' => 'ccc',
+      'ppp' => 'bbb',
+      'qqq' => 'aaa',
     ];
 
     foreach ($menus as $machine_name => $label) {
@@ -155,34 +160,63 @@ class AdminToolbarToolsSortTest extends BrowserTestBase {
     }
 
     $expected = [
-      0 => '/admin/structure/menu/manage/lll',
-      1 => '/admin/structure/menu/manage/lll/add',
-      2 => '/admin/structure/menu/manage/lll/delete',
+      0 => '/admin/structure/menu/manage/qqq',
+      1 => '/admin/structure/menu/manage/qqq/add',
+      2 => '/admin/structure/menu/manage/qqq/delete',
       3 => '/admin/structure/menu/manage/admin',
       4 => '/admin/structure/menu/manage/admin/add',
-      5 => '/admin/structure/menu/manage/kkk',
-      6 => '/admin/structure/menu/manage/kkk/add',
-      7 => '/admin/structure/menu/manage/kkk/delete',
-      8 => '/admin/structure/menu/manage/jjj',
-      9 => '/admin/structure/menu/manage/jjj/add',
-      10 => '/admin/structure/menu/manage/jjj/delete',
-      11 => '/admin/structure/menu/manage/iii',
-      12 => '/admin/structure/menu/manage/iii/add',
-      13 => '/admin/structure/menu/manage/iii/delete',
-      14 => '/admin/structure/menu/manage/hhh',
-      15 => '/admin/structure/menu/manage/hhh/add',
-      16 => '/admin/structure/menu/manage/hhh/delete',
-      17 => '/admin/structure/menu/manage/ggg',
-      18 => '/admin/structure/menu/manage/ggg/add',
-      19 => '/admin/structure/menu/manage/ggg/delete',
+      5 => '/admin/structure/menu/manage/ppp',
+      6 => '/admin/structure/menu/manage/ppp/add',
+      7 => '/admin/structure/menu/manage/ppp/delete',
+      8 => '/admin/structure/menu/manage/ooo',
+      9 => '/admin/structure/menu/manage/ooo/add',
+      10 => '/admin/structure/menu/manage/ooo/delete',
+      11 => '/admin/structure/menu/manage/nnn',
+      12 => '/admin/structure/menu/manage/nnn/add',
+      13 => '/admin/structure/menu/manage/nnn/delete',
+      14 => '/admin/structure/menu/manage/mmm',
+      15 => '/admin/structure/menu/manage/mmm/add',
+      16 => '/admin/structure/menu/manage/mmm/delete',
+      17 => '/admin/structure/menu/manage/lll',
+      18 => '/admin/structure/menu/manage/lll/add',
+      19 => '/admin/structure/menu/manage/lll/delete',
       20 => '/admin/structure/menu/manage/footer',
       21 => '/admin/structure/menu/manage/footer/add',
-      22 => '/admin/structure/menu/manage/fff',
-      23 => '/admin/structure/menu/manage/fff/add',
-      24 => '/admin/structure/menu/manage/fff/delete',
-      25 => '/admin/structure/menu/manage/eee',
-      26 => '/admin/structure/menu/manage/eee/add',
-      27 => '/admin/structure/menu/manage/eee/delete',
+      22 => '/admin/structure/menu/manage/kkk',
+      23 => '/admin/structure/menu/manage/kkk/add',
+      24 => '/admin/structure/menu/manage/kkk/delete',
+      25 => '/admin/structure/menu/manage/jjj',
+      26 => '/admin/structure/menu/manage/jjj/add',
+      27 => '/admin/structure/menu/manage/jjj/delete',
+      28 => '/admin/structure/menu/manage/iii',
+      29 => '/admin/structure/menu/manage/iii/add',
+      30 => '/admin/structure/menu/manage/iii/delete',
+      31 => '/admin/structure/menu/manage/hhh',
+      32 => '/admin/structure/menu/manage/hhh/add',
+      33 => '/admin/structure/menu/manage/hhh/delete',
+      34 => '/admin/structure/menu/manage/ggg',
+      35 => '/admin/structure/menu/manage/ggg/add',
+      36 => '/admin/structure/menu/manage/ggg/delete',
+      37 => '/admin/structure/menu/manage/fff',
+      38 => '/admin/structure/menu/manage/fff/add',
+      39 => '/admin/structure/menu/manage/fff/delete',
+      40 => '/admin/structure/menu/manage/main',
+      41 => '/admin/structure/menu/manage/main/add',
+      42 => '/admin/structure/menu/manage/eee',
+      43 => '/admin/structure/menu/manage/eee/add',
+      44 => '/admin/structure/menu/manage/eee/delete',
+      45 => '/admin/structure/menu/manage/ddd',
+      46 => '/admin/structure/menu/manage/ddd/add',
+      47 => '/admin/structure/menu/manage/ddd/delete',
+      48 => '/admin/structure/menu/manage/ccc',
+      49 => '/admin/structure/menu/manage/ccc/add',
+      50 => '/admin/structure/menu/manage/ccc/delete',
+      51 => '/admin/structure/menu/manage/bbb',
+      52 => '/admin/structure/menu/manage/bbb/add',
+      53 => '/admin/structure/menu/manage/bbb/delete',
+      54 => '/admin/structure/menu/manage/aaa',
+      55 => '/admin/structure/menu/manage/aaa/add',
+      56 => '/admin/structure/menu/manage/aaa/delete',
     ];
 
     foreach ($links as $key => $link) {