diff --git a/src/JoomlaBrowser.php b/src/JoomlaBrowser.php
index 7b7c351..512f5c0 100644
--- a/src/JoomlaBrowser.php
+++ b/src/JoomlaBrowser.php
@@ -123,6 +123,7 @@ public function doFrontendLogout()
 		$I->amOnPage('/index.php?option=com_users&view=login');
 		$this->debug('I click Logout button');
 		$I->click(['xpath' => "//div[@class='logout']//button[contains(text(), 'Log out')]"]);
+		$I->amOnPage('/index.php?option=com_users&view=login');
 		$this->debug('I wait to see Login form');
 		$I->waitForElement(['xpath' => "//div[@class='login']//button[contains(text(), 'Log in')]"], 30);
 		$I->seeElement(['xpath' => "//div[@class='login']//button[contains(text(), 'Log in')]"]);
@@ -588,7 +589,7 @@ public function enablePlugin($pluginName)
 		$I->checkExistenceOf($pluginName);
 		$I->click(['xpath' => "//input[@id='cb0']"]);
 		$I->click(['xpath' => "//div[@id='toolbar-publish']/button"]);
-		$I->see('successfully enabled', ['id' => 'system-message-container']);
+		$I->see(' enabled', ['id' => 'system-message-container']);
 	}
 
 	/**
@@ -748,7 +749,7 @@ public function setModulePosition($module, $position = 'position-7')
 		$I->waitForElement(['id' => 'general'], 30);
 		$I->selectOptionInChosen('Position', $position);
 		$I->click(['xpath' => "//div[@id='toolbar-apply']/button"]);
-		$I->waitForText('Module successfully saved', 30, ['id' => 'system-message-container']);
+		$I->waitForText('Module saved', 30, ['id' => 'system-message-container']);
 	}
 
 	/**
@@ -765,7 +766,7 @@ public function publishModule($module)
 		$I->searchForItem($module);
 		$I->checkAllResults();
 		$I->click(['xpath' => "//div[@id='toolbar-publish']/button"]);
-		$I->waitForText('1 module successfully published.', 30, ['id' => 'system-message-container']);
+		$I->waitForText(' published.', 30, ['id' => 'system-message-container']);
 	}
 
 	/**
@@ -787,7 +788,7 @@ public function displayModuleOnAllPages($module)
 		$I->click(['id' => 'jform_assignment_chzn']);
 		$I->click(['xpath' => "//li[@data-option-array-index='0']"]);
 		$I->click(['xpath' => "//div[@id='toolbar-apply']/button"]);
-		$I->waitForText('Module successfully saved', 30, ['id' => 'system-message-container']);
+		$I->waitForText('Module saved', 30, ['id' => 'system-message-container']);
 	}
 
 	/**
@@ -916,7 +917,7 @@ public function createMenuItem($menuTitle, $menuCategory, $menuItem, $menu = 'Ma
 		$I->debug('I save the menu');
 		$I->click("Save");
 
-		$I->waitForText('Menu item successfully saved', '60', ['id' => 'system-message-container']);
+		$I->waitForText('Menu item saved', '60', ['id' => 'system-message-container']);
 	}
 
 	/**