diff --git a/.gitignore b/.gitignore
index 19ab14c416..9faa430049 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,6 @@ tests/codeception/_output/*
 tests/codeception/vendor/*
 tests/codeception/testingsite*
 tests/codeception/tests/acceptance.suite.yml
-tests/codeception/tests/acceptance/*Tester.php
 tests/codeception/tests/functional/*Tester.php
 tests/codeception/tests/unit/*Tester.php
 
diff --git a/RoboFile.php b/RoboFile.php
index ba3cf01c0a..1d5022cece 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -274,6 +274,15 @@ public function runTests($opts = ['use-htaccess' => false, 'env' => 'desktop'])
 			->stopOnFail();
 
 		$this->taskCodecept($pathToCodeception)
+			->arg('--steps')
+			->arg('--debug')
+			->arg('--fail-fast')
+			->arg('--env ' . $opts['env'])
+			->arg('tests/acceptance/users.feature')
+			->run()
+			->stopOnFail();
+
+	/*	$this->taskCodecept($pathToCodeception)
 			->arg('--steps')
 			->arg('--debug')
 			->arg('--fail-fast')
@@ -289,7 +298,7 @@ public function runTests($opts = ['use-htaccess' => false, 'env' => 'desktop'])
 			->arg('--env ' . $opts['env'])
 			->arg('tests/acceptance/frontend/')
 			->run()
-			->stopOnFail();
+			->stopOnFail();*/
 
 		/*
 		// Uncomment this lines if you need to debug selenium errors
diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php
index 4c7dcbb6d6..1b7f1cb3ba 100644
--- a/tests/_support/AcceptanceTester.php
+++ b/tests/_support/AcceptanceTester.php
@@ -1,5 +1,8 @@
 <?php
 
+use Page\Acceptance\Administrator\LoginPage;
+
+use Page\Acceptance\Administrator\AdminPage;
 
 /**
  * Inherited Methods
@@ -12,15 +15,226 @@
  * @method void am($role)
  * @method void lookForwardTo($achieveValue)
  * @method void comment($description)
- * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = NULL)
+ * @method \Codeception\Lib\Friend haveFriend($name, $actorClass = null)
  *
  * @SuppressWarnings(PHPMD)
-*/
+ */
 class AcceptanceTester extends \Codeception\Actor
 {
-    use _generated\AcceptanceTesterActions;
+	use _generated\AcceptanceTesterActions;
+
+	/**
+	 * Install joomla CMS
+	 *
+	 * @Given Joomla CMS is installed
+	 */
+	public function joomlaCMSIsInstalled()
+	{
+		// throw new \Codeception\Exception\Incomplete("Step `Joomla CMS is installed` is not defined");
+	}
+
+	/**
+	 * @When Login into Joomla administrator with username :arg1 and password :arg1
+	 */
+	public function loginIntoJoomlaAdministrator($username, $password)
+	{
+		$I = $this;
+		$I->amOnPage('administrator/');
+		$I->fillField(LoginPage::$usernameField, $username);
+		$I->fillField(LoginPage::$passwordField, $password);
+		$I->click(LoginPage::$loginButton);
+	}
+
+	/**
+	 * @Then I see administrator dashboard
+	 */
+	public function iSeeAdministratorDashboard()
+	{
+		$I = $this;
+		$I->waitForText(AdminPage::$controlPanelText, 4, AdminPage::$pageTitle);
+	}
+
+	/**
+	 * Method is to set Wait for page title
+	 *
+	 * @param   string   $title    Page Title text
+	 * @param   integer  $timeout  timeout time
+	 *
+	 * @return  void
+	 */
+	public function waitForPageTitle($title, $timeout = 60)
+	{
+		$I = $this;
+		$I->waitForText($title, $timeout, AdminPage::$pageTitle);
+	}
+
+	/**
+	 * Function to check for PHP Notices or Warnings
+	 *
+	 * @param string $page Optional, if not given checks will be done in the current page
+	 *
+	 * @note: doAdminLogin() before
+	 */
+	public function checkForPhpNoticesOrWarnings($page = null)
+	{
+		$I = $this;
+
+		if ($page)
+		{
+			$I->amOnPage($page);
+		}
+
+		$I->dontSeeInPageSource('Notice:');
+		$I->dontSeeInPageSource('<b>Notice</b>:');
+		$I->dontSeeInPageSource('Warning:');
+		$I->dontSeeInPageSource('<b>Warning</b>:');
+		$I->dontSeeInPageSource('Strict standards:');
+		$I->dontSeeInPageSource('<b>Strict standards</b>:');
+		$I->dontSeeInPageSource('The requested page can\'t be found');
+	}
+
+	/**
+	 * Function to select Toolbar buttons in Joomla! Admin Toolbar Panel
+	 *
+	 * @param   string  $button  The full name of the button
+	 *
+	 * @return  void
+	 */
+	public function clickToolbarButton($button)
+	{
+		$I = $this;
+		$input = strtolower($button);
+
+		// @todo Needs to find way to work with different window size.
+		$screenSize = explode("x", $this->getConfiguration('window_size'));
+
+		if ($screenSize[0] <= 480)
+		{
+			$I->click('Toolbar');
+		}
+
+		switch ($input)
+		{
+			case "new":
+				$I->click(['xpath' => "//div[@id='toolbar-new']//button"]);
+				break;
+			case "edit":
+				$I->click(['xpath' => "//div[@id='toolbar-edit']//button"]);
+				break;
+			case "publish":
+				$I->click(['xpath' => "//div[@id='toolbar-publish']//button"]);
+				break;
+			case "unpublish":
+				$I->click(['xpath' => "//div[@id='toolbar-unpublish']//button"]);
+				break;
+			case "archive":
+				$I->click(['xpath' => "//div[@id='toolbar-archive']//button"]);
+				break;
+			case "check-in":
+				$I->click(['xpath' => "//div[@id='toolbar-checkin']//button"]);
+				break;
+			case "batch":
+				$I->click(['xpath' => "//div[@id='toolbar-batch']//button"]);
+				break;
+			case "rebuild":
+				$I->click(['xpath' => "//div[@id='toolbar-refresh']//button"]);
+				break;
+			case "trash":
+				$I->click(['xpath' => "//div[@id='toolbar-trash']//button"]);
+				break;
+			case "save":
+				$I->click(['xpath' => "//div[@id='toolbar-apply']//button"]);
+				break;
+			case "save & close":
+				$I->click(['xpath' => "//div[@id='toolbar-save']//button"]);
+				break;
+			case "save & new":
+				$I->click(['xpath' => "//div[@id='toolbar-save-new']//button"]);
+				break;
+			case "cancel":
+				$I->click(['xpath' => "//div[@id='toolbar-cancel']//button"]);
+				break;
+			case "options":
+				$I->click(['xpath' => "//div[@id='toolbar-options']//button"]);
+				break;
+			case "empty trash":
+				$I->click(['xpath' => "//div[@id='toolbar-delete']//button"]);
+				break;
+			case "unblock":
+				$I->click(['xpath' => "//div[@id='toolbar-unblock']//button"]);
+				break;
+			case "delete":
+				$I->click(['xpath' => "//div[@id='toolbar-delete']//button"]);
+				break;
+			case "featured":
+				$I->click(['xpath' => "//div[@id='toolbar-featured']//button"]);
+				break;
+		}
+	}
+
+	/**
+	 * Function to select all the item in the Search results in Administrator List
+	 *
+	 * Note: We recommend use of checkAllResults function only after searchForItem to be sure you are selecting only the desired result set
+	 *
+	 * @return void
+	 */
+	public function checkAllResults()
+	{
+		$I = $this;
+		$this->comment("Selecting Checkall button");
+		$I->click(['xpath' => "//thead//input[@name='checkall-toggle' or @name='toggle']"]);
+	}
+
+	/**
+	 * Selects an option in a Chosen Selector based on its id
+	 *
+	 * @param   string  $selectId  The id of the <select> element
+	 * @param   string  $option    The text in the <option> to be selected in the chosen selector
+	 *
+	 * @return void
+	 */
+	public function selectOptionInChosenById($selectId, $option)
+	{
+		$chosenSelectID = $selectId . '_chzn';
+		$I = $this;
+		$this->comment("I open the $chosenSelectID chosen selector");
+		$I->click(['xpath' => "//div[@id='$chosenSelectID']/a/div/b"]);
+		$this->comment("I select $option");
+		$I->click(['xpath' => "//div[@id='$chosenSelectID']//li[text()='$option']"]);
+		$I->wait(1); // Gives time to chosen to close
+	}
+	/**
+	 * Function to Verify the Tabs on a Joomla! screen
+	 *
+	 * @param  Array  $expectedTabs   Expected Tabs on the Page
+	 * @param  Mixed  $tabsLocator    Locator for the Tabs in Edit View
+	 *
+	 * @return void
+	 */
+	public function verifyAvailableTabs($expectedTabs, $tabsLocator = ['xpath' => "//ul[@id='myTabTabs']/li/a"])
+	{
+		$I = $this;
+		$actualArrayOfTabs = $I->grabMultiple($tabsLocator);
+		$I->comment("Fetch the current list of Tabs in the edit view which is: " . implode(", ", $actualArrayOfTabs));
+		$url = $I->grabFromCurrentUrl();
+		$I->assertEquals($expectedTabs, $actualArrayOfTabs, "Tab Labels do not match on edit view of" . $url);
+		$I->comment('Verify the Tabs');
+	}
+	/**
+	 * Function to Logout from Administrator Panel in Joomla!
+	 *
+	 * @return void
+	 */
+	public function doAdministratorLogout()
+	{
+		$I = $this;
+		$I->click(['xpath' => "//ul[@class='nav nav-user pull-right']//li//a[@class='dropdown-toggle']"]);
+		$this->comment("I click on Top Right corner toggle to Logout from Admin");
+		$I->waitForElement(['xpath' => "//li[@class='dropdown open']/ul[@class='dropdown-menu']//a[text() = 'Logout']"], 60);
+		$I->click(['xpath' => "//li[@class='dropdown open']/ul[@class='dropdown-menu']//a[text() = 'Logout']"]);
+		$I->waitForElement(['id' => 'mod-login-username'], 60);
+		$I->waitForText('Log in', 60, ['xpath' => "//fieldset[@class='loginform']//button"]);
 
-   /**
-    * Define custom actions here
-    */
+	}
 }
