diff --git a/lib/redmine_dmsf/lockable.rb b/lib/redmine_dmsf/lockable.rb
index 04024d1f..f020dab7 100644
--- a/lib/redmine_dmsf/lockable.rb
+++ b/lib/redmine_dmsf/lockable.rb
@@ -76,6 +76,7 @@ module RedmineDmsf
       l.dmsf_file_last_revision_id = self.last_revision.id if self.is_a?(DmsfFile)
       l.owner = owner
       l.save!
+      reload # Reload the object being locked in order to contain just created lock when asked
       l
     end
 
diff --git a/test/functional/dmsf_files_copy_controller_test.rb b/test/functional/dmsf_files_copy_controller_test.rb
index 479b541d..ead97461 100644
--- a/test/functional/dmsf_files_copy_controller_test.rb
+++ b/test/functional/dmsf_files_copy_controller_test.rb
@@ -107,7 +107,7 @@ class DmsfFilesCopyControllerTest < RedmineDmsf::Test::TestCase
   def test_copy_to_dmsf_enabled
     post :copy, params: { id: @file1.id, target_project_id: @project2.id }
     assert_response :redirect
-    assert flash[:error].empty?
+    assert flash[:error].blank?
   end
 
   def test_copy_to_as_non_member
diff --git a/test/unit/project_patch_test.rb b/test/unit/project_patch_test.rb
index 31c1fcb8..b8a0a6eb 100644
--- a/test/unit/project_patch_test.rb
+++ b/test/unit/project_patch_test.rb
@@ -68,18 +68,22 @@ class ProjectPatchTest < RedmineDmsf::Test::UnitTest
 
   def test_copy_dmsf
     User.current = @jsmith
+
     assert_equal 4, @project1.dmsf_files.visible.all.size
     assert_equal 3, @project1.dmsf_folders.visible.all.size
     assert_equal 2, @project1.file_links.visible.all.size
     assert_equal 1, @project1.folder_links.visible.all.size
     assert_equal 0, @project1.url_links.visible.all.size
+
     assert_equal 1, @project3.dmsf_files.visible.all.size
-    assert_equal 1, @project3.dmsf_folders.all.size
+    assert_equal 0, @project3.dmsf_folders.visible.all.size
     assert_equal 0, @project3.file_links.visible.all.size
     assert_equal 0, @project3.folder_links.visible.all.size
     assert_equal 0, @project3.url_links.visible.all.size
+
     @project3.copy_dmsf @project1
-    assert_equal 4, @project3.dmsf_files.visible.all.size
+
+    assert_equal 5, @project3.dmsf_files.visible.all.size
     assert_equal 0, @project3.dmsf_folders.visible.all.size
     assert_equal 2, @project3.file_links.visible.all.size
     assert_equal 1, @project3.folder_links.visible.all.size