diff --git a/test/functional/activities_controller_test.rb b/test/functional/activities_controller_test.rb
index 0c0fbb2..2a9af2d 100644
--- a/test/functional/activities_controller_test.rb
+++ b/test/functional/activities_controller_test.rb
@@ -136,6 +136,14 @@ class ActivitiesControllerTest < ActionController::TestCase
     end
   end
 
+  def test_index_atom_feed_with_user
+    get :index, :user_id => 2, :format => 'atom'
+
+    assert_response :success
+    assert_template 'common/feed'
+    assert_select 'title', :text => "Redmine: #{User.find(2).name}"
+  end
+
   def test_index_should_show_private_notes_with_permission_only
     journal = Journal.create!(:journalized => Issue.find(2), :notes => 'Private notes with searchkeyword', :private_notes => true)
     @request.session[:user_id] = 2
diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb
index c1b27c6..d0fde7c 100644
--- a/test/functional/attachments_controller_test.rb
+++ b/test/functional/attachments_controller_test.rb
@@ -350,6 +350,11 @@ class AttachmentsControllerTest < ActionController::TestCase
     assert_response 404
   end
 
+  def test_edit_invalid_object_should_return_404
+    get :edit, :object_type => 'issues', :object_id => '999'
+    assert_response 404
+  end
+
   def test_edit_for_object_that_is_not_visible_should_return_403
     get :edit, :object_type => 'issues', :object_id => '4'
     assert_response 403
diff --git a/test/functional/context_menus_controller_test.rb b/test/functional/context_menus_controller_test.rb
index ec62d43..5ff5a85 100644
--- a/test/functional/context_menus_controller_test.rb
+++ b/test/functional/context_menus_controller_test.rb
@@ -250,6 +250,15 @@ class ContextMenusControllerTest < ActionController::TestCase
     assert_select 'a:not(.disabled)', :text => 'Edit'
   end
 
+  def test_context_menu_for_one_time_entry
+    @request.session[:user_id] = 2
+    get :time_entries, :ids => [1]
+    assert_response :success
+    assert_template 'context_menus/time_entries'
+
+    assert_select 'a:not(.disabled)', :text => 'Edit'
+  end
+
   def test_time_entries_context_menu_should_include_custom_fields
     field = TimeEntryCustomField.generate!(:name => "Field", :field_format => "list", :possible_values => ["foo", "bar"])