diff --git a/core/modules/views/lib/Drupal/views/Tests/User/HandlerArgumentUserUidTest.php b/core/modules/views/lib/Drupal/views/Tests/User/HandlerArgumentUserUidTest.php
index 8f5dce5..7da5688 100644
--- a/core/modules/views/lib/Drupal/views/Tests/User/HandlerArgumentUserUidTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/User/HandlerArgumentUserUidTest.php
@@ -27,6 +27,7 @@ public function testArgumentTitle() {
     $view = views_get_view('test_user_uid_argument');
 
     // Tests an invalid user uid.
+    $random_name = $this->randomName();
     $this->executeView($view, array(rand(1000, 10000)));
     $this->assertFalse($view->getTitle());
     $view->destroy();
diff --git a/core/modules/views/lib/Drupal/views/Tests/User/HandlerArgumentUserUidTest.php.orig b/core/modules/views/lib/Drupal/views/Tests/User/HandlerArgumentUserUidTest.php.orig
new file mode 100644
index 0000000..2c9a434
--- /dev/null
+++ b/core/modules/views/lib/Drupal/views/Tests/User/HandlerArgumentUserUidTest.php.orig
@@ -0,0 +1,45 @@
+<?php
+
+  /**
+   * @file
+   * Definition of Drupal\views\Tests\User\HandlerArgumentUserUidTest.
+   */
+
+namespace Drupal\views\Tests\User;
+
+/**
+ * Tests views user uid argument handler.
+ */
+class HandlerArgumentUserUidTest extends UserTestBase {
+
+  public static function getInfo() {
+    return array(
+      'name' => 'User: Uid Argument',
+      'description' => 'Tests the handler of the user: uid Argument.',
+      'group' => 'Views Modules',
+    );
+  }
+
+  /**
+   * Tests the generated title of an user: uid argument.
+   */
+  public function testArgumentTitle() {
+    $view = views_get_view('test_user_uid_argument');
+
+    // Tests an invalid user uid.
+<<<<<<< HEAD
+=======
+    $random_name = $this->randomName();
+>>>>>>> Applied views-1748176-26.patch from http://drupal.org/node/1809128.
+    $this->executeView($view, array(rand(1000, 10000)));
+    $this->assertFalse($view->getTitle());
+    $view->destroy();
+
+    // Tests a valid user.
+    $account = $this->drupalCreateUser();
+    $this->executeView($view, array($account->uid));
+    $this->assertEqual($view->getTitle(), $account->label());
+    $view->destroy();
+  }
+
+}
diff --git a/core/modules/views/lib/Drupal/views/Tests/User/HandlerFilterUserNameTest.php b/core/modules/views/lib/Drupal/views/Tests/User/HandlerFilterUserNameTest.php
index df23db2..359b148 100644
--- a/core/modules/views/lib/Drupal/views/Tests/User/HandlerFilterUserNameTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/User/HandlerFilterUserNameTest.php
@@ -75,9 +75,8 @@ public function testUserNameApi() {
     $view = views_get_view('test_user_name');
 
     // Test all of the accounts with a single entry.
-    $view->initHandlers();
     foreach ($this->accounts as $account) {
-      $view->filter['uid']->value = array($account->id());
+      $view->storage->display['default']['display_options']['filters']['uid']['value'] = $account->id();
     }
 
     $this->executeView($view);
diff --git a/core/modules/views/lib/Drupal/views/Tests/User/HandlerFilterUserNameTest.php.orig b/core/modules/views/lib/Drupal/views/Tests/User/HandlerFilterUserNameTest.php.orig
new file mode 100644
index 0000000..b378c81
--- /dev/null
+++ b/core/modules/views/lib/Drupal/views/Tests/User/HandlerFilterUserNameTest.php.orig
@@ -0,0 +1,196 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\views\Tests\User\HandlerFilterUserNameTest.
+ */
+
+namespace Drupal\views\Tests\User;
+
+use Drupal\views\Tests\ViewTestBase;
+
+/**
+ * Tests the handler of the user: name filter.
+ *
+ * @see Views\user\Plugin\views\filter\Name
+ */
+class HandlerFilterUserNameTest extends ViewTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('views_ui');
+
+  /**
+   * Accounts used by this test.
+   *
+   * @var array
+   */
+  protected $accounts = array();
+
+  /**
+   * Usernames of $accounts.
+   *
+   * @var array
+   */
+  protected $names = array();
+
+  /**
+   * Stores the column map for this testCase.
+   *
+   * @var array
+   */
+  public $columnMap = array(
+    'uid' => 'uid',
+  );
+
+  public static function getInfo() {
+    return array(
+      'name' => 'User: Name Filter',
+      'description' => 'Tests the handler of the user: name filter',
+      'group' => 'Views Modules',
+    );
+  }
+
+  protected function setUp() {
+    parent::setUp();
+
+    $this->enableViewsTestModule();
+
+    $this->accounts = array();
+    $this->names = array();
+    for ($i = 0; $i < 3; $i++) {
+      $this->accounts[] = $account = $this->drupalCreateUser();
+      $this->names[] = $account->label();
+    }
+  }
+
+
+  /**
+   * Tests just using the filter.
+   */
+  public function testUserNameApi() {
+    $view = views_get_view('test_user_name');
+
+    // Test all of the accounts with a single entry.
+<<<<<<< HEAD
+    $view->initHandlers();
+    foreach ($this->accounts as $account) {
+      $view->filter['uid']->value = array($account->id());
+=======
+    foreach ($this->accounts as $account) {
+      $view->storage->display['default']['display_options']['filters']['uid']['value'] = $account->id();
+>>>>>>> Applied views-1748176-26.patch from http://drupal.org/node/1809128.
+    }
+
+    $this->executeView($view);
+    $this->assertIdenticalResultset($view, array(array('uid' => $account->id())), $this->columnMap);
+  }
+
+  /**
+   * Tests using the user interface.
+   */
+  public function testAdminUserInterface() {
+    $admin_user = $this->drupalCreateUser(array('administer views', 'administer site configuration'));
+    $this->drupalLogin($admin_user);
+
+    $path = 'admin/structure/views/nojs/config-item/test_user_name/default/filter/uid';
+    $this->drupalGet($path);
+
+    // Pass in an invalid username, the validation should catch it.
+    $users = array($this->randomName());
+    $users = array_map('strtolower', $users);
+    $edit = array(
+      'options[value]' => implode(', ', $users)
+    );
+    $this->drupalPost($path, $edit, t('Apply'));
+    $message = format_plural(count($users), 'Unable to find user: @users', 'Unable to find users: @users', array('@users' => implode(', ', $users)));
+    $this->assertText($message);
+
+    // Pass in an invalid username and a valid username.
+    $random_name = $this->randomName();
+    $users = array($random_name, $this->names[0]);
+    $users = array_map('strtolower', $users);
+    $edit = array(
+      'options[value]' => implode(', ', $users)
+    );
+    $users = array($users[0]);
+    $this->drupalPost($path, $edit, t('Apply'));
+    $message = format_plural(count($users), 'Unable to find user: @users', 'Unable to find users: @users', array('@users' => implode(', ', $users)));
+    $this->assertRaw($message);
+
+    // Pass in just valid usernames.
+    $users = $this->names;
+    $users = array_map('strtolower', $users);
+    $edit = array(
+      'options[value]' => implode(', ', $users)
+    );
+    $this->drupalPost($path, $edit, t('Apply'));
+    $message = format_plural(count($users), 'Unable to find user: @users', 'Unable to find users: @users', array('@users' => implode(', ', $users)));
+    $this->assertNoRaw($message);
+  }
+
+  /**
+   * Tests exposed filters.
+   */
+  public function testExposedFilter() {
+    $path = 'test_user_name';
+
+    $options = array();
+
+    // Pass in an invalid username, the validation should catch it.
+    $users = array($this->randomName());
+    $users = array_map('strtolower', $users);
+    $options['query']['uid'] = implode(', ', $users);
+    $this->drupalGet($path, $options);
+    $message = format_plural(count($users), 'Unable to find user: @users', 'Unable to find users: @users', array('@users' => implode(', ', $users)));
+    $this->assertRaw($message);
+
+    // Pass in an invalid username and a valid username.
+    $users = array($this->randomName(), $this->names[0]);
+    $options['query']['uid'] = implode(', ', $users);
+    $users = array_map('strtolower', $users);
+    $users = array($users[0]);
+
+    $this->drupalGet($path, $options);
+    $message = format_plural(count($users), 'Unable to find user: @users', 'Unable to find users: @users', array('@users' => implode(', ', $users)));
+    $this->assertRaw($message);
+
+    // Pass in just valid usernames.
+    $users = $this->names;
+    $options['query']['uid'] = implode(', ', $users);
+    $users = array_map('strtolower', $users);
+
+    $this->drupalGet($path, $options);
+    $this->assertNoRaw('Unable to find user');
+    // The actual result should contain all of the user ids.
+    foreach ($this->accounts as $account) {
+      $this->assertRaw($account->uid);
+    }
+  }
+
+  /**
+   * Tests the autocomplete function.
+   *
+   * @see views_ajax_autocomplete_user
+   */
+  public function testUserAutocomplete() {
+    module_load_include('inc', 'views', 'includes/ajax');
+
+    // Nothing should return no user.
+    $result = (array) json_decode(views_ajax_autocomplete_user(''));
+    $this->assertFalse($result);
+
+    // A random user should also not be findable.
+    $result = (array) json_decode(views_ajax_autocomplete_user($this->randomName())->getContent());
+    $this->assertFalse($result);
+
+    // A valid user should be found.
+    $result = (array) json_decode(views_ajax_autocomplete_user($this->names[0])->getContent());
+    $expected_result = array($this->names[0] => $this->names[0]);
+    $this->assertIdentical($result, $expected_result);
+  }
+
+}