diff --git a/pages/flawEdit.ts b/pages/flawEdit.ts
index 1381199..a4f4ae8 100644
--- a/pages/flawEdit.ts
+++ b/pages/flawEdit.ts
@@ -2,22 +2,106 @@ import type { Locator, Page } from '@playwright/test';
 import { FlawCreatePage } from './flawCreate';
 import { faker } from '@faker-js/faker';
 
+export type CommentType = 'public' | 'private' | 'internal';
+
 export class FlawEditPage extends FlawCreatePage {
-  public readonly publicCommentButton: Locator;
-  public readonly publicCommentBox: Locator;
-  public readonly savePublicCommentBox: Locator;
+  readonly publicCommentButton: Locator;
+  readonly publicCommentTab: Locator;
+  readonly publicCommentBox: Locator;
+  readonly savePublicCommentBox: Locator;
+
+  readonly privateCommentButton: Locator;
+  readonly privateCommentTab: Locator;
+  readonly privateCommentBox: Locator;
+  readonly savePrivateCommentBox: Locator;
+
+  readonly internalCommentButton: Locator;
+  readonly internalCommentTab: Locator;
+  readonly internalCommentBox: Locator;
+  readonly saveInternalCommentBox: Locator;
+  readonly addAffectButton: Locator;
+  readonly editAffectButton: Locator;
+  readonly affectModuleBox: Locator;
+  readonly affectComponentBox: Locator;
+  readonly affectAffectednessBox: Locator;
+  readonly affectResolutionBox: Locator;
+  readonly affectImpactBox: Locator;
+  readonly affectCommitButton: Locator;
 
   constructor(page: Page) {
     super(page);
+
+    this.publicCommentTab = this.page.getByRole('button', { name: 'Public Comments', exact: true });
     this.publicCommentButton = this.page.getByRole('button', { name: 'Add Public Comment' });
     this.publicCommentBox = this.page.locator('label').filter({ hasText: 'New Public Comment' });
     this.savePublicCommentBox = this.page.getByRole('button', { name: 'Save Public Comment' });
+
+    this.privateCommentTab = this.page.getByRole('button', { name: 'Private Comments', exact: true });
+    this.privateCommentButton = this.page.getByRole('button', { name: 'Add Private Comment' });
+    this.privateCommentBox = this.page.locator('label').filter({ hasText: 'New Private Comment' });
+    this.savePrivateCommentBox = this.page.getByRole('button', { name: 'Save Private Comment' });
+
+    this.internalCommentTab = this.page.getByRole('button', { name: 'Internal Comments', exact: true });
+    this.internalCommentButton = this.page.getByRole('button', { name: 'Add Internal Comment' });
+    this.internalCommentBox = this.page.locator('label').filter({ hasText: 'New Internal Comment' });
+    this.saveInternalCommentBox = this.page.getByRole('button', { name: 'Save Internal Comment' });
+
+    this.addAffectButton = this.page.getByRole('button', { name: 'Add New Affect' });
+    this.editAffectButton = this.page.getByTitle('Edit affect');
+    this.affectModuleBox = this.page.getByRole('cell', { name: 'NewModule' }).getByRole('textbox');
+    this.affectComponentBox = this.page.getByRole('cell', { name: 'NewComponent' }).getByRole('textbox');
+    this.affectAffectednessBox = this.page.getByRole('cell', { name: 'NEW', exact: true }).getByRole('combobox');
+    this.affectResolutionBox = this.page.locator('td').filter({ hasText: 'DEFER' }).getByRole('combobox');
+    this.affectImpactBox = this.page.locator('td').filter({ hasText: 'LOW' }).getByRole('combobox');
+    this.affectCommitButton = this.page.getByTitle('Commit edit');
     this.submitButton = page.getByRole('button', { name: 'Save Changes', exact: true });
   }
 
-  async addPublicComment() {
+  private async addPublicComment() {
+    await this.publicCommentTab.click();
     await this.publicCommentButton.click();
     await this.fillTextArea(this.publicCommentBox, faker.hacker.phrase());
     await this.savePublicCommentBox.click();
   }
+
+  private async addPrivateComment() {
+    await this.privateCommentTab.click();
+    await this.privateCommentButton.click();
+    await this.fillTextArea(this.privateCommentBox, faker.hacker.phrase());
+    await this.savePrivateCommentBox.click();
+  }
+
+  private async addInternalComment() {
+    await this.internalCommentTab.click();
+    await this.internalCommentButton.click();
+    await this.fillTextArea(this.internalCommentBox, faker.hacker.phrase());
+    await this.saveInternalCommentBox.click();
+  }
+
+  async addComment(type: CommentType) {
+    switch (type) {
+      case 'public':
+        await this.addPublicComment();
+        break;
+      case 'private':
+        await this.addPrivateComment();
+        break;
+      case 'internal':
+        await this.addInternalComment();
+        break;
+    }
+  }
+
+  async addAffect(module = 'rhel-8', component = 'kernel') {
+    await this.addAffectButton.click();
+    await this.editAffectButton.click();
+
+    await this.affectModuleBox.fill(module);
+    await this.affectComponentBox.fill(component);
+
+    await this.affectAffectednessBox.selectOption('AFFECTED');
+    await this.affectResolutionBox.selectOption('DEFER');
+    await this.affectImpactBox.selectOption('LOW');
+    await this.affectCommitButton.click();
+  }
 }
diff --git a/tests/flaw.spec.ts b/tests/flaw.spec.ts
index 6bfcfae..2a73106 100644
--- a/tests/flaw.spec.ts
+++ b/tests/flaw.spec.ts
@@ -1,3 +1,4 @@
+import type { CommentType } from 'pages/flawEdit';
 import { FlawCreatePage, type FlawType } from '../pages/flawCreate';
 import { test, expect } from '../playwright/fixtures';
 
@@ -71,17 +72,30 @@ test.describe('flaw edition', () => {
     await page.goto(`/flaws/${flawId}`);
   });
 
-  test('can add a comment', async ({ page, flawEditPage }) => {
-    await flawEditPage.addPublicComment();
+  (['public', 'private', 'internal'] as const).forEach((type: CommentType) => {
+    test(`can add a ${type} comment`, async ({ page, flawEditPage }) => {
+      await flawEditPage.addComment(type);
 
-    await expect(page.getByText('Public comment saved.')).toBeVisible();
+      await expect(page.getByText(new RegExp(`${type} comment saved`, 'i'))).toBeVisible();
+    });
   });
 
   test('can change the title', async ({ page, flawEditPage }) => {
     const title = await flawEditPage.titleBox.locator('span', { hasNotText: 'Title' }).innerText();
-    await flawEditPage.fillTextBox(flawEditPage.titleBox, title + ' edited');
+    const newTitle = title + ' edited';
+
+    await flawEditPage.fillTextBox(flawEditPage.titleBox, newTitle);
     await flawEditPage.submitButton.click();
 
     await expect(page.getByText('Flaw saved')).toBeVisible();
+    await expect(page.getByText(newTitle)).toBeVisible();
+  });
+
+  test.describe('affects', () => {
+    test('can add an affect', async ({ page, flawEditPage }) => {
+      await flawEditPage.addAffect();
+      await flawEditPage.submitButton.click();
+      await expect(page.getByText('Affects Created.')).toBeVisible();
+    });
   });
 });