diff --git a/tests/_support/Page/Acceptance/Administrator/AdminPage.php b/tests/_support/Page/Acceptance/Administrator/AdminPage.php
new file mode 100644
index 0000000000..0288c23af2
--- /dev/null
+++ b/tests/_support/Page/Acceptance/Administrator/AdminPage.php
@@ -0,0 +1,11 @@
+<?php
+namespace Page\Acceptance\Administrator;
+
+class AdminPage extends \AcceptanceTester
+{
+    public static $systemMessageContainer = ['id' => 'system-message-container'];
+
+    public static $pageTitle = ['class' => 'page-title'];
+    
+    public static $controlPanelText = "Control Panel";
+}
\ No newline at end of file
diff --git a/tests/_support/Page/Acceptance/Administrator/Login.php b/tests/_support/Page/Acceptance/Administrator/Login.php
index 8e84d8379f..cfa824648b 100644
--- a/tests/_support/Page/Acceptance/Administrator/Login.php
+++ b/tests/_support/Page/Acceptance/Administrator/Login.php
@@ -4,14 +4,33 @@
 class Login extends \AcceptanceTester
 {
 	/**
-     * @When I login into Joomla Administrator with username :arg1 and password :arg1
-     */
-    public function login($username, $password)
-    {
-			$I = $this;
-			$I->amOnPage('administrator/');
-			$I->fillField(['css' => 'input[data-tests="username"]'], $username);
-			$I->fillField(['css' => 'input[data-tests="password"]'], $password);
-			$I->click(['css' => 'button[data-tests="log in"]']);
-    }
+	 * Install joomla CMS
+	 *
+	 * @Given Joomla CMS is installed
+	 */
+	public function joomlaCMSIsInstalled()
+	{
+		// throw new \Codeception\Exception\Incomplete("Step `Joomla CMS is installed` is not defined");
+	}
+
+	/**
+	 * @When Login into Joomla administrator with username :arg1 and password :arg1
+	 */
+	public function loginIntoJoomlaAdministrator($username, $password)
+	{
+		$I = $this;
+		$I->amOnPage('administrator/');
+		$I->fillField(['css' => 'input[data-tests="username"]'], $username);
+		$I->fillField(['css' => 'input[data-tests="password"]'], $password);
+		$I->click(['css' => 'button[data-tests="log in"]']);
+	}
+
+	/**
+	 * @Then I see administrator dashboard
+	 */
+	public function iSeeAdministratorDashboard()
+	{
+		$I = $this;
+		$I->waitForPageTitle('Control Panel', 4);
+	}
 }
