diff --git a/tests/acceptance/administrator/AdministratorCategoriesCest.php b/tests/acceptance/administrator/AdministratorCategoriesCest.php
index 7d581a7..fe00030 100644
--- a/tests/acceptance/administrator/AdministratorCategoriesCest.php
+++ b/tests/acceptance/administrator/AdministratorCategoriesCest.php
@@ -9,69 +9,20 @@
  */
 class AdministratorCategoriesCest
 {
-	/**
-	 * Function to delete the menuItem
-	 *
-	 * @param  string $menuItem Title of the menuItem which is to be deleted
-	 * @return void
-	 */
-	private function deleteMenuItem(AcceptanceTester $I, $menuItem)
+	public function administratorVerifyAvailableTabs(\Step\Acceptance\category $I)
 	{
-		$I->amGoingTo('Delete the just saved MenuItem');
-		$I->amOnPage('/administrator/index.php?option=com_menus&view=items');
-		$I->searchForItem($menuItem);
-		$I->checkAllResults();
-		$I->clickToolbarButton('Trash');
-		$I->expectTo('see a success message and the menuItem removed from the list');
-		$I->see('1 menu item successfully trashed.', ['id' => 'system-message-container']);
-		$I->searchForItem($menuItem);
-		$I->setFilter('select status', 'Trashed');
-		$I->checkAllResults();
-		$I->clickToolbarButton('empty trash');
-		$I->see("1 menu item successfully deleted.", ['id' => 'system-message-container']);
-	}
+		$I->am('Administrator');
+		$I->wantToTest('Category Edit View Tabs');
 
-	/**
-	 * Creates a weblink with category
-	 *
-	 * @param   string $title The title for the weblink
-	 * @param   string $url The url for the
-	 * @param   string $cat The category of the weblink
-	 *
-	 */
-	private function createWeblinkWithCategory(AcceptanceTester $I, $title, $url, $cat)
-	{
-		$I->comment('I navigate to Weblinks page in /administrator/');
-		$I->amOnPage('administrator/index.php?option=com_weblinks');
-		$I->waitForText('Web Links', '30', ['css' => 'h1']);
-		$I->comment('I see weblinks page');
-		$I->comment('I try to save a weblink with a filled title and URL');
-		$I->click('New');
-		$I->waitForText('Web Link: New', '30', ['css' => 'h1']);
-		$I->fillField(['id' => 'jform_title'], $title);
-		$I->fillField(['id' => 'jform_url'], $url);
-		$I->selectOptionInChosen('Category', "- " . $cat);
-		$I->click(['xpath' => "//button[@onclick=\"Joomla.submitbutton('weblink.save')\"]"]);
-		$I->waitForText('Web link successfully saved', '30', ['id' => 'system-message-container']);
-	}
+		$I->doAdministratorLogin();
 
-	private function deleteWeblink(AcceptanceTester $I, $weblinkTitle)
-	{
-		$I->amGoingTo('Delete the just saved Weblink');
-		$I->amOnPage('/administrator/index.php?option=com_weblinks');
-		$I->searchForItem($weblinkTitle);
-		$I->checkAllResults();
-		$I->clickToolbarButton('Trash');
-		$I->expectTo('see a success message and the weblink removed from the list');
-		$I->see('1 web link successfully trashed.', ['id' => 'system-message-container']);
-		$I->selectOptionInChosen('- Select Status -', 'Trashed');
-		$I->searchForItem($weblinkTitle);
-		$I->checkAllResults();
-		$I->clickToolbarButton('empty trash');
-		$I->see("1 web link successfully deleted.", ['id' => 'system-message-container']);
+		$I->amGoingTo('Navigate to Categories page in /administrator/ and verify the Tabs');
+		$I->amOnPage('administrator/index.php?option=com_categories&extension=com_weblinks');
+		$I->clickToolbarButton('New');
+		$I->waitForText('Weblinks: New Category', '30', ['css' => 'h1']);
+		$I->verifyAvailableTabs(['Category', 'Publishing', 'Permissions', 'Options']);
 	}
 
-
 	public function administratorCreateCategory(\Step\Acceptance\category $I)
 	{
 		$I->am('Administrator');
@@ -84,6 +35,7 @@ class AdministratorCategoriesCest
 		$I->createCategory($categoryName);
 		$I->amGoingTo('Delete the Category which was created');
 		$I->trashCategory($categoryName);
+		$I->deleteCategory($categoryName);
 	}
 
 	public function administratorCreateCategoryWithoutTitleFails(AcceptanceTester $I)
@@ -131,6 +83,7 @@ class AdministratorCategoriesCest
 
 		$I->amGoingTo('Delete the Category which was created');
 		$I->trashCategory($categoryName);
+		$I->deleteCategory($categoryName);
 	}
 
 	public function administratorUnpublishCategory(\Step\Acceptance\category $I)
