diff --git a/services.info b/services.info
index d07a5fc..83ba9c4 100644
--- a/services.info
+++ b/services.info
@@ -15,6 +15,7 @@ files[] = tests/functional/ServicesResourceTaxonomyTests.test
 files[] = tests/functional/ServicesResourceFileTests.test
 files[] = tests/functional/ServicesEndpointTests.test
 files[] = tests/functional/ServicesParserTests.test
+files[] = tests/functional/ServicesAliasTests.test
 files[] = tests/functional/ServicesXMLRPCTests.test
 files[] = tests/functional/ServicesVersionTests.test
 files[] = tests/unit/TestServicesModule.test
diff --git a/services.resource_build.inc b/services.resource_build.inc
index ae7ea7e..5e3bd2b 100644
--- a/services.resource_build.inc
+++ b/services.resource_build.inc
@@ -151,7 +151,7 @@ function _services_apply_endpoint(&$resources, $endpoint, $strict = TRUE) {
   $classes = array_keys(services_operation_class_info());
   foreach ($resources as $name => &$resource) {
     $cres = ($endpoint && isset($endpoint->resources[$name])) ? $endpoint->resources[$name] : array();
-    $resource['settings'] = $cres;
+    $resource['endpoint'] = $cres;
 
     if ($strict && empty($cres)) {
       unset($resources[$name]);
diff --git a/tests/functional/ServicesAliasTests.test b/tests/functional/ServicesAliasTests.test
new file mode 100644
index 0000000..36bcc98
--- /dev/null
+++ b/tests/functional/ServicesAliasTests.test
@@ -0,0 +1,104 @@
+<?php
+
+/**
+ * @file
+ * Test to confirm Aliases functionality.
+ */
+
+/**
+ * Test case class for Alias tests.
+ */
+class ServicesAliasTests extends ServicesWebTestCase {
+  // Endpoint details.
+  protected $endpoint = NULL;
+
+  /**
+   * Implementation of setUp().
+   */
+  public function setUp() {
+    parent::setUp(
+      'ctools',
+      'services',
+      'rest_server'
+    );
+    $edit = $this->populateEndpointFAPI() ;
+    $endpoint = new stdClass;
+    $endpoint->disabled = FALSE;
+    $endpoint->api_version = 3;
+    $endpoint->name = $edit['name'];
+    $endpoint->server = $edit['server'];
+    $endpoint->path = $edit['path'];
+    $endpoint->authentication = array(
+      'services' => 'services',
+    );
+    $endpoint->server_settings = array(
+      'formatters' => array(
+        'json' => TRUE,
+        'bencode' => TRUE,
+        'rss' => TRUE,
+        'plist' => TRUE,
+        'xmlplist' => TRUE,
+        'php' => TRUE,
+        'yaml' => TRUE,
+        'jsonp' => FALSE,
+        'xml' => FALSE,
+      ),
+      'parsers' => array(
+        'application/x-yaml' => TRUE,
+        'application/json' => TRUE,
+        'application/vnd.php.serialized' => TRUE,
+        'application/plist' => TRUE,
+        'application/plist+xml' => TRUE,
+        'application/x-www-form-urlencoded' => TRUE,
+        'multipart/form-data' => TRUE,
+      ),
+    );
+    $endpoint->resources = array(
+      'user' => array(
+        'alias' => 'user-alias',
+        'actions' => array(
+          'login' => array(
+            'enabled' => 1,
+          ),
+        ),
+      ),
+    );
+    $endpoint->debug = 1;
+    $endpoint->export_type = FALSE;
+    services_endpoint_save($endpoint);
+    $endpoint = services_endpoint_load($endpoint->name);
+    $this->assertTrue($endpoint->name == $edit['name'], t('Endpoint successfully created'));
+    $this->endpoint = $endpoint;
+  }
+
+  /**
+   * Implementation of getInfo().
+   */
+  public static function getInfo() {
+    return array(
+      'name' => t('Alias'),
+      'description' => t('Test the Aliases functionality.'),
+      'group' => t('Services'),
+    );
+  }
+
+  /**
+   * Testing parser functionality.
+   */
+  public function testAlias() {
+    $account = $this->drupalCreateUser();
+
+    // Logout first.
+    $this->drupalLogout();
+
+    // Try to login using alias.
+    $response = $this->servicesPost($this->endpoint->path . '/user-alias/login', array('username' => $account->name, 'password' => $account->pass_raw));
+
+    $response_data = $response['body'];
+
+    $proper_answer = isset($response_data->sessid)
+                  && isset($response_data->user)
+                  && $response_data->user->name == $account->name;
+    $this->assertTrue($proper_answer, t('User successfully logged in.'), 'Alias: User login');
+  }
+}