diff --git a/e2e/playwright/command-bar-tests.spec.ts b/e2e/playwright/command-bar-tests.spec.ts
index 061f8a897..0d2c533a4 100644
--- a/e2e/playwright/command-bar-tests.spec.ts
+++ b/e2e/playwright/command-bar-tests.spec.ts
@@ -1,361 +1,327 @@
-import { test, expect } from '@playwright/test'
+import { test, expect } from './zoo-test'
 
-import { getUtils, setup, tearDown } from './test-utils'
+import { getUtils } from './test-utils'
 import { KCL_DEFAULT_LENGTH } from 'lib/constants'
-
-test.beforeEach(async ({ context, page }, testInfo) => {
-  await setup(context, page, testInfo)
-})
-
-test.afterEach(async ({ page }, testInfo) => {
-  await tearDown(page, testInfo)
-})
+import { normalizeLineEndings } from 'lib/codeEditor'
 
 test.describe('Command bar tests', () => {
-  test('Extrude from command bar selects extrude line after', async ({
-    page,
-  }) => {
-    await page.addInitScript(async () => {
-      localStorage.setItem(
-        'persistCode',
-        `sketch001 = startSketchOn('XY')
-    |> startProfileAt([-10, -10], %)
-    |> line([20, 0], %)
-    |> line([0, 20], %)
-    |> xLine(-20, %)
-    |> close(%)
-      `
-      )
-    })
-
-    const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
-
-    await u.waitForAuthSkipAppStart()
-
-    await u.openDebugPanel()
-    await u.expectCmdLog('[data-message-type="execution-done"]')
-    await u.closeDebugPanel()
-
-    // Click the line of code for xLine.
-    await page.getByText(`close(%)`).click() // TODO remove this and reinstate // await topHorzSegmentClick()
-    await page.waitForTimeout(100)
-
-    await page.getByRole('button', { name: 'Extrude' }).click()
-    await page.waitForTimeout(200)
-    await page.keyboard.press('Enter')
-    await page.waitForTimeout(200)
-    await page.keyboard.press('Enter')
-    await page.waitForTimeout(200)
-    await expect(page.locator('.cm-activeLine')).toHaveText(
-      `extrude001 = extrude(${KCL_DEFAULT_LENGTH}, sketch001)`
-    )
-  })
-
-  test('Fillet from command bar', async ({ page }) => {
-    await page.addInitScript(async () => {
-      localStorage.setItem(
-        'persistCode',
-        `sketch001 = startSketchOn('XY')
-  |> startProfileAt([-5, -5], %)
-  |> line([0, 10], %)
-  |> line([10, 0], %)
-  |> line([0, -10], %)
-  |> lineTo([profileStartX(%), profileStartY(%)], %)
+  test('Extrude from command bar selects extrude line after', async ({ page,  homePage }) => { await page.addInitScript(async () => {
+    localStorage.setItem(
+      'persistCode',
+      `sketch001 = startSketchOn('XY')
+  |> startProfileAt([-10, -10], %)
+  |> line([20, 0], %)
+  |> line([0, 20], %)
+  |> xLine(-20, %)
   |> close(%)
-extrude001 = extrude(-10, sketch001)`
-      )
-    })
-
-    const u = await getUtils(page)
-    await page.setViewportSize({ width: 1000, height: 500 })
-    await u.waitForAuthSkipAppStart()
-    await u.openDebugPanel()
-    await u.expectCmdLog('[data-message-type="execution-done"]')
-    await u.closeDebugPanel()
-
-    const selectSegment = () => page.getByText(`line([0, -10], %)`).click()
-
-    await selectSegment()
-    await page.waitForTimeout(100)
-    await page.getByRole('button', { name: 'Fillet' }).click()
-    await page.waitForTimeout(100)
-    await page.keyboard.press('Enter') // skip selection
-    await page.waitForTimeout(100)
-    await page.keyboard.press('Enter') // accept default radius
-    await page.waitForTimeout(100)
-    await page.keyboard.press('Enter') // submit
-    await page.waitForTimeout(100)
-    await expect(page.locator('.cm-activeLine')).toContainText(
-      `fillet({ radius: ${KCL_DEFAULT_LENGTH}, tags: [seg01] }, %)`
+    `
     )
   })
+  
+  const u = await getUtils(page)
+  await page.setBodyDimensions({ width: 1200, height: 500 })
+  
+  await homePage.goToModelingScene()
+  
+  await u.openDebugPanel()
+  await u.expectCmdLog('[data-message-type="execution-done"]')
+  await u.closeDebugPanel()
+  
+  // Click the line of code for xLine.
+  await page.getByText(`close(%)`).click() // TODO remove this and reinstate // await topHorzSegmentClick()
+  await page.waitForTimeout(100)
+  
+  await page.getByRole('button', { name: 'Extrude' }).click()
+  await page.waitForTimeout(200)
+  await page.keyboard.press('Enter')
+  await page.waitForTimeout(200)
+  await page.keyboard.press('Enter')
+  await page.waitForTimeout(200)
+  await expect(page.locator('.cm-activeLine')).toHaveText(
+    `extrude001 = extrude(${KCL_DEFAULT_LENGTH}, sketch001)`
+  ) })
 
-  test('Command bar can change a setting, and switch back and forth between arguments', async ({
-    page,
-  }) => {
-    const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
-    await u.waitForAuthSkipAppStart()
-
-    const commandBarButton = page.getByRole('button', { name: 'Commands' })
-    const cmdSearchBar = page.getByPlaceholder('Search commands')
-    const commandName = 'debug panel'
-    const commandOption = page.getByRole('option', {
-      name: commandName,
-      exact: false,
-    })
-    const commandLevelArgButton = page.getByRole('button', { name: 'level' })
-    const commandThemeArgButton = page.getByRole('button', { name: 'value' })
-    const paneSelector = page.getByRole('button', { name: 'debug panel' })
-    // This selector changes after we set the setting
-    let commandOptionInput = page.getByPlaceholder('On')
-
-    await expect(
-      page.getByRole('button', { name: 'Start Sketch' })
-    ).not.toBeDisabled()
-
-    // First try opening the command bar and closing it
-    await page
-      .getByRole('button', { name: 'Commands', exact: false })
-      .or(page.getByRole('button', { name: '⌘K' }))
-      .click()
-
-    await expect(cmdSearchBar).toBeVisible()
-    await page.keyboard.press('Escape')
-    await expect(cmdSearchBar).not.toBeVisible()
-
-    // Now try the same, but with the keyboard shortcut, check focus
-    await page.keyboard.press('ControlOrMeta+K')
-    await expect(cmdSearchBar).toBeVisible()
-    await expect(cmdSearchBar).toBeFocused()
-
-    // Try typing in the command bar
-    await cmdSearchBar.fill(commandName)
-    await expect(commandOption).toBeVisible()
-    await commandOption.click()
-    const toggleInput = page.getByPlaceholder('On')
-    await expect(toggleInput).toBeVisible()
-    await expect(toggleInput).toBeFocused()
-    // Select On
-    await page.keyboard.press('ArrowDown')
-    await page.keyboard.press('ArrowDown')
-    await expect(page.getByRole('option', { name: 'Off' })).toHaveAttribute(
-      'data-headlessui-state',
-      'active'
+  test('Fillet from command bar', async ({ page, homePage }) => { await page.addInitScript(async () => {
+    localStorage.setItem(
+      'persistCode',
+      `sketch001 = startSketchOn('XY')
+    |> startProfileAt([-5, -5], %)
+    |> line([0, 10], %)
+    |> line([10, 0], %)
+    |> line([0, -10], %)
+    |> lineTo([profileStartX(%), profileStartY(%)], %)
+    |> close(%)
+  extrude001 = extrude(-10, sketch001)`
     )
-    await page.keyboard.press('Enter')
-
-    // Check the toast appeared
-    await expect(
-      page.getByText(`Set show debug panel to "false" for this project`)
-    ).toBeVisible()
-    // Check that the visibility changed
-    await expect(paneSelector).not.toBeVisible()
-
-    commandOptionInput = page.getByPlaceholder('off')
-
-    // Test case for https://github.com/KittyCAD/modeling-app/issues/2882
-    await commandBarButton.click()
-    await cmdSearchBar.focus()
-    await cmdSearchBar.fill(commandName)
-    await commandOption.click()
-    await expect(commandThemeArgButton).toBeDisabled()
-    await commandOptionInput.focus()
-    await commandOptionInput.fill('on')
-    await commandLevelArgButton.click()
-    await expect(commandLevelArgButton).toBeDisabled()
-
-    // Test case for https://github.com/KittyCAD/modeling-app/issues/2881
-    await commandThemeArgButton.click()
-    await expect(commandThemeArgButton).toBeDisabled()
-    await expect(commandLevelArgButton).toHaveText('level: project')
   })
+  
+  const u = await getUtils(page)
+  await page.setBodyDimensions({ width: 1000, height: 500 })
+  await homePage.goToModelingScene()
+  await u.openDebugPanel()
+  await u.expectCmdLog('[data-message-type="execution-done"]')
+  await u.closeDebugPanel()
+  
+  const selectSegment = () => page.getByText(`line([0, -10], %)`).click()
+  
+  await selectSegment()
+  await page.waitForTimeout(100)
+  await page.getByRole('button', { name: 'Fillet' }).click()
+  await page.waitForTimeout(100)
+  await page.keyboard.press('Enter') // skip selection
+  await page.waitForTimeout(100)
+  await page.keyboard.press('Enter') // accept default radius
+  await page.waitForTimeout(100)
+  await page.keyboard.press('Enter') // submit
+  await page.waitForTimeout(100)
+  await expect(page.locator('.cm-activeLine')).toContainText(
+    `fillet({ radius: ${KCL_DEFAULT_LENGTH}, tags: [seg01] }, %)`
+  ) })
 
-  test('Command bar keybinding works from code editor and can change a setting', async ({
-    page,
-  }) => {
-    const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
-    await u.waitForAuthSkipAppStart()
-
-    await expect(
-      page.getByRole('button', { name: 'Start Sketch' })
-    ).not.toBeDisabled()
-
-    // Put the cursor in the code editor
-    await page.locator('.cm-content').click()
-
-    // Now try the same, but with the keyboard shortcut, check focus
-    await page.keyboard.press('ControlOrMeta+K')
-
-    let cmdSearchBar = page.getByPlaceholder('Search commands')
-    await expect(cmdSearchBar).toBeVisible()
-    await expect(cmdSearchBar).toBeFocused()
-
-    // Try typing in the command bar
-    await cmdSearchBar.fill('theme')
-    const themeOption = page.getByRole('option', {
-      name: 'Settings · app · theme',
-    })
-    await expect(themeOption).toBeVisible()
-    await themeOption.click()
-    const themeInput = page.getByPlaceholder('dark')
-    await expect(themeInput).toBeVisible()
-    await expect(themeInput).toBeFocused()
-    // Select dark theme
-    await page.keyboard.press('ArrowDown')
-    await page.keyboard.press('ArrowDown')
-    await page.keyboard.press('ArrowDown')
-    await expect(page.getByRole('option', { name: 'system' })).toHaveAttribute(
-      'data-headlessui-state',
-      'active'
-    )
-    await page.keyboard.press('Enter')
-
-    // Check the toast appeared
-    await expect(
-      page.getByText(`Set theme to "system" as a user default`)
-    ).toBeVisible()
-    // Check that the theme changed
-    await expect(page.locator('body')).not.toHaveClass(`body-bg dark`)
+  test('Command bar can change a setting, and switch back and forth between arguments', async ({ page,  homePage }) => { const u = await getUtils(page)
+  await page.setBodyDimensions({ width: 1200, height: 500 })
+  await homePage.goToModelingScene()
+  
+  const commandBarButton = page.getByRole('button', { name: 'Commands' })
+  const cmdSearchBar = page.getByPlaceholder('Search commands')
+  const commandName = 'debug panel'
+  const commandOption = page.getByRole('option', {
+    name: commandName,
+    exact: false,
   })
+  const commandLevelArgButton = page.getByRole('button', { name: 'level' })
+  const commandThemeArgButton = page.getByRole('button', { name: 'value' })
+  const paneSelector = page.getByRole('button', { name: 'debug panel' })
+  // This selector changes after we set the setting
+  let commandOptionInput = page.getByPlaceholder('On')
+  
+  await expect(
+    page.getByRole('button', { name: 'Start Sketch' })
+  ).not.toBeDisabled()
+  
+  // First try opening the command bar and closing it
+  await page
+    .getByRole('button', { name: 'Commands', exact: false })
+    .or(page.getByRole('button', { name: '⌘K' }))
+    .click()
+  
+  await expect(cmdSearchBar).toBeVisible()
+  await page.keyboard.press('Escape')
+  await expect(cmdSearchBar).not.toBeVisible()
+  
+  // Now try the same, but with the keyboard shortcut, check focus
+  await page.keyboard.press('ControlOrMeta+K')
+  await expect(cmdSearchBar).toBeVisible()
+  await expect(cmdSearchBar).toBeFocused()
+  
+  // Try typing in the command bar
+  await cmdSearchBar.fill(commandName)
+  await expect(commandOption).toBeVisible()
+  await commandOption.click()
+  const toggleInput = page.getByPlaceholder('On')
+  await expect(toggleInput).toBeVisible()
+  await expect(toggleInput).toBeFocused()
+  // Select On
+  await page.keyboard.press('ArrowDown')
+  await page.keyboard.press('ArrowDown')
+  await expect(page.getByRole('option', { name: 'Off' })).toHaveAttribute(
+    'data-headlessui-state',
+    'active'
+  )
+  await page.keyboard.press('Enter')
+  
+  // Check the toast appeared
+  await expect(
+    page.getByText(`Set show debug panel to "false" for this project`)
+  ).toBeVisible()
+  // Check that the visibility changed
+  await expect(paneSelector).not.toBeVisible()
+  
+  commandOptionInput = page.locator('[id="option-input"]')
+  
+  // Test case for https://github.com/KittyCAD/modeling-app/issues/2882
+  await commandBarButton.click()
+  await cmdSearchBar.focus()
+  await cmdSearchBar.fill(commandName)
+  await commandOption.click()
+  await expect(commandThemeArgButton).toBeDisabled()
+  await commandOptionInput.focus()
+  await commandOptionInput.fill('on')
+  await commandLevelArgButton.click()
+  await expect(commandLevelArgButton).toBeDisabled()
+  
+  // Test case for https://github.com/KittyCAD/modeling-app/issues/2881
+  await commandThemeArgButton.click()
+  await expect(commandThemeArgButton).toBeDisabled()
+  await expect(commandLevelArgButton).toHaveText('level: project') })
 
-  test('Can extrude from the command bar', async ({ page }) => {
-    await page.addInitScript(async () => {
-      localStorage.setItem(
-        'persistCode',
-        `distance = sqrt(20)
-      sketch001 = startSketchOn('XZ')
-      |> startProfileAt([-6.95, 10.98], %)
-      |> line([25.1, 0.41], %)
-      |> line([0.73, -20.93], %)
-      |> line([-23.44, 0.52], %)
-      |> close(%)
-          `
-      )
-    })
+  test('Command bar keybinding works from code editor and can change a setting', async ({ page,  homePage }) => { const u = await getUtils(page)
+  await page.setBodyDimensions({ width: 1200, height: 500 })
+  await homePage.goToModelingScene()
+  
+  await expect(
+    page.getByRole('button', { name: 'Start Sketch' })
+  ).not.toBeDisabled()
+  
+  // Put the cursor in the code editor
+  await page.locator('.cm-content').click()
+  
+  // Now try the same, but with the keyboard shortcut, check focus
+  await page.keyboard.press('ControlOrMeta+K')
+  
+  let cmdSearchBar = page.getByPlaceholder('Search commands')
+  await expect(cmdSearchBar).toBeVisible()
+  await expect(cmdSearchBar).toBeFocused()
+  
+  // Try typing in the command bar
+  await cmdSearchBar.fill('theme')
+  const themeOption = page.getByRole('option', {
+    name: 'Settings · app · theme',
+  })
+  await expect(themeOption).toBeVisible()
+  await themeOption.click()
+  const themeInput = page.getByPlaceholder('dark')
+  await expect(themeInput).toBeVisible()
+  await expect(themeInput).toBeFocused()
+  // Select dark theme
+  await page.keyboard.press('ArrowDown')
+  await page.keyboard.press('ArrowDown')
+  await page.keyboard.press('ArrowDown')
+  await expect(page.getByRole('option', { name: 'system' })).toHaveAttribute(
+    'data-headlessui-state',
+    'active'
+  )
+  await page.keyboard.press('Enter')
+  
+  // Check the toast appeared
+  await expect(
+    page.getByText(`Set theme to "system" as a user default`)
+  ).toBeVisible()
+  // Check that the theme changed
+  await expect(page.locator('body')).not.toHaveClass(`body-bg dark`) })
 
-    const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
-
-    await u.waitForAuthSkipAppStart()
-
-    // Make sure the stream is up
-    await u.openDebugPanel()
-    await u.expectCmdLog('[data-message-type="execution-done"]')
-
-    await expect(
-      page.getByRole('button', { name: 'Start Sketch' })
-    ).not.toBeDisabled()
-    await u.clearCommandLogs()
-    await page.getByRole('button', { name: 'Extrude' }).isEnabled()
-
-    let cmdSearchBar = page.getByPlaceholder('Search commands')
-    await page.keyboard.press('ControlOrMeta+K')
-    await expect(cmdSearchBar).toBeVisible()
-
-    // Search for extrude command and choose it
-    await page.getByRole('option', { name: 'Extrude' }).click()
-
-    // Assert that we're on the selection step
-    await expect(page.getByRole('button', { name: 'selection' })).toBeDisabled()
-    // Select a face
-    await page.mouse.move(700, 200)
-    await page.mouse.click(700, 200)
-
-    // Assert that we're on the distance step
-    await expect(
-      page.getByRole('button', { name: 'distance', exact: false })
-    ).toBeDisabled()
-
-    // Assert that the an alternative variable name is chosen,
-    // since the default variable name is already in use (distance)
-    await page.getByRole('button', { name: 'Create new variable' }).click()
-    await expect(page.getByPlaceholder('Variable name')).toHaveValue(
-      'distance001'
-    )
-
-    const continueButton = page.getByRole('button', { name: 'Continue' })
-    const submitButton = page.getByRole('button', { name: 'Submit command' })
-    await continueButton.click()
-
-    // Review step and argument hotkeys
-    await expect(submitButton).toBeEnabled()
-    await expect(submitButton).toBeFocused()
-    await submitButton.press('Backspace')
-
-    // Assert we're back on the distance step
-    await expect(
-      page.getByRole('button', { name: 'distance', exact: false })
-    ).toBeDisabled()
-
-    await continueButton.click()
-    await submitButton.click()
-
-    // Check that the code was updated
-    await u.waitForCmdReceive('extrude')
-    // Unfortunately this indentation seems to matter for the test
-    await expect(page.locator('.cm-content')).toHaveText(
+  test('Can extrude from the command bar', async ({ page, homePage }) => { await page.addInitScript(async () => {
+    localStorage.setItem(
+      'persistCode',
       `distance = sqrt(20)
-distance001 = ${KCL_DEFAULT_LENGTH}
-sketch001 = startSketchOn('XZ')
+    sketch001 = startSketchOn('XZ')
     |> startProfileAt([-6.95, 10.98], %)
     |> line([25.1, 0.41], %)
     |> line([0.73, -20.93], %)
     |> line([-23.44, 0.52], %)
     |> close(%)
-extrude001 = extrude(distance001, sketch001)`.replace(/(\r\n|\n|\r)/gm, '') // remove newlines
+        `
     )
   })
+  
+  const u = await getUtils(page)
+  await page.setBodyDimensions({ width: 1200, height: 500 })
+  
+  await homePage.goToModelingScene()
+  
+  // Make sure the stream is up
+  await u.openDebugPanel()
+  await u.expectCmdLog('[data-message-type="execution-done"]')
+  
+  await expect(
+    page.getByRole('button', { name: 'Start Sketch' })
+  ).not.toBeDisabled()
+  await u.clearCommandLogs()
+  await page.getByRole('button', { name: 'Extrude' }).isEnabled()
+  
+  let cmdSearchBar = page.getByPlaceholder('Search commands')
+  await page.keyboard.press('ControlOrMeta+K')
+  await expect(cmdSearchBar).toBeVisible()
+  
+  // Search for extrude command and choose it
+  await page.getByRole('option', { name: 'Extrude' }).click()
+  
+  // Assert that we're on the selection step
+  await expect(page.getByRole('button', { name: 'selection' })).toBeDisabled()
+  // Select a face
+  await page.mouse.move(700, 200)
+  await page.mouse.click(700, 200)
+  
+  // Assert that we're on the distance step
+  await expect(
+    page.getByRole('button', { name: 'distance', exact: false })
+  ).toBeDisabled()
+  
+  // Assert that the an alternative variable name is chosen,
+  // since the default variable name is already in use (distance)
+  await page.getByRole('button', { name: 'Create new variable' }).click()
+  await expect(page.getByPlaceholder('Variable name')).toHaveValue(
+    'distance001'
+  )
+  
+  const continueButton = page.getByRole('button', { name: 'Continue' })
+  const submitButton = page.getByRole('button', { name: 'Submit command' })
+  await continueButton.click()
+  
+  // Review step and argument hotkeys
+  await expect(submitButton).toBeEnabled()
+  await expect(submitButton).toBeFocused()
+  await submitButton.press('Backspace')
+  
+  // Assert we're back on the distance step
+  await expect(
+    page.getByRole('button', { name: 'distance', exact: false })
+  ).toBeDisabled()
+  
+  await continueButton.click()
+  await submitButton.click()
+  
+  await u.waitForCmdReceive('extrude')
 
-  test('Can switch between sketch tools via command bar', async ({ page }) => {
-    const u = await getUtils(page)
-    await page.setViewportSize({ width: 1200, height: 500 })
-    await u.waitForAuthSkipAppStart()
+  await expect(page.locator('.cm-content')).toContainText('extrude001 = extrude(distance001, sketch001)')
 
-    const sketchButton = page.getByRole('button', { name: 'Start Sketch' })
-    const cmdBarButton = page.getByRole('button', { name: 'Commands' })
-    const rectangleToolCommand = page.getByRole('option', {
-      name: 'rectangle',
-    })
-    const rectangleToolButton = page.getByRole('button', {
-      name: 'rectangle Corner rectangle',
-    })
-    const lineToolCommand = page.getByRole('option', {
-      name: 'Line',
-    })
-    const lineToolButton = page.getByRole('button', {
-      name: 'line Line',
-      exact: true,
-    })
-    const arcToolCommand = page.getByRole('option', { name: 'Tangential Arc' })
-    const arcToolButton = page.getByRole('button', {
-      name: 'arc Tangential Arc',
-    })
-
-    // Start a sketch
-    await sketchButton.click()
-    await page.mouse.click(700, 200)
-
-    // Switch between sketch tools via the command bar
-    await expect(lineToolButton).toHaveAttribute('aria-pressed', 'true')
-    await cmdBarButton.click()
-    await rectangleToolCommand.click()
-    await expect(rectangleToolButton).toHaveAttribute('aria-pressed', 'true')
-    await cmdBarButton.click()
-    await lineToolCommand.click()
-    await expect(lineToolButton).toHaveAttribute('aria-pressed', 'true')
-
-    // Click in the scene a couple times to draw a line
-    // so tangential arc is valid
-    await page.mouse.click(700, 200)
-    await page.mouse.move(700, 300, { steps: 5 })
-    await page.mouse.click(700, 300)
-
-    // switch to tangential arc via command bar
-    await cmdBarButton.click()
-    await arcToolCommand.click()
-    await expect(arcToolButton).toHaveAttribute('aria-pressed', 'true')
   })
+
+  test('Can switch between sketch tools via command bar', async ({ page, homePage }) => { const u = await getUtils(page)
+  await page.setBodyDimensions({ width: 1200, height: 500 })
+  await homePage.goToModelingScene()
+  
+  const sketchButton = page.getByRole('button', { name: 'Start Sketch' })
+  const cmdBarButton = page.getByRole('button', { name: 'Commands' })
+  const rectangleToolCommand = page.getByRole('option', {
+    name: 'rectangle',
+  })
+  const rectangleToolButton = page.getByRole('button', {
+    name: 'rectangle Corner rectangle',
+  })
+  const lineToolCommand = page.getByRole('option', {
+    name: 'Line',
+  })
+  const lineToolButton = page.getByRole('button', {
+    name: 'line Line',
+    exact: true,
+  })
+  const arcToolCommand = page.getByRole('option', { name: 'Tangential Arc' })
+  const arcToolButton = page.getByRole('button', {
+    name: 'arc Tangential Arc',
+  })
+  
+  // Start a sketch
+  await sketchButton.click()
+  await page.mouse.click(700, 200)
+  
+  // Switch between sketch tools via the command bar
+  await expect(lineToolButton).toHaveAttribute('aria-pressed', 'true')
+  await cmdBarButton.click()
+  await rectangleToolCommand.click()
+  await expect(rectangleToolButton).toHaveAttribute('aria-pressed', 'true')
+  await cmdBarButton.click()
+  await lineToolCommand.click()
+  await expect(lineToolButton).toHaveAttribute('aria-pressed', 'true')
+  
+  // Click in the scene a couple times to draw a line
+  // so tangential arc is valid
+  await page.mouse.click(700, 200)
+  await page.mouse.move(700, 300, { steps: 5 })
+  await page.mouse.click(700, 300)
+  
+  // switch to tangential arc via command bar
+  await cmdBarButton.click()
+  await arcToolCommand.click()
+  await expect(arcToolButton).toHaveAttribute('aria-pressed', 'true') })
 })