diff --git a/demo-shell-ng2/webcomponents/alfresco-login/alfresco-login.html b/demo-shell-ng2/webcomponents/alfresco-login/alfresco-login.html
index 2e230716af..b29138c0b1 100755
--- a/demo-shell-ng2/webcomponents/alfresco-login/alfresco-login.html
+++ b/demo-shell-ng2/webcomponents/alfresco-login/alfresco-login.html
@@ -1,4 +1,4 @@
-<link rel="import" href="../../bower_components/polymer/polymer.html">
+<link rel="import" href="../polymer/polymer.html">
 
 <!--
 An element providing a solution to the login.
@@ -10,8 +10,8 @@ Example:
 @demo
 -->
 
-<link rel="import" href="../../bower_components/paper-input/paper-input.html">
-<link rel="import" href="../../bower_components/paper-button/paper-button.html">
+<link rel="import" href="../paper-input/paper-input.html">
+<link rel="import" href="../paper-button/paper-button.html">
 
 <dom-module id="alfresco-login">
 
@@ -72,13 +72,20 @@ Example:
     ready: function(){
     },
 
+    fireSubmit: function(token) {
+      this.fire("submit", {ticket: token});
+    },
+
     /**
      * Login Alfesco
      *
      * @param {object}
     */
-    _submit: function() {
-      event.preventDefault();
+    _submit: function(event) {
+      if(event) {
+        event.preventDefault();
+      }
+
 
       var self = this;
 
@@ -103,6 +110,7 @@ Example:
       }
 
       xhr.onload = function(e) {
+        e.preventDefault();
         if (xhr.status === 200) {
           var token = '';
           if (xhr.responseXML) {
@@ -111,7 +119,7 @@ Example:
             token = JSON.parse(xhr.responseText).data.ticket;
           }
           if (token) {
-            self.fire("submit", {ticket: token});
+            self.fireSubmit(token);
           } else {
             self.fire("error", {error:'Token error'});
           }
@@ -120,6 +128,7 @@ Example:
         }
       };
       xhr.send(parameterJson);
+      return xhr;
     }
   });
 
diff --git a/demo-shell-ng2/webcomponents/alfresco-login/bower.json b/demo-shell-ng2/webcomponents/alfresco-login/bower.json
new file mode 100644
index 0000000000..3af12e9304
--- /dev/null
+++ b/demo-shell-ng2/webcomponents/alfresco-login/bower.json
@@ -0,0 +1,32 @@
+{
+  "name": "alfresco-login",
+  "description": "Provide the Alfresco login .",
+  "keywords": [
+    "web-component",
+    "web-components",
+    "polymer",
+    "alfresco"
+  ],
+  "main": "alfresco-login.html",
+  "license": "MIT",
+  "ignore": [
+    "/.*",
+    "/test/",
+    "/demo/",
+    "/bower_components/"
+  ],
+  "dependencies": {
+    "polymer": "Polymer/polymer#^1.0.0",
+    "paper-input": "~1.1.10"
+  },
+  "devDependencies": {
+    "iron-component-page": "polymerelements/iron-component-page#^1.0.0",
+    "iron-image": "polymerelements/iron-image#^1.0.0",
+    "paper-styles": "polymerelements/paper-styles#^1.0.0",
+    "test-fixture": "polymerelements/test-fixture#^1.0.0",
+    "web-component-tester": "^4.0.0",
+    "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
+  },
+  "_originalSource": "alfresco-login",
+  "_direct": true
+}
diff --git a/demo-shell-ng2/webcomponents/alfresco-login/index.html b/demo-shell-ng2/webcomponents/alfresco-login/index.html
index 1859d04779..567c389730 100755
--- a/demo-shell-ng2/webcomponents/alfresco-login/index.html
+++ b/demo-shell-ng2/webcomponents/alfresco-login/index.html
@@ -5,7 +5,7 @@
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-  <script src="bower_components/webcomponentsjs/webcomponents-lite.js"></script>
+  <script src="../webcomponentsjs/webcomponents-lite.js"></script>
   <link rel="import" href="alfresco-login.html">
 
 </head>
diff --git a/demo-shell-ng2/webcomponents/alfresco-login/test/index.html b/demo-shell-ng2/webcomponents/alfresco-login/test/index.html
new file mode 100644
index 0000000000..8561a93bca
--- /dev/null
+++ b/demo-shell-ng2/webcomponents/alfresco-login/test/index.html
@@ -0,0 +1,79 @@
+<!doctype html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <script src="../bower_components/webcomponentsjs/webcomponents-lite.js"></script>
+    <script src="../bower_components/web-component-tester/browser.js"></script>
+    <!-- import the element to test -->
+    <link rel="import" href="../alfresco-login.html">
+</head>
+<body>
+<!-- use the document as a place to set up your fixtures -->
+<test-fixture id="alfresco-login-fixture">
+    <template>
+        <alfresco-login>
+        </alfresco-login>
+    </template>
+</test-fixture>
+<script>
+    suite('<alfresco-login>', function() {
+        var myEl;
+        setup(function() {
+            myEl = fixture('alfresco-login-fixture');
+        });
+
+        test('defines the "method" property', function() {
+            assert.equal(myEl.method, 'GET');
+        });
+
+        test('fires submit', function(done) {
+            myEl.addEventListener('submit', function(event) {
+                assert.equal(event.detail.ticket, 'TICKET_mock');
+                done();
+            });
+            myEl.fireSubmit('TICKET_mock');
+        });
+
+    });
+
+    suite('<alfresco-login-submit>', function() {
+        var ajax;
+        var request;
+        var server;
+        var responseHeaders = {
+            json: { 'Content-Type': 'application/json' }
+        };
+        setup(function() {
+            server = sinon.fakeServer.create();
+            server.respondWith(
+                    'GET',
+                    /\/alfresco.*/, [
+                        200,
+                        responseHeaders.json,
+                        '{ "data": { "ticket":"TICKET_mock" } }'
+                    ]
+            );
+        });
+        teardown(function() {
+            server.restore();
+        });
+        suite('when making simple GET requests for JSON', function() {
+            setup(function() {
+                // get fresh instance of iron-ajax before every test
+                ajax = fixture('alfresco-login-fixture');
+            });
+            test('has sane defaults that love you', function() {
+                request = ajax._submit();
+                server.respond();
+                expect(request.response).to.be.ok;
+                expect(request.response).to.be.equal('{ "data": { "ticket":"TICKET_mock" } }');
+            });
+            test('has the correct xhr method', function() {
+                request = ajax._submit();
+                expect(request.method).to.be.equal('GET');
+            });
+        });
+    });
+</script>
+</body>
+</html>
\ No newline at end of file
