diff --git a/playwright.config.ts b/playwright.config.ts
index c3549011..2426db1c 100644
--- a/playwright.config.ts
+++ b/playwright.config.ts
@@ -10,6 +10,7 @@ import { defineConfig, devices } from '@playwright/test'
  * See https://playwright.dev/docs/test-configuration.
  */
 export default defineConfig({
+  snapshotPathTemplate: '{testDir}/__screenshots__/{testFilePath}/{arg}{ext}',
   timeout: 10000,
   testDir: './tests',
   /* Run tests in files in parallel */
@@ -17,7 +18,8 @@ export default defineConfig({
   /* Fail the build on CI if you accidentally left test.only in the source code. */
   forbidOnly: !!process.env.CI,
   /* Retry on CI only */
-  retries: process.env.CI ? 2 : 0,
+  // retries: process.env.CI ? 2 : 0,
+  retries: 0,
   /* Opt out of parallel tests on CI. */
   workers: process.env.CI ? 1 : undefined,
   /* Reporter to use. See https://playwright.dev/docs/test-reporters */
diff --git a/tests/MindElixirFixture.ts b/tests/MindElixirFixture.ts
index 85644cc0..48ccaa71 100644
--- a/tests/MindElixirFixture.ts
+++ b/tests/MindElixirFixture.ts
@@ -48,6 +48,8 @@ export class MindElixirFixture {
     })
   }
   async toHaveScreenshot(locator?: Locator) {
-    await expect(locator || this.page.locator('me-nodes')).toHaveScreenshot()
+    await expect(locator || this.page.locator('me-nodes')).toHaveScreenshot({
+      maxDiffPixelRatio: 0.08,
+    })
   }
 }
diff --git a/tests/__screenshots__/drag-and-drop.spec.ts/DnD-move-after-1.png b/tests/__screenshots__/drag-and-drop.spec.ts/DnD-move-after-1.png
new file mode 100644
index 00000000..6eed3b23
Binary files /dev/null and b/tests/__screenshots__/drag-and-drop.spec.ts/DnD-move-after-1.png differ
diff --git a/tests/__screenshots__/drag-and-drop.spec.ts/DnD-move-before-1.png b/tests/__screenshots__/drag-and-drop.spec.ts/DnD-move-before-1.png
new file mode 100644
index 00000000..dcc23f87
Binary files /dev/null and b/tests/__screenshots__/drag-and-drop.spec.ts/DnD-move-before-1.png differ
diff --git a/tests/drag-and-drop.spec.ts-snapshots/DnD-move-in-1-chromium-win32.png b/tests/__screenshots__/drag-and-drop.spec.ts/DnD-move-in-1.png
similarity index 100%
rename from tests/drag-and-drop.spec.ts-snapshots/DnD-move-in-1-chromium-win32.png
rename to tests/__screenshots__/drag-and-drop.spec.ts/DnD-move-in-1.png
diff --git a/tests/interaction.spec.ts-snapshots/Add-Before-1-chromium.png b/tests/__screenshots__/interaction.spec.ts/Add-Before-1.png
similarity index 100%
rename from tests/interaction.spec.ts-snapshots/Add-Before-1-chromium.png
rename to tests/__screenshots__/interaction.spec.ts/Add-Before-1.png
diff --git a/tests/__screenshots__/interaction.spec.ts/Add-Child-1.png b/tests/__screenshots__/interaction.spec.ts/Add-Child-1.png
new file mode 100644
index 00000000..b5c42999
Binary files /dev/null and b/tests/__screenshots__/interaction.spec.ts/Add-Child-1.png differ
diff --git a/tests/interaction.spec.ts-snapshots/Add-Parent-1-chromium.png b/tests/__screenshots__/interaction.spec.ts/Add-Parent-1.png
similarity index 100%
rename from tests/interaction.spec.ts-snapshots/Add-Parent-1-chromium.png
rename to tests/__screenshots__/interaction.spec.ts/Add-Parent-1.png
diff --git a/tests/interaction.spec.ts-snapshots/Add-Sibling-1-chromium.png b/tests/__screenshots__/interaction.spec.ts/Add-Sibling-1.png
similarity index 100%
rename from tests/interaction.spec.ts-snapshots/Add-Sibling-1-chromium.png
rename to tests/__screenshots__/interaction.spec.ts/Add-Sibling-1.png
diff --git a/tests/interaction.spec.ts-snapshots/Clear-and-reset-1-chromium.png b/tests/__screenshots__/interaction.spec.ts/Clear-and-reset-1.png
similarity index 100%
rename from tests/interaction.spec.ts-snapshots/Clear-and-reset-1-chromium.png
rename to tests/__screenshots__/interaction.spec.ts/Clear-and-reset-1.png
diff --git a/tests/interaction.spec.ts-snapshots/Edit-Node-1-chromium.png b/tests/__screenshots__/interaction.spec.ts/Edit-Node-1.png
similarity index 100%
rename from tests/interaction.spec.ts-snapshots/Edit-Node-1-chromium.png
rename to tests/__screenshots__/interaction.spec.ts/Edit-Node-1.png
diff --git a/tests/interaction.spec.ts-snapshots/Remove-Node-1-chromium.png b/tests/__screenshots__/interaction.spec.ts/Remove-Node-1.png
similarity index 100%
rename from tests/interaction.spec.ts-snapshots/Remove-Node-1-chromium.png
rename to tests/__screenshots__/interaction.spec.ts/Remove-Node-1.png
diff --git a/tests/drag-and-drop.spec.ts-snapshots/DnD-move-after-1-chromium-win32.png b/tests/drag-and-drop.spec.ts-snapshots/DnD-move-after-1-chromium-win32.png
deleted file mode 100644
index ec360eb8..00000000
Binary files a/tests/drag-and-drop.spec.ts-snapshots/DnD-move-after-1-chromium-win32.png and /dev/null differ
diff --git a/tests/drag-and-drop.spec.ts-snapshots/DnD-move-before-1-chromium-win32.png b/tests/drag-and-drop.spec.ts-snapshots/DnD-move-before-1-chromium-win32.png
deleted file mode 100644
index 1d8852f3..00000000
Binary files a/tests/drag-and-drop.spec.ts-snapshots/DnD-move-before-1-chromium-win32.png and /dev/null differ
diff --git a/tests/interaction.spec.ts-snapshots/Add-Child-1-chromium.png b/tests/interaction.spec.ts-snapshots/Add-Child-1-chromium.png
deleted file mode 100644
index b1424b97..00000000
Binary files a/tests/interaction.spec.ts-snapshots/Add-Child-1-chromium.png and /dev/null differ
diff --git a/tests/mind-elixir-test.ts b/tests/mind-elixir-test.ts
index 5f0ae96b..2209ffe4 100644
--- a/tests/mind-elixir-test.ts
+++ b/tests/mind-elixir-test.ts
@@ -8,9 +8,8 @@ type MyFixtures = {
 // Extend base test by providing "todoPage" and "settingsPage".
 // This new "test" can be used in multiple test files, and each of them will get the fixtures.
 export const test = base.extend<MyFixtures>({
-  me: async ({ page }, use, testInfo) => {
+  me: async ({ page }, use) => {
     // Set up the fixture.
-    testInfo.snapshotSuffix = ''
     const me = new MindElixirFixture(page)
     await me.goto()