diff --git a/tests/system/webdriver/Pages/Components/BannerEditPage.php b/tests/system/webdriver/Pages/Components/BannerEditPage.php
index 9378350f7bcaa..1d87dfc99a33f 100644
--- a/tests/system/webdriver/Pages/Components/BannerEditPage.php
+++ b/tests/system/webdriver/Pages/Components/BannerEditPage.php
@@ -62,8 +62,8 @@ class BannerEditPage extends AdminEditPage
 			array('label' => 'Alternative Text', 'id' => 'jform_params_alt', 'type' => 'input', 'tab' => 'details'),
 			array('label' => 'Click URL', 'id' => 'jform_clickurl', 'type' => 'input', 'tab' => 'details'),
 			array('label' => 'Description', 'id' => 'jform_description', 'type' => 'textarea', 'tab' => 'details'),
-			array('label' => 'Category', 'id' => 'jform_catid', 'type' => 'select', 'tab' => 'details'),
 			array('label' => 'Status', 'id' => 'jform_state', 'type' => 'select', 'tab' => 'details'),
+			array('label' => 'Category', 'id' => 'jform_catid', 'type' => 'select', 'tab' => 'details'),			
 			array('label' => 'Pinned', 'id' => 'jform_sticky', 'type' => 'fieldset', 'tab' => 'details'),
 			array('label' => 'Language', 'id' => 'jform_language', 'type' => 'select', 'tab' => 'details'),
 			array('label' => 'Version Note', 'id' => 'jform_version_note', 'type' => 'input', 'tab' => 'details'),
diff --git a/tests/system/webdriver/Pages/Components/CategoryEditPage.php b/tests/system/webdriver/Pages/Components/CategoryEditPage.php
index cdc7cdcffa123..574df2ee6d43e 100644
--- a/tests/system/webdriver/Pages/Components/CategoryEditPage.php
+++ b/tests/system/webdriver/Pages/Components/CategoryEditPage.php
@@ -67,10 +67,10 @@ class CategoryEditPage extends AdminEditPage
 			array('label' => 'Alias', 'id' => 'jform_alias', 'type' => 'input', 'tab' => 'header'),
 			array('label' => 'Description', 'id' => 'jform_description', 'type' => 'textarea', 'tab' => 'general'),
 			array('label' => 'Parent', 'id' => 'jform_parent_id', 'type' => 'select', 'tab' => 'general'),
-			array('label' => 'Tags', 'id' => 'jform_tags', 'type' => 'select', 'tab' => 'general'),
 			array('label' => 'Status', 'id' => 'jform_published', 'type' => 'select', 'tab' => 'general'),
 			array('label' => 'Access', 'id' => 'jform_access', 'type' => 'select', 'tab' => 'general'),
 			array('label' => 'Language', 'id' => 'jform_language', 'type' => 'select', 'tab' => 'general'),
+			array('label' => 'Tags', 'id' => 'jform_tags', 'type' => 'select', 'tab' => 'general'),
 			array('label' => 'Note', 'id' => 'jform_note', 'type' => 'input', 'tab' => 'general'),
 			array('label' => 'Version Note', 'id' => 'jform_version_note', 'type' => 'input', 'tab' => 'general'),
 			array('label' => 'Created Date', 'id' => 'jform_created_time', 'type' => 'input', 'tab' => 'publishing'),
diff --git a/tests/system/webdriver/Pages/Components/ContactEditPage.php b/tests/system/webdriver/Pages/Components/ContactEditPage.php
index b2ee224b5e36b..c78839b425d23 100644
--- a/tests/system/webdriver/Pages/Components/ContactEditPage.php
+++ b/tests/system/webdriver/Pages/Components/ContactEditPage.php
@@ -73,12 +73,12 @@ class ContactEditPage extends AdminEditPage
 			array('label' => 'First Sort Field', 'id' => 'jform_sortname1', 'type' => 'input', 'tab' => 'details'),
 			array('label' => 'Second Sort Field', 'id' => 'jform_sortname2', 'type' => 'input', 'tab' => 'details'),
 			array('label' => 'Third Sort Field', 'id' => 'jform_sortname3', 'type' => 'input', 'tab' => 'details'),
-			array('label' => 'Category', 'id' => 'jform_catid', 'type' => 'select', 'tab' => 'details'),
-			array('label' => 'Tags', 'id' => 'jform_tags', 'type' => 'select', 'tab' => 'details'),
 			array('label' => 'Status', 'id' => 'jform_published', 'type' => 'select', 'tab' => 'details'),
+			array('label' => 'Category', 'id' => 'jform_catid', 'type' => 'select', 'tab' => 'details'),
 			array('label' => 'Featured', 'id' => 'jform_featured', 'type' => 'fieldset', 'tab' => 'details'),
 			array('label' => 'Access', 'id' => 'jform_access', 'type' => 'select', 'tab' => 'details'),
 			array('label' => 'Language', 'id' => 'jform_language', 'type' => 'select', 'tab' => 'details'),
