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..08d9f3d3fe 100644
--- a/RoboFile.php
+++ b/RoboFile.php
@@ -273,6 +273,25 @@ public function runTests($opts = ['use-htaccess' => false, 'env' => 'desktop'])
 			->run()
 			->stopOnFail();
 
+		$this->taskCodecept($pathToCodeception)
+			->arg('--steps')
+			->arg('--debug')
+			->arg('--fail-fast')
+			->arg('--env ' . $opts['env'])
+			->arg('tests/acceptance/content.feature')
+			->run()
+			->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')
@@ -291,6 +310,7 @@ public function runTests($opts = ['use-htaccess' => false, 'env' => 'desktop'])
 			->run()
 			->stopOnFail();
 
+		*/
 		/*
 		// Uncomment this lines if you need to debug selenium errors
 		$seleniumErrors = file_get_contents('selenium.log');
diff --git a/tests/_support/AcceptanceTester.php b/tests/_support/AcceptanceTester.php
index 4c7dcbb6d6..2264d20891 100644
--- a/tests/_support/AcceptanceTester.php
+++ b/tests/_support/AcceptanceTester.php
@@ -12,15 +12,150 @@
  * @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;
 
-   /**
-    * Define custom actions here
-    */
+	/**
+	 * 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, ['class' => 'page-title']);
+	}
+
+	/**
+	 * 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
+	 */
+	public function clickToolbarButton($button)
+	{
+		$I = $this;
+		$input = strtolower($button);
+
+		// @todo Needs to find way to work with different window size.
+		/*$screenSize = explode("x", $this->config['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;
+		}
+	}
+
+	/**
+	 * 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->debug("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->debug("I open the $chosenSelectID chosen selector");
+		$I->click(['xpath' => "//div[@id='$chosenSelectID']/a/div/b"]);
+		//$this->debug("I select $option");
+		$I->click(['xpath' => "//div[@id='$chosenSelectID']//li[text()='$option']"]);
+		$I->wait(1); // Gives time to chosen to close
+	}
 }
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/Step/Acceptance/Administrator/Content.php b/tests/_support/Step/Acceptance/Administrator/Content.php
new file mode 100644
index 0000000000..a15ffcf45c
--- /dev/null
+++ b/tests/_support/Step/Acceptance/Administrator/Content.php
@@ -0,0 +1,186 @@
+<?php
+namespace Step\Acceptance\Administrator;
+
+class Content extends \AcceptanceTester
+{
+	/**
+	 * @Given There is a Add Content link
+	 */
+	public function thereIsAAddContentLink()
+	{
+		$I = $this;
+		$I->amOnPage('administrator/index.php?option=com_content&view=articles');
+		$I->clickToolbarButton('New');
+	}
+
+	/**
+	 * @When I fill mandatory fields for creating article
+	 */
+	public function iFillMandatoryFieldsForCreatingArticle(\Behat\Gherkin\Node\TableNode $fields)
+	{
+
+		$I = $this;
+		// iterate over all rows
+		foreach ($fields->getRows() as $index => $row) {
+			if ($index === 0) { // first row to define fields
+				$keys = $row;
+				continue;
+			}
+			else
+			{
+				if ($row[0] == "title")
+				{
+					$I->fillField(['id' => 'jform_title'], $row[1]);
+				}
+				if ($row[0] == "content")
+				{
+					$I->click('Toggle editor');
+					$I->fillField(['id' => 'jform_articletext'], $row[1]);
+				}
+			}
+		}
+	}
+
+	/**
+	 * @When I save an article
+	 */
+	public function iSaveAnArticle()
+	{
+		$I = $this;
+		$I->clickToolbarButton('Save');
+	}
+
+	/**
+	 * @Then I should see the :arg1 message
+	 */
+	public function iShouldSeeTheMessage($message)
+	{
+		$I = $this;
+		$I->waitForPageTitle('Articles');
+		$I->see($message, ['id' => 'system-message-container']);
+	}
+
+	/**
+	 * @Given I search and select content article with title :arg1
+	 */
+	public function iSearchAndSelectContentArticleWithTitle($title)
+	{
+		$I = $this;
+		$I->amOnPage('administrator/index.php?option=com_content&view=articles');
+		$I->fillField(['id' => 'filter_search'], $title);
+		$I->click('.icon-search');
+		$I->checkAllResults();
+	}
+
+	/**
+	 * @When I featured the article
+	 */
+	public function iFeatureTheContentWithTitle()
+	{
+		$I = $this;
+		$I->click(['xpath' => "//div[@id='toolbar-featured']//button"]);
+	}
+
+	/**
+	 * @Then I save and see the :arg1 message
+	 */
+	public function iSaveAndSeeTheMessage($message)
+	{
+		$I = $this;
+		$I->waitForPageTitle('Articles');
+		$I->see($message, ['id' => 'system-message-container']);
+	}
+
+	/**
+	 * @Given I select the content article with title :arg1
+	 */
+	public function iSelectTheContentArticleWithTitle($title)
+	{
+		$I = $this;
+		$I->amOnPage('administrator/index.php?option=com_content&view=articles');
+		$I->fillField(['id' => 'filter_search'], $title);
+		$I->click('.icon-search');
+		$I->checkAllResults();
+		$I->click(['xpath' => "//div[@id='toolbar-edit']/button"]);
+	}
+
+	/**
+	 * @Given I set access level as a :arg1
+	 */
+	public function iSetAccessLevelAsA($accessLevel)
+	{
+		$I = $this;
+		$I->selectOptionInChosenById('jform_access', $accessLevel);
+	}
+
+	/**
+	 * @When I save the article
+	 */
+	public function iSaveTheArticle()
+	{
+		$I = $this;
+		$I->clickToolbarButton('Save & Close');
+	}
+
+	/**
+	 * @Given I have article with name :arg1
+	 */
+	public function iHaveArticleWithName($title)
+	{
+		$I = $this;
+		$I->amOnPage('administrator/index.php?option=com_content&view=articles');
+		$I->fillField(['id' => 'filter_search'], $title);
+		$I->click('.icon-search');
+		$I->checkAllResults();
+	}
+
+	/**
+	 * @When I unpublish the article
+	 */
+	public function iUnpublish()
+	{
+		$I = $this;
+		$I->clickToolbarButton('unpublish');
+	}
+	/**
+	 * @Then I see article unpublish message :arg1
+	 */
+	public function iSeeArticleUnpublishMessage($message)
+	{
+		$I = $this;
+		$I->waitForPageTitle('Articles');
+		$I->see($message, ['id' => 'system-message-container']);
+	}
+
+
+	/**
+	 * @Given I have :arg1 content article which needs to be Trash
+	 */
+	public function iHaveContentArticleWhichNeedsToBeTrash($title)
+	{
+		$I = $this;
+		$I->amOnPage('administrator/index.php?option=com_content&view=articles');
+		$I->fillField(['id' => 'filter_search'], $title);
+		$I->click('.icon-search');
+		$I->checkAllResults();
+	}
+
+	/**
+	 * @When I Trash the article
+	 */
+	public function iTrashTheArticleWithName()
+	{
+		$I = $this;
+		$I->clickToolbarButton('trash');
+	}
+
+	/**
+	 * @Then I see article trash message :arg1
+	 */
+	public function iSeeArticleTrashMessage($message)
+	{
+		$I = $this;
+		$I->waitForPageTitle('Articles');
+		$I->see($message, ['id' => 'system-message-container']);
+	}
+}
\ No newline at end of file
diff --git a/tests/_support/Step/Acceptance/Administrator/User.php b/tests/_support/Step/Acceptance/Administrator/User.php
index aec47635b4..0a5a77e95f 100644
--- a/tests/_support/Step/Acceptance/Administrator/User.php
+++ b/tests/_support/Step/Acceptance/Administrator/User.php
@@ -4,20 +4,195 @@
 class User extends \AcceptanceTester
 {
 	/**
-	 * @Given I am registered administrator named :arg1
+	 * @Given There is a add user link
 	 */
-	public function iAmRegisteredAdministratorNamed($arg1)
+	public function thereIsAAddUserLink()
 	{
 		$I = $this;
-		$I->comment('@todo');
+		$I->amOnPage('administrator/index.php?option=com_users&view=users');
+		$I->clickToolbarButton('New');
 	}
 
 	/**
-	 * @Then I should see administrator dashboard
+	 * @When I fill mandatory fields for creating User
 	 */
-	public function iShouldSeeAdministratorDashboard()
+	public function iFillMandatoryFieldsForCreatingUser(\Behat\Gherkin\Node\TableNode $fields)
 	{
 		$I = $this;
-		$I->comment('@todo');
+		// iterate over all rows
+		foreach ($fields->getRows() as $index => $row)
+		{
+			if ($index === 0)
+			{ // first row to define fields
+				$keys = $row;
+				continue;
+			}
+			else
+			{
+				if ($row[0] == "Name")
+				{
+					$I->fillField(['id' => 'jform_name'], $row[1]);
+				}
+				if ($row[0] == "Login Name")
+				{
+					$I->fillField(['id' => 'jform_username'], $row[1]);
+				}
+				if ($row[0] == "Password")
+				{
+					$I->fillField(['id' => 'jform_password'], $row[1]);
+				}
+				if ($row[0] == "Confirm Password")
+				{
+					$I->fillField(['id' => 'jform_password2'], $row[1]);
+				}
+				if ($row[0] == "Email")
+				{
+					$I->fillField(['id' => 'jform_email'], $row[1]);
+				}
+			}
+		}
+	}
+
+	/**
+	 * @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, ['id' => 'system-message-container']);
+	}
+
+	/**
+	 * @Given I search and select the user with user name :arg1
+	 */
+	public function iSearchAndSelectTheUserWithUserName($username)
+	{
+		$I = $this;
+		$I->amOnPage('administrator/index.php?option=com_users&view=users');
+		$I->fillField(['id' => 'filter_search'], $username);
+		$I->click('.icon-search');
+		$I->checkAllResults();
+		$I->clickToolbarButton('edit');
+	}
+
+	/**
+	 *  @When I set name as an :arg1 and User Group as :arg1
+	 */
+	public function iAssignedNameAndUserGroup($name, $userGroup)
+	{
+		$I = $this;
+		$I->fillField(['id' => 'jform_name'], $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, ['id' => 'system-message-container']);
+	}
+
+	/**
+	 * @Given I have a user with user name :arg1
+	 */
+	public function iHaveAUserWithUserName($username)
+	{
+		$I = $this;
+		$I->amOnPage('administrator/index.php?option=com_users&view=users');
+		$I->fillField(['id' => 'filter_search'], $username);
+		$I->click('.icon-search');
+		$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, ['id' => 'system-message-container']);
+	}
+
+	/**
+	 * @Given I have a blocked user with user name :arg1
+	 */
+	public function iHaveABlockedUserWithUserName($username)
+	{
+		$I = $this;
+		$I->amOnPage('administrator/index.php?option=com_users&view=users');
+		$I->fillField(['id' => 'filter_search'], $username);
+		$I->click('.icon-search');
+		$I->checkAllResults();
+	}
+
+	/**
+	 * @When I unblock the user
+	 */
+	public function iUnblockTheUser()
+	{
+		$I = $this;
+		$I->waitForPageTitle('Users');
+		$I->click(['xpath' => "//div[@id='toolbar-unblock']//button"]);
+	}
+
+	/**
+	 * @Then I should see the user unblock message :arg1
+	 */
+	public function iShouldSeeTheUserUnblockMessage($message)
+	{
+		$I = $this;
+		$I->waitForPageTitle('Users');
+		$I->see($message, ['id' => 'system-message-container']);
+	}
+
+	/**
+	 * @When I Delete the user :arg1
+	 */
+	public function iDeleteTheUser($username)
+	{
+		$I = $this;
+		$I->amOnPage('administrator/index.php?option=com_users&view=users');
+		$I->fillField(['id' => 'filter_search'], $username);
+		$I->click('.icon-search');
+		$I->checkAllResults();
+		$I->clickToolbarButton('empty trash');
+		$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->expectTo('see a success message and the user is deleted');
+		$I->see($message, ['class' => 'alert-message']);
 	}
 }