diff --git a/tests/_support/Page/Acceptance/Administrator/LoginPage.php b/tests/_support/Page/Acceptance/Administrator/LoginPage.php
new file mode 100644
index 0000000000..3b4a5a7c0c
--- /dev/null
+++ b/tests/_support/Page/Acceptance/Administrator/LoginPage.php
@@ -0,0 +1,17 @@
+<?php
+namespace Page\Acceptance\Administrator;
+
+use Page\Acceptance\Administrator\AdminPage;
+
+class LoginPage extends AdminPage
+{
+    public static $usernameField = ['css' => 'input[data-tests="username"]'];
+    
+    public static $passwordField = ['css' => 'input[data-tests="password"]'];
+    
+    public static $pageTitle = ['class' => 'page-title'];
+    
+    public static $loginButton = ['css' => 'button[data-tests="log in"]'];
+    
+    public static $pageURL = "/administrator/index.php";
+}
\ No newline at end of file
diff --git a/tests/_support/Page/Acceptance/Administrator/UserManagerPage.php b/tests/_support/Page/Acceptance/Administrator/UserManagerPage.php
new file mode 100644
index 0000000000..c335356355
--- /dev/null
+++ b/tests/_support/Page/Acceptance/Administrator/UserManagerPage.php
@@ -0,0 +1,30 @@
+<?php
+namespace Page\Acceptance\Administrator;
+
+use Page\Acceptance\Administrator\AdminPage;
+
+class UserManagerPage extends AdminPage
+{
+    public static $nameField = ['id' => 'jform_name'];
+
+    public static $usernameField = ['id' => 'jform_username'];
+
+    public static $passwordField = ['id' => 'jform_password'];
+
+    public static $password2Field = ['id' => 'jform_password2'];
+
+    public static $emailField = ['id' => 'jform_email'];
+    
+    public static $filterSearch = ['id' => 'filter_search'];
+
+    public static $iconSearch = ['class' => 'icon-search'];
+
+    public static $title = ['id' => 'jform_title'];
+    
+    public static $pageURL = "administrator/index.php?option=com_users&view=users";
+
+    public static $groupPageURL = "administrator/index.php?option=com_users&view=groups";
+
+    public static $aclPageURL = "administrator/index.php?option=com_users&view=levels";
+
+}
diff --git a/tests/_support/Step/Acceptance/Administrator/User.php b/tests/_support/Step/Acceptance/Administrator/User.php
index aec47635b4..b089774d1b 100644
--- a/tests/_support/Step/Acceptance/Administrator/User.php
+++ b/tests/_support/Step/Acceptance/Administrator/User.php
@@ -1,23 +1,438 @@
 <?php
 namespace Step\Acceptance\Administrator;
 
