diff --git a/app/helpers/todos_helper.rb b/app/helpers/todos_helper.rb
index 3f717405..444600db 100644
--- a/app/helpers/todos_helper.rb
+++ b/app/helpers/todos_helper.rb
@@ -25,7 +25,7 @@ module TodosHelper
 
   def remote_edit_menu_item(parameters, todo)
     return link_to_remote(
-      image_tag("edit_off.png", :mouseover => "edit_on.png", :alt => "", :align => "absmiddle")+" Edit",
+      image_tag("edit_off.png", :mouseover => "edit_on.png", :alt => "", :align => "absmiddle", :id => 'edit_icon_todo_'+todo.id.to_s)+" Edit",
       :url => {:controller => 'todos', :action => 'edit', :id => todo.id},
       :method => 'get',
       :with => "'#{parameters}'",
diff --git a/app/views/contexts/_context_listing.rhtml b/app/views/contexts/_context_listing.rhtml
index 5661f3b9..3be6d091 100644
--- a/app/views/contexts/_context_listing.rhtml
+++ b/app/views/contexts/_context_listing.rhtml
@@ -26,7 +26,7 @@
         :with => "'_source_view=#{@source_view}'",
         :before => "$('#{dom_id(context)}').block({message:null});",
         :complete => "$('#{dom_id(context)}').unblock();",
-        :confirm => "Are you sure you want to delete the context '#{context.name}'?"
+        :confirm => "Are you sure that you want to delete the context '#{context.name}'?"
         ) %>
       <%=  link_to_remote(
         image_tag( "blank.png", :title => "Edit context", :class=>"edit_item"),
diff --git a/test/selenium/home/create_todo_in_completed_project.rsel b/test/selenium/home/create_todo_in_completed_project.rsel
index c041c2c0..dbec9a86 100644
--- a/test/selenium/home/create_todo_in_completed_project.rsel
+++ b/test/selenium/home/create_todo_in_completed_project.rsel
@@ -7,7 +7,10 @@ assert_text 'badge_count', '11'
 
 # set project to hidden state
 open "/projects/2"
+click 'css=.project_settings a'
+wait_for_visible "project_state_completed"
 click 'project_state_completed'
+click 'submit_project_2'
 # wait for flash before navigating away from project page
 wait_for_visible "flash"
 
diff --git a/test/selenium/home/create_todo_in_hidden_project.rsel b/test/selenium/home/create_todo_in_hidden_project.rsel
index 95f31cd9..c86ed494 100644
--- a/test/selenium/home/create_todo_in_hidden_project.rsel
+++ b/test/selenium/home/create_todo_in_hidden_project.rsel
@@ -3,7 +3,10 @@ login :as => 'admin'
 
 # set project to hidden state
 open "/projects/2"
+click 'css=.project_settings a'
+wait_for_visible "project_state_hidden"
 click 'project_state_hidden'
+click 'submit_project_2'
 # wait for flash before navigating away from project page to make sure that
 # the changes have been saved
 wait_for_visible "flash"
@@ -24,4 +27,4 @@ wait_for_visible "flash"
 verify_text_not_present 'should be hidden'
 
 # badge count should still be same
-assert_text 'badge_count', '7'
\ No newline at end of file
+assert_text 'badge_count', '7'
diff --git a/vendor/plugins/selenium-on-rails/selenium-core/scripts/user-extensions.js b/vendor/plugins/selenium-on-rails/selenium-core/scripts/user-extensions.js
index afe780d7..dde72cac 100644
--- a/vendor/plugins/selenium-on-rails/selenium-core/scripts/user-extensions.js
+++ b/vendor/plugins/selenium-on-rails/selenium-core/scripts/user-extensions.js
@@ -2,5 +2,5 @@
 // store, assert, assertNot, verify, verifyNot, waitFor, and waitForNot commands.
 // Will result in support for storeContextCount, assertContextCount, etc.
 Selenium.prototype.getContextCount = function() {
-	return this.browserbot.getCurrentWindow().$$('.context').length;
+	return this.browserbot.getCurrentWindow().$('.context').size();
 };