\ No newline at end of file
diff --git a/tests/acceptance/administrator.feature b/tests/acceptance/administrator.feature
new file mode 100644
index 0000000000..ef19bc51c0
--- /dev/null
+++ b/tests/acceptance/administrator.feature
@@ -0,0 +1,9 @@
+Feature: administrator
+  In order to manage my web application
+  As an administrator
+  I need to have a control panel
+
+  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
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/content.feature b/tests/acceptance/content.feature
new file mode 100644
index 0000000000..56d4a9a83e
--- /dev/null
+++ b/tests/acceptance/content.feature
@@ -0,0 +1,40 @@
+Feature: content
+  In order to manage content article in the web
+  As an owner
+  I need to create modify trash publish and Unpublish content article
+
+  Background:
+    Given Joomla CMS is installed
+    When Login into Joomla administrator with username "admin" and password "admin"
+    Then I see administrator dashboard
+
+  Scenario: Create an Article
+    Given There is a Add Content link
+    When I fill mandatory fields for creating article
+      | field   | value                    |
+      | title   | My_Article               |
+      | content | This is my First Article |
+    And I save an article
+    Then I should see the "Article successfully saved." message
+
+  Scenario: Feature an Article
+    Given I search and select content article with title "My_Article"
+    When I featured the article
+    Then I save and see the "1 article featured." message
+
+  Scenario: Modify an article
+    Given I select the content article with title "My_Article"
+    And I set access level as a "Registered"
+    When I save the article
+    Then I should see the "Article successfully saved" message
+
+  Scenario: Unpublish an article
+    Given I have article with name "My_Article"
+    When I unpublish the article
+    Then I see article unpublish message "1 article unpublished."
+
+  Scenario: Trash an article
+    Given I have "My_Article" content article which needs to be Trash
+    When  I Trash the article
+    Then  I see article trash message "1 article trashed."
+
diff --git a/tests/acceptance/users.feature b/tests/acceptance/users.feature
new file mode 100644
index 0000000000..b9ec2a0305
--- /dev/null
+++ b/tests/acceptance/users.feature
@@ -0,0 +1,117 @@
+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: create a user
+    Given There is a add user link
+    When I fill mandatory fields for creating User
+      | field             | value                    |
+      | Name              | register                 |
+      | Login Name        | register                 |
+      | Password          | register                 |
+      | Confirm Password  | register                 |
+      | Email             | baldhapiyu@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: Verify available tabs in com_users
+    Given There is a add/edit user link
+    When I check available tabs
+      |     tab              |
+      | Account Details      |
+      | Assigned User Groups |
+      | Basic Settings       |
+
+  Scenario: Create super admin and login into the backend
+    Given There is a add user link
+    When  I fill mandatory fields for creating User
+      | field             | value                  |
+      | Name              | prital                 |
+      | Login Name        | prital                 |
+      | Password          | prital                 |
+      | Confirm Password  | prital                 |
+      | Email             | baldhapiyu@gmail.com   |
+    And I set assigned user group as an "Administrator"
+    Then I Save the  user
+    And I see the "User successfully saved." message
+
+  Scenario: User without username fails
+    Given There is a add user link
+    When I fill mandatory fields for creating User but don't fill Login Name
+      | field             | value                  |
+      | Name              | piyu                   |
+      | Password          | piyu                   |
+      | Confirm Password  | piyu                   |
+      | Email             | piyu@gmail.com         |
+    Then I Save the  user
+    And I see the "Invalid field:  Login Name" message
+
+  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 user 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 I save the Access Level
+    Then I should see the "Access level successfully saved".
+
+  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 see the "Access level successfully saved".
+
+  Scenario: Delete ACL
+    Given I search and select the Access Level with name "Gsoc_Joomla"
+    When I Delete the Access le vel "Gsoc_admin"
+    Then I confirm the  Access Level have been deleted by getting the message "1 View Access Level successfully removed."
+
+
+  Scenario: User settings (mixed with com_config)
+
+
+
+
+
+