diff --git a/app/Controller/Web/Session.php b/app/Controller/Web/Session.php
index 342a99f1..dea2b606 100644
--- a/app/Controller/Web/Session.php
+++ b/app/Controller/Web/Session.php
@@ -32,7 +32,7 @@ public function post()
                 setcookie('userId', $response->getUserId(), time() + (86400 * 30), "/");
                 setcookie('authToken', $response->getAuthToken(), time() + (86400 * 30), "/");
                 $app = \Slim\Slim::getInstance('developer');
-                $app->redirect("/notes");
+                $app->redirect("./notes");
             }
         } catch (\InvalidArgumentException $error) {
             $response    = $error->getMessage();
diff --git a/app/Controller/Web/User.php b/app/Controller/Web/User.php
index cfe52dcd..8ccca6ed 100644
--- a/app/Controller/Web/User.php
+++ b/app/Controller/Web/User.php
@@ -28,7 +28,7 @@ public function post()
             $response = $userService->create($input);
             if ($response instanceof UserModel) {
                 $app = \Slim\Slim::getInstance('developer');
-                $app->redirect("/login");
+                $app->redirect("./login");
             }
         } catch (\InvalidArgumentException $error) {
             $response    = $error->getMessage();
diff --git a/build.xml b/build.xml
index c8e1d0e2..4cd89537 100755
--- a/build.xml
+++ b/build.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="Notes" default="build" xmlns:flyway="antlib:org.flywaydb.ant">
- <target name="build" depends="copy-config,replace-config-dbname,migrate-db,prepare,composer,lint,phploc-ci,pdepend,phpmd-ci,phpcs-ci,phpcpd-ci,phpunit,phpdox"/>
-
+ <target name="build" depends="copy-config,print,replace-config-dbname,migrate-db,prepare,start-selenium-server,composer,lint,phploc-ci,pdepend,phpmd-ci,phpcs-ci,phpcpd-ci,phpunit,stop-selenium-server,phpdox"/>
+<target name="print">
+  <property environment="env"/>
+  <echo>${env.JOB_NAME}</echo>
+  
+</target>
  <target name="clean" unless="clean.done" description="Cleanup build artifacts">
   <delete dir="${basedir}/build/api"/>
   <delete dir="${basedir}/build/coverage"/>
@@ -16,24 +20,30 @@
  </target>
  
  <target name="copy-config" depends="clean">
-  <property environment="env.APP_ENV"/>
+  <property environment="env"/>
   <condition property="env.APP_ENV" value="${env.APP_ENV}" else="dev">
    <isset property="env.APP_ENV" />
   </condition>
-  <property name="env.APP_ENV" value="dev"/>
+  <property name="env" value="dev"/>
   <echo message="Configuring app environment to ${env.APP_ENV}."/>
   <copy file="${basedir}/app/Config/config_${env.APP_ENV}.json" tofile="${basedir}/app/Config/config.json"/>
   
  </target>
+
  
  <target name="replace-config-dbname" depends="copy-config">
-  <property environment="env.GIT_BRANCH"/>
+  <property environment="env"/>
   <condition property="env.GIT_BRANCH" value="${env.GIT_BRANCH}" else="master">
    <isset property="env.GIT_BRANCH" />
   </condition>
-  <property name="" value="master"/>
   <echo message="Using database name notes-${env.GIT_BRANCH} for this build."/>
   <replace file="${basedir}/app/Config/config.json" token="@GIT_BRANCH" value="${env.GIT_BRANCH}"/>
+  
+  <condition property="env.JOB_NAME" value="${env.JOB_NAME}" else="">
+   <isset property="env.JOB_NAME" />
+  </condition>
+  <echo message="Using Job name ${env.JOB_NAME} for this build."/>
+  <replace file="${basedir}/build/phpunit.xml" token="@JOB_NAME" value="${env.JOB_NAME}"/>
  </target>
 
  <target name="migrate-db" depends="replace-config-dbname" unless="migrate-db.done" description="Cleanup db and build from scratch">
@@ -57,13 +67,25 @@
  </target>
 
  <target name="composer" depends="clean" unless="composer.noupdate" description="Run composer install">
-  <exec executable="php">
+  <exec executable="php">          
    <arg value="${basedir}/build/tools/composer.phar"/>
    <arg value="install"/>
    <arg value="--profile"/>
   </exec>
  </target>
 
+ <target name="start-selenium-server" depends="clean" description="selenium-server-starts">
+  
+   <exec executable="xvfb-run" spawn="true">
+    <arg value="java"/>
+    <arg value="-jar"/>
+    <arg value="${basedir}/build/tools/selenium-server-standalone-2.45.0.jar"/>
+    <arg value="-log"/>
+    <arg value="${basedir}/build/logs/selenium-server-start.log"/>
+    <arg value="&amp;"/>
+    </exec>
+ </target>
+
  <target name="prepare" unless="prepare.done" depends="clean" description="Prepare for build">
   <mkdir dir="${basedir}/build/api"/>
   <mkdir dir="${basedir}/build/coverage"/>
@@ -178,8 +200,12 @@
   </exec>
  </target>
 
- <target name="phpdox" depends="phploc-ci,phpcs-ci,phpmd-ci" description="Generate API documentation using phpDox">
+ <target name="stop-selenium-server" description="selenium-server-stop">
+      <get taskname="selenium-shutdown" dest="${basedir}/build/logs/selenium-server-stop.log" ignoreerrors="true"
+             src="http://localhost:4444/selenium-server/driver/?cmd=shutDownSeleniumServer"/>
+</target>
+
+ <target name="phpdox" depends="phploc-ci,phpcs-ci,phpmd-ci,stop-selenium-server" description="Generate API documentation using phpDox">
   <exec executable="${basedir}/build/tools/phpdox.phar" dir="${basedir}/build"/>
  </target>
 </project>
-
diff --git a/build/phpunit.xml b/build/phpunit.xml
index 91f887d8..8ebbf4c9 100755
--- a/build/phpunit.xml
+++ b/build/phpunit.xml
@@ -4,7 +4,8 @@
          bootstrap="../vendor/autoload.php"
          strict="true"
          verbose="true"
-         timeoutForSmallTests="10">
+         timeoutForSmallTests="10"
+         timeoutForLargeTests="50">
   <testsuites>
     <testsuite name="Notes">
       <directory suffix="Test.php">../tests</directory>
@@ -24,5 +25,9 @@
       <directory suffix=".php">../app</directory>
       </whitelist>
   </filter>
+  <php>
+      <env name="JobName" value="@JOB_NAME" />
+  </php>
+
 </phpunit>
 
diff --git a/build/tools/3EE67F3D0FF405B2.gpg b/build/tools/3EE67F3D0FF405B2.gpg
new file mode 100644
index 00000000..a812412f
Binary files /dev/null and b/build/tools/3EE67F3D0FF405B2.gpg differ
diff --git a/build/tools/selenium-server-standalone-2.45.0.jar b/build/tools/selenium-server-standalone-2.45.0.jar
new file mode 100644
index 00000000..020191b7
Binary files /dev/null and b/build/tools/selenium-server-standalone-2.45.0.jar differ
diff --git a/tests/AcceptanceTest/LoginTest.php b/tests/AcceptanceTest/LoginTest.php
new file mode 100644
index 00000000..6fe1d4bd
--- /dev/null
+++ b/tests/AcceptanceTest/LoginTest.php
@@ -0,0 +1,29 @@
+<?php
+
+class LoginTest extends PHPUnit_Extensions_Selenium2TestCase
+{
+    protected function setUp()
+    {
+        $this->setHost('localhost');
+        $this->setBrowser('firefox');
+        $this->setBrowserUrl('http://localhost/');
+    }
+    
+    /**
+    * @large
+    **/
+    public function testTitle()
+    {    
+        $name=getenv("JobName");
+        $this->url("$name/public/index.php/login");
+        $this->assertEquals('Login', $this->title());
+
+        $this->byName('email')->value("gau@bhapkar.com");
+        $this->byName('password')->value("Gauri@12");
+        $this->byCssSelector('form')->submit();
+        $welcom=$this->byCssSelector('div');
+        $this->assertEquals('Login', $this->title());
+        //$this->assertEquals('Html', $welcom);
+        
+    }
+}
diff --git a/tests/AcceptanceTest/googleChromeTest.php b/tests/AcceptanceTest/googleChromeTest.php
new file mode 100644
index 00000000..e153b89d
--- /dev/null
+++ b/tests/AcceptanceTest/googleChromeTest.php
@@ -0,0 +1,50 @@
+<?php
+
+class googleTest extends PHPUnit_Extensions_Selenium2TestCase
+{
+    protected function setUp()
+    {
+        $this->setHost('localhost');
+        $this->setBrowser('google-chrome');
+        $this->setBrowserUrl('http://localhost/');
+    }
+    /**
+    * @large
+    **/
+     public function testHomeTitle()
+    {   
+        $name=getenv("JobName");
+        $this->url("$name/public/index.php/register");
+        $this->byName('firstName')->value("jonh");
+        $this->byName('lastName')->value("Mock");
+        $this->byName('email')->value("jonh@mock.com");
+        $this->byName('password')->value("Mock@1234");
+        $this->byCssSelector('form')->submit();
+        $this->assertEquals('Login', $this->title());
+        $this->byName('email')->value("jonh@mock.com");
+        $this->byName('password')->value("Mock@1234");
+        $this->byCssSelector('form')->submit();
+        $this->assertEquals('Notes | Home', $this->title());        
+
+        
+        
+    }
+        /**
+    * @large
+    **/
+
+    public function testLoginTitle()
+    {
+        $name=getenv("JobName");
+        $this->url("$name/public/index.php/login");
+        $this->assertEquals('Login', $this->title());
+
+        $this->byName('email')->value("gau@bhapkar.com");
+        $this->byName('password')->value("Gauri@12");
+        $this->byCssSelector('form')->submit();
+        $this->assertEquals('Login', $this->title());
+        
+        
+    }
+   
+}
diff --git a/tests/Routes/RoutesTest.php b/tests/Routes/RoutesTest.php
index d5fcad4e..fc91ea1d 100644
--- a/tests/Routes/RoutesTest.php
+++ b/tests/Routes/RoutesTest.php
@@ -58,7 +58,7 @@ public function loginpage_should_be_loaded_after_user_registration()
         $client->post('/register' ,$parameters);
         
         $this->assertEquals(302, $client->response->status());
-        $this->assertEquals('/login', $client->response->getIterator()["Location"]);
+        $this->assertEquals('./login', $client->response->getIterator()["Location"]);
         
     }
 
@@ -105,7 +105,7 @@ public function loginpage_should_be_loaded_after_user_logged_in()
         $client->post('/login', $parameters);
 
         $this->assertEquals(302, $client->response->status());
-        $this->assertEquals('/notes', $client->response->getIterator()["Location"]);
+        $this->assertEquals('./notes', $client->response->getIterator()["Location"]);
     }
 
     /**