diff --git a/checklistapi.menu_links.yml b/checklistapi.menu_links.yml
new file mode 100644
index 0000000..09ec540
--- /dev/null
+++ b/checklistapi.menu_links.yml
@@ -0,0 +1,5 @@
+checklistapi.report:
+  title: Checklists
+  description: Get an overview of your installed checklists with progress details.
+  route_name: checklistapi.report
+  parent: system.admin_reports
diff --git a/checklistapi.module b/checklistapi.module
index 6cb56d8..8948558 100644
--- a/checklistapi.module
+++ b/checklistapi.module
@@ -118,23 +118,6 @@ function checklistapi_help($path, $arg) {
 }
 
 /**
- * Implements hook_menu_link_defaults().
- */
-function checklistapi_menu_link_defaults() {
-  $links = array();
-
-  // Checklists report.
-  $links['admin/reports/checklistapi'] = array(
-    'link_title' => 'Checklists',
-    'description' => 'Get an overview of your installed checklists with progress details.',
-    'route_name' => 'checklistapi.report',
-    'parent' => 'system.admin_reports',
-  );
-
-  return $links;
-}
-
-/**
  * Implements hook_permission().
  */
 function checklistapi_permission() {
diff --git a/checklistapiexample/checklistapiexample.info.yml b/checklistapiexample/checklistapiexample.info.yml
index 4bd0aac..07bec15 100644
--- a/checklistapiexample/checklistapiexample.info.yml
+++ b/checklistapiexample/checklistapiexample.info.yml
@@ -1,4 +1,4 @@
-name: Checklist API example
+name: Checklist API Example
 type: module
 description: Provides an example implementation of the Checklist API.
 version: VERSION
diff --git a/checklistapiexample/checklistapiexample.menu_links.yml b/checklistapiexample/checklistapiexample.menu_links.yml
new file mode 100644
index 0000000..8dcb84a
--- /dev/null
+++ b/checklistapiexample/checklistapiexample.menu_links.yml
@@ -0,0 +1,5 @@
+checklistapiexample.checklist:
+  title: Checklist API example
+  description: An example implementation of the Checklist API.
+  route_name: checklistapi.checklists.example_checklist
+  parent: system.admin_config_development
diff --git a/lib/Drupal/checklistapi/Tests/ChecklistapiTest.php b/lib/Drupal/checklistapi/Tests/ChecklistapiTest.php
index c667e94..310f690 100644
--- a/lib/Drupal/checklistapi/Tests/ChecklistapiTest.php
+++ b/lib/Drupal/checklistapi/Tests/ChecklistapiTest.php
@@ -19,6 +19,11 @@ use Drupal\simpletest\WebTestBase;
 class ChecklistapiTest extends WebTestBase {
 
   /**
+   * {@inheritdoc}
+   */
+  public static $modules = array('checklistapi', 'checklistapiexample', 'help', 'block');
+
+  /**
    * @var \Drupal\user\Entity\User
    *   A user object with permission to edit any checklist.
    */
@@ -39,10 +44,18 @@ class ChecklistapiTest extends WebTestBase {
    * {@inheritdoc}
    */
   public function setUp() {
-    parent::setUp('checklistapi_example');
+    parent::setUp();
+
+    // Create a privileged user.
     $permissions = array('edit any checklistapi checklist');
     $this->privilegedUser = $this->drupalCreateUser($permissions);
     $this->drupalLogin($this->privilegedUser);
+
+    // Place help block.
+    $this->drupalPlaceBlock('system_help_block', array(
+      'label' => '',
+      'region' => 'help',
+    ));
   }
 
   /**
@@ -67,14 +80,11 @@ class ChecklistapiTest extends WebTestBase {
    * Tests checklist composition.
    */
   public function testChecklistComposition() {
-    // $menu_item = menu_get_item('admin/config/development/checklistapi-example');
-    // $this->assertEqual($menu_item['path'], 'admin/config/development/checklistapi-example', 'Created per-checklist menu item.');
-
     $permissions = array('edit example_checklist checklistapi checklist');
     $this->assertTrue($this->checkPermissions($permissions), 'Created per-checklist permission.');
 
     $this->drupalGet('admin/config/development/checklistapi-example');
-    $this->assertRaw('id="block-system-help"', 'Created per-checklist help block.');
+    $this->assertRaw('This checklist based on', 'Created per-checklist help block.');
   }
 
 }