diff --git a/admin_views_default/comment.admin-content-comment.inc b/admin_views_default/comment.admin-content-comment.inc
index d217e6b..0e02166 100644
--- a/admin_views_default/comment.admin-content-comment.inc
+++ b/admin_views_default/comment.admin-content-comment.inc
@@ -241,7 +241,7 @@ $handler->display->display_options['filters']['name']['exposed'] = TRUE;
 $handler->display->display_options['filters']['name']['expose']['operator_id'] = 'name_op';
 $handler->display->display_options['filters']['name']['expose']['label'] = 'Author';
 $handler->display->display_options['filters']['name']['expose']['operator'] = 'name_op';
-$handler->display->display_options['filters']['name']['expose']['identifier'] = 'name';
+$handler->display->display_options['filters']['name']['expose']['identifier'] = 'author';
 /* Filter criterion: Content: Title */
 $handler->display->display_options['filters']['title']['id'] = 'title';
 $handler->display->display_options['filters']['title']['table'] = 'node';
@@ -252,7 +252,7 @@ $handler->display->display_options['filters']['title']['exposed'] = TRUE;
 $handler->display->display_options['filters']['title']['expose']['operator_id'] = 'title_op';
 $handler->display->display_options['filters']['title']['expose']['label'] = 'Posted in';
 $handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op';
-$handler->display->display_options['filters']['title']['expose']['identifier'] = 'title';
+$handler->display->display_options['filters']['title']['expose']['identifier'] = 'nodeTitle';
 /* Filter criterion: Comment: Approved */
 $handler->display->display_options['filters']['status']['id'] = 'status';
 $handler->display->display_options['filters']['status']['table'] = 'comment';
@@ -263,9 +263,56 @@ $handler->display->display_options['filters']['status']['expose']['label'] = 'Pu
 $handler->display->display_options['filters']['status']['expose']['identifier'] = 'status';
 $handler->display->display_options['filters']['status']['expose']['remember'] = TRUE;
 
-/* Display: System */
-$handler = $view->new_display('system', 'System', 'system_1');
+/* Display: Comments */
+$handler = $view->new_display('system', 'Comments', 'system_1');
 $handler->display->display_options['path'] = 'admin/content/comment';
+
+/* Display: Unpublished */
+$handler = $view->new_display('system', 'Unpublished', 'system_2');
+$handler->display->display_options['defaults']['filter_groups'] = FALSE;
+$handler->display->display_options['defaults']['filters'] = FALSE;
+/* Filter criterion: Comment: Title */
+$handler->display->display_options['filters']['subject']['id'] = 'subject';
+$handler->display->display_options['filters']['subject']['table'] = 'comment';
+$handler->display->display_options['filters']['subject']['field'] = 'subject';
+$handler->display->display_options['filters']['subject']['operator'] = 'contains';
+$handler->display->display_options['filters']['subject']['exposed'] = TRUE;
+$handler->display->display_options['filters']['subject']['expose']['operator_id'] = 'subject_op';
+$handler->display->display_options['filters']['subject']['expose']['label'] = 'Title';
+$handler->display->display_options['filters']['subject']['expose']['operator'] = 'subject_op';
+$handler->display->display_options['filters']['subject']['expose']['identifier'] = 'subject';
+/* Filter criterion: Comment: Author */
+$handler->display->display_options['filters']['name']['id'] = 'name';
+$handler->display->display_options['filters']['name']['table'] = 'comment';
+$handler->display->display_options['filters']['name']['field'] = 'name';
+$handler->display->display_options['filters']['name']['operator'] = 'contains';
+$handler->display->display_options['filters']['name']['exposed'] = TRUE;
+$handler->display->display_options['filters']['name']['expose']['operator_id'] = 'name_op';
+$handler->display->display_options['filters']['name']['expose']['label'] = 'Author';
+$handler->display->display_options['filters']['name']['expose']['operator'] = 'name_op';
+$handler->display->display_options['filters']['name']['expose']['identifier'] = 'author';
+/* Filter criterion: Content: Title */
+$handler->display->display_options['filters']['title']['id'] = 'title';
+$handler->display->display_options['filters']['title']['table'] = 'node';
+$handler->display->display_options['filters']['title']['field'] = 'title';
+$handler->display->display_options['filters']['title']['relationship'] = 'nid';
+$handler->display->display_options['filters']['title']['operator'] = 'contains';
+$handler->display->display_options['filters']['title']['exposed'] = TRUE;
+$handler->display->display_options['filters']['title']['expose']['operator_id'] = 'title_op';
+$handler->display->display_options['filters']['title']['expose']['label'] = 'Posted in';
+$handler->display->display_options['filters']['title']['expose']['operator'] = 'title_op';
+$handler->display->display_options['filters']['title']['expose']['identifier'] = 'nodeTitle';
+/* Filter criterion: Comment: Approved */
+$handler->display->display_options['filters']['status']['id'] = 'status';
+$handler->display->display_options['filters']['status']['table'] = 'comment';
+$handler->display->display_options['filters']['status']['field'] = 'status';
+$handler->display->display_options['filters']['status']['value'] = '0';
+$handler->display->display_options['filters']['status']['exposed'] = TRUE;
+$handler->display->display_options['filters']['status']['expose']['operator_id'] = '';
+$handler->display->display_options['filters']['status']['expose']['label'] = 'Published';
+$handler->display->display_options['filters']['status']['expose']['identifier'] = 'status';
+$handler->display->display_options['filters']['status']['expose']['remember'] = TRUE;
+$handler->display->display_options['path'] = 'admin/content/comment/approval';
 $translatables['admin_views_comment'] = array(
   t('Defaults'),
   t('Comments'),
@@ -288,5 +335,5 @@ $translatables['admin_views_comment'] = array(
   t('Posted in'),
   t('Updated'),
   t('Published'),
-  t('System'),
+  t('Unpublished'),
 );
diff --git a/tests/admin_views.test b/tests/admin_views.test
index 28709a6..db2a00b 100644
--- a/tests/admin_views.test
+++ b/tests/admin_views.test
@@ -19,11 +19,17 @@ class AdminViewsWebTestCase extends DrupalWebTestCase {
   );
 
   function setUp() {
+    // Setup site and modules.
     $modules = func_get_args();
     $modules = isset($modules[0]) && is_array($modules[0]) ? $modules[0] : $modules;
     $modules[] = 'admin_views';
     parent::setUp($modules);
 
+    // Fix testing environment.
+    theme_enable(array('stark'));
+    variable_set('theme_default', 'stark');
+
+    // Setup permissions.
     $permissions = array(
       'access administration pages',
     );
@@ -33,6 +39,38 @@ class AdminViewsWebTestCase extends DrupalWebTestCase {
       }
     }
     $this->admin_user = $this->drupalCreateUser($permissions);
+
+    // Setup default configuration.
+    if (in_array('node', $modules)) {
+      $this->node_type = $this->drupalCreateContentType(array(
+        'type' => 'article',
+        'name' => 'Article',
+        // 2 == COMMENT_NODE_OPEN.
+        'comment' => 2,
+      ));
+    }
+    if (in_array('comment', $modules)) {
+      variable_set('comment_preview_article', DRUPAL_OPTIONAL);
+    }
+  }
+
+  protected function assertOriginalRouterItem($module, $path) {
+    // Retrieve the original router item definition.
+    $items = module_invoke($module, 'menu');
+    $original_item = $items[$path];
+    // Retrieve the computed router item definition.
+    $item = menu_get_item($path);
+
+    // Verify that basic properties are identical.
+    $title = (isset($original_item['title callback']) ? $original_item['title callback']() : $original_item['title']);
+    $this->assertEqual($title, $item['title']);
+    if (isset($original_item['description'])) {
+      $this->assertEqual($original_item['description'], $item['description']);
+    }
+
+    // Verify that the title appears.
+    $this->assertResponse(200);
+    $this->assertText($original_item['title']);
   }
 }
 