+			array('label' => 'Tags', 'id' => 'jform_tags', 'type' => 'select', 'tab' => 'details'),
 			array('label' => 'Version Note', 'id' => 'jform_version_note', 'type' => 'input', 'tab' => 'details'),
 			array('label' => 'Miscellaneous Information', 'id' => 'jform_misc', 'type' => 'textarea', 'tab' => 'misc'),
 			array('label' => 'Start Publishing', 'id' => 'jform_publish_up', 'type' => 'input', 'tab' => 'publishing'),
@@ -115,6 +115,7 @@ class ContactEditPage extends AdminEditPage
 			array('label' => 'Image', 'id' => 'jform_params_show_image', 'type' => 'select', 'tab' => 'attrib-display'),
 			array('label' => 'vCard', 'id' => 'jform_params_allow_vcard', 'type' => 'select', 'tab' => 'attrib-display'),
 			array('label' => 'Show User Articles', 'id' => 'jform_params_show_articles', 'type' => 'select', 'tab' => 'attrib-display'),
+			array('label' => '# Articles to List', 'id' => 'jform_params_articles_display_num', 'type' => 'select', 'tab' => 'attrib-display'),
 			array('label' => 'Show Profile', 'id' => 'jform_params_show_profile', 'type' => 'select', 'tab' => 'attrib-display'),
 			array('label' => 'Show Links', 'id' => 'jform_params_show_links', 'type' => 'select', 'tab' => 'attrib-display'),
 			array('label' => 'Link A Label', 'id' => 'jform_params_linka_name', 'type' => 'input', 'tab' => 'attrib-display'),
diff --git a/tests/system/webdriver/Pages/Components/NewsFeedEditPage.php b/tests/system/webdriver/Pages/Components/NewsFeedEditPage.php
index d967af6a6437b..46be77bfd7806 100644
--- a/tests/system/webdriver/Pages/Components/NewsFeedEditPage.php
+++ b/tests/system/webdriver/Pages/Components/NewsFeedEditPage.php
@@ -59,11 +59,11 @@ class NewsFeedEditPage extends AdminEditPage
 		array('label' => 'Alias', 'id' => 'jform_alias', 'type' => 'input', 'tab' => 'header'),
 		array('label' => 'Link', 'id' => 'jform_link', 'type' => 'input', 'tab' => 'details'),
 		array('label' => 'Description', 'id' => 'jform_description', 'type' => 'textarea', 'tab' => 'details'),
-		array('label' => 'Category', 'id' => 'jform_catid', 'type' => 'select', 'tab' => 'details'),
-		array('label' => 'Tags', 'id' => 'jform_tags', 'type' => 'select', 'tab' => 'details'),
 		array('label' => 'Status', 'id' => 'jform_published', 'type' => 'select', 'tab' => 'details'),
+		array('label' => 'Category', 'id' => 'jform_catid', 'type' => 'select', 'tab' => 'details'),
 		array('label' => 'Access', 'id' => 'jform_access', 'type' => 'select', 'tab' => 'details'),
 		array('label' => 'Language', 'id' => 'jform_language', 'type' => 'select', 'tab' => 'details'),
+		array('label' => 'Tags', 'id' => 'jform_tags', 'type' => 'select', 'tab' => 'details'),
 		array('label' => 'Version Note', 'id' => 'jform_version_note', 'type' => 'input', 'tab' => 'details'),
 		array('label' => 'First Image', 'id' => 'jform_images_image_first', 'type' => 'input', 'tab' => 'images'),
 		array('label' => 'Image Float', 'id' => 'jform_images_float_first', 'type' => 'select', 'tab' => 'images'),
diff --git a/tests/system/webdriver/tests/users/LevelManager0001Test.php b/tests/system/webdriver/tests/users/LevelManager0001Test.php
index 5331533d69e82..dfb6f69096190 100644
--- a/tests/system/webdriver/tests/users/LevelManager0001Test.php
+++ b/tests/system/webdriver/tests/users/LevelManager0001Test.php
@@ -107,7 +107,7 @@ public function add_WithFieldDefaults_Added()
 		$this->levelManagerPage->addLevel();
 		$message = $this->levelManagerPage->getAlertMessage();
 		$this->assertTrue(strpos($message, 'Level successfully saved') >= 0, 'Level save should return success');
-		$this->assertEquals(7, $this->levelManagerPage->getRowNumber('Test Level'), 'Test level should be in row 6');
+		$this->assertGreaterThanOrEqual(1, $this->levelManagerPage->getRowNumber('Test Level'), 'Test level should be present');
 		$this->levelManagerPage->delete('Test Level');
 		$this->assertFalse($this->levelManagerPage->getRowNumber('Test Level'), 'Test level should not be present');
 	}