@@ -170,58 +123,25 @@ class AdministratorCategoriesCest
 		//delete the category
 		$I->amGoingTo('Delete the Category which was created');
 		$I->trashCategory($categoryName);
+		$I->deleteCategory($categoryName);
 	}
-
 	public function administratorArchiveCategory(\Step\Acceptance\category $I)
 	{
 		$I->am('Administrator');
 		$I->wantToTest('Archiving Category in /administrator/');
 		$I->doAdministratorLogin();
-		$salt = rand(1, 100);
-		$I->createCategory('automated testing arch' . $salt);
+		$salt = rand(1,100);
+		$I->createCategory('automated testing arch'.$salt);
 		$I->amGoingTo('Search for automated testing');
-		$I->fillField(['xpath' => "//input[@id=\"filter_search\"]"], "automated testing arch" . $salt . "\n");
+		$I->fillField(['xpath' => "//input[@id=\"filter_search\"]"], "automated testing arch".$salt. "\n");
 		$I->waitForText('Weblinks: Categories', '30', ['css' => 'h1']);
 		$I->amGoingTo('Select the first weblink');
 		$I->click(['xpath' => "//input[@id=\"cb0\"]"]);
 		$I->amGoingTo('try to archive a weblink category');
 		$I->click(['xpath' => "//button[@onclick=\"if (document.adminForm.boxchecked.value==0){alert('Please first make a selection from the list.');}else{ Joomla.submitbutton('categories.archive')}\"]"]);
 		$I->waitForText('Weblinks: Categories', '30', ['css' => 'h1']);
-		$I->expectTo('see a success message after Archiving the category');
-		$I->see('1 category successfully archived.', ['id' => 'system-message-container']);
-		$I->setFilter('select status', 'Archived');
-		//$I->searchForItem('automated testing arch'.$salt);
-		$I->trashCategory('automated testing arch' . $salt);
+		$I->expectTo('see a success message after Archiving the category');$I->see('1 category successfully archived.', ['id' => 'system-message-container']);
+		$I->setFilter('select status','Archived');
+		$I->trashCategory('automated testing arch'.$salt);
 	}
-
-	public function administratorMenuWeblinkCategory(\Step\Acceptance\category $I)
-	{
-		$I->am('Administrator');
-		$salt = rand(1, 100);
-		$categoryName = 'automated testing' . $salt;
-
-		$I->doAdministratorLogin();
-		$I->amGoingTo('Navigate to Categories page in /administrator/ and create a Category');
-		$I->createCategory($categoryName);
-		$title = 'weblink' . $salt;
-		$url = 'www.google.com';
-		$this->createWeblinkWithCategory($I, $title, $url, $categoryName);
-		$menuTitle = 'menuItem' . $salt;
-		$I->createMenuItem($menuTitle, $menuCategory = 'Weblinks', $menuItem = 'List Web Links in a Category', $menu = 'Main Menu', $language = 'All');
-		$I->selectOptionInChosen('Select a Category', $categoryName);
-		$I->click('Save & Close');
-
-		// Go to the frontend
-		$I->comment('I want to check if the menu entry exists in the frontend');
-		$I->amOnPage('index.php/');
-		$I->click(['link' => $menuTitle]);
-		$I->waitForText($categoryName, 60, ['css' => 'h2']);
-		$I->seeElement(['xpath' => "//a[contains(text(),'" . $title . "')]"]);
-
-		//Go to backend
-		$I->amOnPage('/administrator/');
-		$this->deleteWeblink($I, $title);
-		$I->trashCategory($categoryName);
-		$this->deleteMenuItem($I, $menuTitle);
-	}
-}
\ No newline at end of file
+}