@@ -52,14 +90,10 @@ class AdminViewsSystemDisplayTestCase extends AdminViewsWebTestCase {
    * Tests proper inheritance of router item properties.
    */
   function testRouterItemInheritance() {
-    $path = 'admin/people';
-    $item = menu_get_item($path);
-
     $this->drupalLogin($this->admin_user);
+    $path = 'admin/people';
     $out = $this->drupalGet($path);
-    // Verify a regular page response.
-    $this->assertResponse(200);
-    $this->assertText($item['title']);
+    $this->assertOriginalRouterItem('user', $path);
 
     // Verify that local tasks and actions exist and can be accessed.
     foreach (array(t('List'), t('Permissions'), t('Add user')) as $link) {
@@ -71,3 +105,43 @@ class AdminViewsSystemDisplayTestCase extends AdminViewsWebTestCase {
   }
 }
 
+/**
+ * Tests default views.
+ */
+class AdminViewsDefaultViewsTestCase extends AdminViewsWebTestCase {
+  public static function getInfo() {
+    return array(
+      'name' => 'Default views',
+      'description' => 'Tests default views.',
+      'group' => 'Administration views',
+    );
+  }
+
+  function setUp() {
+    parent::setUp(array('node', 'comment'));
+  }
+
+  /**
+   * Tests basic appearance and behavior of built-in default views.
+   */
+  function testComment() {
+    $this->drupalLogin($this->admin_user);
+
+    foreach (array('admin/content/comment', 'admin/content/comment/approval') as $path) {
+      $this->drupalGet($path);
+      $this->assertOriginalRouterItem('comment', $path);
+
+      // Verify that a view with its exposed filters appears.
+      $this->assertFieldByName('subject');
+      $this->assertFieldByName('author');
+      $this->assertFieldByName('nodeTitle');
+      $this->assertFieldByName('status');
+      $this->assertFieldByXPath('//select[@name="status"]/option', 'All', 'Published: All option found.');
+      $this->assertFieldByXPath('//select[@name="status"]/option', '1', 'Published: Yes option found.');
+      $this->assertFieldByXPath('//select[@name="status"]/option', '0', 'Published: No option found.');
+      $this->assertFieldByXPath('//input[@type="submit"]', t('Apply'), 'Apply button found.');
+      $this->assertFieldByXPath('//input[@type="submit"]', t('Reset'), 'Reset button found.');
+    }
+  }
+}
+