diff --git a/src/js/components/EditMenu/SnippetForm/fields/CodeEditorShortcuts.tsx b/src/js/components/EditMenu/SnippetForm/fields/CodeEditorShortcuts.tsx
index 5e44a7a27..c065c996c 100644
--- a/src/js/components/EditMenu/SnippetForm/fields/CodeEditorShortcuts.tsx
+++ b/src/js/components/EditMenu/SnippetForm/fields/CodeEditorShortcuts.tsx
@@ -151,9 +151,9 @@ export const CodeEditorShortcuts: React.FC<CodeEditorShortcutsProps> = ({ editor
 			const keyMapName = codeEditorInstance.codemirror.getOption('keyMap')
 
 			const combinedKeyMap: KeyMap = {
-				...isMacOS() ? fallbackKeyMapMac : fallbackKeyMap,
 				...keyMapName && getKeyMap(keyMapName),
-				...'object' === typeof extraKeys ? extraKeys : undefined
+				...'object' === typeof extraKeys ? extraKeys : undefined,
+				...isMacOS() ? fallbackKeyMapMac : fallbackKeyMap
 			}
 
 			return unpackKeyMap(combinedKeyMap)
diff --git a/src/js/components/ManageMenu/SnippetsTable/SnippetsTableControls.tsx b/src/js/components/ManageMenu/SnippetsTable/SnippetsTableControls.tsx
index 3d9efa60c..9aa5d91fc 100644
--- a/src/js/components/ManageMenu/SnippetsTable/SnippetsTableControls.tsx
+++ b/src/js/components/ManageMenu/SnippetsTable/SnippetsTableControls.tsx
@@ -101,7 +101,7 @@ const FilterByTagControl: React.FC<FilterByTagControlProps> = ({ visibleSnippets
 			<select
 				id={tagFilterId}
 				name="tag"
-				value={currentTag}
+				value={currentTag ?? ''}
 				aria-label={__('Filter snippets by tag', 'code-snippets')}
 				onChange={event => setCurrentTag(event.target.value)}
 			>
diff --git a/src/js/components/ManageMenu/SnippetsTable/SnippetsTableSearch.tsx b/src/js/components/ManageMenu/SnippetsTable/SnippetsTableSearch.tsx
index e8e484a61..fca560f7c 100644
--- a/src/js/components/ManageMenu/SnippetsTable/SnippetsTableSearch.tsx
+++ b/src/js/components/ManageMenu/SnippetsTable/SnippetsTableSearch.tsx
@@ -1,7 +1,7 @@
 import { __, sprintf } from '@wordpress/i18n'
 import React from 'react'
 import { Button } from '../../common/Button'
-import { useSnippetsFilters } from './WithSnippetsTableFilters'
+import { INDEX_STATUS, useSnippetsFilters } from './WithSnippetsTableFilters'
 
 export const SearchArea = () => {
 	const { searchQuery, setSearchQuery } = useSnippetsFilters()
@@ -30,7 +30,14 @@ export const SearchArea = () => {
 }
 
 export const SearchResultsIndicator = () => {
-	const { searchQueryText, searchLineNumber, currentTag, setSearchQuery, setCurrentTag } = useSnippetsFilters()
+	const {
+		searchQueryText,
+		searchLineNumber,
+		currentTag,
+		setCurrentStatus,
+		setSearchQuery,
+		setCurrentTag
+	} = useSnippetsFilters()
 
 	return searchQueryText || currentTag
 		? <p className="snippets-search-subtitle">
@@ -47,6 +54,7 @@ export const SearchResultsIndicator = () => {
 
 			{' '}
 			<Button small className="clear-filters" onClick={() => {
+				setCurrentStatus(INDEX_STATUS)
 				setSearchQuery()
 				setCurrentTag()
 			}}>
diff --git a/src/js/components/ManageMenu/SnippetsTable/useApplyBulkAction.ts b/src/js/components/ManageMenu/SnippetsTable/useApplyBulkAction.ts
index 6fa763444..0601e31f3 100644
--- a/src/js/components/ManageMenu/SnippetsTable/useApplyBulkAction.ts
+++ b/src/js/components/ManageMenu/SnippetsTable/useApplyBulkAction.ts
@@ -135,9 +135,12 @@ export const useApplyBulkAction = (
 
 			case 'trash':
 			case 'delete':
+			case 'restore':
 				await applyAndRefresh(
 					allSnippets.filter(snippet => selected.has(snippet.id)),
-					snippet => api.delete({ id: snippet.id, network: snippet.network }),
+					snippet => 'restore' === action
+						? api.restore({ id: snippet.id, network: snippet.network })
+						: api.delete({ id: snippet.id, network: snippet.network }),
 					refreshSnippetsList)
 				break
 
diff --git a/src/php/Flat_Files/Snippet_Files.php b/src/php/Flat_Files/Snippet_Files.php
index 1ae9a03c5..1c5ad03da 100644
--- a/src/php/Flat_Files/Snippet_Files.php
+++ b/src/php/Flat_Files/Snippet_Files.php
@@ -484,11 +484,11 @@ public static function get_active_snippets_from_flat_files(
 						'condition_id' => intval( $snippet['condition_id'] ),
 					];
 				}
-
-				self::sort_active_snippets( $active_snippets, $db );
 			}
 		}
 
+		self::sort_active_snippets( $active_snippets, $db );
+
 		return $active_snippets;
 	}
 
diff --git a/tests/e2e/code-snippets-community-featured.spec.ts b/tests/e2e/code-snippets-community-featured.spec.ts
index 4282ed5db..849b88c31 100644
--- a/tests/e2e/code-snippets-community-featured.spec.ts
+++ b/tests/e2e/code-snippets-community-featured.spec.ts
@@ -37,6 +37,11 @@ const isSnippetDownloadRequest = (url: URL): boolean =>
 	url.pathname.includes('/cloud/snippets/501/download') ||
 	true === url.searchParams.get('rest_route')?.includes('/cloud/snippets/501/download')
 
+const isSearchRequest = (url: URL): boolean =>
+	(url.pathname.includes('/cloud/snippets') || true === url.searchParams.get('rest_route')?.includes('/cloud/snippets')) &&
+	!isFeaturedRequest(url) && !url.pathname.includes('/download') &&
+	!url.searchParams.get('rest_route')?.includes('/download')
+
 const makeCloudSnippet = (id: number, name: string, localId: number | null = null) => ({
 	id,
 	slug: `mock-cloud-snippet-${id}`,
@@ -169,6 +174,71 @@ test.describe('Community Cloud Featured Snippets', () => {
 			.toContainText('An error occurred while fetching search results. Please try again.')
 	})
 
+	test('shows a clear empty state when a keyword search has no results', async ({ page }) => {
+		await page.route(isSearchRequest, route => route.fulfill({
+			contentType: 'application/json',
+			body: JSON.stringify(makeFeaturedResponse([]))
+		}))
+		await openCommunityCloud(page)
+
+		await page.getByRole('searchbox', { name: 'Search query' }).fill('no matching snippet')
+		await page.getByRole('button', { name: 'Search Cloud Library' }).click()
+		await expect(page.locator('.no-results'))
+			.toHaveText('No snippets could be found with that search term. Please try again.')
+	})
+
+	test('shows a library-specific empty state for a codevault search', async ({ page }) => {
+		await page.route(isSearchRequest, route => route.fulfill({
+			contentType: 'application/json',
+			body: JSON.stringify(makeFeaturedResponse([]))
+		}))
+		await openCommunityCloud(page)
+
+		await page.getByRole('combobox', { name: 'Search method' }).selectOption('codevault')
+		await page.getByRole('searchbox', { name: 'Search query' }).fill('missing library')
+		await page.getByRole('button', { name: 'Search Cloud Library' }).click()
+		await expect(page.locator('.no-results'))
+			.toHaveText('Could not find a codevault with that name. Please try again.')
+	})
+
+	test('shows every available cloud filter', async ({ page }) => {
+		await page.route(isFeaturedRequest, route => route.fulfill({
+			contentType: 'application/json',
+			body: JSON.stringify({
+				...makeFeaturedResponse(),
+				available_filters: {
+					categories: [{ id: 12, name: 'Utilities' }],
+					types: [{ id: 1, name: 'PHP' }],
+					statuses: [{ id: 4, name: 'Verified' }]
+				}
+			})
+		}))
+		await openCommunityCloud(page)
+
+		await expect(page.getByRole('combobox', { name: 'Snippet Category' })).toContainText('Utilities')
+		await expect(page.getByRole('combobox', { name: 'Snippet Type' })).toContainText('PHP')
+		await expect(page.getByRole('combobox', { name: 'Snippet Status' })).toContainText('Verified')
+	})
+
+	test('includes a chosen category in the next cloud request', async ({ page }) => {
+		await page.route(isFeaturedRequest, route => route.fulfill({
+			contentType: 'application/json',
+			body: JSON.stringify({
+				...makeFeaturedResponse(),
+				available_filters: { categories: [{ id: 12, name: 'Utilities' }] }
+			})
+		}))
+		await openCommunityCloud(page)
+		await expect(page.getByRole('combobox', { name: 'Snippet Category' })).toBeVisible()
+
+		const filteredRequest = page.waitForRequest(request => {
+			const url = new URL(request.url())
+			return isFeaturedRequest(url) && '12' === url.searchParams.get('category')
+		})
+		await page.getByRole('combobox', { name: 'Snippet Category' }).selectOption('12')
+		await filteredRequest
+	})
+
 	test('Shares download state between the card and its preview', async ({ page }) => {
 		let releaseDownload: VoidFunction = () => undefined
 		const downloadPending = new Promise<void>(resolve => {
diff --git a/tests/e2e/code-snippets-edit.spec.ts b/tests/e2e/code-snippets-edit.spec.ts
index 2257461bb..17c541acf 100644
--- a/tests/e2e/code-snippets-edit.spec.ts
+++ b/tests/e2e/code-snippets-edit.spec.ts
@@ -23,6 +23,141 @@ test.describe('Code Snippets Admin', () => {
 		})
 	})
 
+	test('Saves a description entered in the visual editor', async ({ page }) => {
+		const snippetName = SnippetsTestHelper.makeUniqueSnippetName('Visual description')
+		const description = 'Saved from the visual description editor.'
+
+		try {
+			await helper.clickAddNewSnippet()
+			await helper.fillSnippetForm({
+				name: snippetName,
+				code: "add_filter('show_admin_bar', '__return_false');"
+			})
+
+			const visualEditor = page.frameLocator('#snippet_description_ifr').locator('body')
+			await expect(visualEditor).toBeVisible()
+			await visualEditor.fill(description)
+			await helper.saveSnippet()
+			await helper.expectSuccessMessage(MESSAGES.SNIPPET_CREATED)
+
+			await page.reload()
+			await expect(page.frameLocator('#snippet_description_ifr').locator('body')).toHaveText(description)
+		} finally {
+			await helper.cleanupSnippet(snippetName)
+		}
+	})
+
+	test('Preserves a description when switching between visual and text tabs', async ({ page }) => {
+		const description = 'Description preserved between editor tabs.'
+
+		await helper.clickAddNewSnippet()
+		const visualEditor = page.frameLocator('#snippet_description_ifr').locator('body')
+		await expect(visualEditor).toBeVisible()
+		await visualEditor.fill(description)
+
+		await page.getByRole('button', { name: 'Code', exact: true }).click()
+		await expect(page.locator('#snippet_description')).toHaveValue(new RegExp(description))
+
+		await page.getByRole('button', { name: 'Visual', exact: true }).click()
+		await expect(visualEditor).toHaveText(description)
+	})
+
+	test('Adds and removes tags before saving a snippet', async ({ page }) => {
+		const snippetName = SnippetsTestHelper.makeUniqueSnippetName('Tagged snippet')
+		const removedTag = 'remove-me'
+		const savedTag = 'saved-tag'
+
+		try {
+			await helper.clickAddNewSnippet()
+			await helper.fillSnippetForm({
+				name: snippetName,
+				code: "add_filter('show_admin_bar', '__return_false');"
+			})
+
+			const tags = page.getByRole('combobox', { name: 'Snippet Tags' })
+			for (const tag of [removedTag, savedTag]) {
+				await tags.fill(tag)
+				await tags.press('Enter')
+				await expect(page.locator('.components-form-token-field__token').filter({ hasText: tag })).toBeVisible()
+			}
+
+			await page.locator('.components-form-token-field__token')
+				.filter({ hasText: removedTag })
+				.locator('.components-form-token-field__remove-token')
+				.click()
+			await expect(page.locator('.components-form-token-field__token').filter({ hasText: removedTag })).toHaveCount(0)
+
+			await helper.saveSnippet()
+			await helper.expectSuccessMessage(MESSAGES.SNIPPET_CREATED)
+			await page.reload()
+			await expect(page.locator('.components-form-token-field__token').filter({ hasText: savedTag })).toBeVisible()
+		} finally {
+			await helper.cleanupSnippet(snippetName)
+		}
+	})
+
+	test('Splits comma-separated tags into individual tokens', async ({ page }) => {
+		const tags = ['first-pasted-tag', 'second-pasted-tag']
+
+		await helper.clickAddNewSnippet()
+		const tagInput = page.getByRole('combobox', { name: 'Snippet Tags' })
+		await tagInput.fill(tags.join(','))
+		await tagInput.press('Enter')
+
+		for (const tag of tags) {
+			await expect(page.locator('.components-form-token-field__token').filter({ hasText: tag })).toBeVisible()
+		}
+	})
+
+	test('Copies a content snippet shortcode from the sidebar', async ({ page, context }) => {
+		const snippetName = SnippetsTestHelper.makeUniqueSnippetName('Shortcode snippet')
+
+		try {
+			const snippetId = await SnippetsTestHelper.createSnippetViaCli({
+				name: snippetName,
+				active: false,
+				type: 'html',
+				scope: 'content'
+			})
+			const shortcode = `[code_snippet id=${snippetId} format name="${snippetName}"]`
+
+			await helper.navigateToSnippetsAdmin()
+			await helper.openSnippet(snippetName)
+			await context.grantPermissions(['clipboard-read', 'clipboard-write'], { origin: new URL(page.url()).origin })
+
+			await page.getByRole('button', { name: 'See options' }).click()
+			const dialog = page.getByRole('dialog', { name: 'Embed Snippet with Shortcode' })
+			await expect(dialog.locator('.shortcode-tag')).toHaveText(shortcode)
+			await dialog.getByRole('button', { name: 'Copy' }).click()
+			await expect(dialog.getByRole('status')).toHaveText('Copied to clipboard.')
+			expect(await page.evaluate(() => navigator.clipboard.readText())).toBe(shortcode)
+		} finally {
+			await helper.cleanupSnippet(snippetName)
+		}
+	})
+
+	test('Expands and collapses the code editor', async ({ page }) => {
+		await helper.clickAddNewSnippet()
+		const form = page.locator('form.snippet-form')
+
+		await expect(form).toHaveClass(/snippet-form-collapsed/)
+		await page.getByRole('button', { name: 'Expand' }).click()
+		await expect(form).toHaveClass(/snippet-form-expanded/)
+		await expect(page.getByRole('button', { name: 'Minimize' })).toBeVisible()
+
+		await page.getByRole('button', { name: 'Minimize' }).click()
+		await expect(form).toHaveClass(/snippet-form-collapsed/)
+	})
+
+	test('Shows the code editor keyboard shortcut reference', async ({ page }) => {
+		await helper.clickAddNewSnippet()
+		const shortcuts = page.locator('.snippet-editor-help')
+
+		await expect(shortcuts).toBeVisible()
+		await shortcuts.hover()
+		await expect(shortcuts.locator('.tooltip-content')).toContainText('Save changes')
+	})
+
 	test('Can activate and deactivate a snippet', async () => {
 		const snippetName = SnippetsTestHelper.makeUniqueSnippetName()
 		await helper.createSnippet({
@@ -64,6 +199,102 @@ test.describe('Code Snippets Admin', () => {
 		await helper.cleanupSnippet(snippetName)
 	})
 
+	test('Saves a snippet priority from the editor sidebar', async ({ page }) => {
+		const snippetName = SnippetsTestHelper.makeUniqueSnippetName('Priority snippet')
+
+		try {
+			await helper.createSnippet({
+				name: snippetName,
+				code: "add_filter('show_admin_bar', '__return_false');"
+			})
+			await helper.openSnippet(snippetName)
+
+			const priority = page.getByRole('spinbutton', { name: 'Priority' })
+			await priority.fill('7')
+			await helper.saveSnippet()
+			await helper.expectSuccessMessage(/Snippet updated/i)
+
+			await page.reload()
+			await expect(page.getByRole('spinbutton', { name: 'Priority' })).toHaveValue('7')
+		} finally {
+			await helper.cleanupSnippet(snippetName)
+		}
+	})
+
+	test('Exports a saved snippet as JSON from the editor sidebar', async ({ page }) => {
+		const snippetName = SnippetsTestHelper.makeUniqueSnippetName('Sidebar export')
+
+		try {
+			await helper.createSnippet({
+				name: snippetName,
+				code: "add_filter('show_admin_bar', '__return_false');"
+			})
+			await helper.openSnippet(snippetName)
+
+			const download = await Promise.all([
+				page.waitForEvent('download'),
+				page.getByRole('button', { name: 'Export', exact: true }).click()
+			]).then(([event]) => event)
+
+			expect(download.suggestedFilename()).toMatch(/\.json$/)
+		} finally {
+			await helper.cleanupSnippet(snippetName)
+		}
+	})
+
+	test('Downloads a PHP code file from the editor sidebar', async ({ page }) => {
+		const snippetName = SnippetsTestHelper.makeUniqueSnippetName('Sidebar code download')
+
+		try {
+			await helper.createSnippet({
+				name: snippetName,
+				code: "add_filter('show_admin_bar', '__return_false');"
+			})
+			await helper.openSnippet(snippetName)
+
+			const download = await Promise.all([
+				page.waitForEvent('download'),
+				page.getByRole('button', { name: 'Download' }).click()
+			]).then(([event]) => event)
+
+			expect(download.suggestedFilename()).toMatch(/\.php$/)
+		} finally {
+			await helper.cleanupSnippet(snippetName)
+		}
+	})
+
+	test('Locks a snippet until it is unlocked from the editor sidebar', async ({ page }) => {
+		const snippetName = SnippetsTestHelper.makeUniqueSnippetName('Locked snippet')
+		const updatedSnippetName = `${snippetName} unlocked`
+		let cleanupName = snippetName
+
+		try {
+			await helper.createSnippet({
+				name: snippetName,
+				code: "add_filter('show_admin_bar', '__return_false');"
+			})
+			await helper.openSnippet(snippetName)
+
+			const lockButton = page.locator('button.snippet-lock-button')
+			await lockButton.click()
+			await expect(page.getByRole('heading', { name: /View Snippet/ })).toBeVisible()
+			await expect(page.locator('#title')).toBeDisabled()
+			await expect(page.locator('button.delete-button')).toBeDisabled()
+
+			await lockButton.click()
+			await expect(page.getByRole('heading', { name: /Edit Snippet/ })).toBeVisible()
+			await expect(page.locator('#title')).toBeEnabled()
+			await expect(page.locator('button.delete-button')).toBeEnabled()
+
+			await page.locator('#title').fill(updatedSnippetName)
+			await helper.saveSnippet()
+			await helper.expectSuccessMessage(/Snippet updated/i)
+			cleanupName = updatedSnippetName
+		} finally {
+			await helper.cleanupSnippet(cleanupName)
+		}
+	})
+
 	test('Back navigation confirms before discarding unsaved changes', async ({ page }) => {
 		const snippetName = SnippetsTestHelper.makeUniqueSnippetName()
 		await helper.clickAddNewSnippet()
@@ -121,6 +352,31 @@ test.describe('Code Snippets Admin', () => {
 		await helper.cleanupSnippet(snippetName)
 	})
 
+	test('Shows a clear error and leaves a snippet inactive when its PHP has a syntax error', async ({ page }) => {
+		const snippetName = SnippetsTestHelper.makeUniqueSnippetName('Syntax error snippet')
+
+		try {
+			await helper.clickAddNewSnippet()
+			await helper.fillSnippetForm({
+				name: snippetName,
+				code: 'function invalid_syntax( {'
+			})
+			await helper.saveSnippet('save_and_activate')
+
+			const errorNotice = page.locator('.wrap > .notice.error').first()
+			await expect(errorNotice).toBeVisible({ timeout: TIMEOUTS.DEFAULT })
+			await expect(errorNotice).toContainText(/syntax error/i)
+			await expect(errorNotice).toContainText(/remains inactive/i)
+
+			await helper.navigateToSnippetsAdmin()
+			await helper.filterSnippetsByName(snippetName)
+			const snippetRow = page.locator(SELECTORS.SNIPPET_ROW).filter({ hasText: snippetName }).first()
+			await expect(snippetRow.getByRole('switch')).not.toBeChecked()
+		} finally {
+			await helper.cleanupSnippet(snippetName)
+		}
+	})
+
 	test('Shows an error notice when activation fails after saving', async ({ page }) => {
 		const snippetName = SnippetsTestHelper.makeUniqueSnippetName()
 		await helper.clickAddNewSnippet()
diff --git a/tests/e2e/code-snippets-evaluation.spec.ts b/tests/e2e/code-snippets-evaluation.spec.ts
index 23d5659d0..a1187f4ca 100644
--- a/tests/e2e/code-snippets-evaluation.spec.ts
+++ b/tests/e2e/code-snippets-evaluation.spec.ts
@@ -158,6 +158,210 @@ test.describe('Code Snippets Evaluation', () => {
 		await expect(page.locator('body')).toHaveClass(/custom-frontend-class/)
 	})
 
+	test('Safe mode query disables front-end snippet execution', async ({ page }) => {
+		const safeModeClass = `safe-mode-${Date.now()}`
+
+		try {
+			await helper.createAndActivateSnippet({
+				name: snippetName,
+				code: `add_filter('body_class', function($classes) { $classes[] = '${safeModeClass}'; return $classes; });`
+			})
+
+			await page.goto(URLS.FRONTEND)
+			await expect(page.locator('body')).toHaveClass(new RegExp(safeModeClass))
+
+			await page.goto(`${URLS.FRONTEND}?snippets-safe-mode=1`)
+			await expect(page.locator('body')).not.toHaveClass(new RegExp(safeModeClass))
+		} finally {
+			await helper.cleanupSnippet(snippetName)
+		}
+	})
+
+	test('Safe mode constant disables snippets while keeping the editor accessible', async ({ page }) => {
+		const safeModeClass = `safe-mode-constant-${Date.now()}`
+		const safeModeMuPluginPath = 'wp-content/mu-plugins/code-snippets-e2e-safe-mode-execution.php'
+		const removeMuPlugin = () =>
+			wpCli(['eval', `@unlink( ABSPATH . ${JSON.stringify(safeModeMuPluginPath)} );`])
+		const enableSafeMode = `
+			$path = ABSPATH . ${JSON.stringify(safeModeMuPluginPath)};
+			wp_mkdir_p( dirname( $path ) );
+			file_put_contents( $path, "<?php\\ndefine( 'CODE_SNIPPETS_SAFE_MODE', true );\\n" );
+		`
+
+		await removeMuPlugin()
+
+		try {
+			await helper.createAndActivateSnippet({
+				name: snippetName,
+				code: `add_filter('body_class', function($classes) { $classes[] = '${safeModeClass}'; return $classes; });`
+			})
+			await page.goto(URLS.FRONTEND)
+			await expect(page.locator('body')).toHaveClass(new RegExp(safeModeClass))
+
+			await wpCli(['eval', enableSafeMode])
+
+			await page.goto(URLS.FRONTEND)
+			await expect(page.locator('body')).not.toHaveClass(new RegExp(safeModeClass))
+
+			await helper.navigateToSnippetsAdmin()
+			const row = page.locator(SELECTORS.SNIPPET_ROW).filter({ hasText: snippetName }).first()
+			await row.locator(SELECTORS.SNIPPET_NAME_LINK).click()
+			await expect(page.locator('#title')).toBeEnabled()
+			await page.getByRole('button', { name: 'Save and Deactivate' }).click()
+			await helper.expectSuccessMessage(/Snippet updated/i)
+
+			await helper.navigateToSnippetsAdmin()
+			const deactivatedRow = page.locator(SELECTORS.SNIPPET_ROW).filter({ hasText: snippetName }).first()
+			await expect(deactivatedRow.getByRole('switch')).not.toBeChecked()
+		} finally {
+			await helper.cleanupSnippet(snippetName)
+			await removeMuPlugin()
+		}
+	})
+
+	test('Safe mode constant warns that snippets will not execute', async ({ page }) => {
+		const safeModeMuPluginPath = 'wp-content/mu-plugins/code-snippets-e2e-safe-mode-notice.php'
+		const removeMuPlugin = () =>
+			wpCli(['eval', `@unlink( ABSPATH . ${JSON.stringify(safeModeMuPluginPath)} );`])
+
+		await removeMuPlugin()
+
+		try {
+			await wpCli(['eval', `
+				$path = ABSPATH . ${JSON.stringify(safeModeMuPluginPath)};
+				wp_mkdir_p( dirname( $path ) );
+				file_put_contents( $path, "<?php\\ndefine( 'CODE_SNIPPETS_SAFE_MODE', true );\\n" );
+			`])
+
+			await page.goto(URLS.SNIPPETS_ADMIN)
+			await expect(page.getByText('Safe mode is active and snippets will not execute!')).toBeVisible()
+		} finally {
+			await removeMuPlugin()
+		}
+	})
+
+	test('Single-use PHP snippets run once from the list', async ({ page }) => {
+		const markerKey = `code_snippets_e2e_single_use_${Date.now()}`
+
+		try {
+			await SnippetsTestHelper.createSnippetViaCli({
+				name: snippetName,
+				active: false,
+				scope: 'single-use',
+				code: `update_option('${markerKey}', 'ran once');`
+			})
+			await helper.navigateToSnippetsAdmin()
+
+			const row = page.locator(SELECTORS.SNIPPET_ROW).filter({ hasText: snippetName }).first()
+			const runOnce = row.getByRole('link', { name: 'Run Once' })
+			await expect(runOnce).toBeVisible()
+			await Promise.all([
+				page.waitForURL(/result=executed/),
+				runOnce.click()
+			])
+
+			expect((await wpCli(['option', 'get', markerKey])).trim()).toBe('ran once')
+		} finally {
+			await wpCli(['eval', `delete_option('${markerKey}');`])
+			await helper.cleanupSnippet(snippetName)
+		}
+	})
+
+	test('PHP snippets execute in priority order', async ({ page }) => {
+		const outputPrefix = `snippet-priority-${Date.now()}`
+		const highPriorityId = `${outputPrefix}-high`
+		const lowPriorityId = `${outputPrefix}-low`
+		const highPriorityName = SnippetsTestHelper.makeUniqueSnippetName('High priority snippet')
+		const lowPriorityName = SnippetsTestHelper.makeUniqueSnippetName('Low priority snippet')
+
+		try {
+			await SnippetsTestHelper.createSnippetViaCli({
+				name: highPriorityName,
+				active: true,
+				priority: 20,
+				code: `add_action('wp_footer', function() { echo '<span id="${highPriorityId}"></span>'; });`
+			})
+			await SnippetsTestHelper.createSnippetViaCli({
+				name: lowPriorityName,
+				active: true,
+				priority: 5,
+				code: `add_action('wp_footer', function() { echo '<span id="${lowPriorityId}"></span>'; });`
+			})
+
+			await helper.navigateToFrontend()
+			await expect.poll(() => page.locator(`span[id^="${outputPrefix}"]`).evaluateAll(elements =>
+				elements.map(({ id }) => id)
+			)).toEqual([lowPriorityId, highPriorityId])
+		} finally {
+			await helper.cleanupSnippet(highPriorityName)
+			await helper.cleanupSnippet(lowPriorityName)
+		}
+	})
+
+	test('CSS snippets load on the front end', async ({ page }) => {
+		if (!await SnippetsTestHelper.isProLicensed()) {
+			test.skip(true, 'CSS snippets require an active Pro license.')
+		}
+
+		const property = `--e2e-css-${Date.now()}`
+
+		await SnippetsTestHelper.createSnippetViaCli({
+			name: snippetName,
+			active: true,
+			type: 'css',
+			code: `body { ${property}: loaded; }`
+		})
+
+		await page.goto(URLS.FRONTEND)
+		await expect.poll(() => page.locator('body').evaluate((body, propertyName) =>
+			getComputedStyle(body).getPropertyValue(propertyName).trim(), property)
+		).toBe('loaded')
+	})
+
+	test('JavaScript snippets load in the site header', async ({ page }) => {
+		if (!await SnippetsTestHelper.isProLicensed()) {
+			test.skip(true, 'JavaScript snippets require an active Pro license.')
+		}
+
+		const marker = `e2e-header-script-${Date.now()}`
+
+		await SnippetsTestHelper.createSnippetViaCli({
+			name: snippetName,
+			active: true,
+			type: 'js',
+			scope: 'site-head-js',
+			code: `document.documentElement.dataset.e2eHeaderScript = '${marker}';`
+		})
+
+		await helper.navigateToFrontend()
+		await expect(page.locator('html')).toHaveAttribute('data-e2e-header-script', marker)
+		expect(await page.locator('head script').evaluateAll((scripts, scriptMarker) =>
+			scripts.some(script => script.textContent?.includes(scriptMarker)), marker
+		)).toBe(true)
+	})
+
+	test('JavaScript snippets load in the site footer', async ({ page }) => {
+		if (!await SnippetsTestHelper.isProLicensed()) {
+			test.skip(true, 'JavaScript snippets require an active Pro license.')
+		}
+
+		const marker = `e2e-footer-script-${Date.now()}`
+
+		await SnippetsTestHelper.createSnippetViaCli({
+			name: snippetName,
+			active: true,
+			type: 'js',
+			scope: 'site-footer-js',
+			code: `document.body.dataset.e2eFooterScript = '${marker}';`
+		})
+
+		await helper.navigateToFrontend()
+		await expect(page.locator('body')).toHaveAttribute('data-e2e-footer-script', marker)
+		expect(await page.locator('body script').evaluateAll((scripts, scriptMarker) =>
+			scripts.some(script => script.textContent?.includes(scriptMarker)), marker
+		)).toBe(true)
+	})
+
 	test('HTML snippet is evaluating correctly in footer', async () => {
 		await helper.createAndActivateSnippet({
 			name: snippetName,
diff --git a/tests/e2e/code-snippets-import.spec.ts b/tests/e2e/code-snippets-import.spec.ts
new file mode 100644
index 000000000..27990b5ea
--- /dev/null
+++ b/tests/e2e/code-snippets-import.spec.ts
@@ -0,0 +1,203 @@
+import { readFileSync } from 'fs'
+import { expect, test } from '@playwright/test'
+import { DEFAULT_E2E_SNIPPET_BASE_NAME, SnippetsTestHelper } from './helpers/SnippetsTestHelper'
+import { SELECTORS, TIMEOUTS, URLS } from './helpers/constants'
+
+const importFile = (snippet: Record<string, unknown>) => ({
+	name: 'code-snippets-export.json',
+	mimeType: 'application/json',
+	buffer: Buffer.from(JSON.stringify({ snippets: [snippet] }))
+})
+
+test.describe('Code Snippets Import', () => {
+	test.beforeEach(async () => {
+		await SnippetsTestHelper.cleanupSnippetsByPrefix(DEFAULT_E2E_SNIPPET_BASE_NAME)
+	})
+
+	test.afterEach(async () => {
+		await SnippetsTestHelper.cleanupSnippetsByPrefix(DEFAULT_E2E_SNIPPET_BASE_NAME)
+	})
+
+	test('imports a selected JSON snippet as inactive', async ({ page }) => {
+		const snippetName = SnippetsTestHelper.makeUniqueSnippetName('Imported JSON')
+
+		await page.goto(URLS.IMPORT_ADMIN)
+		await page.getByRole('radio', { name: /Do not import any duplicate snippets/ }).check()
+		await page.getByLabel('Select files to import').setInputFiles(importFile({
+			id: 1,
+			name: snippetName,
+			desc: 'Imported from an E2E JSON export.',
+			code: `// ${snippetName}`,
+			tags: ['imported'],
+			scope: 'global',
+			priority: 10
+		}))
+		await page.getByRole('button', { name: 'Upload files' }).click()
+
+		await expect(page.getByRole('heading', { name: 'Available snippets (1)' })).toBeVisible()
+		await expect(page.getByRole('row', { name: new RegExp(snippetName) })).toBeVisible()
+		await page.getByRole('checkbox', { name: 'Select all snippets' }).check()
+		await page.getByRole('button', { name: 'Import Selected (1)' }).first().click()
+
+		await expect(page.getByRole('heading', { name: 'Import successful' })).toBeVisible()
+		await expect(page.locator('.import-result-message')).toContainText('Successfully imported 1 snippet.')
+		await expect(page.locator('.import-result-display-card').getByRole('link', { name: 'All Snippets' })).toBeVisible()
+
+		await page.goto(URLS.SNIPPETS_ADMIN)
+		const importedRow = page.locator(SELECTORS.SNIPPET_ROW).filter({ hasText: snippetName }).first()
+		await expect(importedRow).toBeVisible()
+		await expect(importedRow.getByRole('switch')).not.toBeChecked()
+	})
+
+	test('re-imports an exported snippet from its downloaded JSON file', async ({ page }) => {
+		test.setTimeout(TIMEOUTS.LONG)
+		const snippetName = SnippetsTestHelper.makeUniqueSnippetName('Export round trip')
+
+		await SnippetsTestHelper.createSnippetViaCli({
+			name: snippetName,
+			description: 'A snippet restored from its exported file.',
+			active: false,
+			priority: 7,
+			scope: 'front-end',
+			tags: ['round-trip']
+		})
+		await page.goto(URLS.SNIPPETS_ADMIN)
+
+		const sourceRow = page.locator(SELECTORS.SNIPPET_ROW).filter({ hasText: snippetName }).first()
+		await sourceRow.hover()
+		const download = await Promise.all([
+			page.waitForEvent('download'),
+			sourceRow.locator(SELECTORS.EXPORT_ACTION).first().click()
+		]).then(([downloadEvent]) => downloadEvent)
+		const downloadPath = await download.path()
+
+		if (!downloadPath) {
+			throw new Error('Export did not produce a local file path')
+		}
+
+		await SnippetsTestHelper.cleanupSnippetsByPrefix(snippetName)
+		await page.goto(URLS.IMPORT_ADMIN)
+		await page.getByLabel('Select files to import').setInputFiles({
+			name: download.suggestedFilename(),
+			mimeType: 'application/json',
+			buffer: readFileSync(downloadPath)
+		})
+		await page.getByRole('button', { name: 'Upload files' }).click()
+		await page.getByRole('checkbox', { name: 'Select all snippets' }).check()
+		await page.getByRole('button', { name: 'Import Selected (1)' }).first().click()
+
+		await expect(page.getByRole('heading', { name: 'Import successful' })).toBeVisible()
+		await page.goto(URLS.SNIPPETS_ADMIN)
+		const importedRow = page.locator(SELECTORS.SNIPPET_ROW).filter({ hasText: snippetName }).first()
+		await expect(importedRow).toBeVisible()
+		await expect(importedRow.getByRole('switch')).not.toBeChecked()
+	})
+
+	test('rejects an invalid upload with a clear error', async ({ page }) => {
+		await page.goto(URLS.IMPORT_ADMIN)
+		await page.getByLabel('Select files to import').setInputFiles({
+			name: 'not-a-snippet.txt',
+			mimeType: 'text/plain',
+			buffer: Buffer.from('not a Code Snippets export')
+		})
+		await page.getByRole('button', { name: 'Upload files' }).click()
+
+		await expect(page.getByRole('heading', { name: 'File upload error' })).toBeVisible()
+		await expect(page.locator('.import-result-message')).toContainText('No valid snippets found')
+	})
+
+	test('removes a selected file before uploading the remaining file', async ({ page }) => {
+		const keptName = SnippetsTestHelper.makeUniqueSnippetName('Kept import')
+		const removedName = SnippetsTestHelper.makeUniqueSnippetName('Removed import')
+
+		await page.goto(URLS.IMPORT_ADMIN)
+		await page.getByLabel('Select files to import').setInputFiles([
+			{ ...importFile({ id: 1, name: keptName, code: '// kept', scope: 'global' }), name: 'keep.json' },
+			{ ...importFile({ id: 2, name: removedName, code: '// removed', scope: 'global' }), name: 'remove.json' }
+		])
+		await expect(page.getByRole('heading', { name: 'Selected files: (2)' })).toBeVisible()
+
+		await page.getByRole('button', { name: 'Remove file remove.json' }).click()
+		await expect(page.getByRole('heading', { name: 'Selected files: (1)' })).toBeVisible()
+		await page.getByRole('button', { name: 'Upload files' }).click()
+
+		await expect(page.getByRole('heading', { name: 'Available snippets (1)' })).toBeVisible()
+		await expect(page.getByRole('row', { name: new RegExp(keptName) })).toBeVisible()
+		await expect(page.getByRole('row', { name: new RegExp(removedName) })).toHaveCount(0)
+	})
+
+	test('selects and deselects every parsed snippet before importing', async ({ page }) => {
+		const snippets = [
+			{ id: 1, name: SnippetsTestHelper.makeUniqueSnippetName('Select import'), code: '// first', scope: 'global' },
+			{ id: 2, name: SnippetsTestHelper.makeUniqueSnippetName('Select import'), code: '// second', scope: 'global' }
+		]
+
+		await page.goto(URLS.IMPORT_ADMIN)
+		await page.getByLabel('Select files to import').setInputFiles({
+			name: 'multiple-snippets.json',
+			mimeType: 'application/json',
+			buffer: Buffer.from(JSON.stringify({ snippets }))
+		})
+		await page.getByRole('button', { name: 'Upload files' }).click()
+
+		const selectAll = page.getByRole('button', { name: 'Select All' }).first()
+		await selectAll.click()
+		await expect(page.getByRole('checkbox', { name: 'Select all snippets' })).toBeChecked()
+		await expect(page.getByRole('button', { name: 'Deselect All' }).first()).toBeVisible()
+		await page.getByRole('button', { name: 'Deselect All' }).first().click()
+		await expect(page.getByRole('checkbox', { name: 'Select all snippets' })).not.toBeChecked()
+		await expect(page.getByRole('button', { name: 'Import Selected (0)' }).first()).toBeDisabled()
+	})
+
+	test('imports snippets from multiple selected files', async ({ page }) => {
+		const firstName = SnippetsTestHelper.makeUniqueSnippetName('First file import')
+		const secondName = SnippetsTestHelper.makeUniqueSnippetName('Second file import')
+
+		await page.goto(URLS.IMPORT_ADMIN)
+		await page.getByLabel('Select files to import').setInputFiles([
+			{ ...importFile({ id: 1, name: firstName, code: '// first', scope: 'global' }), name: 'first.json' },
+			{ ...importFile({ id: 2, name: secondName, code: '// second', scope: 'global' }), name: 'second.json' }
+		])
+		await page.getByRole('button', { name: 'Upload files' }).click()
+		await expect(page.getByRole('heading', { name: 'Available snippets (2)' })).toBeVisible()
+		await page.getByRole('button', { name: 'Select All' }).first().click()
+		await page.getByRole('button', { name: 'Import Selected (2)' }).first().click()
+
+		await expect(page.locator('.import-result-message')).toContainText('Successfully imported 2 snippets.')
+		await page.goto(URLS.SNIPPETS_ADMIN)
+		await expect(page.locator(SELECTORS.SNIPPET_ROW).filter({ hasText: firstName })).toBeVisible()
+		await expect(page.locator(SELECTORS.SNIPPET_ROW).filter({ hasText: secondName })).toBeVisible()
+	})
+
+	test('skips and replaces duplicate snippets according to the selected policy', async ({ page }) => {
+		const snippetName = SnippetsTestHelper.makeUniqueSnippetName('Imported duplicate')
+		const duplicate = {
+			id: 1,
+			name: snippetName,
+			code: `// replacement for ${snippetName}`,
+			scope: 'global'
+		}
+
+		await SnippetsTestHelper.createSnippetViaCli({
+			name: snippetName,
+			code: `// original ${snippetName}`,
+			active: false
+		})
+
+		await page.goto(URLS.IMPORT_ADMIN)
+		await page.getByRole('radio', { name: /Do not import any duplicate snippets/ }).check()
+		await page.getByLabel('Select files to import').setInputFiles(importFile(duplicate))
+		await page.getByRole('button', { name: 'Upload files' }).click()
+		await page.getByRole('checkbox', { name: 'Select all snippets' }).check()
+		await page.getByRole('button', { name: 'Import Selected (1)' }).first().click()
+		await expect(page.locator('.import-result-message')).toContainText('Successfully imported 0 snippets.')
+
+		await page.goto(URLS.IMPORT_ADMIN)
+		await page.getByRole('radio', { name: /Replace any existing snippets/ }).check()
+		await page.getByLabel('Select files to import').setInputFiles(importFile(duplicate))
+		await page.getByRole('button', { name: 'Upload files' }).click()
+		await page.getByRole('checkbox', { name: 'Select all snippets' }).check()
+		await page.getByRole('button', { name: 'Import Selected (1)' }).first().click()
+		await expect(page.locator('.import-result-message')).toContainText('Successfully imported 1 snippet.')
+	})
+})
diff --git a/tests/e2e/code-snippets-insights.spec.ts b/tests/e2e/code-snippets-insights.spec.ts
index 9071fcb78..e5c9aa057 100644
--- a/tests/e2e/code-snippets-insights.spec.ts
+++ b/tests/e2e/code-snippets-insights.spec.ts
@@ -88,7 +88,7 @@ test.describe('Insights screen', () => {
 			active: false,
 			type: 'js'
 		})
-		await page.goto(URLS.SNIPPETS_ADMIN.replace('page=snippets', 'page=code-snippets-insights'))
+		await page.goto(URLS.INSIGHTS_ADMIN)
 		const activationPie = page.locator('[data-insights-chart="activation"] .insights-pie-chart')
 		const conditionsChart = page.locator('[data-insights-chart="conditions"]')
 
@@ -116,6 +116,35 @@ test.describe('Insights screen', () => {
 		await expect(withoutConditions.locator('strong')).toHaveText('4')
 	})
 
+	test('shows snippet scope counts in the location chart', async ({ page }) => {
+		await SnippetsTestHelper.createSnippetViaCli({ name: 'Insights Global One', active: true })
+		await SnippetsTestHelper.createSnippetViaCli({ name: 'Insights Global Two', active: true })
+		await SnippetsTestHelper.createSnippetViaCli({
+			name: 'Insights Admin Scope',
+			active: true,
+			scope: 'admin'
+		})
+		await SnippetsTestHelper.createSnippetViaCli({
+			name: 'Insights Front-end Scope',
+			active: true,
+			scope: 'front-end'
+		})
+
+		await page.goto(URLS.INSIGHTS_ADMIN)
+		const locationChart = page.locator('[data-insights-chart="location"]')
+
+		for (const [label, count] of [
+			['Run everywhere', '2'],
+			['Only run in administration area', '1'],
+			['Only run on site front-end', '1']
+		]) {
+			const entry = locationChart.locator('li').filter({ hasText: label })
+
+			await expect(entry).toHaveCount(1)
+			await expect(entry.locator('strong')).toHaveText(count)
+		}
+	})
+
 	test('switches used tags between bar and cloud views', async ({ page }) => {
 		await SnippetsTestHelper.createSnippetViaCli({
 			name: 'Insights Shared and Alpha Tags',
@@ -128,7 +157,7 @@ test.describe('Insights screen', () => {
 			tags: ['Shared']
 		})
 
-		await page.goto(URLS.SNIPPETS_ADMIN.replace('page=snippets', 'page=code-snippets-insights'))
+		await page.goto(URLS.INSIGHTS_ADMIN)
 		const tagsChart = page.locator('[data-insights-chart="tags"]')
 
 		await expect(page.getByRole('heading', { name: 'Tags' })).toBeVisible()
@@ -164,7 +193,7 @@ test.describe('Insights screen', () => {
 			tags: ['sample']
 		})
 
-		await page.goto(URLS.SNIPPETS_ADMIN.replace('page=snippets', 'page=code-snippets-insights'))
+		await page.goto(URLS.INSIGHTS_ADMIN)
 
 		const manageUrl = (query: string) => new URL(`${URLS.SNIPPETS_ADMIN}${query}`, baseURL).toString()
 
@@ -202,8 +231,23 @@ test.describe('Insights screen', () => {
 		await expect(tagLink).toHaveCSS('text-decoration-line', 'none')
 	})
 
+	test('opens the matching filtered list from a chart entry', async ({ page }) => {
+		const name = 'Insights Chart Link Snippet'
+		await SnippetsTestHelper.createSnippetViaCli({
+			name,
+			active: true,
+			tags: ['chart-link']
+		})
+
+		await page.goto(URLS.INSIGHTS_ADMIN)
+		await page.locator('[data-insights-chart="tags"]').getByRole('link', { name: 'chart-link' }).click()
+
+		await expect(page).toHaveURL(/page=snippets.*tag=chart-link/)
+		await expect(page.locator('.wp-list-table tbody tr').filter({ hasText: name })).toBeVisible()
+	})
+
 	test('switches and restores each Insights chart view', async ({ page }) => {
-		await page.goto(URLS.SNIPPETS_ADMIN.replace('page=snippets', 'page=code-snippets-insights'))
+		await page.goto(URLS.INSIGHTS_ADMIN)
 
 		const typeChart = page.locator('[data-insights-chart="type"]')
 		const activationChart = page.locator('[data-insights-chart="activation"]')
@@ -254,7 +298,7 @@ test.describe('Insights screen', () => {
 	})
 
 	test('restores a chart view when saving the preference fails', async ({ page }) => {
-		await page.goto(URLS.SNIPPETS_ADMIN.replace('page=snippets', 'page=code-snippets-insights'))
+		await page.goto(URLS.INSIGHTS_ADMIN)
 		const conditionsChart = page.locator('[data-insights-chart="conditions"]')
 
 		await expect(conditionsChart).toHaveAttribute('data-view', 'pie')
@@ -269,7 +313,7 @@ test.describe('Insights screen', () => {
 	})
 
 	test('keeps the latest chart views when an earlier save fails', async ({ page }) => {
-		await page.goto(URLS.SNIPPETS_ADMIN.replace('page=snippets', 'page=code-snippets-insights'))
+		await page.goto(URLS.INSIGHTS_ADMIN)
 		const typeChart = page.locator('[data-insights-chart="type"]')
 		const activationChart = page.locator('[data-insights-chart="activation"]')
 		let rejectFirstRequest: (() => void) | undefined
diff --git a/tests/e2e/code-snippets-list.spec.ts b/tests/e2e/code-snippets-list.spec.ts
index 00b89b21d..091640675 100644
--- a/tests/e2e/code-snippets-list.spec.ts
+++ b/tests/e2e/code-snippets-list.spec.ts
@@ -64,6 +64,173 @@ test.describe('Code Snippets List Page Actions', () => {
 		await expect(search.getByRole('button', { name: 'Search' })).toHaveCount(0)
 	})
 
+	test('Shows an empty state when no snippets match the search', async ({ page }) => {
+		const searchInput = page.getByRole('searchbox', { name: 'Search Snippets:' })
+		await searchInput.fill(`${snippetName}-does-not-exist`)
+
+		await expect(page.getByText('No snippets were found matching the current search query.')).toBeVisible()
+	})
+
+	test('Filters snippets by the selected tag', async ({ page }) => {
+		const taggedSnippetName = SnippetsTestHelper.makeUniqueSnippetName('Tag filter')
+		const tag = `e2e-tag-${Date.now()}`
+
+		try {
+			await SnippetsTestHelper.createSnippetViaCli({
+				name: taggedSnippetName,
+				active: false,
+				tags: [tag]
+			})
+			await helper.navigateToSnippetsAdmin()
+
+			await page.getByRole('combobox', { name: 'Filter snippets by tag' }).selectOption({ label: tag })
+			await expect(snippetRowByName(page, taggedSnippetName)).toBeVisible()
+			await expect(snippetRowByName(page, snippetName)).toBeHidden()
+		} finally {
+			await helper.cleanupSnippet(taggedSnippetName)
+		}
+	})
+
+	test('Clears search, tag, and status filters together', async ({ page }) => {
+		const taggedSnippetName = SnippetsTestHelper.makeUniqueSnippetName('Clear filters')
+		const tag = `e2e-clear-${Date.now()}`
+
+		try {
+			await SnippetsTestHelper.createSnippetViaCli({
+				name: taggedSnippetName,
+				active: false,
+				tags: [tag]
+			})
+			await helper.navigateToSnippetsAdmin()
+
+			await page.locator('.subsubsub .inactive a').click()
+			await page.getByRole('combobox', { name: 'Filter snippets by tag' }).selectOption({ label: tag })
+			await page.getByRole('searchbox', { name: 'Search Snippets:' }).fill(taggedSnippetName)
+			await expect(snippetRowByName(page, taggedSnippetName)).toBeVisible()
+
+			await page.getByRole('button', { name: 'Clear Filters' }).click()
+			await expect.poll(async () => ({
+				search: await page.getByRole('searchbox', { name: 'Search Snippets:' }).inputValue(),
+				tag: await page.getByRole('combobox', { name: 'Filter snippets by tag' }).inputValue(),
+				activeSnippetVisible: await snippetRowByName(page, snippetName).isVisible()
+			}), { timeout: TIMEOUTS.SHORT }).toEqual({
+				search: '',
+				tag: '',
+				activeSnippetVisible: true
+			})
+		} finally {
+			await helper.cleanupSnippet(taggedSnippetName)
+		}
+	})
+
+	test('Searches snippets by name, description, and code', async ({ page }) => {
+		const nameQuery = SnippetsTestHelper.makeUniqueSnippetName('Search name')
+		const descriptionQuery = SnippetsTestHelper.makeUniqueSnippetName('Search-description-query')
+		const codeQuery = SnippetsTestHelper.makeUniqueSnippetName('Search-code-query')
+		const fixtures = [
+			{
+				name: nameQuery,
+				query: nameQuery
+			},
+			{
+				name: SnippetsTestHelper.makeUniqueSnippetName('Search description'),
+				description: descriptionQuery,
+				query: descriptionQuery
+			},
+			{
+				name: SnippetsTestHelper.makeUniqueSnippetName('Search code'),
+				code: `// ${codeQuery}`,
+				query: codeQuery
+			}
+		]
+
+		try {
+			for (const fixture of fixtures) {
+				await SnippetsTestHelper.createSnippetViaCli({ ...fixture, active: false })
+			}
+
+			await helper.navigateToSnippetsAdmin()
+			const searchInput = page.getByRole('searchbox', { name: 'Search Snippets:' })
+
+			for (const fixture of fixtures) {
+				await searchInput.fill(fixture.query)
+				await expect(snippetRowByName(page, fixture.name)).toBeVisible()
+
+				for (const otherFixture of fixtures.filter(other => other !== fixture)) {
+					await expect(snippetRowByName(page, otherFixture.name)).toBeHidden()
+				}
+			}
+		} finally {
+			for (const fixture of fixtures) {
+				await helper.cleanupSnippet(fixture.name)
+			}
+		}
+	})
+
+	test('Lists active and inactive snippets in the table', async ({ page }) => {
+		const inactiveSnippetName = SnippetsTestHelper.makeUniqueSnippetName('Inactive snippet')
+
+		try {
+			await SnippetsTestHelper.createSnippetViaCli({ name: inactiveSnippetName, active: false })
+			await helper.navigateToSnippetsAdmin()
+
+			await expect(snippetRowByName(page, snippetName)).toBeVisible()
+			await expect(snippetRowByName(page, inactiveSnippetName)).toBeVisible()
+		} finally {
+			await helper.cleanupSnippet(inactiveSnippetName)
+		}
+	})
+
+	test('Filters snippets by each status link', async ({ page }) => {
+		const inactiveSnippetName = SnippetsTestHelper.makeUniqueSnippetName('Inactive snippet')
+
+		try {
+			await SnippetsTestHelper.createSnippetViaCli({ name: inactiveSnippetName, active: false })
+			await helper.navigateToSnippetsAdmin()
+
+			const activeRow = snippetRowByName(page, snippetName)
+			const inactiveRow = snippetRowByName(page, inactiveSnippetName)
+			await expect(activeRow).toBeVisible()
+			await expect(inactiveRow).toBeVisible()
+
+			await page.locator('.subsubsub .active a').click()
+			await expect(activeRow).toBeVisible()
+			await expect(inactiveRow).toBeHidden()
+
+			await page.locator('.subsubsub .inactive a').click()
+			await expect(activeRow).toBeHidden()
+			await expect(inactiveRow).toBeVisible()
+
+			await helper.navigateToSnippetsAdmin()
+			await activeRow.getByRole('switch').click({ force: true })
+			await expect(activeRow.getByRole('switch')).not.toBeChecked()
+			await page.locator('.subsubsub .recently_active a').click()
+			await expect(activeRow).toBeVisible()
+			await expect(inactiveRow).toBeHidden()
+		} finally {
+			await helper.cleanupSnippet(inactiveSnippetName)
+		}
+	})
+
+	test('Clears the Recently Active list without deleting snippets', async ({ page }) => {
+		const row = snippetRowByName(page, snippetName)
+
+		await row.getByRole('switch').click({ force: true })
+		await expect(row.getByRole('switch')).not.toBeChecked()
+		await page.locator('.subsubsub .recently_active a').click()
+		await expect(row).toBeVisible()
+
+		const clearList = page.waitForResponse(response =>
+			'POST' === response.request().method() &&
+			'DELETE' === response.request().headers()['x-http-method-override'] &&
+			response.url().includes('/recently-active')
+		)
+		await page.getByRole('button', { name: 'Clear List' }).click()
+		expect((await clearList).status()).toBe(200)
+		await expect(page.locator('.subsubsub .all a')).toHaveAttribute('aria-current', 'page')
+		await expect(row).toBeVisible()
+	})
+
 	test('Card action popovers let keyboard focus continue through the document', async ({ page }) => {
 		await switchSnippetView(page, 'Card view')
 
@@ -196,6 +363,37 @@ test.describe('Code Snippets List Page Actions', () => {
 		await expect(toggleSwitch).toHaveAccessibleName(initialChecked ? /Deactivate/i : /Activate/i)
 	})
 
+	test('Runs and stops a snippet when its row toggle changes', async ({ page }) => {
+		const executionSnippetName = SnippetsTestHelper.makeUniqueSnippetName('Row toggle execution')
+		const bodyClass = `row-toggle-${Date.now()}`
+
+		try {
+			await SnippetsTestHelper.createSnippetViaCli({
+				name: executionSnippetName,
+				active: false,
+				code: `add_filter('body_class', function() { return ['${bodyClass}']; });`
+			})
+			await helper.navigateToSnippetsAdmin()
+
+			let executionRow = snippetRowByName(page, executionSnippetName)
+			await executionRow.getByRole('switch').click({ force: true })
+			await expect(executionRow.getByRole('switch')).toBeChecked()
+
+			await helper.navigateToFrontend()
+			await expect(page.locator('body')).toHaveClass(new RegExp(bodyClass))
+
+			await helper.navigateToSnippetsAdmin()
+			executionRow = snippetRowByName(page, executionSnippetName)
+			await executionRow.getByRole('switch').click({ force: true })
+			await expect(executionRow.getByRole('switch')).not.toBeChecked()
+
+			await helper.navigateToFrontend()
+			await expect(page.locator('body')).not.toHaveClass(new RegExp(bodyClass))
+		} finally {
+			await helper.cleanupSnippet(executionSnippetName)
+		}
+	})
+
 	test('Can access edit from list page', async ({ page }) => {
 		const snippetRow = snippetRowByName(page, snippetName)
 
@@ -206,6 +404,30 @@ test.describe('Code Snippets List Page Actions', () => {
 		await expect(page.locator('#title')).toHaveValue(snippetName)
 	})
 
+	test('Shows View and omits Trash for a locked snippet', async ({ page }) => {
+		const lockedSnippetName = SnippetsTestHelper.makeUniqueSnippetName('Locked snippet')
+
+		try {
+			await SnippetsTestHelper.createSnippetViaCli({
+				name: lockedSnippetName,
+				active: false,
+				locked: true
+			})
+			await helper.navigateToSnippetsAdmin()
+
+			const lockedRow = snippetRowByName(page, lockedSnippetName)
+			await expect(lockedRow).toBeVisible()
+			await lockedRow.hover()
+			const actions = lockedRow.locator('.row-actions')
+
+			await expect(actions.getByRole('link', { name: 'View' })).toBeVisible()
+			await expect(actions.getByRole('link', { name: 'Edit' })).toHaveCount(0)
+			await expect(actions.getByRole('button', { name: 'Trash' })).toHaveCount(0)
+		} finally {
+			await helper.cleanupSnippet(lockedSnippetName)
+		}
+	})
+
 	test('Can clone snippet from list page', async ({ page }) => {
 		const snippetRow = snippetRowByName(page, snippetName)
 
@@ -217,6 +439,7 @@ test.describe('Code Snippets List Page Actions', () => {
 		// Verify that a cloned snippet exists in the table (use table-scoped check to avoid admin bar matches)
 		const clonedRow = snippetRowByName(page, `${snippetName} [CLONE]`)
 		await expect(clonedRow).toBeVisible()
+		await expect(clonedRow.getByRole('switch')).not.toBeChecked()
 
 		// Clean up the clone by trashing it
 		await clickRowAction(clonedRow, SELECTORS.DELETE_ACTION)
@@ -260,6 +483,47 @@ test.describe('Code Snippets List Page Actions', () => {
 		await helper.cleanupSnippet(`${snippetName} [CLONE]`)
 	})
 
+	test('Selects rows with the header checkbox and individual checkboxes', async ({ page }) => {
+		const row = snippetRowByName(page, snippetName)
+		const rowCheckbox = row.locator('input[name="checked[]"]')
+		const selectAll = page.locator(SELECTORS.SNIPPETS_TABLE)
+			.locator('thead')
+			.getByRole('checkbox', { name: 'Select All', exact: true })
+
+		await selectAll.check()
+		await expect(rowCheckbox).toBeChecked()
+
+		await rowCheckbox.uncheck()
+		await expect(selectAll).not.toBeChecked()
+	})
+
+	test('labels table controls and row actions for assistive technology', async ({ page }) => {
+		const tableHead = page.locator(SELECTORS.SNIPPETS_TABLE).locator('thead')
+		const row = snippetRowByName(page, snippetName)
+
+		await expect(tableHead.getByRole('checkbox', { name: 'Select All', exact: true }))
+			.toHaveAccessibleName('Select All')
+
+		for (const column of ['Name', 'Type', 'Modified', 'Priority']) {
+			await expect(tableHead.getByRole('button', { name: new RegExp(`^${column}`) }))
+				.toHaveAccessibleName(new RegExp(column))
+		}
+
+		await row.hover()
+		await expect(row.getByRole('link', { name: 'Edit' })).toHaveAccessibleName('Edit')
+		for (const action of ['Preview', 'Clone', 'Export', 'Trash']) {
+			await expect(row.getByRole('button', { name: action })).toHaveAccessibleName(action)
+		}
+	})
+
+	test('reduces switch animation when the user prefers less motion', async ({ page }) => {
+		await page.emulateMedia({ reducedMotion: 'reduce' })
+		const toggleSwitch = snippetRowByName(page, snippetName).getByRole('switch')
+
+		expect(await toggleSwitch.evaluate(element =>
+			getComputedStyle(element, '::before').transitionDuration)).toBe('0.01s')
+	})
+
 	test('Can trash a snippet from the preview modal', async ({ page }) => {
 		const snippetRow = snippetRowByName(page, snippetName)
 		await clickRowAction(snippetRow, SELECTORS.PREVIEW_ACTION)
@@ -310,6 +574,43 @@ test.describe('Code Snippets List Page Actions', () => {
 		await expect(trashedRow).toContainText(/Restore/i)
 	})
 
+	test('Can restore a trashed snippet from list page', async ({ page }) => {
+		const snippetRow = snippetRowByName(page, snippetName)
+		await clickRowAction(snippetRow, SELECTORS.DELETE_ACTION)
+
+		const confirmDialog = page.locator('[role="dialog"]').filter({ hasText: /Are you sure\?/i })
+		if (await confirmDialog.isVisible()) {
+			await confirmDialog.getByRole('button', { name: 'Trash' }).click()
+		}
+
+		await page.locator('.subsubsub .trashed a').click()
+		await expect(snippetRow).toBeVisible()
+		await clickRowAction(snippetRow, 'button:has-text("Restore")')
+
+		await expect(snippetRow).toBeVisible()
+		await expect(snippetRow).not.toHaveClass(/trashed-snippet/)
+		await expect(snippetRow.getByRole('switch')).not.toBeChecked()
+	})
+
+	test('Confirms permanent deletion from the Trash view', async ({ page }) => {
+		const snippetRow = snippetRowByName(page, snippetName)
+		await clickRowAction(snippetRow, SELECTORS.DELETE_ACTION)
+
+		const trashDialog = page.locator('[role="dialog"]').filter({ hasText: /Are you sure\?/i })
+		if (await trashDialog.isVisible()) {
+			await trashDialog.getByRole('button', { name: 'Trash' }).click()
+		}
+
+		await page.locator('.subsubsub .trashed a').click()
+		await expect(snippetRow).toBeVisible()
+		await clickRowAction(snippetRow, 'button:has-text("Delete Permanently")')
+
+		const deleteDialog = page.locator('[role="dialog"]').filter({ hasText: /Are you sure\?/i })
+		await expect(deleteDialog).toBeVisible()
+		await deleteDialog.getByRole('button', { name: 'Delete' }).click()
+		await expect(snippetRow).toHaveCount(0)
+	})
+
 	test('Can export snippet from list page', async ({ page }) => {
 		test.setTimeout(TIMEOUTS.LONG)
 		const snippetRow = snippetRowByName(page, snippetName)
@@ -325,6 +626,128 @@ test.describe('Code Snippets List Page Actions', () => {
 		expect(download.suggestedFilename()).toMatch(/\.json$/)
 	})
 
+	test('Exports the metadata needed to re-import a snippet', async ({ page }) => {
+		test.setTimeout(TIMEOUTS.LONG)
+		const exportName = SnippetsTestHelper.makeUniqueSnippetName('Export metadata')
+
+		try {
+			await SnippetsTestHelper.createSnippetViaCli({
+				name: exportName,
+				description: 'An E2E export description.',
+				priority: 7,
+				scope: 'front-end',
+				tags: ['e2e-export'],
+				active: false
+			})
+			await helper.navigateToSnippetsAdmin()
+
+			const exportRow = snippetRowByName(page, exportName)
+			await exportRow.hover()
+			const download = await Promise.all([
+				page.waitForEvent('download'),
+				exportRow.locator(SELECTORS.EXPORT_ACTION).first().click()
+			]).then(([downloadEvent]) => downloadEvent)
+			const downloadPath = await download.path()
+
+			if (!downloadPath) {
+				throw new Error('Export did not produce a local file path')
+			}
+
+			const exported = <{ snippets: Record<string, unknown>[] }><unknown>JSON.parse(readFileSync(downloadPath, 'utf-8'))
+			expect(exported.snippets).toEqual([expect.objectContaining({
+				name: exportName,
+				desc: 'An E2E export description.',
+				priority: 7,
+				scope: 'front-end',
+				tags: ['e2e-export']
+			})])
+		} finally {
+			await helper.cleanupSnippet(exportName)
+		}
+	})
+
+	test('Can activate, deactivate, trash, and permanently delete snippets from bulk actions', async ({ page }) => {
+		const bulkSnippetNames = [
+			SnippetsTestHelper.makeUniqueSnippetName('Bulk action snippet'),
+			SnippetsTestHelper.makeUniqueSnippetName('Bulk action snippet')
+		]
+		const rows = () => bulkSnippetNames.map(name => snippetRowByName(page, name))
+		const selectRows = async () => {
+			for (const row of rows()) {
+				await row.locator('input[name="checked[]"]').check({ force: true })
+			}
+		}
+		const applyAction = async (action: string) => {
+			await page.locator('select[name="action"]').first().selectOption({ label: action })
+			await page.locator('#doaction').click()
+		}
+
+		try {
+			for (const name of bulkSnippetNames) {
+				await SnippetsTestHelper.createSnippetViaCli({ name, active: false })
+			}
+			await helper.navigateToSnippetsAdmin()
+			await selectRows()
+			await applyAction('Activate')
+
+			for (const row of rows()) {
+				await expect(row.getByRole('switch')).toBeChecked()
+			}
+
+			await selectRows()
+			await applyAction('Deactivate')
+			for (const row of rows()) {
+				await expect(row.getByRole('switch')).not.toBeChecked()
+			}
+
+			await selectRows()
+			await applyAction('Trash')
+			for (const row of rows()) {
+				await expect(row).toHaveCount(0)
+			}
+
+			await page.locator('.subsubsub .trashed a').click()
+			await selectRows()
+			await applyAction('Delete Permanently')
+			for (const row of rows()) {
+				await expect(row).toHaveCount(0)
+			}
+		} finally {
+			for (const name of bulkSnippetNames) {
+				await helper.cleanupSnippet(name)
+			}
+		}
+	})
+
+	test('Does not apply a bulk action when no rows are selected', async ({ page }) => {
+		const row = snippetRowByName(page, snippetName)
+
+		await page.locator('select[name="action"]').first().selectOption({ label: 'Trash' })
+		await expect(page.locator('#doaction')).toBeDisabled()
+
+		await expect(row).toBeVisible()
+		await expect(row).not.toHaveClass(/trashed-snippet/)
+	})
+
+	test('Restores selected snippets from the Trash with a bulk action', async ({ page }) => {
+		const row = snippetRowByName(page, snippetName)
+
+		await row.locator('input[name="checked[]"]').check({ force: true })
+		await expect(row.locator('input[name="checked[]"]')).toBeChecked()
+		await page.locator('select[name="action"]').first().selectOption({ label: 'Trash' })
+		await page.locator('#doaction').click()
+		await expect(row).toHaveCount(0)
+
+		await page.locator('.subsubsub .trashed a').click()
+		const trashedRow = snippetRowByName(page, snippetName)
+		await trashedRow.locator('input[name="checked[]"]').check({ force: true })
+		await expect(trashedRow.locator('input[name="checked[]"]')).toBeChecked()
+		await page.locator('select[name="action"]').first().selectOption({ label: 'Restore' })
+		await page.locator('#doaction').click()
+		await expect(page.locator('.subsubsub .all a')).toHaveAttribute('aria-current', 'page')
+		await expect(row).toBeVisible()
+	})
+
 	test('Can export multiple snippets from bulk actions', async ({ page }) => {
 		test.setTimeout(TIMEOUTS.LONG)
 		const secondSnippetName = SnippetsTestHelper.makeUniqueSnippetName()
diff --git a/tests/e2e/code-snippets-migration.spec.ts b/tests/e2e/code-snippets-migration.spec.ts
new file mode 100644
index 000000000..0a22dde39
--- /dev/null
+++ b/tests/e2e/code-snippets-migration.spec.ts
@@ -0,0 +1,148 @@
+import { expect, test } from '@playwright/test'
+import { URLS } from './helpers/constants'
+
+const IMPORTER = {
+	name: 'header-footer-code-manager',
+	title: 'Header Footer Code Manager',
+	is_active: true
+}
+
+const SNIPPETS = [
+	{ id: 7, title: 'Legacy Header Code', table_data: { id: 7, title: 'Legacy Header Code' } },
+	{ id: 8, title: 'Legacy Footer Code', table_data: { id: 8, title: 'Legacy Footer Code' } }
+]
+
+const isMigrationRequest = (url: URL): boolean =>
+	url.pathname.includes('/import/plugins') || true === url.searchParams.get('rest_route')?.includes('/import/plugins')
+
+const migrationRoute = (url: URL) => url.searchParams.get('rest_route') ?? url.pathname
+
+const isSelectedImporterRoute = (url: URL) => migrationRoute(url).endsWith(`/import/plugins/${IMPORTER.name}`)
+
+test.describe('Code Snippets Migration', () => {
+	test('opens the migration tab from its URL state', async ({ page }) => {
+		await page.route(isMigrationRequest, route => route.fulfill({ json: {} }))
+		await page.goto(`${URLS.IMPORT_ADMIN}&tab=migrate`)
+
+		await expect(page.getByRole('heading', { level: 1, name: 'Import: Migrate from other plugins' })).toBeVisible()
+		await expect(page.getByRole('combobox', { name: 'Select plugin' })).toBeVisible()
+	})
+
+	test('lists available importers', async ({ page }) => {
+		await page.route(isMigrationRequest, route => route.fulfill({ json: { [IMPORTER.name]: IMPORTER } }))
+		await page.goto(`${URLS.IMPORT_ADMIN}&tab=migrate`)
+
+		await expect(page.getByRole('option', { name: IMPORTER.title })).toBeEnabled()
+	})
+
+	test('identifies inactive importers without allowing their selection', async ({ page }) => {
+		const inactiveImporter = { ...IMPORTER, name: 'insert-headers-footers', title: 'Insert Headers and Footers', is_active: false }
+		await page.route(isMigrationRequest, route => route.fulfill({ json: { [inactiveImporter.name]: inactiveImporter } }))
+		await page.goto(`${URLS.IMPORT_ADMIN}&tab=migrate`)
+
+		await expect(page.getByRole('option', { name: `${inactiveImporter.title} (Inactive)` })).toBeDisabled()
+	})
+
+	test('loads an importer and records it in the URL', async ({ page }) => {
+		await page.route(isMigrationRequest, route => {
+			const url = new URL(route.request().url())
+			return route.fulfill({ json: isSelectedImporterRoute(url) ? SNIPPETS : { [IMPORTER.name]: IMPORTER } })
+		})
+		await page.goto(`${URLS.IMPORT_ADMIN}&tab=migrate`)
+
+		await page.getByRole('combobox', { name: 'Select plugin' }).selectOption(IMPORTER.name)
+		await expect(page.getByRole('heading', { name: 'Available snippets (2)' })).toBeVisible()
+		expect(new URL(page.url()).searchParams.get('from')).toBe(IMPORTER.name)
+	})
+
+	test('shows an empty state when an importer has no snippets', async ({ page }) => {
+		await page.route(isMigrationRequest, route => {
+			const url = new URL(route.request().url())
+			return route.fulfill({ json: isSelectedImporterRoute(url) ? [] : { [IMPORTER.name]: IMPORTER } })
+		})
+		await page.goto(`${URLS.IMPORT_ADMIN}&tab=migrate`)
+
+		await page.getByRole('combobox', { name: 'Select plugin' }).selectOption(IMPORTER.name)
+		await expect(page.getByRole('heading', { name: 'No snippets found' })).toBeVisible()
+	})
+
+	test('reports an importer fetch error', async ({ page }) => {
+		await page.route(isMigrationRequest, route => {
+			const url = new URL(route.request().url())
+			return route.fulfill(isSelectedImporterRoute(url)
+				? { status: 500, json: { message: 'Importer unavailable' } }
+				: { json: { [IMPORTER.name]: IMPORTER } })
+		})
+		await page.goto(`${URLS.IMPORT_ADMIN}&tab=migrate`)
+
+		await page.getByRole('combobox', { name: 'Select plugin' }).selectOption(IMPORTER.name)
+		await expect(page.getByRole('heading', { name: 'Error loading snippets' })).toBeVisible()
+	})
+
+	test('shows automatic tag controls for migrated snippets', async ({ page }) => {
+		await page.route(isMigrationRequest, route => {
+			const url = new URL(route.request().url())
+			return route.fulfill({ json: isSelectedImporterRoute(url) ? SNIPPETS : { [IMPORTER.name]: IMPORTER } })
+		})
+		await page.goto(`${URLS.IMPORT_ADMIN}&tab=migrate`)
+
+		await page.getByRole('combobox', { name: 'Select plugin' }).selectOption(IMPORTER.name)
+		await page.getByRole('checkbox', { name: 'Add tag automatically' }).check()
+		await expect(page.getByRole('textbox', { name: 'Tag to add to imported snippets' })).toHaveValue(`imported-${IMPORTER.name}`)
+	})
+
+	test('selects all migrated snippets before importing', async ({ page }) => {
+		await page.route(isMigrationRequest, route => {
+			const url = new URL(route.request().url())
+			return route.fulfill({ json: isSelectedImporterRoute(url) ? SNIPPETS : { [IMPORTER.name]: IMPORTER } })
+		})
+		await page.goto(`${URLS.IMPORT_ADMIN}&tab=migrate`)
+
+		await page.getByRole('combobox', { name: 'Select plugin' }).selectOption(IMPORTER.name)
+		await page.getByRole('button', { name: 'Select All' }).first().click()
+		await expect(page.getByRole('button', { name: 'Import Selected (2)' }).first()).toBeEnabled()
+		await page.getByRole('button', { name: 'Deselect All' }).first().click()
+		await expect(page.getByRole('button', { name: 'Import Selected (0)' }).first()).toBeDisabled()
+	})
+
+	test('reports an unsuccessful migration', async ({ page }) => {
+		await page.route(isMigrationRequest, route => {
+			const url = new URL(route.request().url())
+			const path = migrationRoute(url)
+			return route.fulfill({
+				json: path.endsWith('/import') ? { imported: [] } : isSelectedImporterRoute(url) ? SNIPPETS : { [IMPORTER.name]: IMPORTER }
+			})
+		})
+		await page.goto(`${URLS.IMPORT_ADMIN}&tab=migrate`)
+
+		await page.getByRole('combobox', { name: 'Select plugin' }).selectOption(IMPORTER.name)
+		await page.getByRole('checkbox', { name: 'Select Legacy Header Code' }).check()
+		await page.getByRole('button', { name: 'Import Selected (1)' }).first().click()
+		await expect(page.getByRole('heading', { name: 'Error importing snippets' })).toBeVisible()
+	})
+
+	test('imports selected snippets with an automatic tag', async ({ page }) => {
+		let importRequest: unknown
+		await page.route(isMigrationRequest, route => {
+			const url = new URL(route.request().url())
+			const path = migrationRoute(url)
+
+			if (path.endsWith('/import')) {
+				importRequest = route.request().postDataJSON()
+				return route.fulfill({ json: { imported: [7] } })
+			}
+
+			return route.fulfill({ json: isSelectedImporterRoute(url) ? SNIPPETS : { [IMPORTER.name]: IMPORTER } })
+		})
+		await page.goto(`${URLS.IMPORT_ADMIN}&tab=migrate`)
+
+		await page.getByRole('combobox', { name: 'Select plugin' }).selectOption(IMPORTER.name)
+		await page.getByRole('checkbox', { name: 'Add tag automatically' }).check()
+		await page.getByRole('textbox', { name: 'Tag to add to imported snippets' }).fill('migrated')
+		await page.getByRole('checkbox', { name: 'Select Legacy Header Code' }).check()
+		await page.getByRole('button', { name: 'Import Selected (1)' }).first().click()
+
+		await expect(page.getByRole('heading', { name: '1 snippets imported!' })).toBeVisible()
+		expect(importRequest).toMatchObject({ ids: [7], auto_add_tags: true, tag_value: 'migrated' })
+	})
+})
diff --git a/tests/e2e/code-snippets-preview.spec.ts b/tests/e2e/code-snippets-preview.spec.ts
index 68b6fe3d4..327d1e620 100644
--- a/tests/e2e/code-snippets-preview.spec.ts
+++ b/tests/e2e/code-snippets-preview.spec.ts
@@ -174,6 +174,20 @@ test.describe('Code Snippets Preview Modal', () => {
 			.toBeCloseTo(CONTROL_HEIGHT, 0)
 	})
 
+	test('keeps keyboard focus inside the preview dialog', async ({ page }) => {
+		await openPreviewEditor(page)
+		const modal = page.locator('.code-snippets-preview-modal')
+		const containsFocusedElement = () => modal.evaluate(element => element.contains(document.activeElement))
+
+		await modal.getByRole('button', { name: 'Close' }).focus()
+		await page.keyboard.press('Shift+Tab')
+		await expect.poll(containsFocusedElement).toBe(true)
+
+		await modal.getByRole('button').last().focus()
+		await page.keyboard.press('Tab')
+		await expect.poll(containsFocusedElement).toBe(true)
+	})
+
 	for (const keypress of <const> ['Tab', 'Shift+Tab']) {
 		test(`${keypress} leaves the preview editor`, async ({ page }) => {
 			const editor = await openPreviewEditor(page)
diff --git a/tests/e2e/contextual-help.spec.ts b/tests/e2e/contextual-help.spec.ts
new file mode 100644
index 000000000..0ffc64e59
--- /dev/null
+++ b/tests/e2e/contextual-help.spec.ts
@@ -0,0 +1,41 @@
+import { expect, test } from '@playwright/test'
+import { URLS } from './helpers/constants'
+
+const SCREENS_WITH_HELP = [
+	{ name: 'Add Snippet', url: URLS.ADD_SNIPPET_ADMIN },
+	{ name: 'Manage Snippets', url: URLS.SNIPPETS_ADMIN },
+	{ name: 'Cloud Community', url: URLS.CLOUD_COMMUNITY_ADMIN },
+	{ name: 'Cloud Library', url: URLS.CLOUD_LIBRARY_ADMIN },
+	{ name: 'Blueprints', url: URLS.BLUEPRINTS_ADMIN },
+	{ name: 'AI Agent', url: URLS.AI_AGENT_ADMIN },
+	{ name: 'Insights', url: URLS.INSIGHTS_ADMIN },
+	{ name: 'Import', url: URLS.IMPORT_ADMIN },
+	{ name: 'Settings', url: URLS.SETTINGS_ADMIN },
+	{ name: 'Welcome', url: URLS.WELCOME_ADMIN }
+]
+
+test.describe('Contextual Help', () => {
+	for (const screen of SCREENS_WITH_HELP) {
+		test(`${screen.name} screen exposes its Help tabs`, async ({ page }) => {
+			await page.goto(screen.url)
+
+			await page.locator('#contextual-help-link').click()
+			const help = page.locator('#contextual-help-wrap')
+			await expect(help).toBeVisible()
+			await expect(help.locator('.contextual-help-tabs li')).not.toHaveCount(0)
+		})
+
+		test(`${screen.name} screen opens the first Help topic`, async ({ page }) => {
+			await page.goto(screen.url)
+
+			await page.locator('#contextual-help-link').click()
+			const help = page.locator('#contextual-help-wrap')
+			const firstTopic = help.locator('.contextual-help-tabs a').first()
+			const panelId = await firstTopic.getAttribute('href')
+
+			expect(panelId).toMatch(/^#.+/)
+			await firstTopic.click()
+			await expect(help.locator(panelId ?? '')).toBeVisible()
+		})
+	}
+})
diff --git a/tests/e2e/helpers/SnippetsTestHelper.ts b/tests/e2e/helpers/SnippetsTestHelper.ts
index f6d14e4a4..e5237150b 100644
--- a/tests/e2e/helpers/SnippetsTestHelper.ts
+++ b/tests/e2e/helpers/SnippetsTestHelper.ts
@@ -13,6 +13,7 @@ const RANDOM_SLICE_END = 7
 const CLICK_RETRIES = 3
 const SAVE_CONFIRM_RETRIES = 3
 const AT_LEAST_ONE = 1
+
 const getErrorMessage = (error: unknown): string => {
 	if (error instanceof Error) {
 		return error.message
@@ -30,7 +31,12 @@ export interface SnippetFormOptions {
 export interface CreateSnippetCliOptions {
 	name: string;
 	active: boolean;
+	description?: string;
+	code?: string;
 	conditionId?: number;
+	locked?: boolean;
+	priority?: number;
+	scope?: string;
 	tags?: readonly string[];
 	type?: 'php' | 'html' | 'css' | 'js' | 'cond';
 }
@@ -95,19 +101,24 @@ export class SnippetsTestHelper {
 				break
 		}
 
-		const code = 'html' === type ? `<p>${options.name}</p>\n` : `// ${options.name}\n`
+		const code = options.code ?? ('html' === type ? `<p>${options.name}</p>\n` : `// ${options.name}\n`)
+		scope = options.scope ?? scope
 
 		const php = `
 			$snippet = new \\Code_Snippets\\Model\\Snippet([
 				'name' => ${JSON.stringify(options.name)},
-				'desc' => '',
+				'desc' => ${JSON.stringify(options.description ?? '')},
 				'code' => ${JSON.stringify(code)},
 				'scope' => ${JSON.stringify(scope)},
 				'active' => ${options.active ? 'true' : 'false'},
 				'condition_id' => ${options.conditionId ?? 0},
+				'priority' => ${options.priority ?? 10},
 				'tags' => ${JSON.stringify(options.tags ?? [])},
 			]);
 			$snippet = \\Code_Snippets\\save_snippet($snippet);
+			if (${options.locked ? 'true' : 'false'}) {
+				\\Code_Snippets\\set_snippet_locked($snippet->id, true);
+			}
 			echo $snippet->id;
 		`
 
@@ -129,7 +140,9 @@ export class SnippetsTestHelper {
 				[ $network, $table ] = $target;
 				$ids = $wpdb->get_col( $wpdb->prepare( "SELECT id FROM {$table} WHERE name LIKE %s", $like ) );
 				foreach ( $ids as $id ) {
-					\\Code_Snippets\\delete_snippet( intval( $id ), (bool) $network );
+					$id = intval( $id );
+					\\Code_Snippets\\set_snippet_locked( $id, false, (bool) $network );
+					\\Code_Snippets\\delete_snippet( $id, (bool) $network );
 				}
 			}
 		`
diff --git a/tests/e2e/helpers/wpCli.ts b/tests/e2e/helpers/wpCli.ts
index 99b3e68b6..f5a56aef7 100644
--- a/tests/e2e/helpers/wpCli.ts
+++ b/tests/e2e/helpers/wpCli.ts
@@ -28,7 +28,7 @@ export const wpCli = async (args: string[], options: WpCliOptions = {}): Promise
 		const { stdout } = await execFileAsync('docker', [
 			'exec',
 			'-u',
-			'root',
+			'www-data',
 			'-w',
 			'/var/www/html',
 			dockerContainer,
diff --git a/tests/e2e/rest-api-auth.spec.ts b/tests/e2e/rest-api-auth.spec.ts
new file mode 100644
index 000000000..7e127b46f
--- /dev/null
+++ b/tests/e2e/rest-api-auth.spec.ts
@@ -0,0 +1,31 @@
+import { expect, test } from '@playwright/test'
+import { URLS } from './helpers/constants'
+
+test.describe('Snippets REST API authentication', () => {
+	test('rejects creating a snippet without a REST nonce', async ({ page }) => {
+		await page.goto(URLS.WP_ADMIN)
+
+		const response = await page.evaluate(async () => {
+			const request = await fetch('/?rest_route=/code-snippets/v1/snippets', {
+				method: 'POST',
+				headers: { 'Content-Type': 'application/json' },
+				body: JSON.stringify({
+					name: 'Unauthorised E2E snippet',
+					code: '// This must not be saved.',
+					scope: 'global',
+					network: false
+				})
+			})
+
+			const body: unknown = JSON.parse(await request.text())
+
+			return {
+				status: request.status,
+				body
+			}
+		})
+
+		expect(response.status).toBe(401)
+		expect(response.body).toMatchObject({ code: 'rest_forbidden' })
+	})
+})
diff --git a/tests/e2e/rtl-layout.spec.ts b/tests/e2e/rtl-layout.spec.ts
index e9f4d3231..078a547b9 100644
--- a/tests/e2e/rtl-layout.spec.ts
+++ b/tests/e2e/rtl-layout.spec.ts
@@ -45,6 +45,23 @@ const inspect = (): LayoutReport => {
 }
 
 test.describe('Right-to-left layout', () => {
+	test('switches the code editor direction', async ({ page }) => {
+		await page.goto(URLS.ADD_SNIPPET_ADMIN)
+		await page.waitForSelector('.CodeMirror')
+		const isRtl = 'rtl' === await page.locator('html').getAttribute('dir')
+		test.skip(!isRtl, 'The RTL locale is not available on this site, so there is nothing to check.')
+
+		const direction = page.getByRole('combobox', { name: 'Code Direction' })
+		const codeMirrorDirection = () => page.locator('.CodeMirror').evaluate(editor =>
+			(<{ CodeMirror: { getOption: (option: string) => string } }><unknown>editor).CodeMirror.getOption('direction'))
+
+		await direction.selectOption('rtl')
+		await expect.poll(codeMirrorDirection).toBe('rtl')
+
+		await direction.selectOption('ltr')
+		await expect.poll(codeMirrorDirection).toBe('ltr')
+	})
+
 	for (const { name, url, ready } of SCREENS) {
 		test(`${name} mirrors without spilling off the page`, async ({ page }) => {
 			await page.setViewportSize({ width: 1360, height: 900 })
diff --git a/tests/e2e/settings-permissions.spec.ts b/tests/e2e/settings-permissions.spec.ts
new file mode 100644
index 000000000..89f81f943
--- /dev/null
+++ b/tests/e2e/settings-permissions.spec.ts
@@ -0,0 +1,40 @@
+import { expect, test } from '@playwright/test'
+import { URLS } from './helpers/constants'
+import { wpCli } from './helpers/wpCli'
+
+test.describe('Settings permissions', () => {
+	test('does not allow an Editor to access Settings', async ({ browser, page }) => {
+		const username = `cs-e2e-editor-${Date.now()}`
+		const password = 'e2e-editor-password'
+		let userCreated = false
+
+		await page.goto(URLS.WP_ADMIN)
+		const baseUrl = new URL(page.url()).origin
+		const editorContext = await browser.newContext()
+		const editorPage = await editorContext.newPage()
+
+		try {
+			await wpCli([
+				'user',
+				'create',
+				username,
+				`${username}@example.test`,
+				'--role=editor',
+				`--user_pass=${password}`
+			])
+			userCreated = true
+			await editorPage.goto(`${baseUrl}${URLS.WP_LOGIN}`)
+			await editorPage.getByLabel('Username or Email Address').fill(username)
+			await editorPage.getByRole('textbox', { name: 'Password' }).fill(password)
+			await editorPage.getByRole('button', { name: 'Log In' }).click()
+
+			await editorPage.goto(`${baseUrl}${URLS.SETTINGS_ADMIN}`)
+			await expect(editorPage.getByText('Sorry, you are not allowed to access this page.')).toBeVisible()
+		} finally {
+			await editorContext.close()
+			if (userCreated) {
+				await wpCli(['user', 'delete', username, '--yes'])
+			}
+		}
+	})
+})
diff --git a/tests/e2e/settings-tabs.spec.ts b/tests/e2e/settings-tabs.spec.ts
index 142294c1d..97bd84b82 100644
--- a/tests/e2e/settings-tabs.spec.ts
+++ b/tests/e2e/settings-tabs.spec.ts
@@ -1,9 +1,31 @@
 import { expect, test } from '@playwright/test'
-import { URLS } from './helpers/constants'
+import { SnippetsTestHelper } from './helpers/SnippetsTestHelper'
+import { wpCli } from './helpers/wpCli'
+import { TIMEOUTS, URLS } from './helpers/constants'
 
 const TABS = '#settings-sections-tabs'
+const SETTINGS_SECTIONS = ['editing', 'running', 'interface', 'advanced']
 
 test.describe('Settings tabs', () => {
+	test('shows a success notice after saving the current tab', async ({ page }) => {
+		await page.goto(`${URLS.SETTINGS_ADMIN}&section=editing`)
+		const editorRows = page.getByRole('spinbutton').first()
+		const originalRows = await editorRows.inputValue()
+
+		try {
+			await editorRows.fill(String(Number(originalRows) + 1))
+			await page.getByRole('button', { name: 'Save Changes' }).click()
+
+			await expect(page).toHaveURL(/section=editing/)
+			await expect(page.locator('#setting-error-settings-saved')).toContainText('Settings saved.')
+		} finally {
+			await wpCli([
+				'eval',
+				`\\Code_Snippets\\Settings\\update_setting('general', 'visual_editor_rows', ${originalRows});`
+			])
+		}
+	})
+
 	test('switch between rendered sections in place', async ({ page }) => {
 		await page.goto(`${URLS.SETTINGS_ADMIN}&section=editing`)
 
@@ -32,4 +54,131 @@ test.describe('Settings tabs', () => {
 		await expect(wrap).toHaveAttribute('data-active-tab', 'editing')
 		await expect(page.locator(`${TABS} [data-section="editing"]`)).toHaveClass(/active-type/)
 	})
+
+	test('renders every mandatory Settings tab', async ({ page }) => {
+		await page.goto(`${URLS.SETTINGS_ADMIN}&section=editing`)
+
+		for (const section of SETTINGS_SECTIONS) {
+			await expect(page.locator(`${TABS} [data-section="${section}"]`)).toBeVisible({ timeout: TIMEOUTS.SHORT })
+		}
+	})
+
+	test('confirms cache reset from Advanced settings', async ({ page }) => {
+		await page.goto(`${URLS.SETTINGS_ADMIN}&section=advanced`)
+		await page.getByRole('button', { name: 'Reset Caches' }).click()
+
+		await expect(page.locator('#setting-error-snippet_caches_reset')).toContainText('Successfully reset snippets caches.')
+	})
+
+	test('confirms database table upgrade from Advanced settings', async ({ page }) => {
+		await page.goto(`${URLS.SETTINGS_ADMIN}&section=advanced`)
+		await page.getByRole('button', { name: 'Upgrade Database Table' }).click()
+
+		await expect(page.locator('#setting-error-database_update_done')).toContainText('Successfully performed database table upgrade.')
+	})
+
+	test('changes the default snippet save action when Activate by Default is toggled', async ({ page }) => {
+		await page.goto(`${URLS.SETTINGS_ADMIN}&section=running`)
+		const activateByDefault = page.getByRole('checkbox', { name: /Make the 'Save and Activate' button/ })
+		const originalValue = await activateByDefault.isChecked()
+
+		try {
+			await activateByDefault.uncheck()
+			await page.getByRole('button', { name: 'Save Changes' }).click()
+			await page.goto(URLS.ADD_SNIPPET_ADMIN)
+			await expect(page.getByRole('button', { name: 'Save Snippet' })).toHaveClass(/button-primary/)
+
+			await page.goto(`${URLS.SETTINGS_ADMIN}&section=running`)
+			await page.getByRole('checkbox', { name: /Make the 'Save and Activate' button/ }).check()
+			await page.getByRole('button', { name: 'Save Changes' }).click()
+			await page.goto(URLS.ADD_SNIPPET_ADMIN)
+			await expect(page.getByRole('button', { name: 'Save and Activate' })).toHaveClass(/button-primary/)
+		} finally {
+			await wpCli([
+				'eval',
+				`\\Code_Snippets\\Settings\\update_setting('general', 'activate_by_default', ${originalValue ? 'true' : 'false'});`
+			])
+		}
+	})
+
+	test('shows Insights controls for performance tracking and security scanning', async ({ page }) => {
+		test.skip(!await SnippetsTestHelper.isProLicensed(), 'Insights controls require an active Pro license.')
+
+		await page.goto(`${URLS.SETTINGS_ADMIN}&section=insights`)
+
+		await expect(page.getByRole('checkbox', { name: /Track Snippet Performance/ })).toBeVisible({ timeout: TIMEOUTS.SHORT })
+		await expect(page.getByRole('checkbox', { name: /Scan Snippets for Security Issues/ })).toBeVisible({ timeout: TIMEOUTS.SHORT })
+	})
+
+	test('resets settings to their defaults', async ({ page }) => {
+		const originalSettings = (await wpCli(['eval', "echo wp_json_encode(get_option('code_snippets_settings')); "])).trim()
+
+		try {
+			await page.goto(`${URLS.SETTINGS_ADMIN}&section=running`)
+			await page.getByRole('checkbox', { name: /Make the 'Save and Activate' button/ }).uncheck()
+			await page.getByRole('button', { name: 'Save Changes' }).click()
+			await page.locator('input[name="code_snippets_settings[reset_settings]"]').click()
+
+			await expect(page.locator('#setting-error-settings_reset')).toContainText(
+				'All settings have been reset to their defaults.',
+				{ timeout: TIMEOUTS.SHORT }
+			)
+			await page.goto(URLS.ADD_SNIPPET_ADMIN)
+			await expect(page.getByRole('button', { name: 'Save and Activate' })).toHaveClass(/button-primary/)
+		} finally {
+			await wpCli([
+				'eval',
+				`update_option('code_snippets_settings', json_decode(${JSON.stringify(originalSettings)}, true));`
+			])
+		}
+	})
+
+	test('stores the Complete Uninstall setting', async ({ page }) => {
+		await page.goto(`${URLS.SETTINGS_ADMIN}&section=advanced`)
+		const completeUninstall = page.getByRole('checkbox', { name: /also delete all snippets and plugin settings/ })
+		const originalValue = await completeUninstall.isChecked()
+
+		try {
+			await completeUninstall.uncheck()
+			await page.getByRole('button', { name: 'Save Changes' }).click()
+			await page.reload()
+			await expect(page.getByRole('checkbox', { name: /also delete all snippets and plugin settings/ })).not.toBeChecked()
+
+			await page.getByRole('checkbox', { name: /also delete all snippets and plugin settings/ }).check()
+			await page.getByRole('button', { name: 'Save Changes' }).click()
+			await page.reload()
+			await expect(
+				page.getByRole('checkbox', { name: /also delete all snippets and plugin settings/ })
+			).toBeChecked({ timeout: TIMEOUTS.SHORT })
+		} finally {
+			await wpCli([
+				'eval',
+				`\\Code_Snippets\\Settings\\update_setting('general', 'complete_uninstall', ${originalValue ? 'true' : 'false'});`
+			])
+		}
+	})
+
+	test('shows and hides the admin bar menu when its setting changes', async ({ page }) => {
+		await page.goto(`${URLS.SETTINGS_ADMIN}&section=interface`)
+		const enableAdminBar = page.getByRole('checkbox', { name: /Show a Snippets menu in the admin bar/ })
+		const originalValue = await enableAdminBar.isChecked()
+
+		try {
+			await enableAdminBar.uncheck()
+			await page.getByRole('button', { name: 'Save Changes' }).click()
+			await page.goto(URLS.SNIPPETS_ADMIN)
+			await expect(page.locator('#wp-admin-bar-code-snippets')).toHaveCount(0)
+
+			await page.goto(`${URLS.SETTINGS_ADMIN}&section=interface`)
+			await page.getByRole('checkbox', { name: /Show a Snippets menu in the admin bar/ }).check()
+			await page.getByRole('button', { name: 'Save Changes' }).click()
+			await page.goto(URLS.SNIPPETS_ADMIN)
+			await expect(page.locator('#wp-admin-bar-code-snippets')).toBeVisible()
+		} finally {
+			await wpCli([
+				'eval',
+				`\\Code_Snippets\\Settings\\update_setting('general', 'enable_admin_bar', ${originalValue ? 'true' : 'false'});`
+			])
+		}
+	})
 })
diff --git a/tests/e2e/welcome.spec.ts b/tests/e2e/welcome.spec.ts
new file mode 100644
index 000000000..37097804f
--- /dev/null
+++ b/tests/e2e/welcome.spec.ts
@@ -0,0 +1,53 @@
+import { expect, test } from '@playwright/test'
+import { URLS } from './helpers/constants'
+
+test.describe('What’s New screen', () => {
+	test('renders the Resources and Updates screen', async ({ page }) => {
+		await page.goto(URLS.WELCOME_ADMIN)
+
+		await expect(page.getByRole('heading', { level: 1, name: 'Resources and Updates' })).toBeVisible()
+		await expect(page.locator('.code-snippets-welcome')).toBeVisible()
+	})
+
+	test('links the Latest changes section to the full changelog in a new tab', async ({ page }) => {
+		await page.goto(URLS.WELCOME_ADMIN)
+
+		const changelog = page.locator('.code-snippets-changelog')
+		const link = changelog.getByRole('link', { name: 'View changelog' })
+		await expect(changelog.getByRole('heading', { name: 'Latest changes' })).toBeVisible()
+		await expect(link).toHaveAttribute('href', 'https://wordpress.org/plugins/code-snippets/changelog')
+		await expect(link).toHaveAttribute('target', '_blank')
+	})
+
+	test('protects the changelog link from sending referrer information', async ({ page }) => {
+		await page.goto(URLS.WELCOME_ADMIN)
+
+		await expect(page.locator('.code-snippets-changelog').getByRole('link', { name: 'View changelog' }))
+			.toHaveAttribute('rel', 'noreferrer')
+	})
+
+	test('provides toolbar links to Insights and Import', async ({ page }) => {
+		await page.goto(URLS.WELCOME_ADMIN)
+
+		const mainLinks = page.getByRole('navigation', { name: 'Main links' })
+		const insights = new URL(await mainLinks.getByRole('link', { name: 'Insights' }).getAttribute('href') ?? '')
+		const importSnippets = new URL(await mainLinks.getByRole('link', { name: 'Import' }).getAttribute('href') ?? '')
+
+		expect(`${insights.pathname}${insights.search}`).toBe(URLS.INSIGHTS_ADMIN)
+		expect(`${importSnippets.pathname}${importSnippets.search}`).toBe(URLS.IMPORT_ADMIN)
+	})
+
+	test('gives the hero image a meaningful text alternative', async ({ page }) => {
+		await page.goto(URLS.WELCOME_ADMIN)
+
+		await expect(page.locator('.code-snippets-hero').getByRole('img', { name: 'Latest news image' })).toBeVisible()
+	})
+
+	test('opens the hero article in a protected new tab', async ({ page }) => {
+		await page.goto(URLS.WELCOME_ADMIN)
+
+		const heroLink = page.locator('.code-snippets-hero').getByRole('link', { name: /Read more/ })
+		await expect(heroLink).toHaveAttribute('target', '_blank')
+		await expect(heroLink).toHaveAttribute('rel', 'noopener noreferrer')
+	})
+})
diff --git a/tests/unit/Core/Uninstaller_Test.php b/tests/unit/Core/Uninstaller_Test.php
index ed0f2e3ea..8ba959337 100644
--- a/tests/unit/Core/Uninstaller_Test.php
+++ b/tests/unit/Core/Uninstaller_Test.php
@@ -2,10 +2,14 @@
 
 namespace Code_Snippets\Core;
 
+use Code_Snippets\Model\Snippet;
 use Code_Snippets\REST_API\Preferences\Insights_View_Rest_Controller;
 use Code_Snippets\REST_API\Preferences\Snippet_View_REST_Controller;
 use Code_Snippets\UnitTestCase;
 use function Code_Snippets\code_snippets;
+use function Code_Snippets\delete_snippet;
+use function Code_Snippets\get_snippet;
+use function Code_Snippets\save_snippet;
 
 /**
  * Tests for complete plugin uninstallation.
@@ -18,6 +22,7 @@ class Uninstaller_Test extends UnitTestCase {
 	 * @return void
 	 */
 	public function tear_down() {
+		remove_filter( 'query', [ $this, '_create_temporary_tables' ] );
 		code_snippets()->db->create_or_upgrade_tables();
 		delete_option( Snippet_View_REST_Controller::OPTION_NAME );
 		delete_option( Insights_View_Rest_Controller::OPTION_NAME );
@@ -52,4 +57,79 @@ public function test_complete_uninstall_removes_insights_chart_view_preferences(
 
 		$this->assertFalse( get_option( Insights_View_Rest_Controller::OPTION_NAME ) );
 	}
+
+	/**
+	 * A standard uninstall leaves snippets and settings ready for a reinstall.
+	 *
+	 * @return void
+	 */
+	public function test_incomplete_uninstall_preserves_snippets_and_settings(): void {
+		$settings = [ 'general' => [ 'complete_uninstall' => false ] ];
+		$snippet  = save_snippet(
+			new Snippet(
+				[
+					'name' => 'Preserved uninstall snippet',
+					'code' => 'add_action( \'init\', \'__return_null\' );',
+				]
+			)
+		);
+
+		update_option( 'code_snippets_settings', $settings );
+		( new Uninstaller() )->uninstall_plugin();
+
+		$this->assertSame( $settings, get_option( 'code_snippets_settings' ) );
+		$this->assertSame( 'Preserved uninstall snippet', get_snippet( $snippet->id )->name );
+
+		delete_snippet( $snippet->id );
+	}
+
+	/**
+	 * A reinstall after a preserving uninstall keeps existing snippets available.
+	 *
+	 * @return void
+	 */
+	public function test_reinstall_after_incomplete_uninstall_keeps_existing_snippets(): void {
+		$snippet = save_snippet(
+			new Snippet(
+				[
+					'name' => 'Reinstalled preserved snippet',
+					'code' => 'add_action( \'init\', \'__return_null\' );',
+				]
+			)
+		);
+
+		update_option( 'code_snippets_settings', [ 'general' => [ 'complete_uninstall' => false ] ] );
+		( new Uninstaller() )->uninstall_plugin();
+		code_snippets()->db->create_or_upgrade_tables();
+
+		$this->assertSame( 'Reinstalled preserved snippet', get_snippet( $snippet->id )->name );
+
+		delete_snippet( $snippet->id );
+	}
+
+	/**
+	 * A complete uninstall removes the snippets table and plugin settings.
+	 *
+	 * @return void
+	 */
+	public function test_complete_uninstall_removes_the_snippets_table_and_settings(): void {
+		$db = code_snippets()->db;
+
+		update_option(
+			'code_snippets_settings',
+			[
+				'general' => [ 'complete_uninstall' => true ],
+			]
+		);
+		remove_filter( 'query', [ $this, '_drop_temporary_tables' ] );
+
+		try {
+			( new Uninstaller() )->uninstall_plugin();
+		} finally {
+			add_filter( 'query', [ $this, '_drop_temporary_tables' ] );
+		}
+
+		$this->assertFalse( DB::table_exists( $db->table, true ) );
+		$this->assertFalse( get_option( 'code_snippets_settings' ) );
+	}
 }
diff --git a/tests/unit/Core/Upgrader_Test.php b/tests/unit/Core/Upgrader_Test.php
new file mode 100644
index 000000000..e2619a74f
--- /dev/null
+++ b/tests/unit/Core/Upgrader_Test.php
@@ -0,0 +1,78 @@
+<?php
+
+namespace Code_Snippets\Core;
+
+use Code_Snippets\Model\Snippet;
+use Code_Snippets\UnitTestCase;
+use function Code_Snippets\code_snippets;
+use function Code_Snippets\get_snippet;
+use function Code_Snippets\save_snippet;
+use const Code_Snippets\PLUGIN_VERSION;
+
+/**
+ * Tests for plugin installation and upgrades.
+ */
+class Upgrader_Test extends UnitTestCase {
+
+	/**
+	 * Restore the snippets table after an installation test removes it.
+	 *
+	 * @return void
+	 */
+	public function tear_down() {
+		code_snippets()->db->create_or_upgrade_tables();
+
+		parent::tear_down();
+	}
+
+	/**
+	 * A first install creates the snippets table and stores the plugin version.
+	 *
+	 * @return void
+	 */
+	public function test_fresh_install_creates_the_snippets_table_and_records_the_current_version(): void {
+		global $wpdb;
+
+		$db = code_snippets()->db;
+
+		$wpdb->query( "DROP TABLE IF EXISTS $db->table" ); // phpcs:ignore WordPress.DB.DirectDatabaseQuery.NoCaching, WordPress.DB.DirectDatabaseQuery.SchemaChange -- A fresh-install fixture has no snippets table.
+		delete_option( 'code_snippets_version' );
+
+		$upgrader = new Upgrader( PLUGIN_VERSION, $db );
+		$upgrader->run();
+		remove_action( 'init', [ $upgrader, 'create_sample_content' ] );
+
+		$this->assertTrue( DB::table_exists( $db->table, true ) );
+		$this->assertSame( PLUGIN_VERSION, get_option( 'code_snippets_version' ) );
+	}
+
+	/**
+	 * An upgrade keeps existing snippets and settings while recording the new version.
+	 *
+	 * @return void
+	 */
+	public function test_upgrade_from_an_older_version_preserves_snippets_and_settings(): void {
+		$settings = [ 'general' => [ 'enable_admin_bar' => false ] ];
+		$snippet = save_snippet(
+			new Snippet(
+				[
+					'name' => 'Existing installation snippet',
+					'code' => 'add_action( \'init\', \'__return_null\' );',
+				]
+			)
+		);
+
+		$this->assertInstanceOf( Snippet::class, $snippet );
+
+		update_option( 'code_snippets_settings', $settings );
+		update_option( 'code_snippets_version', '3.9.9' );
+
+		( new Upgrader( PLUGIN_VERSION, code_snippets()->db ) )->run();
+
+		$preserved_snippet = get_snippet( $snippet->id );
+
+		$this->assertSame( 'Existing installation snippet', $preserved_snippet->name );
+		$this->assertSame( $settings, get_option( 'code_snippets_settings' ) );
+		$this->assertSame( PLUGIN_VERSION, get_option( 'code_snippets_version' ) );
+	}
+}
diff --git a/tests/unit/REST_API/Snippets/REST_API_Snippets_Test.php b/tests/unit/REST_API/Snippets/REST_API_Snippets_Test.php
index 24d5ea668..961da9aa1 100644
--- a/tests/unit/REST_API/Snippets/REST_API_Snippets_Test.php
+++ b/tests/unit/REST_API/Snippets/REST_API_Snippets_Test.php
@@ -125,6 +125,67 @@ public function test_get_all_snippets_without_pagination() {
 		$this->assertArrayHasKey( 'code', $response[0] );
 	}
 
+	/**
+	 * A missing snippet is reported as a 404 instead of an internal error.
+	 *
+	 * @return void
+	 */
+	public function test_getting_a_missing_snippet_returns_404(): void {
+		$request = new WP_REST_Request( 'GET', "/$this->namespace/$this->base_route/999999" );
+		$request->set_param( 'network', false );
+		$response = rest_do_request( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 404, $response->get_status() );
+		$this->assertSame( 'rest_cannot_get', $data['code'] );
+		$this->assertSame( 'The snippet could not be found.', $data['message'] );
+	}
+
+	/**
+	 * Snippets can be created, read, updated, trashed, and permanently deleted.
+	 *
+	 * @return void
+	 */
+	public function test_snippet_crud_lifecycle(): void {
+		$endpoint = "/$this->namespace/$this->base_route";
+		$created  = $this->make_mutating_request(
+			'POST',
+			$endpoint,
+			[
+				'name'    => 'REST CRUD fixture',
+				'code'    => '// REST CRUD fixture',
+				'scope'   => 'global',
+				'active'  => false,
+				'network' => false,
+			]
+		);
+		$snippet_id = $created['id'];
+
+		$this->assertGreaterThan( 0, $snippet_id );
+		$this->assertSame( 'REST CRUD fixture', $this->make_request( "$endpoint/$snippet_id", [ 'network' => false ] )['name'] );
+
+		$updated = $this->make_mutating_request(
+			'PUT',
+			"$endpoint/$snippet_id",
+			[
+				'name'    => 'Updated REST CRUD fixture',
+				'network' => false,
+			]
+		);
+
+		$this->assertSame( 'Updated REST CRUD fixture', $updated['name'] );
+
+		$trashed = $this->make_mutating_request( 'DELETE', "$endpoint/$snippet_id", [ 'network' => false ] );
+		$this->assertTrue( $trashed['trashed'] );
+
+		$request = new WP_REST_Request( 'DELETE', "$endpoint/$snippet_id" );
+		$request->set_param( 'network', false );
+		$response = rest_do_request( $request );
+
+		$this->assertSame( 204, $response->get_status() );
+		$this->assertSame( 0, get_snippet( $snippet_id )->id );
+	}
+
 	/**
 	 * Test pagination with per_page parameter only (first page).
 	 */