diff --git a/spec/controllers/hyrax/file_sets_controller_spec.rb b/spec/controllers/hyrax/file_sets_controller_spec.rb
index 48131f84f9..115844c185 100644
--- a/spec/controllers/hyrax/file_sets_controller_spec.rb
+++ b/spec/controllers/hyrax/file_sets_controller_spec.rb
@@ -542,7 +542,7 @@
       let(:file) { fixture_file_upload('/world.png', 'image/png') }
       let(:work) { FactoryBot.valkyrie_create(:hyrax_work, title: "test title", uploaded_files: [FactoryBot.create(:uploaded_file, user: work_user)], edit_users: [work_user]) }
       let(:file_set) { query_service.find_members(resource: work).first }
-      let(:file_metadata) { query_service.custom_queries.find_file_metadata_by(id: file_set.file_ids.first) }
+      let(:file_metadata) { query_service.custom_queries.find_files(file_set: file_set).first }
       let(:uploaded) { storage_adapter.find_by(id: file_metadata.file_identifier) }
       let(:query_service) { Hyrax.query_service }
       let(:storage_adapter) { Hyrax.storage_adapter }
diff --git a/spec/hyrax/transactions/file_set_destroy_spec.rb b/spec/hyrax/transactions/file_set_destroy_spec.rb
index be17f9f78b..e5aa8d9238 100644
--- a/spec/hyrax/transactions/file_set_destroy_spec.rb
+++ b/spec/hyrax/transactions/file_set_destroy_spec.rb
@@ -42,7 +42,7 @@
     context "with attached files" do
       let(:work) { FactoryBot.valkyrie_create(:hyrax_work, uploaded_files: [FactoryBot.create(:uploaded_file)], edit_users: [user]) }
       let(:file_set) { query_service.find_members(resource: work).first }
-      let(:file_metadata) { query_service.custom_queries.find_file_metadata_by(id: file_set.file_ids.first) }
+      let(:file_metadata) { query_service.custom_queries.find_files(file_set: file_set).first }
       let(:uploaded) { storage_adapter.find_by(id: file_metadata.file_identifier) }
       let(:storage_adapter) { Hyrax.storage_adapter }
       let(:query_service) { Hyrax.query_service }
diff --git a/spec/hyrax/transactions/work_destroy_spec.rb b/spec/hyrax/transactions/work_destroy_spec.rb
index 33ab48dc36..1a2f5a9a71 100644
--- a/spec/hyrax/transactions/work_destroy_spec.rb
+++ b/spec/hyrax/transactions/work_destroy_spec.rb
@@ -44,7 +44,7 @@
     context "with attached files" do
       let(:work) { FactoryBot.valkyrie_create(:hyrax_work, uploaded_files: [FactoryBot.create(:uploaded_file)], edit_users: [user]) }
       let(:file_set) { query_service.find_members(resource: work).first }
-      let(:file_metadata) { query_service.custom_queries.find_file_metadata_by(id: file_set.file_ids.first) }
+      let(:file_metadata) { query_service.custom_queries.find_files(file_set: file_set).first }
       let(:uploaded) { storage_adapter.find_by(id: file_metadata.file_identifier) }
       let(:storage_adapter) { Hyrax.storage_adapter }
       let(:query_service) { Hyrax.query_service }
diff --git a/spec/presenters/hyrax/version_list_presenter_spec.rb b/spec/presenters/hyrax/version_list_presenter_spec.rb
index b260ad2527..ca5edfad44 100644
--- a/spec/presenters/hyrax/version_list_presenter_spec.rb
+++ b/spec/presenters/hyrax/version_list_presenter_spec.rb
@@ -80,7 +80,7 @@
     let(:file) { fixture_file_upload('/world.png', 'image/png') }
     let(:work) { FactoryBot.valkyrie_create(:hyrax_work, uploaded_files: [FactoryBot.create(:uploaded_file)]) }
     let(:file_set) { query_service.find_members(resource: work).first }
-    let(:file_metadata) { query_service.custom_queries.find_file_metadata_by(id: file_set.file_ids.first) }
+    let(:file_metadata) { query_service.custom_queries.find_files(file_set: file_set).first }
     let(:uploaded) { storage_adapter.find_by(id: file_metadata.file_identifier) }
     let(:query_service) { Hyrax.query_service }
     let(:storage_adapter) { Hyrax.storage_adapter }