diff --git a/lib/osf-components/addon/components/file-browser/add-new/template.hbs b/lib/osf-components/addon/components/file-browser/add-new/template.hbs
index 3b66eca30c5..40674f21050 100644
--- a/lib/osf-components/addon/components/file-browser/add-new/template.hbs
+++ b/lib/osf-components/addon/components/file-browser/add-new/template.hbs
@@ -6,6 +6,7 @@
         as |dropdown|
     >
         <dropdown.trigger
+            data-test-add-new-trigger
             aria-label={{t 'osf-components.file-browser.add_button_aria'}}
             local-class='TriggerButton {{if dropdown.isOpen 'CloseButton'}}'>
             <FaIcon @icon='plus' @size='2x' @fixedWidth={{true}} />
diff --git a/lib/osf-components/addon/components/file-browser/component.ts b/lib/osf-components/addon/components/file-browser/component.ts
index 240e9d349d4..c108ce68289 100644
--- a/lib/osf-components/addon/components/file-browser/component.ts
+++ b/lib/osf-components/addon/components/file-browser/component.ts
@@ -10,6 +10,7 @@ import StorageManager from 'osf-components/components/storage-provider-manager/s
 interface Args {
     manager: StorageManager;
     selectable?: boolean;
+    enableUpload?: boolean;
 }
 
 export default class FileBrowser extends Component<Args> {
diff --git a/lib/osf-components/addon/components/file-browser/delete-file-modal/template.hbs b/lib/osf-components/addon/components/file-browser/delete-file-modal/template.hbs
index d5e7bd5403e..d96fa672263 100644
--- a/lib/osf-components/addon/components/file-browser/delete-file-modal/template.hbs
+++ b/lib/osf-components/addon/components/file-browser/delete-file-modal/template.hbs
@@ -3,6 +3,8 @@
 as |dialog|>
     <dialog.trigger>
         <Button
+            data-test-bulk-delete-trigger
+            data-analytics-name='Bulk file delete'
             @type='destroy'
             {{on 'click' dialog.open}}
         >
diff --git a/lib/osf-components/addon/components/file-browser/template.hbs b/lib/osf-components/addon/components/file-browser/template.hbs
index b31859de74f..7b8fa519d07 100644
--- a/lib/osf-components/addon/components/file-browser/template.hbs
+++ b/lib/osf-components/addon/components/file-browser/template.hbs
@@ -97,6 +97,8 @@
             {{#if (gt @manager.selectedFiles.length 0)}}
                 {{#if @manager.currentFolder.userCanDeleteFromHere}}
                     <Button
+                        data-test-bulk-move-trigger
+                        data-analytics-name='Bulk move files'
                         @layout='fake-link'
                         {{on 'click' (queue (action (mut this.useCopyModal) false) (action (mut this.moveModalOpen) true))}}
                     >
@@ -105,6 +107,8 @@
                     </Button>
                 {{/if}}
                 <Button
+                    data-test-bulk-copy-trigger
+                    data-analytics-name='Bulk copy files'
                     @layout='fake-link'
                     {{on 'click' (queue (action (mut this.useCopyModal) true) (action (mut this.moveModalOpen) true))}}
                 >
@@ -191,7 +195,7 @@
             {{/if}}
         </:item>
         <:empty>
-            <div local-class='EmptyText'>
+            <div data-test-empty-folder local-class='EmptyText'>
                 {{t 'osf-components.file-browser.empty_folder'}}
             </div>
         </:empty>
diff --git a/mirage/factories/file.ts b/mirage/factories/file.ts
index 6bf8a1a25fa..076618f66f5 100644
--- a/mirage/factories/file.ts
+++ b/mirage/factories/file.ts
@@ -54,7 +54,7 @@ export default Factory.extend<MirageFile & FileTraits>({
     path(i: number) {
         return `/${i}`;
     },
-    checkout: 'null',
+    checkout: null,
     tags() {
         return faker.lorem.words(5).split(' ');
     },
diff --git a/tests/acceptance/guid-node/files-test.ts b/tests/acceptance/guid-node/files-test.ts
index 027f38c33f4..2c716defc54 100644
--- a/tests/acceptance/guid-node/files-test.ts
+++ b/tests/acceptance/guid-node/files-test.ts
@@ -1,30 +1,106 @@
 import { currentRouteName } from '@ember/test-helpers';
+import { ModelInstance } from 'ember-cli-mirage';
 import { setupMirage } from 'ember-cli-mirage/test-support';
-// import { percySnapshot } from 'ember-percy';
+import { t } from 'ember-intl/test-support';
+import { TestContext } from 'ember-test-helpers';
+import { percySnapshot } from 'ember-percy';
 import { module, test } from 'qunit';
 
-import { setupOSFApplicationTest, visit } from 'ember-osf-web/tests/helpers';
+import { click, setupOSFApplicationTest, visit } from 'ember-osf-web/tests/helpers';
+import NodeModel from 'ember-osf-web/models/node';
+import FileModel from 'ember-osf-web/models/file';
+import FileProviderModel from 'ember-osf-web/models/file-provider';
+
+interface GuidNodeTestContext extends TestContext {
+    node: ModelInstance<NodeModel>;
+    osfStorage: ModelInstance<FileProviderModel>;
+    file: ModelInstance<FileModel>;
+}
 
 module('Acceptance | guid-node/files', hooks => {
     setupOSFApplicationTest(hooks);
     setupMirage(hooks);
 
-    test('leftnav for read user', async function(assert) {
-        const node = server.create('node', 'withFiles', 'withStorage');
-        await visit(`/${node.id}/files`);
+    hooks.beforeEach(async function(this: GuidNodeTestContext) {
+        this.node = server.create('node', 'withFiles','withStorage');
+        this.osfStorage = this.node.files.models.firstObject!;
+        this.file = server.create('file', {
+            id: 'hello',
+            target: this.node,
+            parentFolder: this.osfStorage.rootFolder,
+        });
+    });
+
+    test('read user', async function(this: GuidNodeTestContext, assert) {
+        await visit(`/${this.node.id}/files`);
 
         assert.equal(currentRouteName(), 'guid-node.files.provider', 'Current route is files');
+
+        // Check leftnav
         assert.dom('[data-test-overview-link]').exists('Overview link exists');
         assert.dom('[data-test-files-link]').exists('Files link exists');
-        // check active tab + file providers
+        assert.dom('[data-test-file-providers-list]')
+            .containsText(t('registries.overview.files.storage_providers.osfstorage'), 'Osf Storage shown as provider');
         assert.dom('[data-test-analytics-link]').exists('Analytics link exists');
         assert.dom('[data-test-registrations-link]').exists('Registrations link exists');
         assert.dom('[data-test-contributors-link]').exists('Contributors link exists');
         assert.dom('[data-test-settings-link]').exists('Settings link exists');
+
+        // Check file actions
+        await click(`[data-test-file-list-item="${this.file.id}"] [data-test-file-download-share-trigger]`);
+        await percySnapshot(assert);
+        assert.dom('[data-test-copy-button]').exists('Single file copy available');
+        assert.dom('[data-test-move-button]').doesNotExist('Single file move not available');
+        assert.dom('[data-test-delete-button]').doesNotExist('Single file delete not available');
+        assert.dom('[data-test-rename-link]').doesNotExist('Single file rename not available');
+        await click(`[data-test-file-list-item="${this.file.id}"] [data-test-file-download-share-trigger]`);
+
+        // Check bulk file actions
+        await click(`[data-test-select-file="${this.file.id}"]`);
+        assert.dom('[data-test-bulk-copy-trigger]').exists('Bulk copy available');
+        assert.dom('[data-test-bulk-move-trigger]').doesNotExist('Bulk move not available');
+        assert.dom('[data-test-bulk-delete-trigger]').doesNotExist('Bulk delete not available');
+
+        await click('[data-test-bulk-copy-trigger]');
+        assert.dom('[data-test-dialog]').containsText(t('osf-components.move_file_modal.no_write_permission'),
+            'Copy modal has permission-related message');
+        assert.dom('[data-test-move-files-button]').isDisabled('Copy button disabled');
+        assert.dom('[data-test-move-files-button]').containsText(t('general.copy'));
     });
 
-    // test no files
-    // test selecting files + file actions
-    // test switching providers
-    // test links for different user permissions and VOL status and wiki enabled
+    test('No files', async function(this: GuidNodeTestContext, assert) {
+        this.osfStorage!.rootFolder.update({files: []});
+
+        await visit(`/${this.node.id}/files`);
+        await percySnapshot(assert);
+        assert.dom('[data-test-file-list-item]').doesNotExist('No file or folder items');
+        assert.dom('[data-test-empty-folder]')
+            .containsText(t('osf-components.file-browser.empty_folder'), 'Empty folder');
+    });
+
+    test('Multi-file actions', async function(this: GuidNodeTestContext, assert) {
+        this.node.update({ currentUserPermissions: ['admin', 'write', 'read'] });
+        await visit(`/${this.node.id}/files`);
+        await click(`[data-test-select-file="${this.file.id}"]`);
+        await percySnapshot(assert);
+        assert.dom('[data-test-bulk-move-trigger]').exists('Bulk move available');
+        assert.dom('[data-test-bulk-copy-trigger]').exists('Bulk copy available');
+        assert.dom('[data-test-bulk-delete-trigger]').exists('Bulk delete available');
+
+        await click('[data-test-bulk-move-trigger]');
+        assert.dom('[data-test-dialog]').doesNotContainText(t('osf-components.move_file_modal.no_write_permission'),
+            'Move modal does not show permission-related message');
+    });
+
+    test('Switching providers', async function(this: GuidNodeTestContext, assert) {
+        server.create('file-provider', {
+            provider: 'bitbucket',
+            name: 'bitbucket',
+            target: this.node,
+        });
+        await visit(`/${this.node.id}/files`);
+        assert.dom('[data-test-files-provider-link="bitbucket"').exists('Bitbucket shown');
+        assert.dom('[data-test-files-provider-link="bitbucket"').hasAttribute('href',
+            `/${this.node.id}/files/bitbucket`, 'Links to bitbucket files');
+    });
 });
diff --git a/tests/engines/registries/acceptance/overview/files-test.ts b/tests/engines/registries/acceptance/overview/files-test.ts
index f502e1a7216..ffeaad76e28 100644
--- a/tests/engines/registries/acceptance/overview/files-test.ts
+++ b/tests/engines/registries/acceptance/overview/files-test.ts
@@ -5,7 +5,7 @@ import { module, test } from 'qunit';
 import { t } from 'ember-intl/test-support';
 
 import { Permission } from 'ember-osf-web/models/osf-model';
-import { currentURL, visit } from 'ember-osf-web/tests/helpers';
+import { click, currentURL, visit } from 'ember-osf-web/tests/helpers';
 import { setupEngineApplicationTest } from 'ember-osf-web/tests/helpers/engines';
 
 module('Registries | Acceptance | overview.files', hooks => {
@@ -42,6 +42,7 @@ module('Registries | Acceptance | overview.files', hooks => {
         assert.dom('[data-test-file-search]').exists('File search input exists');
         assert.dom('[data-test-file-sort-trigger]').exists('File sort trigger exists');
         assert.dom('[data-test-file-help]').exists('File help button exists');
+        assert.dom('[data-test-add-new-trigger]').doesNotExist('Add new button not shown');
 
         assert.dom('[data-test-file-providers-list]').containsText(
             t('osf-components.file-browser.storage_providers.osfstorage'),'File providers list contains OSF Storage',
@@ -53,9 +54,30 @@ module('Registries | Acceptance | overview.files', hooks => {
             'Download all from here button has the right download link',
         );
 
-        // assert.dom('[data-test-file-list-item]').exists({ count: files.length }, 'Files displayed');
-        // assert.dom('[data-test-file-list-link]').containsText('Name', 'File name displayed');
-        // assert.dom('[data-test-file-list-date]').containsText('Date', 'File date displayed');
-        // assert.dom('[data-test-file-download-share-trigger]').exists('File download/share trigger exists');
+        assert.dom('[data-test-file-list-item]').exists('Files displayed');
+        assert.dom('[data-test-file-name]').exists('File name displayed');
+        assert.dom('[data-test-file-list-date]').exists('File date displayed');
+        assert.dom('[data-test-file-download-share-trigger]').exists('File download/share trigger exists');
+        await click('[data-test-file-download-share-trigger]');
+        assert.dom('[data-test-download-button]').exists('Download button exists');
+        assert.dom('[data-test-embed-button]').exists('Embed button exists');
+        assert.dom('[data-test-social-sharing-button]').exists('Share button exists');
+        assert.dom('[data-test-delete-button]').doesNotExist('Delete button not shown');
+        assert.dom('[data-test-rename-link]').doesNotExist('Rename button not shown');
+        assert.dom('[data-test-move-button]').doesNotExist('Move button not shown');
+        assert.dom('[data-test-copy-button]').doesNotExist('Copy button not shown');
+
+    });
+
+    test('No files', async assert => {
+        const registration = server.create('registration');
+
+        await visit(`/${registration.id}/files`);
+        await percySnapshot(assert);
+        assert.equal(currentURL(), `/${registration.id}/files`, 'At registration files list URL');
+
+        assert.dom('[data-test-file-list-item]').doesNotExist('No files displayed');
+        assert.dom('[data-test-empty-folder]')
+            .containsText(t('osf-components.file-browser.empty_folder'), 'Empty folder');
     });
 });
diff --git a/tests/integration/components/file-browser/component-test.ts b/tests/integration/components/file-browser/component-test.ts
index 653a7df429a..c9ddf00da5a 100644
--- a/tests/integration/components/file-browser/component-test.ts
+++ b/tests/integration/components/file-browser/component-test.ts
@@ -2,7 +2,6 @@ import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 import { ModelInstance } from 'ember-cli-mirage';
 import { TestContext, t } from 'ember-intl/test-support';
-import { MirageRegistration } from 'ember-osf-web/mirage/factories/registration';
 import { click } from 'ember-osf-web/tests/helpers';
 import { setupRenderingTest } from 'ember-qunit';
 import { module, test } from 'qunit';
@@ -10,9 +9,11 @@ import { FileItemKinds } from 'ember-osf-web/models/base-file-item';
 import FileProviderModel from 'ember-osf-web/models/file-provider';
 import { setupMirage } from 'ember-cli-mirage/test-support';
 import FileModel from 'ember-osf-web/models/file';
+import NodeModel from 'ember-osf-web/models/node';
+import stripHtmlTags from 'ember-osf-web/utils/strip-html-tags';
 
 interface FileBrowserTestContext extends TestContext {
-    mirageRegistration: ModelInstance<MirageRegistration>;
+    mirageNode: ModelInstance<NodeModel>;
     osfStorageProvider: FileProviderModel;
     topLevelFiles: Array<ModelInstance<FileModel>>;
     topLevelFolder: ModelInstance<FileModel>;
@@ -24,20 +25,20 @@ module('Integration | Component | file-browser', hooks => {
     setupMirage(hooks);
     hooks.beforeEach(function(this: FileBrowserTestContext) {
         this.store = this.owner.lookup('service:store');
-        this.mirageRegistration = server.create('registration');
-        const osfStorage = this.mirageRegistration.files.models[0];
+        this.mirageNode = server.create('node', 'withFiles', 'withStorage', 'currentUserAdmin');
+        const osfStorage = this.mirageNode.files.models[0];
         this.topLevelFiles = server.createList('file', 2, {
-            target: this.mirageRegistration,
+            target: this.mirageNode,
             parentFolder: osfStorage.rootFolder,
         });
         this.topLevelFolder = server.create('file', {
-            target: this.mirageRegistration,
+            target: this.mirageNode,
             parentFolder: osfStorage.rootFolder,
             kind: FileItemKinds.Folder,
         });
         osfStorage.rootFolder.update({ files: [...this.topLevelFiles, this.topLevelFolder] });
         this.secondaryLevelFiles = server.createList('file', 2, {
-            target: this.mirageRegistration,
+            target: this.mirageNode,
             parentFolder: this.topLevelFolder,
         });
         this.topLevelFolder.update({ files: this.secondaryLevelFiles });
@@ -45,14 +46,15 @@ module('Integration | Component | file-browser', hooks => {
 
     test('it renders and navigates through folders',
         async function(this: FileBrowserTestContext, assert) {
-            const registration = await this.store.findRecord('registration', this.mirageRegistration.id);
-            const storageProviders = await registration.files;
+            const node = await this.store.findRecord('node', this.mirageNode.id);
+            const storageProviders = await node.files;
             this.osfStorageProvider = storageProviders.toArray()[0];
             await render(hbs`
                 <StorageProviderManager::StorageManager @provider={{this.osfStorageProvider}} as |manager|>
-                    <FileBrowser @manager={{manager}} />
+                    <FileBrowser @manager={{manager}} @enableUpload={{true}} />
                 </StorageProviderManager::StorageManager>
             `);
+            assert.dom('[data-test-add-new-trigger]').exists('Add new file/folder option shown');
             for (const item of this.topLevelFiles) {
                 assert.dom(`[data-test-file-list-item='${item.id}'][data-test-indented='false']`)
                     .exists('Top level file exists');
@@ -84,8 +86,8 @@ module('Integration | Component | file-browser', hooks => {
 
     test('it renders and select files/folders',
         async function(this: FileBrowserTestContext, assert) {
-            const registration = await this.store.findRecord('registration', this.mirageRegistration.id);
-            const storageProviders = await registration.files;
+            const node = await this.store.findRecord('node', this.mirageNode.id);
+            const storageProviders = await node.files;
             this.osfStorageProvider = storageProviders.toArray()[0];
             await render(hbs`
                 <StorageProviderManager::StorageManager @provider={{this.osfStorageProvider}} as |manager|>
@@ -93,16 +95,100 @@ module('Integration | Component | file-browser', hooks => {
                 </StorageProviderManager::StorageManager>
             `);
             assert.dom('[data-test-file-selected-count]').doesNotExist('No files selected');
+            assert.dom('[data-test-bulk-copy-trigger]').doesNotExist('Bulk move button not shown');
+            assert.dom('[data-test-bulk-copy-trigger]').doesNotExist('Bulk copy button not shown');
+            assert.dom('[data-test-bulk-delete-trigger]').doesNotExist('Bulk delete button not shown');
             await click(`[data-test-select-folder="${this.topLevelFolder.id}"]`);
             await click(`[data-test-select-file="${this.topLevelFiles[0].id}"]`);
             assert.dom('[data-test-file-selected-count]').containsText(
                 t('osf-components.file-browser.number_selected', {numberOfFilesSelected: 2} ), '2 files selected',
             );
+            assert.dom('[data-test-bulk-move-trigger]').exists('Bulk move button shown');
+            assert.dom('[data-test-bulk-copy-trigger]').exists('Bulk copy button shown');
+            assert.dom('[data-test-bulk-delete-trigger]').exists('Bulk delete button shown');
             await click(`[data-test-select-file="${this.topLevelFiles[0].id}"]`);
             assert.dom('[data-test-file-selected-count]').containsText(
                 t('osf-components.file-browser.number_selected', {numberOfFilesSelected: 1} ), '1 file selected',
             );
             await click('[data-test-clear-file-selection]');
             assert.dom('[data-test-file-selected-count]').doesNotExist('No files selected');
+            assert.dom('[data-test-bulk-move-trigger]').doesNotExist('Bulk move button hidden');
+            assert.dom('[data-test-bulk-copy-trigger]').doesNotExist('Bulk copy button hidden');
+            assert.dom('[data-test-bulk-delete-trigger]').doesNotExist('Bulk delete button hidden');
+        });
+
+    test('it renders non-selectable lists for registrations',
+        async function(this: FileBrowserTestContext, assert) {
+            const mirageRegistration = server.create('registration', 'withFiles');
+            const registration = await this.store.findRecord('registration', mirageRegistration.id);
+            const storageProviders = await registration.files;
+            this.osfStorageProvider = storageProviders.toArray()[0];
+            await render(hbs`
+                <StorageProviderManager::StorageManager @provider={{this.osfStorageProvider}} as |manager|>
+                    <FileBrowser @manager={{manager}} @selectable={{false}} />
+                </StorageProviderManager::StorageManager>
+            `);
+            assert.dom('[data-test-select-folder]').doesNotExist('Folders not selectable');
+            assert.dom('[data-test-select-file]').doesNotExist('Files not selectable');
+            assert.dom('[data-test-add-new-trigger]').doesNotExist('Add new file/folder option not shown');
+        });
+
+    test('it renders help text for nodes',
+        async function(this: FileBrowserTestContext, assert) {
+            const node = await this.store.findRecord('node', this.mirageNode.id);
+            const storageProviders = await node.files;
+            this.osfStorageProvider = storageProviders.toArray()[0];
+            await render(hbs`
+                <StorageProviderManager::StorageManager @provider={{this.osfStorageProvider}} as |manager|>
+                    <FileBrowser @manager={{manager}} @enableUpload={{true}} @selectable={{true}} />
+                </StorageProviderManager::StorageManager>
+            `);
+            await click('[data-test-file-help]');
+            assert.dom('[data-test-dialog]')
+                .containsText(t('osf-components.file-browser.help_modal.select'), 'File select info');
+            assert.dom('[data-test-dialog]')
+                .containsText(t('osf-components.file-browser.help_modal.upload'), 'Upload file info');
+            assert.dom('[data-test-dialog]')
+                .containsText(t('osf-components.file-browser.help_modal.create_folder'), 'Create folder info');
+            assert.dom('[data-test-dialog]')
+                .containsText(t('osf-components.file-browser.help_modal.move'), 'Move info');
+            assert.dom('[data-test-dialog]')
+                .containsText(t('osf-components.file-browser.help_modal.copy'), 'Copy info');
+            assert.dom('[data-test-dialog]')
+                .containsText(t('osf-components.file-browser.help_modal.download_file'), 'Download info');
+            assert.dom('[data-test-dialog]').containsText(
+                stripHtmlTags(t('osf-components.file-browser.help_modal.more_info_projects')).toString(),
+                'Project help guide',
+            );
+        });
+
+    test('it renders help text for registrations',
+        async function(this: FileBrowserTestContext, assert) {
+            const mirageRegistration = server.create('registration', 'withFiles');
+            const registration = await this.store.findRecord('registration', mirageRegistration.id);
+            const storageProviders = await registration.files;
+            this.osfStorageProvider = storageProviders.toArray()[0];
+            await render(hbs`
+                <StorageProviderManager::StorageManager @provider={{this.osfStorageProvider}} as |manager|>
+                    <FileBrowser @manager={{manager}} @selectable={{false}} />
+                </StorageProviderManager::StorageManager>
+            `);
+            await click('[data-test-file-help]');
+            assert.dom('[data-test-dialog]')
+                .doesNotContainText(t('osf-components.file-browser.help_modal.select'), 'No file select info');
+            assert.dom('[data-test-dialog]')
+                .doesNotContainText(t('osf-components.file-browser.help_modal.upload'), 'no upload file info');
+            assert.dom('[data-test-dialog]')
+                .doesNotContainText(t('osf-components.file-browser.help_modal.create_folder'), 'No create folder info');
+            assert.dom('[data-test-dialog]')
+                .doesNotContainText(t('osf-components.file-browser.help_modal.move'), 'No move info');
+            assert.dom('[data-test-dialog]')
+                .doesNotContainText(t('osf-components.file-browser.help_modal.copy'), 'No copy info');
+            assert.dom('[data-test-dialog]')
+                .containsText(t('osf-components.file-browser.help_modal.download_file'), 'Download info');
+            assert.dom('[data-test-dialog]').containsText(
+                stripHtmlTags(t('osf-components.file-browser.help_modal.more_info_registrations')).toString(),
+                'Registration help guide',
+            );
         });
 });