+use Page\Acceptance\Administrator\AdminPage;
+use Page\Acceptance\Administrator\LoginPage;
+use  Page\Acceptance\Administrator\UserManagerPage;
+
 class User extends \AcceptanceTester
 {
 	/**
-	 * @Given I am registered administrator named :arg1
+	 * @Given There is a add user link
+	 */
+	public function thereIsAAddUserLink()
+	{
+		$I = $this;
+		$I->amOnPage(UserManagerPage::$pageURL);
+		$I->clickToolbarButton('New');
+	}
+
+	/**
+	 * @When I create new user with fields Name :name, Login Name :username, Password :password and Email :email
+	 */
+	public function iCreateNewUser($name, $username, $password, $email)
+	{
+		$I = $this;
+		$I->fillField(UserManagerPage::$nameField, $name);
+		$I->fillField(UserManagerPage::$usernameField, $username);
+		$I->fillField(UserManagerPage::$passwordField, $password);
+		$I->fillField(UserManagerPage::$password2Field, $password);
+		$I->fillField(UserManagerPage::$emailField, $email);
+	}
+
+	/**
+	 * @Then I Save the  user
+	 */
+	public function iSaveTheUser()
+	{
+		$I = $this;
+		$I->clickToolbarButton('Save & Close');
+	}
+
+	/**
+	 * @Then I see the :arg1 message
+	 */
+	public function iSeeTheMessage($message)
+	{
+		$I = $this;
+		$I->waitForPageTitle('Users');
+		$I->see($message,AdminPage::$systemMessageContainer);
+	}
+
+	/**
+	 * @Given I search and select the user with user name :username
+	 */
+	public function iSearchAndSelectTheUserWithUserName($username)
+	{
+		$I = $this;
+		$I->amOnPage(UserManagerPage::$pageURL);
+		$I->fillField(UserManagerPage::$filterSearch, $username);
+		$I->click(UserManagerPage::$iconSearch);
+		$I->checkAllResults();
+		$I->clickToolbarButton('edit');
+	}
+
+	/**
+	 *  @When I set name as an :name and User Group as :arg1
+	 */
+	public function iAssignedNameAndUserGroup($name, $userGroup)
+	{
+		$I = $this;
+		$I->fillField(UserManagerPage::$nameField, $name);
+		$I->click('Assigned User Groups');
+
+		// @todo use $userGroup variable to select user group dynamically
+		$I->checkOption('#1group_4');
+	}
+
+	/**
+	 * @Then I should display the :arg1 message
+	 */
+	public function iShouldDisplayTheMessage($message)
+	{
+		$I = $this;
+		$I->clickToolbarButton('Save & Close');
+		$I->waitForPageTitle('Users');
+		$I->see($message, AdminPage::$systemMessageContainer);
+	}
+
+	/**
+	 * @Given I have a user with user name :arg1
+	 */
+	public function iHaveAUserWithUserName($username)
+	{
+		$I = $this;
+		$I->amOnPage(UserManagerPage::$pageURL);
+		$I->fillField(UserManagerPage::$filterSearch, $username);
+		$I->click(UserManagerPage::$iconSearch);
+		$I->checkAllResults();
+	}
+
+	/**
+	 * @When I block the user
+	 */
+	public function iBlockTheUser()
+	{
+		$I = $this;
+		$I->clickToolbarButton('unpublish');
+	}
+
+	/**
+	 * @Then I should see the user block message :arg1
+	 */
+	public function iShouldSeeTheUserBlockMessage($message)
+	{
+		$I = $this;
+		$I->waitForPageTitle('Users');
+		$I->see($message, AdminPage::$systemMessageContainer);
+	}
+
+	/**
+	 * @Given I have a blocked user with user name :arg1
+	 */
+	public function iHaveABlockedUserWithUserName($username)
+	{
+		$I = $this;
+		$I->amOnPage(UserManagerPage::$pageURL);
+		$I->fillField(UserManagerPage::$filterSearch, $username);
+		$I->click(UserManagerPage::$iconSearch);
+		$I->checkAllResults();
+	}
+
+	/**
+	 * @When I unblock the user
+	 */
+	public function iUnblockTheUser()
+	{
+		$I = $this;
+		$I->waitForPageTitle('Users');
+		$I->clickToolbarButton('unblock');
+	}
+
+	/**
+	 * @Then I should see the user unblock message :arg1
+	 */
+	public function iShouldSeeTheUserUnblockMessage($message)
+	{
+		$I = $this;
+		$I->waitForPageTitle('Users');
+		$I->see($message, AdminPage::$systemMessageContainer);
+	}
+
+	/**
+	 * @When I Delete the user :arg1
+	 */
+	public function iDeleteTheUser($username)
+	{
+		$I = $this;
+		$I->amOnPage(UserManagerPage::$pageURL);
+		$I->fillField(UserManagerPage::$filterSearch, $username);
+		$I->click(UserManagerPage::$iconSearch);
+		$I->checkAllResults();
+		$I->clickToolbarButton('delete');
+		$I->acceptPopup();
+	}
+
+	/**
+	 * @Then I confirm the user should have been deleted by getting the message :arg1
+	 */
+	public function iConfirmTheUserDeleteSucessfully($message)
+	{
+		$I = $this;
+		$I->checkForPhpNoticesOrWarnings();
+		$I->see($message, AdminPage::$systemMessageContainer);;
+	}
+
+	/**
+	 * @Given There is an user link
+	 */
+	public function thereIsAnUserLink()
+	{
+		$I = $this;
+		$I->amOnPage(UserManagerPage::$pageURL);
+	}
+
+	/**
+	 * @When I see the user edit view tabs
+	 */
+	public function iSeeTheUsereditViewTabs()
+	{
+		$I = $this;
+		$I->clickToolbarButton('New');
+		$I->waitForPageTitle('Users');
+	}
+
+	/**
+	 * @Then I check available tabs :tab1, :tab2 and :tab3
+	 */
+	public function iCheckAvailableTabs($tab1, $tab2, $tab3)
+	{
+		$I = $this;
+		$I->verifyAvailableTabs([$tab1, $tab2, $tab3]);
+	}
+
+	/**
+	 * @When I create a super admin with fields Name :name, Login Name :username, Password :password, and Email :email
+	 */
+	public function iCreateASuperAdmin($name, $username, $password, $email)
+	{
+		$I = $this;
+		$I->fillField(UserManagerPage::$nameField, $name);
+		$I->fillField(UserManagerPage::$usernameField, $username);
+		$I->fillField(UserManagerPage::$passwordField, $password);
+		$I->fillField(UserManagerPage::$password2Field, $password);
+		$I->fillField(UserManagerPage::$emailField, $email);
+	}
+
+	/**
+	 * @When I set assigned user group as an Administrator
+	 */
+	public function iSetAssignedUserGroupAsAnAdministrator()
+	{
+		$I = $this;
+		$I->click('Assigned User Groups');
+		$I->checkOption('#1group_7');
+	}
+
+	/**
+	 * @Then Login in backend with username :username and password :password
+	 */
+	public function loginInBackend($username, $password)
+	{
+		$I = $this;
+		$I->doAdministratorLogout();
+		$I->fillField(LoginPage::$usernameField, $username);
+		$I->fillField(LoginPage::$passwordField, $password);
+		$I->click('Log in');
+	}
+
+	/**
+	 * @When I don't fill Login Name but fulfill remaining mandatory fields: Name :name, Password :password and Email :email
+	 */
+	public function iDontFillLoginName($name, $password, $email)
+	{
+		$I = $this;
+		$I->fillField(UserManagerPage::$nameField, $name);
+		$I->fillField(UserManagerPage::$passwordField, $password);
+		$I->fillField(UserManagerPage::$password2Field, $password);
+		$I->fillField(UserManagerPage::$emailField, $email);
+	}
+
+	/**
+	 * @Then I see the :error alert error
+	 */
+	public function iSeeTheAlertError($error)
+	{
+		$I = $this;
+		$I->see($error,AdminPage::$systemMessageContainer);
+	}
+
+
+	/**
+	 * @Given There is a add new group link
+	 */
+	public function thereIsAAddNewGroupLink()
+	{
+		$I = $this;
+		$I->amOnPage(UserManagerPage::$groupPageURL);
+		$I->clickToolbarButton('New');
+	}
+
+	/**
+	 * @When I fill Group Title as a :arg1
+	 */
+	public function iFillGroupTitleAsA($GroupTitle)
+	{
+		$I = $this;
+		$I->fillField(UserManagerPage::$title, $GroupTitle);
+	}
+
+	/**
+	 * @When I save the Group
+	 */
+	public function iSaveTheGroup()
+	{
+		$I = $this;
+		$I->clickToolbarButton('Save & Close');
+	}
+
+	/**
+	 * @Then I should see the :arg1 message
+	 */
+	public function iShouldSeeTheMessage($message)
+	{
+		$I = $this;
+		$I->waitForPageTitle('Users: Groups');
+		$I->see($message, AdminPage::$systemMessageContainer);
+	}
+
+	/**
+	 * @Given I search and select the Group with name :arg1
+	 */
+	public function iSearchAndSelectTheGroupWithName($GroupTitle)
+	{
+		$I = $this;
+		$I->amOnPage(UserManagerPage::$groupPageURL);
+		$I->fillField(UserManagerPage::$filterSearch, $GroupTitle);
+		$I->click(UserManagerPage::$iconSearch);
+		$I->checkAllResults();
+		$I->clickToolbarButton('edit');
+	}
+
+	/**
+	 * @Given I set group Title as a :arg1
+	 */
+	public function iSetGroupTitleAsA($GroupTitle)
+	{
+		$I = $this;
+		$I->fillField(UserManagerPage::$title, $GroupTitle);
+	}
+
+	/**
+	 * @When I Delete the Group :arg1
+	 */
+	public function iDeleteTheGroup($GroupTitle)
+	{
+		$I = $this;
+		$I->amOnPage(UserManagerPage::$groupPageURL);
+		$I->fillField(UserManagerPage::$filterSearch, $GroupTitle);
+		$I->click(UserManagerPage::$iconSearch);
+		$I->checkAllResults();
+		$I->clickToolbarButton('delete');
+		$I->acceptPopup();
+	}
+
+	/**
+	 * @Then I confirm the group should have been deleted by getting the message :arg1
+	 */
+	public function iDeleteUserGroup($message)
+	{
+		$I = $this;
+		$I->checkForPhpNoticesOrWarnings();
+		$I->see($message, AdminPage::$systemMessageContainer);
+	}
+
+	/**
+	 * @Given There is a add viewing access level link
+	 */
+	public function thereIsAAddViewingAccessLevelLink()
+	{
+		$I = $this;
+		$I->amOnPage(UserManagerPage::$aclPageURL);
+		$I->clickToolbarButton('New');
+	}
+
+	/**
+	 * @When I fill Level Title as a :levelTitle and set Access as a public
+	 */
+	public function iFillAccessLevelDetail($levelTitle)
+	{
+		$I = $this;
+		$I->fillField(UserManagerPage::$title, $levelTitle);
+		$I->checkOption('#1group_1');
+	}
+
+	/**
+	 * @When I save the Access Level
+	 */
+	public function iSaveTheAccessLevel()
+	{
+		$I = $this;
+		$I->clickToolbarButton('Save & Close');
+	}
+
+	/**
+	 * @Then I should be see the :arg1 message
+	 */
+	public function iShouldBeSeeTheMessage($message)
+	{
+		$I = $this;
+		$I->waitForPageTitle('Users: Viewing Access Levels');
+		$I->see($message, AdminPage::$systemMessageContainer);
+	}
+
+	/**
+	 * @Given I search and select the Access Level with name :arg1
+	 */
+	public function iSearchAndSelectTheAccessLevelWithName($LevelTitle)
+	{
+		$I = $this;
+		$I->amOnPage(UserManagerPage::$aclPageURL);
+		$I->fillField(UserManagerPage::$filterSearch, $LevelTitle);
+		$I->click(UserManagerPage::$iconSearch);
+		$I->checkAllResults();
+		$I->clickToolbarButton('edit');
+	}
+
+	/**
+	 * @Given I set Access Level title as a :arg1
+	 */
+	public function iSetAccessLevelTitleAsA($LevelTitle)
+	{
+		$I = $this;
+		$I->fillField(UserManagerPage::$title, $LevelTitle);
+	}
+
+	/**
+	 * @When I save Access Level
+	 */
+	public function iSaveAccessLevel()
+	{
+		$I = $this;
+		$I->clickToolbarButton('Save & Close');
+	}
+
+	/**
+	 * @When I Delete the Access level :arg1
 	 */
-	public function iAmRegisteredAdministratorNamed($arg1)
+	public function iDeleteTheAccessLeVel($LevelTitle)
 	{
 		$I = $this;
-		$I->comment('@todo');
+		$I->amOnPage(UserManagerPage::$aclPageURL);
+		$I->fillField(UserManagerPage::$filterSearch, $LevelTitle);
+		$I->click(UserManagerPage::$iconSearch);
+		$I->checkAllResults();
+		$I->clickToolbarButton('delete');
+		$I->acceptPopup();
 	}
 
 	/**
-	 * @Then I should see administrator dashboard
+	 * @Then I confirm the  Access Level have been deleted by getting the message :arg1
 	 */
-	public function iShouldSeeAdministratorDashboard()
+	public function iDeleteAccessLevel($message)
 	{
 		$I = $this;
-		$I->comment('@todo');
+		$I->checkForPhpNoticesOrWarnings();
+		$I->see($message, AdminPage::$systemMessageContainer);
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/acceptance.suite.dist.yml b/tests/acceptance.suite.dist.yml
index 438c17844f..a0fe3118b2 100644
--- a/tests/acceptance.suite.dist.yml
+++ b/tests/acceptance.suite.dist.yml
@@ -8,7 +8,8 @@ class_name: AcceptanceTester
 modules:
     enabled:
         - JoomlaBrowser
-        - AcceptanceHelper
+        - AcceptanceHelper        
+        - Asserts
     config:
         JoomlaBrowser:
             url: 'http://localhost/tests/joomla-cms3'     # the url that points to the joomla installation at /tests/system/joomla-cms
@@ -36,4 +37,4 @@ gherkin:
         default:
             - AcceptanceTester
             - Step\Acceptance\Administrator\User
-            - Page\Acceptance\Administrator\Login
\ No newline at end of file
+            - Page\Acceptance\Administrator\Login
diff --git a/tests/acceptance/administratorlogin.feature b/tests/acceptance/administratorlogin.feature
index 77a446c8ee..138c74bf38 100644
--- a/tests/acceptance/administratorlogin.feature
+++ b/tests/acceptance/administratorlogin.feature
@@ -1,9 +1,9 @@
 Feature: administrator login
   In order to manage my web application
-  As administrator
-  I need to be able to login
+  As an administrator
+  I need to have a control panel
 
-  Scenario: Successful login
-    Given I am registered administrator named "admin"
-    When I login into Joomla Administrator with username "admin" and password "admin"
-    Then I should see administrator dashboard
+  Scenario: Login in Administrator
+    Given Joomla CMS is installed
+    When Login into Joomla administrator with username "admin" and password "admin"
+    Then I see administrator dashboard
\ No newline at end of file
diff --git a/tests/acceptance/users.feature b/tests/acceptance/users.feature
new file mode 100644
index 0000000000..2f12c79204
--- /dev/null
+++ b/tests/acceptance/users.feature
@@ -0,0 +1,88 @@
+Feature: users
+  In order to manage users in the web
+  As an owner
+  I need to create edit block unblock and delete user
+
+  Background:
+    Given Joomla CMS is installed
+    When Login into Joomla administrator with username "admin" and password "admin"
+    Then I see administrator dashboard
+
+  Scenario: Verify available tabs in com_users
+    Given There is an user link
+    When I see the user edit view tabs
+    Then I check available tabs "Account Details", "Assigned User Groups" and "Basic Settings"
+
+  Scenario: perform a add new user
+    Given There is a add user link
+    When I create new user with fields Name "register", Login Name "register", Password "register" and Email "register@gmail.com"
+    Then I Save the  user
+    And I see the "User successfully saved." message
+
+  Scenario: Edit user
+    Given I search and select the user with user name "register"
+    When I set name as an "Editor" and User Group as "Editor"
+    Then I Save the  user
+    And I see the "User successfully saved." message
+
+  Scenario: Block a User
+    Given I have a user with user name "register"
+    When I block the user
+    Then I should see the user block message "User blocked."
+
+  Scenario: Unblock user
+    Given I have a blocked user with user name "register"
+    When I unblock the user
+    Then I should see the user unblock message "User enabled."
+
+  Scenario: Delete user
+    Given I have a user with user name "Editor"
+    When I Delete the user "Editor"
+    Then I confirm the user should have been deleted by getting the message "1 user successfully deleted."
+
+  Scenario: Create super admin and login into the backend
+    Given There is a add user link
+    When  I create a super admin with fields Name "prital", Login Name "prital", Password "prital", and Email "prital@gmail.com"
+    And I set assigned user group as an Administrator
+    Then I Save the  user
+    And Login in backend with username "prital" and password "prital"
+
+  Scenario:create User without username fails
+    Given There is a add user link
+    When I don't fill Login Name but fulfill remaining mandatory fields: Name "piyu", Password "piyu" and Email "piyu@gmail.com"
+    Then I Save the  user
+    And I see the "Invalid field:  Login Name" alert error
+
+  Scenario: Create group
+    Given There is a add new group link
+    When I fill Group Title as a "Gsoc"
+    And I save the Group
+    Then I should see the "Group successfully saved." message
+
+  Scenario: Edit group
+    Given I search and select the Group with name "Gsoc"
+    And I set group Title as a "Gsoc_admin"
+    When I save the Group
+    Then I should see the "Group successfully saved." message
+
+  Scenario: Delete Group
+    Given I search and select the Group with name "Gsoc_admin"
+    When I Delete the Group "Gsoc_admin"
+    Then I confirm the group should have been deleted by getting the message "1 User Group successfully deleted."
+
+  Scenario: Create ACL level
+    Given There is a add viewing access level link
+    When I fill Level Title as a "joomla" and set Access as a public
+    And I save the Access Level
+    Then I should be see the "Access level successfully saved." message
+
+  Scenario:  Edit ACL
+    Given I search and select the Access Level with name "joomla"
+    And I set Access Level title as a "Gsoc_joomla"
+    When I save Access Level
+    Then I should be see the "Access level successfully saved." message
+
+  Scenario: Delete ACL
+    Given I search and select the Access Level with name "Gsoc_joomla"
+    When I Delete the Access level "Gsoc_joomla"
+    Then I confirm the  Access Level have been deleted by getting the message "1 View Access Level successfully removed."