diff --git a/features/approve_article.feature b/features/approve_article.feature
index ac2294a..4541fe4 100644
--- a/features/approve_article.feature
+++ b/features/approve_article.feature
@@ -62,7 +62,8 @@ Feature: approve article
     And I press "Spread this"
     And I follow "Delete"
     And I confirm the browser dialog
-    When I am logged in as "joaosilva"
+    And I follow "Logout"
+    And I am logged in as "joaosilva"
     And I go to sample-community's control panel
     And I follow "Process requests"
     And I choose "Reject"
diff --git a/features/balloon.feature b/features/balloon.feature
index e786c5b..1f2b18c 100644
--- a/features/balloon.feature
+++ b/features/balloon.feature
@@ -41,19 +41,19 @@ Feature: balloon
   @selenium
   Scenario: I should not see trigger if not enabled on page
     Given feature "show_balloon_with_profile_links_when_clicked" is disabled on environment
-    When I go to /assets/people
+    When I go to /search/people
     Then I should not see "Profile links"
 
   @selenium
   Scenario: I should not see trigger by default on page
     Given feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
-    When I go to /assets/communities
+    When I go to /search/communities
     Then I should not see "Members"
 
   @selenium
   Scenario: I should see balloon when clicked on page trigger
     Given feature "show_balloon_with_profile_links_when_clicked" is enabled on environment
-    And I go to /assets/communities
+    And I go to /search/communities
     And display ".community-trigger"
     When I follow "Profile links"
     Then I should see "Members"
diff --git a/features/browse_enterprises.feature b/features/browse_enterprises.feature
index 16f14fa..790c0e8 100644
--- a/features/browse_enterprises.feature
+++ b/features/browse_enterprises.feature
@@ -13,20 +13,20 @@ Scenario: show all enterprises
   Given the following enterprises
     | identifier | name        |
     | shop2      | Fruits Shop |
-  Given I am on /assets/enterprises
+  Given I am on /search/enterprises
   Then I should see "Enterprises"
   And I should see "Shoes Shop"
   And I should see "Fruits Shop"
 
 Scenario: show profile links button
-  Given I am on /assets/enterprises
+  Given I am on /search/enterprises
   Then I should see "Profile links" within "a.enterprise-trigger"
   And I should not see "Members"
   And I should not see "Agenda"
 
 @selenium-fixme
 Scenario: show profile links when clicked
-  Given I am on /assets/enterprises
+  Given I am on /search/enterprises
   When I follow "Profile links"
   Then I should see "Products" within "ul.menu-submenu-list"
   And I should see "Members" within "ul.menu-submenu-list"
@@ -34,7 +34,7 @@ Scenario: show profile links when clicked
 
 @selenium-fixme
 Scenario: go to catalog when click on products link
-  Given I am on /assets/enterprises
+  Given I am on /search/enterprises
   When I follow "Profile links"
   And I follow "Products" and wait
   Then I should be exactly on /catalog/shop1
diff --git a/features/change_appearance.feature b/features/change_appearance.feature
index 7f07cab..5eb5b1f 100644
--- a/features/change_appearance.feature
+++ b/features/change_appearance.feature
@@ -14,7 +14,7 @@ Feature: Change appearance
     And I should not see an element ".box-4"
     And I go to joaosilva's control panel
     And I follow "Edit Appearance"
-    And I follow "Left Top and Right"
+    And I follow "Top and Side Bars"
     And I go to joaosilva's control panel
     And I follow "Edit sideboxes"
     And I should see an element ".box-4"
diff --git a/features/events.feature b/features/events.feature
index 22772e2..e7ddbbc 100644
--- a/features/events.feature
+++ b/features/events.feature
@@ -17,7 +17,7 @@ Feature: events
     Then I should see "November 2009" within ".current-month"
 
   Scenario: go to next month in global agenda
-    Given I am on /assets/events?year=2009&month=11
+    Given I am on /search/events?year=2009&month=11
     When I follow "December"
     Then I should see "December 2009" within ".current-month"
 
@@ -27,7 +27,7 @@ Feature: events
     Then I should see "September 2009" within ".current-month"
 
   Scenario: go to previous month in global agenda
-    Given I am on /assets/events?year=2009&month=11
+    Given I am on /search/events?year=2009&month=11
     When I follow "October"
     Then I should see "October 2009" within ".current-month"
 
@@ -43,7 +43,7 @@ Feature: events
 
   Scenario: go to specific day in global agenda
     Given I am on the homepage
-    When I am on /assets/events?year=2009&month=11&day=12
+    When I am on /search/events?year=2009&month=11&day=12
     Then I should see "Events for November, 2009"
 
   Scenario: list events for specific day
