diff --git a/app/services/bulk_upload/downloader.rb b/app/services/bulk_upload/downloader.rb
index 8dfab86e4..a76324fc0 100644
--- a/app/services/bulk_upload/downloader.rb
+++ b/app/services/bulk_upload/downloader.rb
@@ -1,7 +1,7 @@
 class BulkUpload::Downloader
   attr_reader :bulk_upload
 
-  delegate :path, to: :file
+  delegate :path, to: :file, prefix: true
 
   def initialize(bulk_upload:)
     @bulk_upload = bulk_upload
@@ -15,10 +15,6 @@ class BulkUpload::Downloader
     file.unlink
   end
 
-  def file_path
-    file.path
-  end
-
   def presigned_url
     s3_storage_service.get_presigned_url(bulk_upload.identifier, 60)
   end
diff --git a/spec/views/bulk_upload_lettings_results/show.html.erb_spec.rb b/spec/views/bulk_upload_lettings_results/show.html.erb_spec.rb
index 637dfa3a9..e7ffc68f8 100644
--- a/spec/views/bulk_upload_lettings_results/show.html.erb_spec.rb
+++ b/spec/views/bulk_upload_lettings_results/show.html.erb_spec.rb
@@ -1,10 +1,12 @@
 require "rails_helper"
 
 RSpec.describe "bulk_upload_lettings_results/show.html.erb" do
+  let(:user) { create(:user) }
   let(:bulk_upload) { create(:bulk_upload, :lettings) }
 
   context "when mutiple rows in wrong order" do
     before do
+      allow(view).to receive(:current_user).and_return(user)
       create(:bulk_upload_error, bulk_upload:, cell: "C14", row: "14", col: "C")
       create(:bulk_upload_error, bulk_upload:, cell: "D10", row: "10", col: "D")
     end
@@ -22,6 +24,7 @@ RSpec.describe "bulk_upload_lettings_results/show.html.erb" do
 
   context "when 1 row with 2 errors" do
     before do
+      allow(view).to receive(:current_user).and_return(user)
       create(:bulk_upload_error, bulk_upload:, cell: "AA100", row: "100", col: "AA")
       create(:bulk_upload_error, bulk_upload:, cell: "Z100", row: "100", col: "Z")
     end
diff --git a/spec/views/bulk_upload_lettings_results/summary.html.erb_spec.rb b/spec/views/bulk_upload_lettings_results/summary.html.erb_spec.rb
index ac0c1f82d..5ebb05dbe 100644
--- a/spec/views/bulk_upload_lettings_results/summary.html.erb_spec.rb
+++ b/spec/views/bulk_upload_lettings_results/summary.html.erb_spec.rb
@@ -1,10 +1,12 @@
 require "rails_helper"
 
 RSpec.describe "bulk_upload_lettings_results/summary.html.erb" do
+  let(:user) { create(:user) }
   let(:bulk_upload) { create(:bulk_upload, :lettings) }
 
   context "when mutiple rows in wrong order" do
     before do
+      allow(view).to receive(:current_user).and_return(user)
       create(:bulk_upload_error, bulk_upload:, cell: "C14", row: "14", col: "C")
       create(:bulk_upload_error, bulk_upload:, cell: "D10", row: "10", col: "D")
     end
@@ -22,6 +24,7 @@ RSpec.describe "bulk_upload_lettings_results/summary.html.erb" do
 
   context "when 1 row with 2 errors" do
     before do
+      allow(view).to receive(:current_user).and_return(user)
       create(:bulk_upload_error, bulk_upload:, cell: "AA100", row: "100", col: "AA")
       create(:bulk_upload_error, bulk_upload:, cell: "Z100", row: "100", col: "Z")
     end
diff --git a/spec/views/bulk_upload_sales_results/show.html.erb_spec.rb b/spec/views/bulk_upload_sales_results/show.html.erb_spec.rb
index dc6751dc8..0ad13fbb3 100644
--- a/spec/views/bulk_upload_sales_results/show.html.erb_spec.rb
+++ b/spec/views/bulk_upload_sales_results/show.html.erb_spec.rb
@@ -1,10 +1,12 @@
 require "rails_helper"
 
 RSpec.describe "bulk_upload_sales_results/show.html.erb" do
+  let(:user) { create(:user) }
   let(:bulk_upload) { create(:bulk_upload, :sales) }
 
   context "when mutiple rows in wrong order" do
     before do
+      allow(view).to receive(:current_user).and_return(user)
       create(:bulk_upload_error, bulk_upload:, cell: "C14", row: "14", col: "C")
       create(:bulk_upload_error, bulk_upload:, cell: "D10", row: "10", col: "D")
     end
@@ -22,6 +24,7 @@ RSpec.describe "bulk_upload_sales_results/show.html.erb" do
 
   context "when 1 row with 2 errors" do
     before do
+      allow(view).to receive(:current_user).and_return(user)
       create(:bulk_upload_error, bulk_upload:, cell: "AA100", row: "100", col: "AA")
       create(:bulk_upload_error, bulk_upload:, cell: "Z100", row: "100", col: "Z")
     end
diff --git a/spec/views/bulk_upload_sales_results/summary.html.erb_spec.rb b/spec/views/bulk_upload_sales_results/summary.html.erb_spec.rb
index b3d9aa006..d999ad9d4 100644
--- a/spec/views/bulk_upload_sales_results/summary.html.erb_spec.rb
+++ b/spec/views/bulk_upload_sales_results/summary.html.erb_spec.rb
@@ -1,10 +1,12 @@
 require "rails_helper"
 
 RSpec.describe "bulk_upload_sales_results/summary.html.erb" do
+  let(:user) { create(:user) }
   let(:bulk_upload) { create(:bulk_upload, :sales) }
 
   context "when mutiple rows in wrong order" do
     before do
+      allow(view).to receive(:current_user).and_return(user)
       create(:bulk_upload_error, bulk_upload:, cell: "C14", row: "14", col: "C")
       create(:bulk_upload_error, bulk_upload:, cell: "D10", row: "10", col: "D")
     end
@@ -22,6 +24,7 @@ RSpec.describe "bulk_upload_sales_results/summary.html.erb" do
 
   context "when 1 row with 2 errors" do
     before do
+      allow(view).to receive(:current_user).and_return(user)
       create(:bulk_upload_error, bulk_upload:, cell: "AA100", row: "100", col: "AA")
       create(:bulk_upload_error, bulk_upload:, cell: "Z100", row: "100", col: "Z")
     end
diff --git a/spec/views/logs/_create_for_org_actions.html.erb_spec.rb b/spec/views/logs/_create_for_org_actions.html.erb_spec.rb
index e82cb8d27..df448844d 100644
--- a/spec/views/logs/_create_for_org_actions.html.erb_spec.rb
+++ b/spec/views/logs/_create_for_org_actions.html.erb_spec.rb
@@ -14,8 +14,8 @@ RSpec.describe "logs/_create_for_org_actions.html.erb" do
   context "with data sharing agreement" do
     it "does include create log buttons" do
       render
-      expect(fragment).to have_button("Create a new lettings log for this organisation")
-      expect(fragment).to have_button("Create a new sales log for this organisation")
+      expect(fragment).to have_button("Create a new lettings log")
+      expect(fragment).to have_button("Create a new sales log")
     end
   end
 
@@ -24,8 +24,8 @@ RSpec.describe "logs/_create_for_org_actions.html.erb" do
 
     it "does not include create log buttons" do
       render
-      expect(fragment).not_to have_button("Create a new lettings log for this organisation")
-      expect(fragment).not_to have_button("Create a new sales log for this organisation")
+      expect(fragment).not_to have_button("Create a new lettings log")
+      expect(fragment).not_to have_button("Create a new sales log")
     end
   end
 end