@@ -88,7 +88,7 @@ Feature: events
     And the following events
       | owner      | name            | start_date |
       | josemanuel | Manuel Birthday | 2009-10-24 |
-    When I am on /assets/events?year=2009&month=10&day=24
+    When I am on /search/events?year=2009&month=10&day=24
     Then I should see "Another Conference"
     And I should see "Manuel Birthday"
 
@@ -157,7 +157,7 @@ Feature: events
     Then I should not see "New events" link
 
   Scenario: display environment name in global agenda
-    When I am on /assets/events
+    When I am on /search/events
     Then I should see "Colivre.net's Events"
 
   @selenium
diff --git a/features/profile_domain.feature b/features/profile_domain.feature
index ef2afe7..34e555e 100644
--- a/features/profile_domain.feature
+++ b/features/profile_domain.feature
@@ -21,9 +21,7 @@ Feature: domain for profile
   Scenario: access profile control panel through profile blocks
     Given I am logged in as "joaosilva"
     When I go to joaosilva's homepage
-    And I follow "Control panel" within ".profile-info-block"
-    Then I should see "Joao Silva" within "span.control-panel-title"
-    When I follow "Control panel" within ".profile-image-block"
+    And I follow "Control panel" within ".profile-image-block"
     Then I should see "Joao Silva" within "span.control-panel-title"
 
   @selenium
diff --git a/features/profile_search.feature b/features/profile_search.feature
index 7191149..1a932b2 100644
--- a/features/profile_search.feature
+++ b/features/profile_search.feature
@@ -36,7 +36,7 @@ Feature: search inside a profile
       | joaosilva | ProfileSearchBlock  |
     When I go to joaosilva's profile
     And I fill in "q" with "bees" within ".profile-search-block"
-    And I press "Search"
+    And I press "Search" within ".profile-search-block"
     Then I should see "bees and butterflies" within ".main-block"
 
   Scenario: not display unpublished articles
diff --git a/features/register_enterprise.feature b/features/register_enterprise.feature
index 2f02d90..556c747 100644
--- a/features/register_enterprise.feature
+++ b/features/register_enterprise.feature
@@ -203,5 +203,5 @@ Feature: register enterprise
 
   Scenario: a user cant see button to register new enterprise if enterprise_registration disabled
     Given feature "enterprise_registration" is disabled on environment
-    When I am on /assets/enterprises
+    When I am on /search/enterprises
     Then I should not see "New enterprise" link
diff --git a/features/search_enterprises.feature b/features/search_enterprises.feature
index 05c852b..f07fcf8 100644
--- a/features/search_enterprises.feature
+++ b/features/search_enterprises.feature
@@ -56,7 +56,7 @@ Feature: search enterprises
       | owner | name | body | homepage |
       | shop1 | Shoes home | This is the <i>homepage</i> of Shoes shop! It has a very long and pretty vague description, just so we can test wether the system will correctly create an excerpt of this text. We should probably talk about shoes. | true |
     When I search enterprises for "shoes"
-    And I choose the search filter "Full"
+    And I select "Full" from "display"
     Then I should see "This is the homepage of" within ".search-enterprise-description"
     And I should see "about sho..." within ".search-enterprise-description"
 
@@ -66,7 +66,7 @@ Feature: search enterprises
       | identifier | name | description |
       | shop4 | Clothes shop | This <b>clothes</b> shop also sells shoes! This too has a very long and pretty vague description, just so we can test wether the system will correctly create an excerpt of this text. Clothes are a really important part of our lives. |
     When I search enterprises for "clothes"
-    And I choose the search filter "Full"
+    And I select "Full" from "display"
     And I should see "This clothes shop" within ".search-enterprise-description"
     And I should see "really import..." within ".search-enterprise-description"
 
diff --git a/features/suggest_article.feature b/features/suggest_article.feature
index d968a43..297d9b0 100644
--- a/features/suggest_article.feature
+++ b/features/suggest_article.feature
@@ -14,9 +14,12 @@ Feature: suggest article
 
   @selenium
   Scenario: highlight an article before approval of a suggested article
-    Given someone suggested the following article to be published
-      | target           | article_name        | article_body                    | name | email            |
-      | sample-community | A suggested article | this is an article about whales | jose | jose@example.org |
+    Given I am on Sample Community's blog
+    And I follow "Suggest an article"
+    And I fill in "Title" with "Suggestion"
+    And I fill in "Your name" with "Some Guy"
+    And I fill in "Email" with "someguy@somewhere.com"
+    And I press "Save"
     When I am logged in as "joaosilva"
     And I go to sample-community's control panel
     And I follow "Process requests"
--
libgit2 0.21.2