From f493f031df9fb75fad502778df9ab7deb05611bb Mon Sep 17 00:00:00 2001
From: Jesse Mazzella <ozyx@users.noreply.github.com>
Date: Wed, 27 Jul 2022 14:31:18 -0700
Subject: [PATCH] [e2e] Refactor and document our extension of existing
 Playwright API and RFE features (#5537)

---
 .circleci/config.yml                          |  47 +--
 .github/PULL_REQUEST_TEMPLATE.md              |   2 +-
 README.md                                     |  68 ++--
 e2e/README.md                                 | 338 ++++++++++++----
 e2e/appActions.js                             |  83 ++++
 e2e/baseFixtures.js                           | 174 ++++++++
 e2e/commonActions.js                          |  18 -
 e2e/fixtures.js                               |  69 ----
 .../addInitRestrictedNotebook.js              |   4 +-
 .../addNoneditableObject.js                   |   0
 e2e/playwright-ci.config.js                   |   2 +-
 e2e/playwright-local.config.js                |   5 +-
 e2e/pluginFixtures.js                         | 125 ++++++
 e2e/test-data/VisualTestData_storage.json     |   4 +-
 e2e/test-data/recycled_local_storage.json     |   4 +-
 .../baseFixtures.e2e.spec.js}                 |  10 +-
 .../framework/exampleTemplate.e2e.spec.js     | 124 ++++++
 .../generateVisualTestData.e2e.spec.js        |  12 +-
 .../framework/pluginFixtures.e2e.spec.js      |  45 +++
 e2e/tests/framework/testData.e2e.spec.js      |  36 ++
 .../{ => functional}/branding.e2e.spec.js     |   3 +-
 .../example/eventGenerator.e2e.spec.js        |  53 ++-
 .../sineWaveLimitProvider.e2e.spec.js}        |   3 +-
 .../forms => functional}/forms.e2e.spec.js    |  69 ++--
 .../menu.e2e.spec.js}                         |  38 +-
 .../{ => functional}/moveObjects.e2e.spec.js  |  31 +-
 .../plugins/clocks/clock.e2e.spec.js}         |   5 +-
 .../plugins/clocks}/remoteClock.e2e.spec.js   |   4 +-
 .../conditionSet/conditionSet.e2e.spec.js}    |  18 +-
 .../imagery/exampleImagery.e2e.spec.js        |  23 +-
 .../exportAsJson.e2e.spec.js                  |   3 +-
 .../importAsJson.e2e.spec.js                  |   3 +-
 .../plugins/notebook/notebook.e2e.spec.js     |   4 +-
 .../notebook/restrictedNotebook.e2e.spec.js   |  54 +--
 .../plugins/notebook/tags.e2e.spec.js         |  43 +-
 .../plugins/plot/autoscale.e2e.spec.js        |  15 +-
 .../autoscale-canvas-panned-chrome-darwin     | Bin
 .../autoscale-canvas-panned-chrome-linux      | Bin
 .../autoscale-canvas-prepan-chrome-darwin     | Bin
 .../autoscale-canvas-prepan-chrome-linux      | Bin
 .../plugins/plot/logPlot.e2e.spec.js          |  21 +-
 .../plugins/plot/missingPlotObj.e2e.spec.js   |  17 +-
 .../telemetryTable/telemetryTable.e2e.spec.js |   8 +-
 .../timeConductor/timeConductor.e2e.spec.js   |   3 +-
 .../plugins/timer/timer.e2e.spec.js           |  64 +--
 .../search.e2e.spec.js}                       | 178 +++++++--
 e2e/tests/{ => functional}/smoke.e2e.spec.js  |   8 +-
 e2e/tests/search.e2e.spec.js                  | 123 ------
 e2e/tests/visual/addInit.visual.spec.js       |  60 ++-
 .../visual/controlledClock.visual.spec.js     |  51 +--
 e2e/tests/visual/default.visual.spec.js       | 371 +++++++++---------
 e2e/tests/visual/search.visual.spec.js        |   3 +-
 karma.conf.js                                 |  12 +-
 package.json                                  |   7 +-
 54 files changed, 1523 insertions(+), 942 deletions(-)
 create mode 100644 e2e/appActions.js
 create mode 100644 e2e/baseFixtures.js
 delete mode 100644 e2e/commonActions.js
 delete mode 100644 e2e/fixtures.js
 rename e2e/{tests/plugins/notebook => helper}/addInitRestrictedNotebook.js (91%)
 rename e2e/{tests/persistence => helper}/addNoneditableObject.js (100%)
 create mode 100644 e2e/pluginFixtures.js
 rename e2e/tests/{framework.e2e.spec.js => framework/baseFixtures.e2e.spec.js} (84%)
 create mode 100644 e2e/tests/framework/exampleTemplate.e2e.spec.js
 rename e2e/tests/{visual => framework}/generateVisualTestData.e2e.spec.js (90%)
 create mode 100644 e2e/tests/framework/pluginFixtures.e2e.spec.js
 create mode 100644 e2e/tests/framework/testData.e2e.spec.js
 rename e2e/tests/{ => functional}/branding.e2e.spec.js (97%)
 rename e2e/tests/{ => functional}/example/eventGenerator.e2e.spec.js (52%)
 rename e2e/tests/{example/generator/SinewaveLimitProvider.e2e.spec.js => functional/example/generator/sineWaveLimitProvider.e2e.spec.js} (98%)
 rename e2e/tests/{api/forms => functional}/forms.e2e.spec.js (53%)
 rename e2e/tests/{persistence/persistability.e2e.spec.js => functional/menu.e2e.spec.js} (56%)
 rename e2e/tests/{ => functional}/moveObjects.e2e.spec.js (82%)
 rename e2e/tests/{plugins/clock/Clock.e2e.spec.js => functional/plugins/clocks/clock.e2e.spec.js} (95%)
 rename e2e/tests/{plugins/remoteClock => functional/plugins/clocks}/remoteClock.e2e.spec.js (93%)
 rename e2e/tests/{plugins/condition/condition.e2e.spec.js => functional/plugins/conditionSet/conditionSet.e2e.spec.js} (95%)
 rename e2e/tests/{ => functional}/plugins/imagery/exampleImagery.e2e.spec.js (97%)
 rename e2e/tests/{plugins/ExportAsJSON => functional/plugins/importAndExportAsJSON}/exportAsJson.e2e.spec.js (96%)
 rename e2e/tests/{plugins/ImportAsJSON => functional/plugins/importAndExportAsJSON}/importAsJson.e2e.spec.js (94%)
 rename e2e/tests/{ => functional}/plugins/notebook/notebook.e2e.spec.js (98%)
 rename e2e/tests/{ => functional}/plugins/notebook/restrictedNotebook.e2e.spec.js (84%)
 rename e2e/tests/{ => functional}/plugins/notebook/tags.e2e.spec.js (86%)
 rename e2e/tests/{ => functional}/plugins/plot/autoscale.e2e.spec.js (93%)
 rename e2e/tests/{ => functional}/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-darwin (100%)
 rename e2e/tests/{ => functional}/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-linux (100%)
 rename e2e/tests/{ => functional}/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-darwin (100%)
 rename e2e/tests/{ => functional}/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-linux (100%)
 rename e2e/tests/{ => functional}/plugins/plot/logPlot.e2e.spec.js (95%)
 rename e2e/tests/{ => functional}/plugins/plot/missingPlotObj.e2e.spec.js (89%)
 rename e2e/tests/{ => functional}/plugins/telemetryTable/telemetryTable.e2e.spec.js (94%)
 rename e2e/tests/{ => functional}/plugins/timeConductor/timeConductor.e2e.spec.js (98%)
 rename e2e/tests/{ => functional}/plugins/timer/timer.e2e.spec.js (73%)
 rename e2e/tests/{ui/layout/search/grandsearch.e2e.spec.js => functional/search.e2e.spec.js} (56%)
 rename e2e/tests/{ => functional}/smoke.e2e.spec.js (90%)
 delete mode 100644 e2e/tests/search.e2e.spec.js

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6814113ac1..07687b0c4d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -94,30 +94,13 @@ jobs:
     parameters:
       node-version:
         type: string
-      browser:
-        type: string
     executor: pw-focal-development
     steps:
       - build_and_install:
           node-version: <<parameters.node-version>>
-      - when:
-          condition:
-            equal: [ "FirefoxESR", <<parameters.browser>> ]
-          steps:
-            - browser-tools/install-firefox:
-                version: "91.7.1esr" #https://archive.mozilla.org/pub/firefox/releases/
-      - when:
-          condition:
-            equal: [ "FirefoxHeadless", <<parameters.browser>> ]
-          steps:
-            - browser-tools/install-firefox
-      - when:
-          condition:
-            equal: [ "ChromeHeadless", <<parameters.browser>> ]
-          steps:
-            - browser-tools/install-chrome:
-                replace-existing: false
-      - run: npm run test -- --browsers=<<parameters.browser>>
+      - browser-tools/install-chrome:
+          replace-existing: false
+      - run: npm run test
       - run: npm run cov:unit:publish
       - save_cache_cmd:
           node-version: <<parameters.node-version>>
@@ -130,14 +113,14 @@ jobs:
     parameters:
       node-version:
         type: string
-      suite:
+      suite: #stable or full
         type: string
     executor: pw-focal-development
     parallelism: 4
     steps:
       - build_and_install:
           node-version: <<parameters.node-version>>
-      - when: #Only install chrome-beta when running the full suite to save $$$
+      - when: #Only install chrome-beta when running the 'full' suite to save $$$
           condition:
             equal: [ "full", <<parameters.suite>> ]
           steps:
@@ -176,42 +159,26 @@ workflows:
       - lint:
           name: node14-lint
           node-version: lts/fermium
-      - unit-test:
-          name: node16-chrome
-          node-version: lts/gallium
-          browser: ChromeHeadless
       - unit-test:
           name: node18-chrome
           node-version: "18"
-          browser: ChromeHeadless
       - e2e-test:
-          name: e2e-ci
+          name: e2e-stable
           node-version: lts/gallium
-          suite: ci
+          suite: stable
       - perf-test:
           node-version: lts/gallium
   the-nightly: #These jobs do not run on PRs, but against master at night
     jobs:
-      - unit-test:
-          name: node16-firefoxESR-nightly
-          node-version: lts/gallium
-          browser: FirefoxESR
-      - unit-test:
-          name: node14-firefox-nightly
-          node-version: lts/fermium
-          browser: FirefoxHeadless
       - unit-test:
           name: node14-chrome-nightly
           node-version: lts/fermium
-          browser: ChromeHeadless
       - unit-test:
           name: node16-chrome-nightly
           node-version: lts/gallium
-          browser: ChromeHeadless
       - unit-test:
           name: node18-chrome
           node-version: "18"
-          browser: ChromeHeadless
       - npm-audit:
           node-version: lts/gallium
       - e2e-test:
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 8cbde6e73d..a5525f4ce9 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -13,7 +13,7 @@ Closes <!--- Insert Issue Number(s) this PR addresses. Start by typing # will op
 ### Author Checklist
 
 * [ ] Changes address original issue?
-* [ ] Unit tests included and/or updated with changes?
+* [ ] Tests included and/or updated with changes?
 * [ ] Command line build passes?
 * [ ] Has this been smoke tested?
 * [ ] Testing instructions included in associated issue OR is this a dependency/testcase change?
diff --git a/README.md b/README.md
index 8321674764..dc685fac11 100644
--- a/README.md
+++ b/README.md
@@ -11,22 +11,6 @@ Once you've created something amazing with Open MCT, showcase your work in our G
 Try Open MCT now with our [live demo](https://openmct-demo.herokuapp.com/).
 ![Demo](https://nasa.github.io/openmct/static/res/images/Open-MCT.Browse.Layout.Mars-Weather-1.jpg)
 
-## Open MCT v2.0.0
-Support for our legacy bundle-based API, and the libraries that it was built on (like Angular 1.x), have now been removed entirely from this repository.
-
-For now if you have an Open MCT application that makes use of the legacy API, [a plugin](https://github.com/nasa/openmct-legacy-plugin) is provided that bootstraps the legacy bundling mechanism and API. This plugin will not be maintained over the long term however, and the legacy support plugin will not be tested for compatibility with future versions of Open MCT. It is provided for convenience only.
-
-### How do I know if I am using legacy API?
-You might still be using legacy API if your source code
-
-* Contains files named bundle.js, or bundle.json,
-* Makes calls to `openmct.$injector()`, or `openmct.$angular`,
-* Makes calls to `openmct.legacyRegistry`, `openmct.legacyExtension`, or `openmct.legacyBundle`.
-
-
-### What should I do if I am using legacy API?
-Please refer to [the modern Open MCT API](https://nasa.github.io/openmct/documentation/). Post any questions to the [Discussions section](https://github.com/nasa/openmct/discussions) of the Open MCT GitHub repository.
-
 ## Building and Running Open MCT Locally
 
 Building and running Open MCT in your local dev environment is very easy. Be sure you have [Git](https://git-scm.com/downloads) and [Node.js](https://nodejs.org/) installed, then follow the directions below. Need additional information? Check out the [Getting Started](https://nasa.github.io/openmct/getting-started/) page on our website.
@@ -84,7 +68,10 @@ For information on writing plugins, please see [our API documentation](https://g
 
 ## Tests
 
-Tests are written for [Jasmine 3](https://jasmine.github.io/api/3.1/global)
+Our automated test coverage comes in the form of unit, e2e, visual, performance, and security tests. 
+
+### Unit Tests
+Unit Tests are written for [Jasmine](https://jasmine.github.io/api/edge/global)
 and run by [Karma](http://karma-runner.github.io). To run:
 
 `npm test`
@@ -93,16 +80,33 @@ The test suite is configured to load any scripts ending with `Spec.js` found
 in the `src` hierarchy. Full configuration details are found in
 `karma.conf.js`. By convention, unit test scripts should be located
 alongside the units that they test; for example, `src/foo/Bar.js` would be
-tested by `src/foo/BarSpec.js`. (For legacy reasons, some existing tests may
-be located in separate `test` folders near the units they test, but the
-naming convention is otherwise the same.)
+tested by `src/foo/BarSpec.js`.
 
-### Test Reporting
+### e2e, Visual, and Performance tests
+The e2e, Visual, and Performance tests are written for playwright and run by playwright's new test runner [@playwright/test](https://playwright.dev/). 
 
-When `npm test` is run, test results will be written as HTML to
-`dist/reports/tests/`. Code coverage information is written to `dist/reports/coverage`.
+To run the e2e tests which are part of every commit:
 
-Code Coverage Reports are available from [codecov.io](https://app.codecov.io/gh/nasa/openmct/)
+`npm run test:e2e:stable`
+
+To run the visual test suite:
+
+`npm run test:e2e:visual`
+
+To run the performance tests:
+
+`npm run test:perf`
+
+The test suite is configured to all tests localed in `e2e/tests/` ending in `*.e2e.spec.js`. For more about the e2e test suite, please see the [README](./e2e/README.md)
+
+### Security Tests
+Each commit is analyzed for known security vulnerabilities using [CodeQL](https://codeql.github.com/docs/codeql-language-guides/codeql-library-for-javascript/) and our overall security report is available on [LGTM](https://lgtm.com/projects/g/nasa/openmct/)
+
+### Test Reporting and Code Coverage
+
+Each test suite generates a report in CircleCI. For a complete overview of testing functionality, please see our [Circle CI Test Insights Dashboard](https://app.circleci.com/insights/github/nasa/openmct/workflows/the-nightly/overview?branch=master&reporting-window=last-30-days)
+
+Our code coverage is generated during the runtime of our unit, e2e, and visual tests. The combination of those reports is published to [codecov.io](https://app.codecov.io/gh/nasa/openmct/)
 
 # Glossary
 
@@ -143,3 +147,19 @@ documentation, may presume an understanding of these terms.
   user makes another such choice.)
 * _namespace_: A name used to identify a persistence store. A running open MCT 
 application could potentially use multiple persistence stores, with the 
+
+## Open MCT v2.0.0
+Support for our legacy bundle-based API, and the libraries that it was built on (like Angular 1.x), have now been removed entirely from this repository.
+
+For now if you have an Open MCT application that makes use of the legacy API, [a plugin](https://github.com/nasa/openmct-legacy-plugin) is provided that bootstraps the legacy bundling mechanism and API. This plugin will not be maintained over the long term however, and the legacy support plugin will not be tested for compatibility with future versions of Open MCT. It is provided for convenience only.
+
+### How do I know if I am using legacy API?
+You might still be using legacy API if your source code
+
+* Contains files named bundle.js, or bundle.json,
+* Makes calls to `openmct.$injector()`, or `openmct.$angular`,
+* Makes calls to `openmct.legacyRegistry`, `openmct.legacyExtension`, or `openmct.legacyBundle`.
+
+
+### What should I do if I am using legacy API?
+Please refer to [the modern Open MCT API](https://nasa.github.io/openmct/documentation/). Post any questions to the [Discussions section](https://github.com/nasa/openmct/discussions) of the Open MCT GitHub repository.
diff --git a/e2e/README.md b/e2e/README.md
index 15e6f0619c..619884340d 100644
--- a/e2e/README.md
+++ b/e2e/README.md
@@ -2,9 +2,266 @@
 
 This document captures information specific to the e2e testing of Open MCT. For general information about testing, please see [the Open MCT README](https://github.com/nasa/openmct/blob/master/README.md#tests).
 
-## Overview
+## Table of Contents
 
-This document is designed to capture on the What, Why, and How's of writing and running e2e tests in Open MCT.
+This document is designed to capture on the What, Why, and How's of writing and running e2e tests in Open MCT. Please use the built-in Github Table of Contents functionality at the top left of this page or the markup.
+
+1. [Getting Started](#getting-started)
+2. [Types of Testing](#types-of-e2e-testing)
+3. [Architecture](#architecture)
+
+## Getting Started
+
+While our team does our best to lower the barrier to entry to working with our e2e framework and Open MCT, there is a bit of work required to get from 0 to 1 test contributed.
+
+### Getting started with Playwright
+
+If this is your first time ever using the Playwright framework, we recommend going through the [Getting Started Guide](https://playwright.dev/docs/next/intro) which can be completed in about 15 minutes. This will give you a concise tour of Playwright's functionality and an understanding of the official Playwright documentation which we leverage in Open MCT.
+
+### Getting started with Open MCT's implementation of Playwright
+
+Once you've got an understanding of Playwright, you'll need a baseline understanding of Open MCT:
+
+1. Follow the steps [Building and Running Open MCT Locally](../README.md#building-and-running-open-mct-locally)
+2. Once you're serving Open MCT locally, create an Example Telemetry Object (e.g.: 'Sine Wave Generator')
+3. Create a 'Plot' Object (e.g.: 'Stacked Plot')
+4. Expand the Tree on the left-hand nav and drag and drop the Example Telemetry Object into the Plot Object
+5. Create a 'Display Layout' object
+6. From the Tree, Drag the Plot object into the Display Layout
+
+What you've created is a display which mimics the display that a mission control operator might use to understand and model telemetry data.
+
+Recreate the steps above with Playwright's codegen tool:
+
+1. `npm run start` in a terminal window
+2. Open another terminal window and start the Playwright codegen application `npx playwright codegen`
+3. Navigate the browser to `http://localhost:8080`
+4. Click the Create button and notice how your actions in the browser are being recorded in the Playwright Inspector
+5. Continue through the steps 2-6 above
+
+What you've created is an automated test which mimics the creation of a mission control display.
+
+Next, you should walk through our implementation of Playwright in Open MCT:
+
+1. Close any terminals which are serving up a local instance of Open MCT
+2. Run our 'Getting Started' test in debug mode with `npm run test:e2e:local -- exampleTemplate --debug`
+3. Step through each test step in the Playwright Inspector to see how we leverage Playwright's capabilities to test Open MCT
+
+## Types of e2e Testing
+
+e2e testing describes the layer at which a test is performed without prescribing the assertions which are made. Generally, when writing an e2e test, we have three choices to make on an assertion strategy:
+
+1. Functional - Verifies the functional correctness of the application. Sometimes interchanged with e2e or regression testing.
+2. Visual - Verifies the "look and feel" of the application and can only detect _undesirable changes when compared to a previous baseline_.
+3. Snapshot - Similar to Visual in that it captures the "look" of the application and can only detect _undesirable changes when compared to a previous baseline_. **Generally not preferred due to advanced setup necessary.**
+
+When choosing between the different testing strategies, think only about the assertion that is made at the end of the series of test steps. "I want to verify that the Timer plugin functions correctly" vs "I want to verify that the Timer plugin does not look different than originally designed".
+
+We do not want to interleave visual and functional testing inside the same suite because visual test verification of correctness must happen with a 3rd party service. This service is not available when executing these tests in other contexts (i.e. VIPER).
+
+### Functional Testing
+
+The bulk of our e2e coverage lies in "functional" test coverage which verifies that Open MCT is functionally correct as well as defining _how we expect it to behave_. This enables us to test the application exactly as a user would, while prescribing exactly how a user can interact with the application via a web browser.
+
+### Visual Testing
+
+Visual Testing is an essential part of our e2e strategy as it ensures that the application _appears_ correctly to a user while it compliments the functional e2e suite. It would be impractical to make thousands of assertions functional assertions on the look and feel of the application. Visual testing is interested in getting the DOM into a specified state and then comparing that it has not changed against a baseline.
+
+For a better understanding of the visual issues which affect Open MCT, please see our bug tracker with the `label:visual` filter applied [here](https://github.com/nasa/openmct/issues?q=label%3Abug%3Avisual+)
+To read about how to write a good visual test, please see [How to write a great Visual Test](#how-to-write-a-great-visual-test). 
+
+`npm run test:e2e:visual` will run all of the visual tests against a local instance of Open MCT. If no `PERCY_TOKEN` API key is found in the terminal or command line environment variables, no visual comparisons will be made.
+
+#### Percy.io
+To make this possible, we're leveraging a 3rd party service, [Percy](https://percy.io/). This service maintains a copy of all changes, users, scm-metadata, and baselines to verify that the application looks and feels the same _unless approved by a Open MCT developer_. To request a Percy API token, please reach out to the Open MCT Dev team on GitHub. For more information, please see the official [Percy documentation](https://docs.percy.io/docs/visual-testing-basics)
+
+### (Advanced) Snapshot Testing
+
+Snapshot testing is very similar to visual testing but allows us to be more precise in detecting change without relying on a 3rd party service. Unfortuantely, this precision requires advanced test setup and teardown and so we're using this pattern as a last resort.
+
+To give an example, if a *single* visual test assertion for an Overlay plot is run through multiple DOM rendering engines at various viewports to see how the Plot looks. If that same test were run as a snapshot test, it could only be executed against a single browser, on a single platform (ubuntu docker container).
+
+Read more about [Playwright Snapshots](https://playwright.dev/docs/test-snapshots)
+
+Open MCT's implementation
+-Our Snapshot tests receive a @snapshot tag.
+-Snapshots need to be executed within the official playwright container to ensure we're using the exact rendering platform in CI and locally
+
+```
+docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:[GET THIS VERSION FROM OUR CIRCLECI CONFIG FILE]-focal /bin/bash
+npm install
+npx playwright test --config=e2e/playwright-ci.config.js --project=chrome --grep @snapshot
+```
+
+(WIP) Updating Snapshots
+When the @snapshot tests fail, they will need to be evaluated to see if the failure is an acceptable change or 
+
+## Performance Testing
+
+The open source performance tests function mostly as a contract for the locator logic, functionality, and assumptions will work in our downstream, closed source test suites.
+
+They're found in the `/e2e/tests/performance` repo and are to be executed with the following npm script:
+
+```npm run test:perf```
+
+These tests are expected to become blocking and gating with assertions as we extend the capabilities of playwright.
+
+## Test Architecture and CI
+
+### Architecture (TODO)
+
+
+
+### File Structure
+
+Our file structure follows the type of type of testing being excercised at the e2e layer and files containing test suites which matcher application behavior or our `src` and `example` layout. This area is not well refined as we figure out what works best for closed source and downstream projects. This may change altogether if we move `e2e` to it's own npm package.
+
+ - `./helper` - contains helper functions or scripts which are leveraged directly within the testsuites. i.e. non-default plugin scripts injected into DOM
+ - `./test-data` - contains test data which is leveraged or generated in the functional, performance, or visual test suites. i.e. localStorage data
+ - `./tests/functional` - the bulk of the tests are contained within this folder to verify the functionality of open mct
+ - `./tests/functional/example/` - tests which specifically verify the example plugins
+ - `./tests/functional/plugins/` - tests which loosely test each plugin. This folder is the most likely to change. Note: some @snapshot tests are still contained within this structure
+ - `./tests/framework/` - tests which verify that our testframework functionality and assumptions will continue to work based on further refactoring or playwright version changes
+ - `./tests/performance/` - performance tests
+ - `./tests/visual/` - Visual tests
+ - `./appActions.js` - Contains common fixtures which can be leveraged by testcase authors to quickly move through the application when writing new tests.
+ - `./baseFixture.js` - Contains base fixtures which only extend default `@playwright/test` functionality. The goal is to remove these fixtures as native Playwright APIs improve.
+
+Our functional tests end in `*.e2e.spec.js`, visual tests in `*.visual.spec.js` and performance tests in `*.perf.spec.js`. 
+
+### Configuration
+
+Where possible, we try to run Open MCT without modification or configuration change so that the Open MCT doesn't fail exclusively in "test mode" or in "production mode".
+
+Open MCT is leveraging the [config file](https://playwright.dev/docs/test-configuration) pattern to describe the capabilities of Open MCT e2e _where_ it's run
+- `./playwright-ci.config.js` - Used when running in CI or to debug CI issues locally
+- `./playwright-local.config.js` - Used when running locally
+- `./playwright-performance.config.js` - Used when running performance tests in CI or locally
+- `./playwright-visual.config.js` - Used to run the visual tests in CI or locally
+#### Test Tags
+
+Test tags are a great way of organizing tests outside of a file structure. To learn more see the official documentation [here](https://playwright.dev/docs/test-annotations#tag-tests)
+Current list of test tags:
+- `@ipad` - Test case or test suite is compatible with Playwright's iPad support and Open MCT's read-only mobile view (i.e. no Create button).
+- `@gds` - Denotes a GDS Test Case used in the VIPER Mission.
+- `@addInit` - Initializes the browser with an injected and artificial state. Useful for loading non-default plugins. Likely will not work outside of app.js.
+- `@localStorage` - Captures or generates session storage to manipulate browser state. Useful for excluding in tests which require a persistent backend (i.e. CouchDB).
+- `@snapshot` - Uses Playwright's snapshot functionality to record a copy of the DOM for direct comparison. Must be run inside of the playwright container.
+- `@unstable` - A new test or test which is known to be flaky.
+
+### Continuous Integration
+
+The cheapest time to catch a bug is Pre-merge. Unfortuantely, this is the most expensive time to run all of the tests since each Merge event can consistent of hundreds of commits. For this reason, we're selective in _what_ we run as much as _when_ we run it.
+
+We leverage CircleCI to run tests against each commit and inject the Test Reports which are generated by playwright so that they team can keep track of flaky and [historical Test Trends](https://app.circleci.com/insights/github/nasa/openmct/workflows/overall-circleci-commit-status/tests?branch=master&reporting-window=last-30-days)
+
+We leverage Github Actions / Workflows to execute tests as it gives us the ability to run against multiple operating systems with greater control over git event triggers (i.e. Run on a PR Comment event).
+
+Our CI environment consists of 3 main modes of operation:
+
+#### 1. Per-Commit Testing
+CircleCI
+- Stable e2e tests against ubuntu and chrome
+- Performance tests against ubuntu and chrome
+- e2e tests are linted
+
+#### 2. Per-Merge Testing
+Github Actions / Workflow
+- Full suite against all browsers/projects. Triggered with Github Label Event 'pr:e2e'
+- Visual Tests. Triggered with Github Label Event 'pr:visual'
+
+#### 3. Scheduled / Batch Testing
+Nightly Testing in Circle CI
+- Full e2e suite against ubuntu and chrome
+- Performance tests against ubuntu and chrome
+
+Github Actions / Workflow
+- Visual Test baseline generation.
+
+#### Parallelism and Fast Feedback
+In order to provide fast feedback in the Per-Commit context, we try to keep total test feedback at 5 minutes or less. That is to say, A developer should have a pass/fail result in under 5 minutes.
+
+Playwright has native support for semi-intelligent sharding. Read about it [here](https://playwright.dev/docs/test-parallel#shard-tests-between-multiple-machines).
+
+We will be adjusting the parallelization of the Per-Commit tests to keep below the 5 minute total runtime threshold.
+
+In addition to the Parallelization of Test Runners (Sharding), we're also running two concurrent threads on every Shard. This is the functional limit of what CircelCI Agents can support from a memory and CPU resource constraint.
+
+So for every commit, Playwright is effectively running 4 x 2 concurrent browsercontexts to keep the overall runtime to a miminum.
+
+At the same time, we don't want to waste CI resources on parallel runs, so we've configured each shard to fail after 5 test failures. Test failure logs are recorded and stored to allow fast triage.
+#### Test Promotion
+
+In order to maintain fast and reliable feedback, tests go through a promotion process. All new test cases or test suites must be labeled with the `@unstable` annotation. The Open MCT dev team runs these unstable tests in our private repos to ensure they work downstream and are reliable.
+
+To run the stable tests, use the ```npm run test:e2e:stable``` command. To run the new and flaky tests, use the ```npm run test:e2e:unstable``` command.
+
+A testcase and testsuite are to be unmarked as @unstable when:
+1. They run as part of "full" run 5 times without failure.
+2. They've been by a Open MCT Developer 5 times in the closed source repo without failure.
+
+### Cross-browser and Cross-operating system
+
+- Where is it tested
+- What's supported
+- Mobile
+
+## Test Design, Best Practices, and Tips & Tricks
+
+### Test Design (TODO)
+
+- How to make tests robust to function in other contexts (VISTA, VIPER, etc.)
+  - Leverage the use of appActions.js like getOrCreateDomainObject
+- How to make tests faster and more resilient
+  - When possible, navigate directly by URL
+  - Leverage ```await page.goto('/', { waitUntil: 'networkidle' });```
+  - Avoid repeated setup to test to test a single assertion. Write longer tests with multiple soft assertions.
+
+### How to write a great test (TODO)
+
+#### How to write a great visual test (TODO)
+
+### Best Practices
+
+For now, our best practices exist as self-tested, living documentation in our [exampleTemplate.e2e.spec.js](./tests/framework/exampleTemplate.e2e.spec.js) file.
+
+### Tips & Tricks (TODO)
+
+The following contains a list of tips and tricks which don't exactly fit into a FAQ or Best Practices doc.
+
+- Working with multiple pages
+There are instances where multiple browser pages will need to be opened to verify multi-page or multi-tab application behavior.
+
+### Reporting
+
+Test Reporting is done through official Playwright reporters and the CI Systems which execute them.
+
+We leverage the following official Playwright reporters:
+- HTML
+- junit
+- github annotations
+- Tracefile
+- Screenshots
+
+When running the tests locally with the `npm run test:local` command, the html report will open automatically on failure. Inside this HTML report will be a complete summary of the finished tests. If the tests failed, you'll see embedded links to screenshot failure, execution logs, and the Tracefile.
+
+When looking at the reports run in CI, you'll leverage this same HTML Report which is hosted either in CircleCI or Github Actions as a build artifact.
+### e2e Code Coverage
+
+Code coverage is collected during test execution using our custom [baseFixture](./baseFixtures.js). The raw coverage files are stored in a `.nyc_report` directory to be converted into a lcov file with the following [nyc](https://github.com/istanbuljs/nyc) command:
+
+```npm run cov:e2e:report```
+
+At this point, the nyc linecov report can be published to [codecov.io](https://about.codecov.io/) with the following command:
+
+```npm run cov:e2e:stable:publish``` for the stable suite running in ubuntu. 
+or 
+```npm run cov:e2e:full:publish``` for the full suite running against all available platforms.
+
+Codecov.io will combine each of the above commands with [Codecov.io Flags](https://docs.codecov.com/docs/flags). Effectively, this allows us to combine multiple reports which are run at various stages of our CI Pipeline or run as part of a parallel process.
+
+This e2e coverage is combined with our unit test report to give a comprehensive (if flawed) view of line coverage.
+## Other
 
 ### About e2e testing
 
@@ -12,7 +269,7 @@ e2e testing is an industry-standard approach to automating the testing of web-ba
 
 Historically, the abstraction necessary to replicate real user behavior meant that:
 
-- e2e tests were "expensive" due to how much code each test executed. The closer a test replicates the user, the more code is needed run during test execution. Unit tests could run smaller units of code more effeciently.
+- e2e tests were "expensive" due to how much code each test executed. The closer a test replicates the user, the more code is needed run during test execution. Unit tests could run smaller units of code more efficiently.
 - e2e tests were flaky due to network conditions or the underlying protocols associated with testing a browser.
 - e2e frameworks relied on a browser communication standard which lacked the observability and controls necessary needed to reach the code paths possible with unit and integration tests.
 - e2e frameworks provided insufficient debug information on test failure
@@ -25,7 +282,7 @@ Modern e2e frameworks:
 - These new browser-internal protocols enable near-instant, bi-directional communication between test code and the browser, speeding up test execution and making the tests as reliable as the application itself.
 - Provide test debug tooling which enables developers to pinpoint failure
 
-Furthermore, the abstraction necessary to run e2e tests as a user enables them to be extended to run within a variety of contexts. This matches the extensible design of Open MCT. 
+Furthermore, the abstraction necessary to run e2e tests as a user enables them to be extended to run within a variety of contexts. This matches the extensible design of Open MCT.
 
 A single e2e test in Open MCT is extended to run:
 
@@ -38,85 +295,24 @@ A single e2e test in Open MCT is extended to run:
 ### Why Playwright?
 
 [Playwright](https://playwright.dev/) was chosen as our e2e framework because it solves a few VIPER Mission needs:
+
 1. First-class support for Automated Performance Testing
 2. Official Chrome, Chrome Canary, and iPad Capabilities
-3. Support for Browserless.io
+3. Support for Browserless.io to run tests in a "hermetically sealed" environment
 4. Ability to generate code coverage reports
 
-## Getting Started
-
-### Getting started with Playwright
-
-### Getting started with Open MCT's implementation of Playwright
-
-## Types of Testing
-
-### (TBD) Visual Testing
-
-- Visual tests leverage [Percy](https://percy.io/).
-- Visual tests should be written within the `./tests/visual` folder so that they can be ignored during git clones to avoid leaking credentials when executing percy cli
-
-#### (TBD) How to write a good visual test
-
-### (TBD) Snapshot Testing
-
-<https://playwright.dev/docs/test-snapshots>
-
-### (TBD) Mobile Testing
-
-### (TBD) Performance Testing
-
-### (FUTURE) Component Testing
-
-- Component testing is currrently possible in Playwright but not enabled on this project. For more, please see: <https://playwright.dev/docs/test-components>
-
-## Architecture, Test Design and Best Practices
-
-### (TBD) Architecture
-
-#### (TBD)  Continuous Integration
-
-- Test maturation
-- Difference between full and e2e-ci suites
-- Platforms
-
-### (TBD) Multi-browser and Multi-operating system
-
-- Where is it tested
-- What's supported
-
-### (TBD) Test Design
-
-- Re-usable tests for VISTA, VIPER, etc.
-
-#### Annotations
-
-- Annotations are a great way of organizing tests outside of a file structure.
-- Current list of annotations:
-  - `@ipad` - Mobile execution possible with Playwright's iPad support.
-  - `@gds` - Executes a GDS Test Case. Used to track in VIPER Mission.
-  - `@addInit` - Initializes the browser with an injected and artificial state. Useful for non-default plugins.
-  - `@localStorage` - Captures or generates session storage to manipulate browser state. Useful for excluding in tests which require a persistent backend (i.e. CouchDB).
-  - `@snapshot` - Uses Playwright's snapshot functionality to record a copy of the DOM for direct comparison. Must be run inside of a container.
-
-### (TBD) Best Practices
-
-### (TBD) Reporting
-
-### (TBD) Code Coverage
-
-Code coverage is collected during test execution and reported with [nyc](https://github.com/istanbuljs/nyc) and [codecov.io](https://about.codecov.io/)
-
-## Other
-
 ### FAQ
 
 - How does this help NASA missions?
 - When should I write an e2e test instead of a unit test?
 - When should I write a functional vs visual test?
 - How is Open MCT extending default Playwright functionality?
+- What about Component Testing?
 
 ### Troubleshooting
 
 - Why is my test failing on CI and not locally?
 - How can I view the failing tests on CI?
+- Tests won't start because 'Error: http://localhost:8080/# is already used...'
+This error will appear when running the tests locally. Sometimes, the webserver is left in an orphaned state and needs to be cleaned up. To clear up the orphaned webserver, execute the following from your Terminal:
+```lsof -n -i4TCP:8080 | awk '{print$2}' | tail -1 | xargs kill -9```
diff --git a/e2e/appActions.js b/e2e/appActions.js
new file mode 100644
index 0000000000..09a4f529cc
--- /dev/null
+++ b/e2e/appActions.js
@@ -0,0 +1,83 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2022, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * The fixtures in this file are to be used to consolidate common actions performed by the
+ * various test suites. The goal is only to avoid duplication of code across test suites and not to abstract
+ * away the underlying functionality of the application. For more about the App Action pattern, see /e2e/README.md)
+ *
+ * For example, if two functions are nearly identical in
+ * timer.e2e.spec.js and notebook.e2e.spec.js, that function should be generalized and moved into this file.
+ */
+
+/**
+ * This common function creates a `domainObject` with default options. It is the preferred way of creating objects
+ * in the e2e suite when uninterested in properties of the objects themselves.
+ * @param {import('@playwright/test').Page} page
+ * @param {string} type
+ * @param {string | undefined} name
+ */
+async function createDomainObjectWithDefaults(page, type, name) {
+    //Click the Create button
+    await page.click('button:has-text("Create")');
+
+    // Click the object specified by 'type'
+    await page.click(`text=${type}`);
+
+    // Modify the name input field of the domain object to accept 'name'
+    if (name) {
+        const nameInput = page.locator('input[type="text"]').nth(2);
+        await nameInput.fill("");
+        await nameInput.fill(name);
+    }
+
+    // Click OK button and wait for Navigate event
+    await Promise.all([
+        page.waitForNavigation({waitUntil: 'networkidle'}),
+        page.click('text=OK')
+    ]);
+}
+
+/**
+* Open the given `domainObject`'s context menu from the object tree.
+* Expands the 'My Items' folder if it is not already expanded.
+* @param {import('@playwright/test').Page} page
+* @param {string} myItemsFolderName the name of the "My Items" folder
+* @param {string} domainObjectName the display name of the `domainObject`
+*/
+async function openObjectTreeContextMenu(page, myItemsFolderName, domainObjectName) {
+    const myItemsFolder = page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3);
+    const className = await myItemsFolder.getAttribute('class');
+    if (!className.includes('c-disclosure-triangle--expanded')) {
+        await myItemsFolder.click();
+    }
+
+    await page.locator(`a:has-text("${domainObjectName}")`).click({
+        button: 'right'
+    });
+}
+
+// eslint-disable-next-line no-undef
+module.exports = {
+    createDomainObjectWithDefaults,
+    openObjectTreeContextMenu
+};
diff --git a/e2e/baseFixtures.js b/e2e/baseFixtures.js
new file mode 100644
index 0000000000..298d965221
--- /dev/null
+++ b/e2e/baseFixtures.js
@@ -0,0 +1,174 @@
+/* eslint-disable no-undef */
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2022, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * This file is dedicated to extending the base functionality of the `@playwright/test` framework.
+ * The functions in this file should be viewed as temporary or a shim to be removed as the RFEs in
+ * the Playwright GitHub repo are implemented. Functions which serve those RFEs are marked with corresponding
+ * GitHub issues.
+ */
+
+const base = require('@playwright/test');
+const { expect } = base;
+const fs = require('fs');
+const path = require('path');
+const { v4: uuid } = require('uuid');
+const sinon = require('sinon');
+
+/**
+ * Takes a `ConsoleMessage` and returns a formatted string. Used to enable console log error detection.
+ * @see {@link https://github.com/microsoft/playwright/discussions/11690 Github Discussion}
+ * @private
+ * @param {import('@playwright/test').ConsoleMessage} msg
+ * @returns {String} formatted string with message type, text, url, and line and column numbers
+ */
+function _consoleMessageToString(msg) {
+    const { url, lineNumber, columnNumber } = msg.location();
+
+    return `[${msg.type()}] ${msg.text()} at (${url} ${lineNumber}:${columnNumber})`;
+}
+
+/**
+ * Wait for all animations within the given element and subtrees to finish. Useful when
+ * verifying that css transitions have completed.
+ * @see {@link https://github.com/microsoft/playwright/issues/15660 Github RFE}
+ * @param {import('@playwright/test').Locator} locator
+ * @return {Promise<Animation[]>}
+ */
+function waitForAnimations(locator) {
+    return locator
+        .evaluate((element) =>
+            Promise.all(
+                element
+                    .getAnimations({ subtree: true })
+                    .map((animation) => animation.finished)));
+}
+
+/**
+ * This is part of our codecoverage shim.
+ * @see {@link https://github.com/mxschmitt/playwright-test-coverage Github Example Project}
+ * @constant {string}
+ */
+const istanbulCLIOutput = path.join(process.cwd(), '.nyc_output');
+
+exports.test = base.test.extend({
+    /**
+     * This allows the test to manipulate the browser clock. This is useful for Visual and Snapshot tests which need
+     * the Time Indicator Clock to be in a specific state.
+     * Usage:
+     * ```
+     * test.use({
+     *   clockOptions: {
+     *       now: 0,
+     *       shouldAdvanceTime: true
+     * ```
+     * If clockOptions are provided, will override the default clock with fake timers provided by SinonJS.
+     *
+     * Default: `undefined`
+     *
+     * @see {@link https://github.com/microsoft/playwright/issues/6347 Github RFE}
+     * @see {@link https://github.com/sinonjs/fake-timers/#var-clock--faketimersinstallconfig SinonJS FakeTimers Config}
+     */
+    clockOptions: [undefined, { option: true }],
+    overrideClock: [async ({ context, clockOptions }, use) => {
+        if (clockOptions !== undefined) {
+            await context.addInitScript({
+                path: path.join(__dirname, '../', './node_modules/sinon/pkg/sinon.js')
+            });
+            await context.addInitScript((options) => {
+                window.__clock = sinon.useFakeTimers(options);
+            }, clockOptions);
+        }
+
+        await use(context);
+    }, {
+        auto: true,
+        scope: 'test'
+    }],
+    /**
+     * Extends the base context class to add codecoverage shim.
+     * @see {@link https://github.com/mxschmitt/playwright-test-coverage Github Project}
+     */
+    context: async ({ context }, use) => {
+        await context.addInitScript(() =>
+            window.addEventListener('beforeunload', () =>
+                (window).collectIstanbulCoverage(JSON.stringify((window).__coverage__))
+            )
+        );
+        await fs.promises.mkdir(istanbulCLIOutput, { recursive: true });
+        await context.exposeFunction('collectIstanbulCoverage', (coverageJSON) => {
+            if (coverageJSON) {
+                fs.writeFileSync(path.join(istanbulCLIOutput, `playwright_coverage_${uuid()}.json`), coverageJSON);
+            }
+        });
+
+        await use(context);
+        for (const page of context.pages()) {
+            await page.evaluate(() => (window).collectIstanbulCoverage(JSON.stringify((window).__coverage__)));
+        }
+    },
+    /**
+     * If true, will assert against any console.error calls that occur during the test. Assertions occur
+     * during test teardown (after the test has completed).
+     *
+     * Default: `true`
+     */
+    failOnConsoleError: [true, { option: true }],
+    /**
+     * Extends the base page class to enable console log error detection.
+     * @see {@link https://github.com/microsoft/playwright/discussions/11690 Github Discussion}
+     */
+    page: async ({ page, failOnConsoleError }, use) => {
+        // Capture any console errors during test execution
+        const messages = [];
+        page.on('console', (msg) => messages.push(msg));
+
+        await use(page);
+
+        // Assert against console errors during teardown
+        if (failOnConsoleError) {
+            messages.forEach(
+                msg => expect.soft(msg.type(), `Console error detected: ${_consoleMessageToString(msg)}`).not.toEqual('error')
+            );
+        }
+    },
+    /**
+     * Extends the base browser class to enable CDP connection definition in playwright.config.js. Once
+     * that RFE is implemented, this function can be removed.
+     * @see {@link https://github.com/microsoft/playwright/issues/8379 Github RFE}
+     */
+    browser: async ({ playwright, browser }, use, workerInfo) => {
+        // Use browserless if configured
+        if (workerInfo.project.name.match(/browserless/)) {
+            const vBrowser = await playwright.chromium.connectOverCDP({
+                endpointURL: 'ws://localhost:3003'
+            });
+            await use(vBrowser);
+        } else {
+            // Use Local Browser for testing.
+            await use(browser);
+        }
+    }
+});
+exports.expect = expect;
+exports.waitForAnimations = waitForAnimations;
diff --git a/e2e/commonActions.js b/e2e/commonActions.js
deleted file mode 100644
index 13bfb9b90b..0000000000
--- a/e2e/commonActions.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Wait for all animations within the given element and subtrees to finish
- * See: https://github.com/microsoft/playwright/issues/15660#issuecomment-1184911658
- * @param {import('@playwright/test').Locator} locator
- */
-function waitForAnimations(locator) {
-    return locator
-        .evaluate((element) =>
-            Promise.all(
-                element
-                    .getAnimations({ subtree: true })
-                    .map((animation) => animation.finished)));
-}
-
-// eslint-disable-next-line no-undef
-module.exports = {
-    waitForAnimations
-};
diff --git a/e2e/fixtures.js b/e2e/fixtures.js
deleted file mode 100644
index ce46de5bbf..0000000000
--- a/e2e/fixtures.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/* This file extends the base functionality of the playwright test framework to enable
- * code coverage instrumentation, console log error detection and working with a 3rd
- * party Chrome-as-a-service extension called Browserless.
- */
-
-const base = require('@playwright/test');
-const { expect } = require('@playwright/test');
-const fs = require('fs');
-const path = require('path');
-const { v4: uuid } = require('uuid');
-
-/**
- * Takes a `ConsoleMessage` and returns a formatted string
- * @param {import('@playwright/test').ConsoleMessage} msg
- * @returns {String} formatted string with message type, text, url, and line and column numbers
- */
-function consoleMessageToString(msg) {
-    const { url, lineNumber, columnNumber } = msg.location();
-
-    return `[${msg.type()}] ${msg.text()}
-    at (${url} ${lineNumber}:${columnNumber})`;
-}
-
-//The following is based on https://github.com/mxschmitt/playwright-test-coverage
-// eslint-disable-next-line no-undef
-const istanbulCLIOutput = path.join(process.cwd(), '.nyc_output');
-
-// eslint-disable-next-line no-undef
-exports.test = base.test.extend({
-    //The following is based on https://github.com/mxschmitt/playwright-test-coverage
-    context: async ({ context }, use) => {
-        await context.addInitScript(() =>
-            window.addEventListener('beforeunload', () =>
-                (window).collectIstanbulCoverage(JSON.stringify((window).__coverage__))
-            )
-        );
-        await fs.promises.mkdir(istanbulCLIOutput, { recursive: true });
-        await context.exposeFunction('collectIstanbulCoverage', (coverageJSON) => {
-            if (coverageJSON) {
-                fs.writeFileSync(path.join(istanbulCLIOutput, `playwright_coverage_${uuid()}.json`), coverageJSON);
-            }
-        });
-        await use(context);
-        for (const page of context.pages()) {
-            await page.evaluate(() => (window).collectIstanbulCoverage(JSON.stringify((window).__coverage__)));
-        }
-    },
-    page: async ({ baseURL, page }, use) => {
-        const messages = [];
-        page.on('console', (msg) => messages.push(msg));
-        await use(page);
-        messages.forEach(
-            msg => expect.soft(msg.type(), `Console error detected: ${consoleMessageToString(msg)}`).not.toEqual('error')
-        );
-    },
-    browser: async ({ playwright, browser }, use, workerInfo) => {
-        // Use browserless if configured
-        if (workerInfo.project.name.match(/browserless/)) {
-            const vBrowser = await playwright.chromium.connectOverCDP({
-                endpointURL: 'ws://localhost:3003'
-            });
-            await use(vBrowser);
-        } else {
-            // Use Local Browser for testing.
-            await use(browser);
-        }
-    }
-});
-
diff --git a/e2e/tests/plugins/notebook/addInitRestrictedNotebook.js b/e2e/helper/addInitRestrictedNotebook.js
similarity index 91%
rename from e2e/tests/plugins/notebook/addInitRestrictedNotebook.js
rename to e2e/helper/addInitRestrictedNotebook.js
index dd303fb521..71917895a2 100644
--- a/e2e/tests/plugins/notebook/addInitRestrictedNotebook.js
+++ b/e2e/helper/addInitRestrictedNotebook.js
@@ -20,9 +20,9 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-// this will be called from the test suite with
+// This should be used to install the non-default Restricted Notebook plugin since it is not installed by default.
+// e.g.
 // await page.addInitScript({ path: path.join(__dirname, 'addInitRestrictedNotebook.js') });
-// it will install the RestrictedNotebook since it is not installed by default
 
 document.addEventListener('DOMContentLoaded', () => {
     const openmct = window.openmct;
diff --git a/e2e/tests/persistence/addNoneditableObject.js b/e2e/helper/addNoneditableObject.js
similarity index 100%
rename from e2e/tests/persistence/addNoneditableObject.js
rename to e2e/helper/addNoneditableObject.js
diff --git a/e2e/playwright-ci.config.js b/e2e/playwright-ci.config.js
index a0139f56bf..7e9bd0b9d8 100644
--- a/e2e/playwright-ci.config.js
+++ b/e2e/playwright-ci.config.js
@@ -9,7 +9,7 @@ const NUM_WORKERS = 2;
 
 /** @type {import('@playwright/test').PlaywrightTestConfig} */
 const config = {
-    retries: 3, //Retries 3 times for a total of 4. When running sharded and with maxFailures = 5, this should ensure that flake is managed without failing the full suite
+    retries: 2, //Retries 2 times for a total of 3 runs. When running sharded and with maxFailures = 5, this should ensure that flake is managed without failing the full suite
     testDir: 'tests',
     testIgnore: '**/*.perf.spec.js', //Ignore performance tests and define in playwright-perfromance.config.js
     timeout: 60 * 1000,
diff --git a/e2e/playwright-local.config.js b/e2e/playwright-local.config.js
index d79c702b19..87365fee2b 100644
--- a/e2e/playwright-local.config.js
+++ b/e2e/playwright-local.config.js
@@ -12,7 +12,10 @@ const config = {
     testIgnore: '**/*.perf.spec.js',
     timeout: 30 * 1000,
     webServer: {
-        command: 'cross-env NODE_ENV=test npm run start',
+        env: {
+            NODE_ENV: 'test'
+        },
+        command: 'npm run start',
         url: 'http://localhost:8080/#',
         timeout: 120 * 1000,
         reuseExistingServer: true
diff --git a/e2e/pluginFixtures.js b/e2e/pluginFixtures.js
new file mode 100644
index 0000000000..39ec388c34
--- /dev/null
+++ b/e2e/pluginFixtures.js
@@ -0,0 +1,125 @@
+/* eslint-disable no-undef */
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2022, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/**
+ * The file contains custom fixtures which extend the base functionality of the Playwright fixtures
+ * and appActions. These fixtures should be generalized across all plugins.
+ */
+
+const { test, expect } = require('./baseFixtures');
+const { createDomainObjectWithDefaults } = require('./appActions');
+
+/**
+ * @typedef {Object} ObjectCreateOptions
+ * @property {string} type
+ * @property {string} name
+ */
+
+/**
+ * Used to create a new domain object as a part of getOrCreateDomainObject.
+ * @type {Map<string, string>}
+ */
+const createdObjects = new Map();
+
+/**
+ * This action will create a domain object for the test to reference and return the uuid. If an object
+ * of a given name already exists, it will return the uuid of that object to the test instead of creating
+ * a new file. The intent is to move object creation out of test suites which are not explicitly worried
+ * about object creation, while providing a consistent interface to retrieving objects in a persistentContext.
+ * @param {import('@playwright/test').Page} page
+ * @param {ObjectCreateOptions} options
+ * @returns {Promise<string>} uuid of the domain object
+ */
+async function getOrCreateDomainObject(page, options) {
+    const { type, name } = options;
+    const objectName = name ? `${type}:${name}` : type;
+
+    if (createdObjects.has(objectName)) {
+        return createdObjects.get(objectName);
+    }
+
+    await createDomainObjectWithDefaults(page, type, name);
+
+    // Once object is created, get the uuid from the url
+    const uuid = await page.evaluate(() => {
+        return window.location.href.match(/[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/)[0];
+    });
+
+    createdObjects.set(objectName, uuid);
+
+    return uuid;
+}
+
+/**
+ * If provided, these options will be used to get or create the desired domain object before
+ * any tests or test hooks have run.
+ * The `uuid` of the `domainObject` will then be available to use within the scoped tests.
+ *
+ * ### Example:
+ * ```js
+ * test.describe("My test suite", () => {
+ *    test.use({ objectCreateOptions: { type: "Telemetry Table", name: "My Telemetry Table" }});
+ *    test("'My Telemetry Table' is created and provides a uuid", async ({ page, domainObject }) => {
+ *         const { uuid } = domainObject;
+ *         expect(uuid).toBeDefined();
+ *     }))
+ * });
+ * ```
+ * @type {ObjectCreateOptions}
+ */
+const objectCreateOptions = null;
+
+/**
+ * The name of the "My Items" folder in the domain object tree.
+ *
+ * Default: `"My Items"`
+ *
+ * @type {string}
+ */
+const myItemsFolderName = "My Items";
+
+exports.test = test.extend({
+    myItemsFolderName: [myItemsFolderName, { option: true }],
+    // eslint-disable-next-line no-shadow
+    openmctConfig: async ({ myItemsFolderName }, use) => {
+        await use({ myItemsFolderName });
+    },
+    objectCreateOptions: [objectCreateOptions, {option: true}],
+    // eslint-disable-next-line no-shadow
+    domainObject: [async ({ page, objectCreateOptions }, use) => {
+        // FIXME: This is a false-positive caused by a bug in the eslint-plugin-playwright rule.
+        // eslint-disable-next-line playwright/no-conditional-in-test
+        if (objectCreateOptions === null) {
+            await use(page);
+
+            return;
+        }
+
+        //Go to baseURL
+        await page.goto('./', { waitUntil: 'networkidle' });
+
+        const uuid = await getOrCreateDomainObject(page, objectCreateOptions);
+        await use({ uuid });
+    }, { auto: true }]
+});
+exports.expect = expect;
diff --git a/e2e/test-data/VisualTestData_storage.json b/e2e/test-data/VisualTestData_storage.json
index d059303264..2ee2eaf6cf 100644
--- a/e2e/test-data/VisualTestData_storage.json
+++ b/e2e/test-data/VisualTestData_storage.json
@@ -6,11 +6,11 @@
       "localStorage": [
         {
           "name": "tcHistory",
-          "value": "{\"utc\":[{\"start\":1654548551471,\"end\":1654550351471}]}"
+          "value": "{\"utc\":[{\"start\":1658617611983,\"end\":1658619411983}]}"
         },
         {
           "name": "mct",
-          "value": "{\"mine\":{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"527856c0-cced-4b64-bb19-f943432326d0\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"persisted\":1654550352296,\"modified\":1654550352296},\"527856c0-cced-4b64-bb19-f943432326d0\":{\"identifier\":{\"key\":\"527856c0-cced-4b64-bb19-f943432326d0\",\"namespace\":\"\"},\"name\":\"Unnamed Overlay Plot\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"ce88ce37-8bb9-45e1-a85b-bb7e3c8453b9\",\"namespace\":\"\"}],\"configuration\":{\"series\":[{\"identifier\":{\"key\":\"ce88ce37-8bb9-45e1-a85b-bb7e3c8453b9\",\"namespace\":\"\"}}],\"yAxis\":{},\"xAxis\":{}},\"modified\":1654550353356,\"location\":\"mine\",\"persisted\":1654550353357},\"ce88ce37-8bb9-45e1-a85b-bb7e3c8453b9\":{\"name\":\"Unnamed Sine Wave Generator\",\"type\":\"generator\",\"identifier\":{\"key\":\"ce88ce37-8bb9-45e1-a85b-bb7e3c8453b9\",\"namespace\":\"\"},\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":\"5000\"},\"modified\":1654550353350,\"location\":\"527856c0-cced-4b64-bb19-f943432326d0\",\"persisted\":1654550353350}}"
+          "value": "{\"mine\":{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"7fa5749b-8969-494c-9d85-c272516d333c\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"persisted\":1658619412848,\"modified\":1658619412848},\"7fa5749b-8969-494c-9d85-c272516d333c\":{\"identifier\":{\"key\":\"7fa5749b-8969-494c-9d85-c272516d333c\",\"namespace\":\"\"},\"name\":\"Unnamed Overlay Plot\",\"type\":\"telemetry.plot.overlay\",\"composition\":[{\"key\":\"67cbb9fc-af46-4148-b9e5-aea11179ae4b\",\"namespace\":\"\"}],\"configuration\":{\"series\":[{\"identifier\":{\"key\":\"67cbb9fc-af46-4148-b9e5-aea11179ae4b\",\"namespace\":\"\"}}]},\"modified\":1658619413566,\"location\":\"mine\",\"persisted\":1658619413567},\"67cbb9fc-af46-4148-b9e5-aea11179ae4b\":{\"name\":\"Unnamed Sine Wave Generator\",\"type\":\"generator\",\"identifier\":{\"key\":\"67cbb9fc-af46-4148-b9e5-aea11179ae4b\",\"namespace\":\"\"},\"telemetry\":{\"period\":10,\"amplitude\":1,\"offset\":0,\"dataRateInHz\":1,\"phase\":0,\"randomness\":0,\"loadDelay\":\"5000\"},\"modified\":1658619413552,\"location\":\"7fa5749b-8969-494c-9d85-c272516d333c\",\"persisted\":1658619413552}}"
         },
         {
           "name": "mct-tree-expanded",
diff --git a/e2e/test-data/recycled_local_storage.json b/e2e/test-data/recycled_local_storage.json
index 5026bca3bb..9f816a2278 100644
--- a/e2e/test-data/recycled_local_storage.json
+++ b/e2e/test-data/recycled_local_storage.json
@@ -6,11 +6,11 @@
       "localStorage": [
         {
           "name": "tcHistory",
-          "value": "{\"utc\":[{\"start\":1654537164464,\"end\":1654538964464},{\"start\":1652301954635,\"end\":1652303754635}]}"
+          "value": "{\"utc\":[{\"start\":1658617494563,\"end\":1658619294563},{\"start\":1658617090044,\"end\":1658618890044},{\"start\":1658616460484,\"end\":1658618260484},{\"start\":1658608882159,\"end\":1658610682159},{\"start\":1654537164464,\"end\":1654538964464},{\"start\":1652301954635,\"end\":1652303754635}]}"
         },
         {
           "name": "mct",
-          "value": "{\"mine\":{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"f64bea3b-58a7-4586-8c05-8b651e5f0bfd\",\"namespace\":\"\"},{\"key\":\"2d02a680-eb7e-4645-bba2-dd298f76efb8\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"persisted\":1654538965703,\"modified\":1654538965703},\"f64bea3b-58a7-4586-8c05-8b651e5f0bfd\":{\"name\":\"Unnamed Condition Set\",\"type\":\"conditionSet\",\"identifier\":{\"key\":\"f64bea3b-58a7-4586-8c05-8b651e5f0bfd\",\"namespace\":\"\"},\"configuration\":{\"conditionTestData\":[],\"conditionCollection\":[{\"isDefault\":true,\"id\":\"73f2d9ae-d1f3-4561-b7fc-ecd5df557249\",\"configuration\":{\"name\":\"Default\",\"output\":\"Default\",\"trigger\":\"all\",\"criteria\":[]},\"summary\":\"Default condition\"}]},\"composition\":[],\"telemetry\":{},\"modified\":1652303755999,\"location\":\"mine\",\"persisted\":1652303756002},\"2d02a680-eb7e-4645-bba2-dd298f76efb8\":{\"name\":\"Unnamed Condition Set\",\"type\":\"conditionSet\",\"identifier\":{\"key\":\"2d02a680-eb7e-4645-bba2-dd298f76efb8\",\"namespace\":\"\"},\"configuration\":{\"conditionTestData\":[],\"conditionCollection\":[{\"isDefault\":true,\"id\":\"4291d80c-303c-4d8d-85e1-10f012b864fb\",\"configuration\":{\"name\":\"Default\",\"output\":\"Default\",\"trigger\":\"all\",\"criteria\":[]},\"summary\":\"Default condition\"}]},\"composition\":[],\"telemetry\":{},\"modified\":1654538965702,\"location\":\"mine\",\"persisted\":1654538965702}}"
+          "value": "{\"mine\":{\"identifier\":{\"key\":\"mine\",\"namespace\":\"\"},\"name\":\"My Items\",\"type\":\"folder\",\"composition\":[{\"key\":\"f64bea3b-58a7-4586-8c05-8b651e5f0bfd\",\"namespace\":\"\"},{\"key\":\"2d02a680-eb7e-4645-bba2-dd298f76efb8\",\"namespace\":\"\"},{\"key\":\"72a5f66b-39a7-4f62-8c40-4a99a33d6a8e\",\"namespace\":\"\"},{\"key\":\"8e4d20f1-9a04-4de5-8db5-c7e08d27f70d\",\"namespace\":\"\"},{\"key\":\"3e294eae-6124-409b-a870-554d1bdcdd6f\",\"namespace\":\"\"},{\"key\":\"ec24d05d-5df5-4c96-9241-b73636cd19a9\",\"namespace\":\"\"}],\"location\":\"ROOT\",\"persisted\":1658619295366,\"modified\":1658619295366},\"f64bea3b-58a7-4586-8c05-8b651e5f0bfd\":{\"name\":\"Unnamed Condition Set\",\"type\":\"conditionSet\",\"identifier\":{\"key\":\"f64bea3b-58a7-4586-8c05-8b651e5f0bfd\",\"namespace\":\"\"},\"configuration\":{\"conditionTestData\":[],\"conditionCollection\":[{\"isDefault\":true,\"id\":\"73f2d9ae-d1f3-4561-b7fc-ecd5df557249\",\"configuration\":{\"name\":\"Default\",\"output\":\"Default\",\"trigger\":\"all\",\"criteria\":[]},\"summary\":\"Default condition\"}]},\"composition\":[],\"telemetry\":{},\"modified\":1652303755999,\"location\":\"mine\",\"persisted\":1652303756002},\"2d02a680-eb7e-4645-bba2-dd298f76efb8\":{\"name\":\"Unnamed Condition Set\",\"type\":\"conditionSet\",\"identifier\":{\"key\":\"2d02a680-eb7e-4645-bba2-dd298f76efb8\",\"namespace\":\"\"},\"configuration\":{\"conditionTestData\":[],\"conditionCollection\":[{\"isDefault\":true,\"id\":\"4291d80c-303c-4d8d-85e1-10f012b864fb\",\"configuration\":{\"name\":\"Default\",\"output\":\"Default\",\"trigger\":\"all\",\"criteria\":[]},\"summary\":\"Default condition\"}]},\"composition\":[],\"telemetry\":{},\"modified\":1654538965702,\"location\":\"mine\",\"persisted\":1654538965702},\"72a5f66b-39a7-4f62-8c40-4a99a33d6a8e\":{\"name\":\"Unnamed Condition Set\",\"type\":\"conditionSet\",\"identifier\":{\"key\":\"72a5f66b-39a7-4f62-8c40-4a99a33d6a8e\",\"namespace\":\"\"},\"configuration\":{\"conditionTestData\":[],\"conditionCollection\":[{\"isDefault\":true,\"id\":\"2b6bf89f-877b-42b8-acc1-a9a575efdbe1\",\"configuration\":{\"name\":\"Default\",\"output\":\"Default\",\"trigger\":\"all\",\"criteria\":[]},\"summary\":\"Default condition\"}]},\"composition\":[],\"telemetry\":{},\"modified\":1658610682787,\"location\":\"mine\",\"persisted\":1658610682787},\"8e4d20f1-9a04-4de5-8db5-c7e08d27f70d\":{\"name\":\"Unnamed Condition Set\",\"type\":\"conditionSet\",\"identifier\":{\"key\":\"8e4d20f1-9a04-4de5-8db5-c7e08d27f70d\",\"namespace\":\"\"},\"configuration\":{\"conditionTestData\":[],\"conditionCollection\":[{\"isDefault\":true,\"id\":\"b9a9c413-4b94-401d-b0c7-5e404f182616\",\"configuration\":{\"name\":\"Default\",\"output\":\"Default\",\"trigger\":\"all\",\"criteria\":[]},\"summary\":\"Default condition\"}]},\"composition\":[],\"telemetry\":{},\"modified\":1658618261112,\"location\":\"mine\",\"persisted\":1658618261112},\"3e294eae-6124-409b-a870-554d1bdcdd6f\":{\"name\":\"Unnamed Condition Set\",\"type\":\"conditionSet\",\"identifier\":{\"key\":\"3e294eae-6124-409b-a870-554d1bdcdd6f\",\"namespace\":\"\"},\"configuration\":{\"conditionTestData\":[],\"conditionCollection\":[{\"isDefault\":true,\"id\":\"108043b1-9c88-4e1d-8deb-fbf2cdb528f9\",\"configuration\":{\"name\":\"Default\",\"output\":\"Default\",\"trigger\":\"all\",\"criteria\":[]},\"summary\":\"Default condition\"}]},\"composition\":[],\"telemetry\":{},\"modified\":1658618890910,\"location\":\"mine\",\"persisted\":1658618890910},\"ec24d05d-5df5-4c96-9241-b73636cd19a9\":{\"name\":\"Unnamed Condition Set\",\"type\":\"conditionSet\",\"identifier\":{\"key\":\"ec24d05d-5df5-4c96-9241-b73636cd19a9\",\"namespace\":\"\"},\"configuration\":{\"conditionTestData\":[],\"conditionCollection\":[{\"isDefault\":true,\"id\":\"4062bd9b-b788-43dd-ab0a-8fa10a78d4b3\",\"configuration\":{\"name\":\"Default\",\"output\":\"Default\",\"trigger\":\"all\",\"criteria\":[]},\"summary\":\"Default condition\"}]},\"composition\":[],\"telemetry\":{},\"modified\":1658619295363,\"location\":\"mine\",\"persisted\":1658619295363}}"
         },
         {
           "name": "mct-tree-expanded",
diff --git a/e2e/tests/framework.e2e.spec.js b/e2e/tests/framework/baseFixtures.e2e.spec.js
similarity index 84%
rename from e2e/tests/framework.e2e.spec.js
rename to e2e/tests/framework/baseFixtures.e2e.spec.js
index 0b109fb123..16b74a8863 100644
--- a/e2e/tests/framework.e2e.spec.js
+++ b/e2e/tests/framework/baseFixtures.e2e.spec.js
@@ -22,14 +22,14 @@
 
 /*
 This test suite is dedicated to testing our use of the playwright framework as it
-relates to how we've extended it (i.e. ./e2e/fixtures.js) and assumptions made in our dev environment
+relates to how we've extended it (i.e. ./e2e/baseFixtures.js) and assumptions made in our dev environment
 (app.js and ./e2e/webpack-dev-middleware.js)
 */
 
-const { test } = require('../fixtures.js');
+const { test } = require('../../baseFixtures.js');
 
-test.describe('fixtures.js tests', () => {
-    test('Verify that tests fail if console.error is thrown', async ({ page }) => {
+test.describe('baseFixtures tests', () => {
+    test('Verify that tests fail if console.error is thrown @framework', async ({ page }) => {
         test.fail();
         //Go to baseURL
         await page.goto('./', { waitUntil: 'networkidle' });
@@ -41,7 +41,7 @@ test.describe('fixtures.js tests', () => {
         ]);
 
     });
-    test('Verify that tests pass if console.warn is thrown', async ({ page }) => {
+    test('Verify that tests pass if console.warn is thrown @framework', async ({ page }) => {
         //Go to baseURL
         await page.goto('./', { waitUntil: 'networkidle' });
 
diff --git a/e2e/tests/framework/exampleTemplate.e2e.spec.js b/e2e/tests/framework/exampleTemplate.e2e.spec.js
new file mode 100644
index 0000000000..e1d28ca779
--- /dev/null
+++ b/e2e/tests/framework/exampleTemplate.e2e.spec.js
@@ -0,0 +1,124 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2022, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/*
+* This test suite template is to be used when creating new testsuites. It will be kept up to date with the latest improvements
+* made by the Open MCT team. It will also follow our best pratices as those evolve. Please use this structure as a _reference_ and clear
+* or update any references when creating a new test suite!
+*
+* To illustrate current best practices, we've included a mocked up test suite for Renaming a Timer domain object. In this example
+* this test suite should be cloned and renamed as /e2e/tests/plugins/timer/renameTimer.e2e.spec.js
+*
+* Demonstrated:
+* - Using appActions to leverage existing functions
+* - Structure
+* - @unstable annotation
+* - await, expect, test, describe syntax
+* - Writing a custom function for a test suite
+* - Test stub for unfinished test coverage (test.fixme)
+*
+* The structure should follow
+* 1. imports
+* 2. test.describe()
+* 3. -> test1
+*    -> test2
+*    -> test3(stub)
+* 4. Any custom functions
+*
+*/
+
+//Structure: Some standard Imports. Please update the required pathing
+const { test, expect } = require('../../baseFixtures');
+const { createDomainObjectWithDefaults } = require('../../appActions');
+
+// Structure: Try to keep a single describe block per logical groups of tests. If your test runtime exceeds 5 minutes or 500 lines, it's likely that it will need to be split.
+// Annotations: Please use the @unstable tag so that our automation can pick it up as a part of our test promotion pipeline.
+test.describe('Renaming Timer Object @unstable', () => {
+    //Create a testcase name which will be obvious when it fails in CI
+    test('Can create a new Timer object and rename it from actions Menu', async ({ page }) => {
+        //Open a browser, navigate to the main page, and wait until all networkevents to resolve
+        await page.goto('./', { waitUntil: 'networkidle' });
+        //We provide some helper functions in appActions like createDomainObjectWithDefaults. This example will create a Timer object
+        await createDomainObjectWithDefaults(page, 'Timer');
+        //Assert the object to be created and check it's name in the title
+        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Timer');
+
+        const newObjectName = "Renamed Timer";
+        //We've created an example of a shared function which pases the page and newObjectName values
+        await renameObjectFrom3DotMenu(page, newObjectName);
+
+        //Assert that the name has changed in the browser bar to the value we assigned above
+        await expect(page.locator('.l-browse-bar__object-name')).toContainText(newObjectName);
+
+    });
+    test('An existing Timer object can be renamed twice', async ({ page }) => {
+        //Open a browser, navigate to the main page, and wait until all networkevents to resolve
+        await page.goto('./', { waitUntil: 'networkidle' });
+        //We provide some helper functions in appActions like createDomainObjectWithDefaults. This example will create a Timer object
+        await createDomainObjectWithDefaults(page, 'Timer');
+        //Expect the object to be created and check it's name in the title
+        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Timer');
+
+        const newObjectName = "Renamed Timer";
+        const newObjectName2 = "Re-Renamed Timer";
+        //We've created an example of a shared function which pases the page and newObjectName values
+        await renameObjectFrom3DotMenu(page, newObjectName);
+
+        //Assert that the name has changed in the browser bar to the value we assigned above
+        await expect(page.locator('.l-browse-bar__object-name')).toContainText(newObjectName);
+
+        await renameObjectFrom3DotMenu(page, newObjectName2);
+
+        //Assert that the name has changed in the browser bar to the second value
+        await expect(page.locator('.l-browse-bar__object-name')).toContainText(newObjectName2);
+    });
+
+    //If you run out of time to write new tests, please stub in the missing tests in place with a test.fixme and BDD-style test steps. Someone will carry the baton!
+    test.fixme('Can Rename Timer Object from Tree', async ({ page }) => {
+        //Create a new object
+        //Copy this object
+        //Delete first object
+        //Expect copied object to persist
+    });
+});
+
+//Structure: custom functions should be declared last. We are leaning on JSDoc pretty heavily to describe functionality. It is not required, but heavily recommended.
+
+/**
+ * This is an example of a function which is shared between testcases in this test suite. When refactoring, we'll be looking
+ * for common functionality which makes sense to generalize for the entire test framework.
+ * @param {import('@playwright/test').Page} page
+ * @param {string} newNameForTimer New Name for object
+ */
+async function renameObjectFrom3DotMenu(page, newNameForTimer) {
+
+    // Click on 3 Dot Menu
+    await page.locator('button[title="More options"]').click();
+    // Click text=Edit Properties...
+    await page.locator('text=Edit Properties...').click();
+
+    // Rename the object with newNameForTimer variable which is passed into this function
+    await page.locator('text=Properties Title Notes >> input[type="text"]').fill(newNameForTimer);
+
+    // Click Ok button to Save
+    await page.locator('text=OK').click();
+}
diff --git a/e2e/tests/visual/generateVisualTestData.e2e.spec.js b/e2e/tests/framework/generateVisualTestData.e2e.spec.js
similarity index 90%
rename from e2e/tests/visual/generateVisualTestData.e2e.spec.js
rename to e2e/tests/framework/generateVisualTestData.e2e.spec.js
index f5f8273d9d..df6350d251 100644
--- a/e2e/tests/visual/generateVisualTestData.e2e.spec.js
+++ b/e2e/tests/framework/generateVisualTestData.e2e.spec.js
@@ -31,10 +31,11 @@ TODO: Provide additional validation of object properties as it grows.
 
 */
 
-const { test } = require('../../fixtures.js');
-const { expect } = require('@playwright/test');
+const { test, expect } = require('../../pluginFixtures.js');
+
+test('Generate Visual Test Data @localStorage', async ({ page, context, openmctConfig }) => {
+    const { myItemsFolderName } = openmctConfig;
 
-test('Generate Visual Test Data @localStorage', async ({ page, context }) => {
     //Go to baseURL
     await page.goto('./', { waitUntil: 'networkidle' });
 
@@ -43,9 +44,6 @@ test('Generate Visual Test Data @localStorage', async ({ page, context }) => {
     // add overlay plot with defaults
     await page.locator('li:has-text("Overlay Plot")').click();
 
-    // Click on My Items in Tree. Workaround for https://github.com/nasa/openmct/issues/5184
-    await page.click('form[name="mctForm"] a:has-text("My Items")');
-
     await Promise.all([
         page.waitForNavigation(),
         page.locator('text=OK').click(),
@@ -74,7 +72,7 @@ test('Generate Visual Test Data @localStorage', async ({ page, context }) => {
     ]);
 
     // focus the overlay plot
-    await page.locator('text=Open MCT My Items >> span').nth(3).click();
+    await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
     await Promise.all([
         page.waitForNavigation(),
         page.locator('text=Unnamed Overlay Plot').first().click()
diff --git a/e2e/tests/framework/pluginFixtures.e2e.spec.js b/e2e/tests/framework/pluginFixtures.e2e.spec.js
new file mode 100644
index 0000000000..1d8ffbe01b
--- /dev/null
+++ b/e2e/tests/framework/pluginFixtures.e2e.spec.js
@@ -0,0 +1,45 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2022, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/*
+This test suite is dedicated to testing our use of our custom fixtures to verify
+that they are working as expected.
+*/
+
+const { test, expect } = require('../../pluginFixtures.js');
+
+test.describe('pluginFixtures tests', () => {
+    test.use({ domainObjectName: 'Timer' });
+    let timerUUID;
+
+    test('Creates a timer object @framework @unstable', ({ domainObject }) => {
+        const { uuid } = domainObject;
+        const uuidRegexp = /[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/;
+        expect(uuid).toMatch(uuidRegexp);
+        timerUUID = uuid;
+    });
+
+    test('Provides same uuid for subsequent uses of the same object @framework', ({ domainObject }) => {
+        const { uuid } = domainObject;
+        expect(uuid).toEqual(timerUUID);
+    });
+});
diff --git a/e2e/tests/framework/testData.e2e.spec.js b/e2e/tests/framework/testData.e2e.spec.js
new file mode 100644
index 0000000000..37d30b2040
--- /dev/null
+++ b/e2e/tests/framework/testData.e2e.spec.js
@@ -0,0 +1,36 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2022, United States Government
+ * as represented by the Administrator of the National Aeronautics and Space
+ * Administration. All rights reserved.
+ *
+ * Open MCT is licensed under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0.
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ * Open MCT includes source code licensed under additional open source
+ * licenses. See the Open Source Licenses file (LICENSES.md) included with
+ * this source code distribution or the Licensing information page available
+ * at runtime from the About dialog for additional information.
+ *****************************************************************************/
+
+/*
+* This test suite template is to be used when verifying Test Data files found in /e2e/test-data/
+*/
+
+const { test } = require('../../baseFixtures');
+
+test.describe('recycled_local_storage @localStorage', () => {
+    //We may want to do some additional level of verification of this file. For now, we just verify that it exists and can be used in a test suite.
+    test.use({ storageState: './e2e/test-data/recycled_local_storage.json' });
+    test('Can use recycled_local_storage file', async ({ page }) => {
+        await page.goto('./', { waitUntil: 'networkidle' });
+    });
+});
+
diff --git a/e2e/tests/branding.e2e.spec.js b/e2e/tests/functional/branding.e2e.spec.js
similarity index 97%
rename from e2e/tests/branding.e2e.spec.js
rename to e2e/tests/functional/branding.e2e.spec.js
index 28e63eb332..473cb79e73 100644
--- a/e2e/tests/branding.e2e.spec.js
+++ b/e2e/tests/functional/branding.e2e.spec.js
@@ -24,8 +24,7 @@
 This test suite is dedicated to tests which verify branding related components.
 */
 
-const { test } = require('../fixtures.js');
-const { expect } = require('@playwright/test');
+const { test, expect } = require('../../baseFixtures.js');
 
 test.describe('Branding tests', () => {
     test('About Modal launches with basic branding properties', async ({ page }) => {
diff --git a/e2e/tests/example/eventGenerator.e2e.spec.js b/e2e/tests/functional/example/eventGenerator.e2e.spec.js
similarity index 52%
rename from e2e/tests/example/eventGenerator.e2e.spec.js
rename to e2e/tests/functional/example/eventGenerator.e2e.spec.js
index 0ee3099c78..bba8940b74 100644
--- a/e2e/tests/example/eventGenerator.e2e.spec.js
+++ b/e2e/tests/functional/example/eventGenerator.e2e.spec.js
@@ -24,40 +24,33 @@
 This test suite is dedicated to tests which verify the basic operations surrounding the example event generator.
 */
 
-const { test } = require('../../fixtures.js');
-const { expect } = require('@playwright/test');
+const { test, expect } = require('../../../baseFixtures');
+const { createDomainObjectWithDefaults } = require('../../../appActions');
 
-test.describe('Example Event Generator Operations', () => {
-    test('Can create example event generator with a name', async ({ page }) => {
+test.describe('Example Event Generator CRUD Operations', () => {
+    test('Can create a Test Event Generator and it results in the table View', async ({ page }) => {
         //Go to baseURL
         await page.goto('./', { waitUntil: 'networkidle' });
-        // let's make an event generator
-        await page.locator('button:has-text("Create")').click();
-        // Click li:has-text("Event Message Generator")
-        await page.locator('li:has-text("Event Message Generator")').click();
-        // Click text=Properties Title Notes >> input[type="text"]
-        await page.locator('text=Properties Title Notes >> input[type="text"]').click();
-        // Fill text=Properties Title Notes >> input[type="text"]
-        await page.locator('text=Properties Title Notes >> input[type="text"]').fill('Test Event Generator');
-        // Press Enter
-        await page.locator('text=Properties Title Notes >> input[type="text"]').press('Enter');
-        // Click text=OK
-        await Promise.all([
-            page.waitForNavigation({ url: /.*&view=table/ }),
-            page.locator('text=OK').click()
-        ]);
 
-        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Test Event Generator');
-        // Click button:has-text("Fixed Timespan")
-        await page.locator('button:has-text("Fixed Timespan")').click();
-    });
+        //Create a name for the object
+        const newObjectName = 'Test Event Generator';
 
-    test.fixme('telemetry is coming in for test event', async ({ page }) => {
-        // Go to object created in step one
-        // Verify the telemetry table is filled with > 1 row
-    });
-    test.fixme('telemetry is sorted by time ascending', async ({ page }) => {
-        // Go to object created in step one
-        // Verify the telemetry table has a class with "is-sorting asc"
+        await createDomainObjectWithDefaults(page, 'Event Message Generator', newObjectName);
+
+        //Assertions against newly created object which define standard behavior
+        await expect(page.waitForURL(/.*&view=table/)).toBeTruthy();
+        await expect(page.locator('.l-browse-bar__object-name')).toContainText(newObjectName);
+    });
+});
+
+test.describe('Example Event Generator Telemetry Event Verficiation', () => {
+
+    test.fixme('telemetry is coming in for test event', async ({ page }) => {
+    // Go to object created in step one
+    // Verify the telemetry table is filled with > 1 row
+    });
+    test.fixme('telemetry is sorted by time ascending', async ({ page }) => {
+    // Go to object created in step one
+    // Verify the telemetry table has a class with "is-sorting asc"
     });
 });
diff --git a/e2e/tests/example/generator/SinewaveLimitProvider.e2e.spec.js b/e2e/tests/functional/example/generator/sineWaveLimitProvider.e2e.spec.js
similarity index 98%
rename from e2e/tests/example/generator/SinewaveLimitProvider.e2e.spec.js
rename to e2e/tests/functional/example/generator/sineWaveLimitProvider.e2e.spec.js
index 9422a7350b..86d89272bb 100644
--- a/e2e/tests/example/generator/SinewaveLimitProvider.e2e.spec.js
+++ b/e2e/tests/functional/example/generator/sineWaveLimitProvider.e2e.spec.js
@@ -24,8 +24,7 @@
 This test suite is dedicated to tests which verify the basic operations surrounding conditionSets.
 */
 
-const { test } = require('../../../fixtures.js');
-const { expect } = require('@playwright/test');
+const { test, expect } = require('../../../../baseFixtures');
 
 test.describe('Sine Wave Generator', () => {
     test('Create new Sine Wave Generator Object and validate create Form Logic', async ({ page, browserName }) => {
diff --git a/e2e/tests/api/forms/forms.e2e.spec.js b/e2e/tests/functional/forms.e2e.spec.js
similarity index 53%
rename from e2e/tests/api/forms/forms.e2e.spec.js
rename to e2e/tests/functional/forms.e2e.spec.js
index 8fbb5b26ab..9da49274ac 100644
--- a/e2e/tests/api/forms/forms.e2e.spec.js
+++ b/e2e/tests/functional/forms.e2e.spec.js
@@ -21,57 +21,80 @@
  *****************************************************************************/
 
 /*
-This test suite is dedicated to tests which verify form functionality.
+This test suite is dedicated to tests which verify form functionality in isolation
 */
 
-const { test, expect } = require('@playwright/test');
+const { test, expect } = require('../../baseFixtures');
+const path = require('path');
 
 const TEST_FOLDER = 'test folder';
 
-test.describe('forms set', () => {
-    test('New folder form has title as required field', async ({ page }) => {
+test.describe('Form Validation Behavior', () => {
+    test('Required Field indicators appear if title is empty and can be corrected', async ({ page }) => {
         //Go to baseURL
         await page.goto('./', { waitUntil: 'networkidle' });
 
-        // Click button:has-text("Create")
         await page.click('button:has-text("Create")');
-        // Click :nth-match(:text("Folder"), 2)
         await page.click(':nth-match(:text("Folder"), 2)');
-        // Click text=Properties Title Notes >> input[type="text"]
+
+        // Fill in empty string into title and trigger validation with 'Tab'
         await page.click('text=Properties Title Notes >> input[type="text"]');
-        // Fill text=Properties Title Notes >> input[type="text"]
         await page.fill('text=Properties Title Notes >> input[type="text"]', '');
-        // Press Tab
         await page.press('text=Properties Title Notes >> input[type="text"]', 'Tab');
 
-        const okButton = page.locator('text=OK');
-
-        await expect(okButton).toBeDisabled();
+        //Required Field Form Validation
+        await expect(page.locator('text=OK')).toBeDisabled();
         await expect(page.locator('.c-form-row__state-indicator').first()).toHaveClass(/invalid/);
 
-        // Click text=Properties Title Notes >> input[type="text"]
+        //Correct Form Validation for missing title and trigger validation with 'Tab'
         await page.click('text=Properties Title Notes >> input[type="text"]');
-        // Fill text=Properties Title Notes >> input[type="text"]
         await page.fill('text=Properties Title Notes >> input[type="text"]', TEST_FOLDER);
-        // Press Tab
         await page.press('text=Properties Title Notes >> input[type="text"]', 'Tab');
 
+        //Required Field Form Validation is corrected
+        await expect(page.locator('text=OK')).toBeEnabled();
         await expect(page.locator('.c-form-row__state-indicator').first()).not.toHaveClass(/invalid/);
 
-        // Click text=OK
+        //Finish Creating Domain Object
         await Promise.all([
             page.waitForNavigation(),
             page.click('text=OK')
         ]);
 
+        //Verify that the Domain Object has been created with the corrected title property
         await expect(page.locator('.l-browse-bar__object-name')).toContainText(TEST_FOLDER);
     });
-    test.fixme('Create all object types and verify correctness', async ({ page }) => {
-        //Create the following Domain Objects with their unique Object Types
-        // Sine Wave Generator (number object)
-        // Timer Object
-        // Plan View Object
-        // Clock Object
-        // Hyperlink
+});
+
+test.describe('Persistence operations @addInit', () => {
+    // add non persistable root item
+    test.beforeEach(async ({ page }) => {
+        // eslint-disable-next-line no-undef
+        await page.addInitScript({ path: path.join(__dirname, '../../helper', 'addNoneditableObject.js') });
+    });
+
+    test('Persistability should be respected in the create form location field', async ({ page }) => {
+        test.info().annotations.push({
+            type: 'issue',
+            description: 'https://github.com/nasa/openmct/issues/4323'
+        });
+        await page.goto('./', { waitUntil: 'networkidle' });
+
+        await page.click('button:has-text("Create")');
+
+        await page.click('text=Condition Set');
+
+        await page.locator('form[name="mctForm"] >> text=Persistence Testing').click();
+
+        const okButton = page.locator('button:has-text("OK")');
+        await expect(okButton).toBeDisabled();
     });
 });
+
+test.describe('Form Correctness by Object Type', () => {
+    test.fixme('Verify correct behavior of number object (SWG)', async ({page}) => {});
+    test.fixme('Verify correct behavior of number object Timer', async ({page}) => {});
+    test.fixme('Verify correct behavior of number object Plan View', async ({page}) => {});
+    test.fixme('Verify correct behavior of number object Clock', async ({page}) => {});
+    test.fixme('Verify correct behavior of number object Hyperlink', async ({page}) => {});
+});
diff --git a/e2e/tests/persistence/persistability.e2e.spec.js b/e2e/tests/functional/menu.e2e.spec.js
similarity index 56%
rename from e2e/tests/persistence/persistability.e2e.spec.js
rename to e2e/tests/functional/menu.e2e.spec.js
index f8301d769e..9dca46cba7 100644
--- a/e2e/tests/persistence/persistability.e2e.spec.js
+++ b/e2e/tests/functional/menu.e2e.spec.js
@@ -21,46 +21,23 @@
  *****************************************************************************/
 
 /*
-This test suite is dedicated to tests which verify the basic operations surrounding conditionSets.
+This test suite is dedicated to tests which verify persistability checks
 */
 
-const { test } = require('../../fixtures.js');
-const { expect } = require('@playwright/test');
+const { test, expect } = require('../../baseFixtures.js');
+
 const path = require('path');
 
 test.describe('Persistence operations @addInit', () => {
     // add non persistable root item
     test.beforeEach(async ({ page }) => {
         // eslint-disable-next-line no-undef
-        await page.addInitScript({ path: path.join(__dirname, 'addNoneditableObject.js') });
+        await page.addInitScript({ path: path.join(__dirname, '../../helper', 'addNoneditableObject.js') });
     });
 
-    test('Persistability should be respected in the create form location field', async ({ page }) => {
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/4323'
-        });
-        // Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        // Click the Create button
-        await page.click('button:has-text("Create")');
-
-        // Click text=Condition Set
-        await page.click('text=Condition Set');
-
-        // Click form[name="mctForm"] >> text=Persistence Testing
-        await page.locator('form[name="mctForm"] >> text=Persistence Testing').click();
-
-        // Check that "OK" button is disabled
-        const okButton = page.locator('button:has-text("OK")');
-        await expect(okButton).toBeDisabled();
-    });
     test('Non-persistable objects should not show persistence related actions', async ({ page }) => {
-        // Go to baseURL
         await page.goto('./', { waitUntil: 'networkidle' });
 
-        // Click text=Persistence Testing >> nth=0
         await page.locator('text=Persistence Testing').first().click({
             button: 'right'
         });
@@ -70,11 +47,4 @@ test.describe('Persistence operations @addInit', () => {
         await expect.soft(menuOptions).toContainText(['Open In New Tab', 'View', 'Create Link']);
         await expect(menuOptions).not.toContainText(['Move', 'Duplicate', 'Remove', 'Add New Folder', 'Edit Properties...', 'Export as JSON', 'Import from JSON']);
     });
-    test.fixme('Cannot move a previously created domain object to non-peristable boject in Move Modal', async ({ page }) => {
-        //Create a domain object
-        //Save Domain object
-        //Move Object and verify that cannot select non-persistable object
-        //Move Object to My Items
-        //Verify successful move
-    });
 });
diff --git a/e2e/tests/moveObjects.e2e.spec.js b/e2e/tests/functional/moveObjects.e2e.spec.js
similarity index 82%
rename from e2e/tests/moveObjects.e2e.spec.js
rename to e2e/tests/functional/moveObjects.e2e.spec.js
index 864a0ad510..f11f8c7b23 100644
--- a/e2e/tests/moveObjects.e2e.spec.js
+++ b/e2e/tests/functional/moveObjects.e2e.spec.js
@@ -24,11 +24,12 @@
 This test suite is dedicated to tests which verify the basic operations surrounding moving objects.
 */
 
-const { test } = require('../fixtures.js');
-const { expect } = require('@playwright/test');
+const { test, expect } = require('../../pluginFixtures');
 
 test.describe('Move item tests', () => {
-    test('Create a basic object and verify that it can be moved to another folder', async ({ page }) => {
+    test('Create a basic object and verify that it can be moved to another folder', async ({ page, openmctConfig }) => {
+        const { myItemsFolderName } = openmctConfig;
+
         // Go to Open MCT
         await page.goto('./');
 
@@ -66,21 +67,23 @@ test.describe('Move item tests', () => {
         await page.waitForSelector('.c-message-banner__message', { state: 'detached'});
 
         // Move Folder 2 from Folder 1 to My Items
-        await page.locator('text=Open MCT My Items >> span').nth(3).click();
+        await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
         await page.locator('.c-tree__scrollable div div:nth-child(2) .c-tree__item .c-tree__item__view-control').click();
 
         await page.locator(`a:has-text("${folder2}")`).click({
             button: 'right'
         });
         await page.locator('li.icon-move').click();
-        await page.locator('form[name="mctForm"] >> text=My Items').click();
+        await page.locator(`form[name="mctForm"] >> text=${myItemsFolderName}`).click();
 
         await page.locator('text=OK').click();
 
         // Expect that Folder 2 is in My Items, the root folder
-        expect(page.locator(`text=My Items >> nth=0:has(text=${folder2})`)).toBeTruthy();
+        expect(page.locator(`text=${myItemsFolderName} >> nth=0:has(text=${folder2})`)).toBeTruthy();
     });
-    test('Create a basic object and verify that it cannot be moved to telemetry object without Composition Provider', async ({ page }) => {
+    test('Create a basic object and verify that it cannot be moved to telemetry object without Composition Provider', async ({ page, openmctConfig }) => {
+        const { myItemsFolderName } = openmctConfig;
+
         // Go to Open MCT
         await page.goto('./');
 
@@ -111,11 +114,11 @@ test.describe('Move item tests', () => {
         expect.soft(okButtonStateDisabled).toBeTruthy();
 
         // Continue test regardless of assertion and create it in My Items
-        await page.locator('form[name="mctForm"] >> text=My Items').click();
+        await page.locator(`form[name="mctForm"] >> text=${myItemsFolderName}`).click();
         await page.locator('text=OK').click();
 
         // Open My Items
-        await page.locator('text=Open MCT My Items >> span').nth(3).click();
+        await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
 
         // Select Folder Object and select Move from context menu
         await Promise.all([
@@ -128,10 +131,18 @@ test.describe('Move item tests', () => {
         await page.locator('li.icon-move').click();
 
         // See if it's possible to put the folder in the Telemetry object after creation
-        await page.locator('text=Location Open MCT My Items >> span').nth(3).click();
+        await page.locator(`text=Location Open MCT ${myItemsFolderName} >> span`).nth(3).click();
         await page.locator(`form[name="mctForm"] >> text=${telemetryTable}`).click();
         let okButton2 = await page.locator('button.c-button.c-button--major:has-text("OK")');
         let okButtonStateDisabled2 = await okButton2.isDisabled();
         expect(okButtonStateDisabled2).toBeTruthy();
     });
 });
+
+test.fixme('Cannot move a previously created domain object to non-peristable object in Move Modal', async ({ page }) => {
+    //Create a domain object
+    //Save Domain object
+    //Move Object and verify that cannot select non-persistable object
+    //Move Object to My Items
+    //Verify successful move
+});
diff --git a/e2e/tests/plugins/clock/Clock.e2e.spec.js b/e2e/tests/functional/plugins/clocks/clock.e2e.spec.js
similarity index 95%
rename from e2e/tests/plugins/clock/Clock.e2e.spec.js
rename to e2e/tests/functional/plugins/clocks/clock.e2e.spec.js
index 878e7a0d02..cecdb30b47 100644
--- a/e2e/tests/plugins/clock/Clock.e2e.spec.js
+++ b/e2e/tests/functional/plugins/clocks/clock.e2e.spec.js
@@ -24,10 +24,9 @@
 This test suite is dedicated to tests which verify the basic operations surrounding Clock.
 */
 
-const { test } = require('../../../fixtures.js');
-const { expect } = require('@playwright/test');
+const { test, expect } = require('../../../../baseFixtures');
 
-test.describe('Clock Generator', () => {
+test.describe('Clock Generator CRUD Operations', () => {
 
     test('Timezone dropdown will collapse when clicked outside or on dropdown icon again', async ({ page }) => {
         test.info().annotations.push({
diff --git a/e2e/tests/plugins/remoteClock/remoteClock.e2e.spec.js b/e2e/tests/functional/plugins/clocks/remoteClock.e2e.spec.js
similarity index 93%
rename from e2e/tests/plugins/remoteClock/remoteClock.e2e.spec.js
rename to e2e/tests/functional/plugins/clocks/remoteClock.e2e.spec.js
index f9167d9e4e..648060d713 100644
--- a/e2e/tests/plugins/remoteClock/remoteClock.e2e.spec.js
+++ b/e2e/tests/functional/plugins/clocks/remoteClock.e2e.spec.js
@@ -20,9 +20,9 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-const { test } = require('../../../fixtures.js');
+// FIXME: Remove this eslint exception once tests are implemented
 // eslint-disable-next-line no-unused-vars
-const { expect } = require('@playwright/test');
+const { test, expect } = require('../../../../baseFixtures');
 
 test.describe('Remote Clock', () => {
     // eslint-disable-next-line require-await
diff --git a/e2e/tests/plugins/condition/condition.e2e.spec.js b/e2e/tests/functional/plugins/conditionSet/conditionSet.e2e.spec.js
similarity index 95%
rename from e2e/tests/plugins/condition/condition.e2e.spec.js
rename to e2e/tests/functional/plugins/conditionSet/conditionSet.e2e.spec.js
index 790ebbf491..847f9b28a4 100644
--- a/e2e/tests/plugins/condition/condition.e2e.spec.js
+++ b/e2e/tests/functional/plugins/conditionSet/conditionSet.e2e.spec.js
@@ -26,26 +26,21 @@ suite is sharing state between tests which is considered an anti-pattern. Implim
 demonstrate some playwright for test developers. This pattern should not be re-used in other CRUD suites.
 */
 
-const { test } = require('../../../fixtures.js');
-const { expect } = require('@playwright/test');
+const { test, expect } = require('../../../../pluginFixtures.js');
 
 let conditionSetUrl;
 let getConditionSetIdentifierFromUrl;
 
 test.describe.serial('Condition Set CRUD Operations on @localStorage', () => {
     test.beforeAll(async ({ browser}) => {
+        //TODO: This needs to be refactored
         const context = await browser.newContext();
         const page = await context.newPage();
-        //Go to baseURL
         await page.goto('./', { waitUntil: 'networkidle' });
-
-        //Click the Create button
         await page.click('button:has-text("Create")');
 
-        // Click text=Condition Set
         await page.locator('li:has-text("Condition Set")').click();
 
-        // Click text=OK
         await Promise.all([
             page.waitForNavigation(),
             page.click('text=OK')
@@ -65,6 +60,7 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage', () => {
 
     //Load localStorage for subsequent tests
     test.use({ storageState: './e2e/test-data/recycled_local_storage.json' });
+
     //Begin suite of tests again localStorage
     test('Condition set object properties persist in main view and inspector @localStorage', async ({ page }) => {
         //Navigate to baseURL with injected localStorage
@@ -88,7 +84,9 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage', () => {
         expect.soft(page.locator('_vue=item.name=Unnamed Condition Set')).toBeTruthy();
 
     });
-    test('condition set object can be modified on @localStorage', async ({ page }) => {
+    test('condition set object can be modified on @localStorage', async ({ page, openmctConfig }) => {
+        const { myItemsFolderName } = openmctConfig;
+
         await page.goto(conditionSetUrl, { waitUntil: 'networkidle' });
 
         //Assertions on loaded Condition Set in main view. This is a stateful transition step after page.goto()
@@ -117,7 +115,7 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage', () => {
 
         // Verify Tree reflects updated Name proprety
         // Expand Tree
-        await page.locator('text=Open MCT My Items >> span >> nth=3').click();
+        await page.locator(`text=Open MCT ${myItemsFolderName} >> span >> nth=3`).click();
         // Verify Condition Set Object is renamed in Tree
         expect(page.locator('a:has-text("Renamed Condition Set")')).toBeTruthy();
         // Verify Search Tree reflects renamed Name property
@@ -141,7 +139,7 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage', () => {
 
         // Verify Tree reflects updated Name proprety
         // Expand Tree
-        await page.locator('text=Open MCT My Items >> span >> nth=3').click();
+        await page.locator(`text=Open MCT ${myItemsFolderName} >> span >> nth=3`).click();
         // Verify Condition Set Object is renamed in Tree
         expect(page.locator('a:has-text("Renamed Condition Set")')).toBeTruthy();
         // Verify Search Tree reflects renamed Name property
diff --git a/e2e/tests/plugins/imagery/exampleImagery.e2e.spec.js b/e2e/tests/functional/plugins/imagery/exampleImagery.e2e.spec.js
similarity index 97%
rename from e2e/tests/plugins/imagery/exampleImagery.e2e.spec.js
rename to e2e/tests/functional/plugins/imagery/exampleImagery.e2e.spec.js
index 48242975bf..3f78d620ac 100644
--- a/e2e/tests/plugins/imagery/exampleImagery.e2e.spec.js
+++ b/e2e/tests/functional/plugins/imagery/exampleImagery.e2e.spec.js
@@ -26,10 +26,8 @@ but only assume that example imagery is present.
 */
 /* globals process */
 
-const { test } = require('../../../fixtures.js');
-const { expect } = require('@playwright/test');
-const { waitForAnimations } = require('../../../commonActions.js');
-
+const { waitForAnimations } = require('../../../../baseFixtures');
+const { test, expect } = require('../../../../pluginFixtures');
 const backgroundImageSelector = '.c-imagery__main-image__background-image';
 const panHotkey = process.platform === 'linux' ? ['Control', 'Alt'] : ['Alt'];
 const expectedAltText = process.platform === 'linux' ? 'Ctrl+Alt drag to pan' : 'Alt drag to pan';
@@ -159,7 +157,7 @@ test.describe('Example Imagery Object', () => {
 
     });
 
-    test('Can use + - buttons to zoom on the image', async ({ page }) => {
+    test('Can use + - buttons to zoom on the image @unstable', async ({ page }) => {
         // Get initial image dimensions
         const initialBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
 
@@ -186,7 +184,7 @@ test.describe('Example Imagery Object', () => {
         expect(finalBoundingBox).toEqual(initialBoundingBox);
     });
 
-    test('Can use the reset button to reset the image', async ({ page }, testInfo) => {
+    test('Can use the reset button to reset the image @unstable', async ({ page }, testInfo) => {
         test.slow(testInfo.project === 'chrome-beta', "This test is slow in chrome-beta");
         // Get initial image dimensions
         const initialBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
@@ -229,8 +227,7 @@ test.describe('Example Imagery Object', () => {
 // ('Clicking on the left arrow should pause the imagery and go to previous image');
 // ('If the imagery view is in pause mode, it should not be updated when new images come in');
 // ('If the imagery view is not in pause mode, it should be updated when new images come in');
-test('Example Imagery in Display layout', async ({ page, browserName }) => {
-    test.fixme(browserName === 'firefox', 'This test needs to be updated to work with firefox');
+test('Example Imagery in Display layout @unstable', async ({ page }) => {
     test.info().annotations.push({
         type: 'issue',
         description: 'https://github.com/nasa/openmct/issues/5265'
@@ -439,7 +436,9 @@ test.describe('Example imagery thumbnails resize in display layouts', () => {
 // test.fixme('If the imagery view is in pause mode, images still come in');
 // test.fixme('If the imagery view is not in pause mode, it should be updated when new images come in');
 test.describe('Example Imagery in Flexible layout', () => {
-    test('Example Imagery in Flexible layout', async ({ page, browserName }) => {
+    test('Example Imagery in Flexible layout @unstable', async ({ page, browserName, openmctConfig }) => {
+        const { myItemsFolderName } = openmctConfig;
+
         test.fixme(browserName === 'firefox', 'This test needs to be updated to work with firefox');
         test.info().annotations.push({
             type: 'issue',
@@ -477,10 +476,10 @@ test.describe('Example Imagery in Flexible layout', () => {
         // Click text=Flexible Layout
         await page.click('text=Flexible Layout');
 
-        // Assert Flexable layout
+        // Assert Flexible layout
         await expect(page.locator('.js-form-title')).toHaveText('Create a New Flexible Layout');
 
-        await page.locator('form[name="mctForm"] >> text=My Items').click();
+        await page.locator(`form[name="mctForm"] >> text=${myItemsFolderName}`).click();
 
         // Click My Items
         await Promise.all([
@@ -513,7 +512,7 @@ test.describe('Example Imagery in Flexible layout', () => {
         await mouseZoomIn(page);
 
         // Center the mouse pointer
-        const zoomedBoundingBox = await await page.locator(backgroundImageSelector).boundingBox();
+        const zoomedBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
         const imageCenterX = zoomedBoundingBox.x + zoomedBoundingBox.width / 2;
         const imageCenterY = zoomedBoundingBox.y + zoomedBoundingBox.height / 2;
         await page.mouse.move(imageCenterX, imageCenterY);
diff --git a/e2e/tests/plugins/ExportAsJSON/exportAsJson.e2e.spec.js b/e2e/tests/functional/plugins/importAndExportAsJSON/exportAsJson.e2e.spec.js
similarity index 96%
rename from e2e/tests/plugins/ExportAsJSON/exportAsJson.e2e.spec.js
rename to e2e/tests/functional/plugins/importAndExportAsJSON/exportAsJson.e2e.spec.js
index 6da6c0287f..4e36221b68 100644
--- a/e2e/tests/plugins/ExportAsJSON/exportAsJson.e2e.spec.js
+++ b/e2e/tests/functional/plugins/importAndExportAsJSON/exportAsJson.e2e.spec.js
@@ -24,10 +24,9 @@
 This test suite is dedicated to tests which verify the basic operations surrounding exportAsJSON.
 */
 
-const { test } = require('../../../fixtures.js');
 // FIXME: Remove this eslint exception once tests are implemented
 // eslint-disable-next-line no-unused-vars
-const { expect } = require('@playwright/test');
+const { test, expect } = require('../../../../baseFixtures');
 
 test.describe('ExportAsJSON', () => {
     test.fixme('Create a basic object and verify that it can be exported as JSON from Tree', async ({ page }) => {
diff --git a/e2e/tests/plugins/ImportAsJSON/importAsJson.e2e.spec.js b/e2e/tests/functional/plugins/importAndExportAsJSON/importAsJson.e2e.spec.js
similarity index 94%
rename from e2e/tests/plugins/ImportAsJSON/importAsJson.e2e.spec.js
rename to e2e/tests/functional/plugins/importAndExportAsJSON/importAsJson.e2e.spec.js
index 6469e8f157..ad0ff3f6b1 100644
--- a/e2e/tests/plugins/ImportAsJSON/importAsJson.e2e.spec.js
+++ b/e2e/tests/functional/plugins/importAndExportAsJSON/importAsJson.e2e.spec.js
@@ -24,10 +24,9 @@
 This test suite is dedicated to tests which verify the basic operations surrounding importAsJSON.
 */
 
-const { test } = require('../../../fixtures.js');
 // FIXME: Remove this eslint exception once tests are implemented
 // eslint-disable-next-line no-unused-vars
-const { expect } = require('@playwright/test');
+const { test, expect } = require('../../../../baseFixtures');
 
 test.describe('ExportAsJSON', () => {
     test.fixme('Verify that domain object can be importAsJSON from Tree', async ({ page }) => {
diff --git a/e2e/tests/plugins/notebook/notebook.e2e.spec.js b/e2e/tests/functional/plugins/notebook/notebook.e2e.spec.js
similarity index 98%
rename from e2e/tests/plugins/notebook/notebook.e2e.spec.js
rename to e2e/tests/functional/plugins/notebook/notebook.e2e.spec.js
index 021946c875..0c33421814 100644
--- a/e2e/tests/plugins/notebook/notebook.e2e.spec.js
+++ b/e2e/tests/functional/plugins/notebook/notebook.e2e.spec.js
@@ -24,7 +24,9 @@
 This test suite is dedicated to tests which verify the basic operations surrounding Notebooks.
 */
 
-const { test } = require('../../../fixtures');
+// FIXME: Remove this eslint exception once tests are implemented
+// eslint-disable-next-line no-unused-vars
+const { test, expect } = require('../../../../baseFixtures');
 
 test.describe('Notebook CRUD Operations', () => {
     test.fixme('Can create a Notebook Object', async ({ page }) => {
diff --git a/e2e/tests/plugins/notebook/restrictedNotebook.e2e.spec.js b/e2e/tests/functional/plugins/notebook/restrictedNotebook.e2e.spec.js
similarity index 84%
rename from e2e/tests/plugins/notebook/restrictedNotebook.e2e.spec.js
rename to e2e/tests/functional/plugins/notebook/restrictedNotebook.e2e.spec.js
index c12bb94fd7..c076329d40 100644
--- a/e2e/tests/plugins/notebook/restrictedNotebook.e2e.spec.js
+++ b/e2e/tests/functional/plugins/notebook/restrictedNotebook.e2e.spec.js
@@ -20,8 +20,8 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-const { test } = require('../../../fixtures');
-const { expect } = require('@playwright/test');
+const { test, expect } = require('../../../../pluginFixtures');
+const { openObjectTreeContextMenu } = require('../../../../appActions');
 const path = require('path');
 
 const TEST_TEXT = 'Testing text for entries.';
@@ -38,15 +38,17 @@ test.describe('Restricted Notebook', () => {
         await expect(page.locator('.l-browse-bar__object-name')).toContainText(`Unnamed ${CUSTOM_NAME}`);
     });
 
-    test('Can be deleted if there are no locked pages @addInit', async ({ page }) => {
-        await openContextMenuRestrictedNotebook(page);
+    test('Can be deleted if there are no locked pages @addInit', async ({ page, openmctConfig }) => {
+        const { myItemsFolderName } = openmctConfig;
+
+        await openObjectTreeContextMenu(page, myItemsFolderName, `Unnamed ${CUSTOM_NAME}`);
 
         const menuOptions = page.locator('.c-menu ul');
         await expect.soft(menuOptions).toContainText('Remove');
 
         const restrictedNotebookTreeObject = page.locator(`a:has-text("Unnamed ${CUSTOM_NAME}")`);
 
-        // notbook tree object exists
+        // notebook tree object exists
         expect.soft(await restrictedNotebookTreeObject.count()).toEqual(1);
 
         // Click Remove Text
@@ -80,17 +82,13 @@ test.describe('Restricted Notebook with at least one entry and with the page loc
         await enterTextEntry(page);
         await lockPage(page);
 
-        // FIXME: Give ample time for the mutation to happen
-        // https://github.com/nasa/openmct/issues/5409
-        // eslint-disable-next-line playwright/no-wait-for-timeout
-        await page.waitForTimeout(1 * 1000);
-
         // open sidebar
         await page.locator('button.c-notebook__toggle-nav-button').click();
     });
 
-    test('Locked page should now be in a locked state @addInit', async ({ page }, testInfo) => {
+    test('Locked page should now be in a locked state @addInit @unstable', async ({ page, openmctConfig }, testInfo) => {
         test.fixme(testInfo.project === 'chrome-beta', "Test is unreliable on chrome-beta");
+        const { myItemsFolderName } = openmctConfig;
         // main lock message on page
         const lockMessage = page.locator('text=This page has been committed and cannot be modified or removed');
         expect.soft(await lockMessage.count()).toEqual(1);
@@ -100,7 +98,7 @@ test.describe('Restricted Notebook with at least one entry and with the page loc
         expect.soft(await pageLockIcon.count()).toEqual(1);
 
         // no way to remove a restricted notebook with a locked page
-        await openContextMenuRestrictedNotebook(page);
+        await openObjectTreeContextMenu(page, myItemsFolderName, `Unnamed ${CUSTOM_NAME}`);
         const menuOptions = page.locator('.c-menu ul');
 
         await expect(menuOptions).not.toContainText('Remove');
@@ -148,9 +146,10 @@ test.describe('Restricted Notebook with at least one entry and with the page loc
 
 test.describe('Restricted Notebook with a page locked and with an embed @addInit', () => {
 
-    test.beforeEach(async ({ page }) => {
+    test.beforeEach(async ({ page, openmctConfig }) => {
+        const { myItemsFolderName } = openmctConfig;
         await startAndAddRestrictedNotebookObject(page);
-        await dragAndDropEmbed(page);
+        await dragAndDropEmbed(page, myItemsFolderName);
     });
 
     test('Allows embeds to be deleted if page unlocked @addInit', async ({ page }) => {
@@ -177,12 +176,9 @@ test.describe('Restricted Notebook with a page locked and with an embed @addInit
  */
 async function startAndAddRestrictedNotebookObject(page) {
     // eslint-disable-next-line no-undef
-    await page.addInitScript({ path: path.join(__dirname, 'addInitRestrictedNotebook.js') });
-    //Go to baseURL
+    await page.addInitScript({ path: path.join(__dirname, '../../../../helper/', 'addInitRestrictedNotebook.js') });
     await page.goto('./', { waitUntil: 'networkidle' });
-    //Click the Create button
     await page.click('button:has-text("Create")');
-    // Click text=CUSTOME_NAME
     await page.click(`text=${CUSTOM_NAME}`); // secondarily tests renamability also
     // Click text=OK
     await Promise.all([
@@ -207,17 +203,17 @@ async function enterTextEntry(page) {
 /**
  * @param {import('@playwright/test').Page} page
  */
-async function dragAndDropEmbed(page) {
+async function dragAndDropEmbed(page, myItemsFolderName) {
     // Click button:has-text("Create")
     await page.locator('button:has-text("Create")').click();
     // Click li:has-text("Sine Wave Generator")
     await page.locator('li:has-text("Sine Wave Generator")').click();
     // Click form[name="mctForm"] >> text=My Items
-    await page.locator('form[name="mctForm"] >> text=My Items').click();
+    await page.locator(`form[name="mctForm"] >> text=${myItemsFolderName}`).click();
     // Click text=OK
     await page.locator('text=OK').click();
     // Click text=Open MCT My Items >> span >> nth=3
-    await page.locator('text=Open MCT My Items >> span').nth(3).click();
+    await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
     // Click text=Unnamed CUSTOM_NAME
     await Promise.all([
         page.waitForNavigation(),
@@ -237,19 +233,3 @@ async function lockPage(page) {
     //Wait until Lock Banner is visible
     await page.locator('text=Lock Page').click();
 }
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function openContextMenuRestrictedNotebook(page) {
-    const myItemsFolder = page.locator('text=Open MCT My Items >> span').nth(3);
-    const className = await myItemsFolder.getAttribute('class');
-    if (!className.includes('c-disclosure-triangle--expanded')) {
-        await myItemsFolder.click();
-    }
-
-    // Click a:has-text("Unnamed CUSTOM_NAME")
-    await page.locator(`a:has-text("Unnamed ${CUSTOM_NAME}")`).click({
-        button: 'right'
-    });
-}
diff --git a/e2e/tests/plugins/notebook/tags.e2e.spec.js b/e2e/tests/functional/plugins/notebook/tags.e2e.spec.js
similarity index 86%
rename from e2e/tests/plugins/notebook/tags.e2e.spec.js
rename to e2e/tests/functional/plugins/notebook/tags.e2e.spec.js
index 1b6064820e..aa8bd9e8a1 100644
--- a/e2e/tests/plugins/notebook/tags.e2e.spec.js
+++ b/e2e/tests/functional/plugins/notebook/tags.e2e.spec.js
@@ -24,15 +24,14 @@
 This test suite is dedicated to tests which verify form functionality.
 */
 
-const { expect } = require('@playwright/test');
-const { test } = require('../../../fixtures');
+const { test, expect } = require('../../../../pluginFixtures');
 
 /**
   * Creates a notebook object and adds an entry.
   * @param {import('@playwright/test').Page} - page to load
   * @param {number} [iterations = 1] - the number of entries to create
   */
-async function createNotebookAndEntry(page, iterations = 1) {
+async function createNotebookAndEntry(page, myItemsFolderName, iterations = 1) {
     //Go to baseURL
     await page.goto('./', { waitUntil: 'networkidle' });
 
@@ -42,7 +41,7 @@ async function createNotebookAndEntry(page, iterations = 1) {
     // Click button:has-text("OK")
     await Promise.all([
         page.waitForNavigation(),
-        page.locator('[name="mctForm"] >> text=My Items').click(),
+        page.locator(`[name="mctForm"] >> text=${myItemsFolderName}`).click(),
         page.locator('button:has-text("OK")').click()
     ]);
 
@@ -61,8 +60,8 @@ async function createNotebookAndEntry(page, iterations = 1) {
   * @param {import('@playwright/test').Page} page
   * @param {number} [iterations = 1] - the number of entries (and tags) to create
   */
-async function createNotebookEntryAndTags(page, iterations = 1) {
-    await createNotebookAndEntry(page, iterations);
+async function createNotebookEntryAndTags(page, myItemsFolderName, iterations = 1) {
+    await createNotebookAndEntry(page, myItemsFolderName, iterations);
 
     for (let iteration = 0; iteration < iterations; iteration++) {
         // Click text=To start a new entry, click here or drag and drop any object
@@ -83,8 +82,10 @@ async function createNotebookEntryAndTags(page, iterations = 1) {
 }
 
 test.describe('Tagging in Notebooks', () => {
-    test('Can load tags', async ({ page }) => {
-        await createNotebookAndEntry(page);
+    test('Can load tags', async ({ page, openmctConfig }) => {
+        const { myItemsFolderName } = openmctConfig;
+
+        await createNotebookAndEntry(page, myItemsFolderName);
         // Click text=To start a new entry, click here or drag and drop any object
         await page.locator('button:has-text("Add Tag")').click();
 
@@ -95,8 +96,10 @@ test.describe('Tagging in Notebooks', () => {
         await expect(page.locator('[aria-label="Autocomplete Options"]')).toContainText("Drilling");
         await expect(page.locator('[aria-label="Autocomplete Options"]')).toContainText("Driving");
     });
-    test('Can add tags', async ({ page }) => {
-        await createNotebookEntryAndTags(page);
+    test('Can add tags', async ({ page, openmctConfig }) => {
+        const { myItemsFolderName } = openmctConfig;
+
+        await createNotebookEntryAndTags(page, myItemsFolderName);
 
         await expect(page.locator('[aria-label="Notebook Entry"]')).toContainText("Science");
         await expect(page.locator('[aria-label="Notebook Entry"]')).toContainText("Driving");
@@ -110,8 +113,10 @@ test.describe('Tagging in Notebooks', () => {
         await expect(page.locator('[aria-label="Autocomplete Options"]')).not.toContainText("Driving");
         await expect(page.locator('[aria-label="Autocomplete Options"]')).toContainText("Drilling");
     });
-    test('Can search for tags', async ({ page }) => {
-        await createNotebookEntryAndTags(page);
+    test('Can search for tags', async ({ page, openmctConfig }) => {
+        const { myItemsFolderName } = openmctConfig;
+
+        await createNotebookEntryAndTags(page, myItemsFolderName);
         // Click [aria-label="OpenMCT Search"] input[type="search"]
         await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
         // Fill [aria-label="OpenMCT Search"] input[type="search"]
@@ -134,8 +139,10 @@ test.describe('Tagging in Notebooks', () => {
         await expect(page.locator('[aria-label="Search Result"]')).not.toBeVisible();
     });
 
-    test('Can delete tags', async ({ page }) => {
-        await createNotebookEntryAndTags(page);
+    test('Can delete tags', async ({ page, openmctConfig }) => {
+        const { myItemsFolderName } = openmctConfig;
+
+        await createNotebookEntryAndTags(page, myItemsFolderName);
         await page.locator('[aria-label="Notebook Entries"]').click();
         // Delete Driving
         await page.locator('text=Science Driving Add Tag >> button').nth(1).click();
@@ -147,7 +154,9 @@ test.describe('Tagging in Notebooks', () => {
         await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('sc');
         await expect(page.locator('[aria-label="Search Result"]')).not.toContainText("Driving");
     });
-    test('Tags persist across reload', async ({ page }) => {
+    test('Tags persist across reload', async ({ page, openmctConfig }) => {
+        const { myItemsFolderName } = openmctConfig;
+
         //Go to baseURL
         await page.goto('./', { waitUntil: 'networkidle' });
 
@@ -159,14 +168,14 @@ test.describe('Tagging in Notebooks', () => {
         // Click button:has-text("OK")
         await Promise.all([
             page.waitForNavigation(),
-            page.locator('[name="mctForm"] >> text=My Items').click(),
+            page.locator(`[name="mctForm"] >> text=${myItemsFolderName}`).click(),
             page.locator('button:has-text("OK")').click()
         ]);
 
         await page.click('.c-disclosure-triangle');
 
         const ITERATIONS = 4;
-        await createNotebookEntryAndTags(page, ITERATIONS);
+        await createNotebookEntryAndTags(page, myItemsFolderName, ITERATIONS);
 
         for (let iteration = 0; iteration < ITERATIONS; iteration++) {
             const entryLocator = `[aria-label="Notebook Entry"] >> nth = ${iteration}`;
diff --git a/e2e/tests/plugins/plot/autoscale.e2e.spec.js b/e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js
similarity index 93%
rename from e2e/tests/plugins/plot/autoscale.e2e.spec.js
rename to e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js
index 71e37980ed..643880056d 100644
--- a/e2e/tests/plugins/plot/autoscale.e2e.spec.js
+++ b/e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js
@@ -24,9 +24,7 @@
 Testsuite for plot autoscale.
 */
 
-const { test } = require('../../../fixtures.js');
-const { expect } = require('@playwright/test');
-
+const { test, expect } = require('../../../../pluginFixtures');
 test.use({
     viewport: {
         width: 1280,
@@ -35,7 +33,9 @@ test.use({
 });
 
 test.describe('ExportAsJSON', () => {
-    test('User can set autoscale with a valid range @snapshot', async ({ page }) => {
+    test('User can set autoscale with a valid range @snapshot', async ({ page, openmctConfig }) => {
+        const { myItemsFolderName } = openmctConfig;
+
         //This is necessary due to the size of the test suite.
         test.slow();
 
@@ -43,7 +43,7 @@ test.describe('ExportAsJSON', () => {
 
         await setTimeRange(page);
 
-        await createSinewaveOverlayPlot(page);
+        await createSinewaveOverlayPlot(page, myItemsFolderName);
 
         await testYTicks(page, ['-1.00', '-0.50', '0.00', '0.50', '1.00']);
 
@@ -103,8 +103,9 @@ async function setTimeRange(page, start = '2022-03-29 22:00:00.000Z', end = '202
 
 /**
  * @param {import('@playwright/test').Page} page
+ * @param {string} myItemsFolderName
  */
-async function createSinewaveOverlayPlot(page) {
+async function createSinewaveOverlayPlot(page, myItemsFolderName) {
     // click create button
     await page.locator('button:has-text("Create")').click();
 
@@ -140,7 +141,7 @@ async function createSinewaveOverlayPlot(page) {
     await page.waitForSelector('.c-message-banner__message', { state: 'detached'});
 
     // focus the overlay plot
-    await page.locator('text=Open MCT My Items >> span').nth(3).click();
+    await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
     await Promise.all([
         page.waitForNavigation(),
         page.locator('text=Unnamed Overlay Plot').first().click()
diff --git a/e2e/tests/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-darwin b/e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-darwin
similarity index 100%
rename from e2e/tests/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-darwin
rename to e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-darwin
diff --git a/e2e/tests/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-linux b/e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-linux
similarity index 100%
rename from e2e/tests/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-linux
rename to e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-linux
diff --git a/e2e/tests/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-darwin b/e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-darwin
similarity index 100%
rename from e2e/tests/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-darwin
rename to e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-darwin
diff --git a/e2e/tests/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-linux b/e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-linux
similarity index 100%
rename from e2e/tests/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-linux
rename to e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-linux
diff --git a/e2e/tests/plugins/plot/logPlot.e2e.spec.js b/e2e/tests/functional/plugins/plot/logPlot.e2e.spec.js
similarity index 95%
rename from e2e/tests/plugins/plot/logPlot.e2e.spec.js
rename to e2e/tests/functional/plugins/plot/logPlot.e2e.spec.js
index 9bca2af86e..c76bf82cc9 100644
--- a/e2e/tests/plugins/plot/logPlot.e2e.spec.js
+++ b/e2e/tests/functional/plugins/plot/logPlot.e2e.spec.js
@@ -25,15 +25,15 @@ Tests to verify log plot functionality. Note this test suite if very much under
 necessarily be used for reference when writing new tests in this area.
 */
 
-const { test } = require('../../../fixtures.js');
-const { expect } = require('@playwright/test');
-
+const { test, expect } = require('../../../../pluginFixtures');
 test.describe('Log plot tests', () => {
-    test('Log Plot ticks are functionally correct in regular and log mode and after refresh', async ({ page }) => {
+    test('Log Plot ticks are functionally correct in regular and log mode and after refresh', async ({ page, openmctConfig }) => {
+        const { myItemsFolderName } = openmctConfig;
+
         //Test.slow decorator is currently broken. Needs to be fixed in https://github.com/nasa/openmct/issues/5374
         test.slow();
 
-        await makeOverlayPlot(page);
+        await makeOverlayPlot(page, myItemsFolderName);
         await testRegularTicks(page);
         await enableEditMode(page);
         await enableLogMode(page);
@@ -48,8 +48,10 @@ test.describe('Log plot tests', () => {
 
     // Leaving test as 'TODO' for now.
     // NOTE: Not eligible for community contributions.
-    test.fixme('Verify that log mode option is reflected in import/export JSON', async ({ page }) => {
-        await makeOverlayPlot(page);
+    test.fixme('Verify that log mode option is reflected in import/export JSON', async ({ page, openmctConfig }) => {
+        const { myItemsFolderName } = openmctConfig;
+
+        await makeOverlayPlot(page, myItemsFolderName);
         await enableEditMode(page);
         await enableLogMode(page);
         await saveOverlayPlot(page);
@@ -67,8 +69,9 @@ test.describe('Log plot tests', () => {
 /**
  * Makes an overlay plot with a sine wave generator and clicks on the overlay plot in the sidebar so it is the active thing displayed.
  * @param {import('@playwright/test').Page} page
+ * @param {string} myItemsFolderName
  */
-async function makeOverlayPlot(page) {
+async function makeOverlayPlot(page, myItemsFolderName) {
     // fresh page with time range from 2022-03-29 22:00:00.000Z to 2022-03-29 22:00:30.000Z
     await page.goto('./', { waitUntil: 'networkidle' });
 
@@ -130,7 +133,7 @@ async function makeOverlayPlot(page) {
 
     // click on overlay plot
 
-    await page.locator('text=Open MCT My Items >> span').nth(3).click();
+    await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
     await Promise.all([
         page.waitForNavigation(),
         page.locator('text=Unnamed Overlay Plot').first().click()
diff --git a/e2e/tests/plugins/plot/missingPlotObj.e2e.spec.js b/e2e/tests/functional/plugins/plot/missingPlotObj.e2e.spec.js
similarity index 89%
rename from e2e/tests/plugins/plot/missingPlotObj.e2e.spec.js
rename to e2e/tests/functional/plugins/plot/missingPlotObj.e2e.spec.js
index cf8bef58aa..a30c308d48 100644
--- a/e2e/tests/plugins/plot/missingPlotObj.e2e.spec.js
+++ b/e2e/tests/functional/plugins/plot/missingPlotObj.e2e.spec.js
@@ -24,11 +24,12 @@
 Tests to verify log plot functionality when objects are missing
 */
 
-const { test } = require('../../../fixtures.js');
-const { expect } = require('@playwright/test');
+const { test, expect } = require('../../../../pluginFixtures');
 
 test.describe('Handle missing object for plots', () => {
-    test('Displays empty div for missing stacked plot item', async ({ page, browserName }) => {
+    test('Displays empty div for missing stacked plot item @unstable', async ({ page, browserName, openmctConfig }) => {
+        const { myItemsFolderName } = openmctConfig;
+
         test.fixme(browserName === 'firefox', 'Firefox failing due to console events being missed');
         const errorLogs = [];
 
@@ -39,7 +40,7 @@ test.describe('Handle missing object for plots', () => {
         });
 
         //Make stacked plot
-        await makeStackedPlot(page);
+        await makeStackedPlot(page, myItemsFolderName);
 
         //Gets local storage and deletes the last sine wave generator in the stacked plot
         const localStorage = await page.evaluate(() => window.localStorage);
@@ -63,7 +64,7 @@ test.describe('Handle missing object for plots', () => {
         //Verify Main section is there on load
         await expect.soft(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Stacked Plot');
 
-        await page.locator('text=Open MCT My Items >> span').nth(3).click();
+        await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
         await Promise.all([
             page.waitForNavigation(),
             page.locator('text=Unnamed Stacked Plot').first().click()
@@ -80,7 +81,7 @@ test.describe('Handle missing object for plots', () => {
  * This is used the create a stacked plot object
  * @private
  */
-async function makeStackedPlot(page) {
+async function makeStackedPlot(page, myItemsFolderName) {
     // fresh page with time range from 2022-03-29 22:00:00.000Z to 2022-03-29 22:00:30.000Z
     await page.goto('./', { waitUntil: 'networkidle' });
 
@@ -102,7 +103,7 @@ async function makeStackedPlot(page) {
     await createSineWaveGenerator(page);
 
     // click on stacked plot
-    await page.locator('text=Open MCT My Items >> span').nth(3).click();
+    await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
     await Promise.all([
         page.waitForNavigation(),
         page.locator('text=Unnamed Stacked Plot').first().click()
@@ -112,7 +113,7 @@ async function makeStackedPlot(page) {
     await createSineWaveGenerator(page);
 
     // click on stacked plot
-    await page.locator('text=Open MCT My Items >> span').nth(3).click();
+    await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
     await Promise.all([
         page.waitForNavigation(),
         page.locator('text=Unnamed Stacked Plot').first().click()
diff --git a/e2e/tests/plugins/telemetryTable/telemetryTable.e2e.spec.js b/e2e/tests/functional/plugins/telemetryTable/telemetryTable.e2e.spec.js
similarity index 94%
rename from e2e/tests/plugins/telemetryTable/telemetryTable.e2e.spec.js
rename to e2e/tests/functional/plugins/telemetryTable/telemetryTable.e2e.spec.js
index 007a68fb17..dbbf5c1a90 100644
--- a/e2e/tests/plugins/telemetryTable/telemetryTable.e2e.spec.js
+++ b/e2e/tests/functional/plugins/telemetryTable/telemetryTable.e2e.spec.js
@@ -20,16 +20,16 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-const { test } = require('../../../fixtures');
-const { expect } = require('@playwright/test');
+const { test, expect } = require('../../../../pluginFixtures');
 
 test.describe('Telemetry Table', () => {
-    test('unpauses and filters data when paused by button and user changes bounds', async ({ page }) => {
+    test('unpauses and filters data when paused by button and user changes bounds', async ({ page, openmctConfig }) => {
         test.info().annotations.push({
             type: 'issue',
             description: 'https://github.com/nasa/openmct/issues/5113'
         });
 
+        const { myItemsFolderName } = openmctConfig;
         const bannerMessage = '.c-message-banner__message';
         const createButton = 'button:has-text("Create")';
 
@@ -64,7 +64,7 @@ test.describe('Telemetry Table', () => {
         ]);
 
         // focus the Telemetry Table
-        await page.locator('text=Open MCT My Items >> span').nth(3).click();
+        await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
         await Promise.all([
             page.waitForNavigation(),
             page.locator('text=Unnamed Telemetry Table').first().click()
diff --git a/e2e/tests/plugins/timeConductor/timeConductor.e2e.spec.js b/e2e/tests/functional/plugins/timeConductor/timeConductor.e2e.spec.js
similarity index 98%
rename from e2e/tests/plugins/timeConductor/timeConductor.e2e.spec.js
rename to e2e/tests/functional/plugins/timeConductor/timeConductor.e2e.spec.js
index 4b0aa03dfa..6e23c4c82a 100644
--- a/e2e/tests/plugins/timeConductor/timeConductor.e2e.spec.js
+++ b/e2e/tests/functional/plugins/timeConductor/timeConductor.e2e.spec.js
@@ -20,8 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-const { test } = require('../../../fixtures.js');
-const { expect } = require('@playwright/test');
+const { test, expect } = require('../../../../baseFixtures');
 
 test.describe('Time conductor operations', () => {
     test('validate start time does not exceeds end time', async ({ page }) => {
diff --git a/e2e/tests/plugins/timer/timer.e2e.spec.js b/e2e/tests/functional/plugins/timer/timer.e2e.spec.js
similarity index 73%
rename from e2e/tests/plugins/timer/timer.e2e.spec.js
rename to e2e/tests/functional/plugins/timer/timer.e2e.spec.js
index 201d00e6dd..648467b120 100644
--- a/e2e/tests/plugins/timer/timer.e2e.spec.js
+++ b/e2e/tests/functional/plugins/timer/timer.e2e.spec.js
@@ -20,41 +20,28 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-const { test } = require('../../../fixtures.js');
-const { expect } = require('@playwright/test');
+const { test, expect } = require('../../../../pluginFixtures');
+const { openObjectTreeContextMenu } = require('../../../../appActions');
+
+const options = {
+    type: 'Timer'
+};
 
 test.describe('Timer', () => {
-
-    test.beforeEach(async ({ page }) => {
-        //Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        //Click the Create button
-        await page.click('button:has-text("Create")');
-
-        // Click 'Timer'
-        await page.click('text=Timer');
-
-        // Click text=OK
-        await Promise.all([
-            page.waitForNavigation({waitUntil: 'networkidle'}),
-            page.click('text=OK')
-        ]);
-
-        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Timer');
-    });
-
-    test('Can perform actions on the Timer', async ({ page }) => {
+    test.use({ objectCreateOptions: options });
+    test('Can perform actions on the Timer', async ({ page, openmctConfig }) => {
         test.info().annotations.push({
             type: 'issue',
             description: 'https://github.com/nasa/openmct/issues/4313'
         });
 
+        const { myItemsFolderName } = await openmctConfig;
+
         await test.step("From the tree context menu", async () => {
-            await triggerTimerContextMenuAction(page, 'Start');
-            await triggerTimerContextMenuAction(page, 'Pause');
-            await triggerTimerContextMenuAction(page, 'Restart at 0');
-            await triggerTimerContextMenuAction(page, 'Stop');
+            await triggerTimerContextMenuAction(page, myItemsFolderName, 'Start');
+            await triggerTimerContextMenuAction(page, myItemsFolderName, 'Pause');
+            await triggerTimerContextMenuAction(page, myItemsFolderName, 'Restart at 0');
+            await triggerTimerContextMenuAction(page, myItemsFolderName, 'Stop');
         });
 
         await test.step("From the 3dot menu", async () => {
@@ -82,31 +69,14 @@ test.describe('Timer', () => {
  * @typedef {'Start' | 'Pause' | 'Restart at 0'} TimerViewAction
  */
 
-/**
- * Open the timer context menu from the object tree.
- * Expands the 'My Items' folder if it is not already expanded.
- * @param {import('@playwright/test').Page} page
- */
-async function openTimerContextMenu(page) {
-    const myItemsFolder = page.locator('text=Open MCT My Items >> span').nth(3);
-    const className = await myItemsFolder.getAttribute('class');
-    if (!className.includes('c-disclosure-triangle--expanded')) {
-        await myItemsFolder.click();
-    }
-
-    await page.locator(`a:has-text("Unnamed Timer")`).click({
-        button: 'right'
-    });
-}
-
 /**
  * Trigger a timer action from the tree context menu
  * @param {import('@playwright/test').Page} page
  * @param {TimerAction} action
  */
-async function triggerTimerContextMenuAction(page, action) {
+async function triggerTimerContextMenuAction(page, myItemsFolderName, action) {
     const menuAction = `.c-menu ul li >> text="${action}"`;
-    await openTimerContextMenu(page);
+    await openObjectTreeContextMenu(page, myItemsFolderName, "Unnamed Timer");
     await page.locator(menuAction).click();
     assertTimerStateAfterAction(page, action);
 }
@@ -122,7 +92,7 @@ async function triggerTimer3dotMenuAction(page, action) {
     let isActionAvailable = false;
     let iterations = 0;
     // Dismiss/open the 3dot menu until the action is available
-    // or a maxiumum number of iterations is reached
+    // or a maximum number of iterations is reached
     while (!isActionAvailable && iterations <= 20) {
         await page.click('.c-object-view');
         await page.click(threeDotMenuButton);
diff --git a/e2e/tests/ui/layout/search/grandsearch.e2e.spec.js b/e2e/tests/functional/search.e2e.spec.js
similarity index 56%
rename from e2e/tests/ui/layout/search/grandsearch.e2e.spec.js
rename to e2e/tests/functional/search.e2e.spec.js
index dfcfa6774f..fcff6aa5d3 100644
--- a/e2e/tests/ui/layout/search/grandsearch.e2e.spec.js
+++ b/e2e/tests/functional/search.e2e.spec.js
@@ -20,50 +20,17 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-/*
-This test suite is dedicated to tests which verify search functionality.
-*/
-
-const { expect } = require('@playwright/test');
-const { test } = require('../../../../fixtures');
-
 /**
-  * Creates a notebook object and adds an entry.
-  * @param {import('@playwright/test').Page} page
-  */
-async function createClockAndDisplayLayout(page) {
-    //Go to baseURL
-    await page.goto('./', { waitUntil: 'networkidle' });
+ * This test suite is dedicated to tests which verify search functionalities.
+ */
 
-    // Click button:has-text("Create")
-    await page.locator('button:has-text("Create")').click();
-    // Click li:has-text("Notebook")
-    await page.locator('li:has-text("Clock")').click();
-    // Click button:has-text("OK")
-    await Promise.all([
-        page.waitForNavigation(),
-        page.locator('button:has-text("OK")').click()
-    ]);
-
-    // Click a:has-text("My Items")
-    await Promise.all([
-        page.waitForNavigation(),
-        page.locator('a:has-text("My Items") >> nth=0').click()
-    ]);
-    // Click button:has-text("Create")
-    await page.locator('button:has-text("Create")').click();
-    // Click li:has-text("Notebook")
-    await page.locator('li:has-text("Display Layout")').click();
-    // Click button:has-text("OK")
-    await Promise.all([
-        page.waitForNavigation(),
-        page.locator('button:has-text("OK")').click()
-    ]);
-}
+const { test, expect } = require('../../pluginFixtures');
 
 test.describe('Grand Search', () => {
-    test('Can search for objects, and subsequent search dropdown behaves properly', async ({ page }) => {
-        await createClockAndDisplayLayout(page);
+    test('Can search for objects, and subsequent search dropdown behaves properly', async ({ page, openmctConfig }) => {
+        const { myItemsFolderName } = openmctConfig;
+
+        await createClockAndDisplayLayout(page, myItemsFolderName);
 
         // Click [aria-label="OpenMCT Search"] input[type="search"]
         await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
@@ -109,3 +76,134 @@ test.describe('Grand Search', () => {
         await expect(page.locator('.is-object-type-clock')).toBeVisible();
     });
 });
+
+test.describe("Search Tests @unstable", () => {
+    const searchResultSelector = '.c-gsearch-result__title';
+
+    test('Validate empty search result', async ({ page }) => {
+        // Go to baseURL
+        await page.goto("./", { waitUntil: "networkidle" });
+
+        // Invalid search for objects
+        await page.type("input[type=search]", 'not found');
+
+        // Wait for search to complete
+        await waitForSearchCompletion(page);
+
+        // Get the search results
+        const searchResults = await page.locator(searchResultSelector);
+
+        // Verify that no results are found
+        expect(await searchResults.count()).toBe(0);
+    });
+
+    test('Validate single object in search result', async ({ page }) => {
+        //Go to baseURL
+        await page.goto("./", { waitUntil: "networkidle" });
+
+        // Create a folder object
+        const folderName = 'testFolder';
+        await createFolderObject(page, folderName);
+
+        // Full search for object
+        await page.type("input[type=search]", folderName);
+
+        // Wait for search to complete
+        await waitForSearchCompletion(page);
+
+        // Get the search results
+        const searchResults = await page.locator(searchResultSelector);
+
+        // Verify that one result is found
+        expect(await searchResults.count()).toBe(1);
+        await expect(searchResults).toHaveText(folderName);
+    });
+
+    test("Validate multiple objects in search results return partial matches", async ({ page }) => {
+        test.info().annotations.push({
+            type: 'issue',
+            description: 'https://github.com/nasa/openmct/issues/4667'
+        });
+
+        // Go to baseURL
+        await page.goto("/", { waitUntil: "networkidle" });
+
+        // Create folder objects
+        const folderName = "e928a26e-e924-4ea0";
+        const folderName2 = "e928a26e-e924-4001";
+
+        await createFolderObject(page, folderName);
+        await createFolderObject(page, folderName2);
+
+        // Partial search for objects
+        await page.type("input[type=search]", 'e928a26e');
+
+        // Wait for search to finish
+        await waitForSearchCompletion(page);
+
+        // Get the search results
+        const searchResults = await page.locator(searchResultSelector);
+
+        // Verify that the search result/s correctly match the search query
+        expect(await searchResults.count()).toBe(2);
+        await expect(await searchResults.first()).toHaveText(folderName);
+        await expect(await searchResults.last()).toHaveText(folderName2);
+    });
+});
+
+async function createFolderObject(page, folderName) {
+    // Open Create menu
+    await page.locator('button:has-text("Create")').click();
+
+    // Select Folder object
+    await page.locator('text=Folder').nth(1).click();
+
+    // Click folder title to enter edit mode
+    await page.locator('text=Properties Title Notes >> input[type="text"]').click();
+
+    // Enter folder name
+    await page.locator('text=Properties Title Notes >> input[type="text"]').fill(folderName);
+
+    // Create folder object
+    await page.locator('text=OK').click();
+}
+
+async function waitForSearchCompletion(page) {
+    // Wait loading spinner to disappear
+    await page.waitForSelector('.c-tree-and-search__loading', { state: 'detached' });
+}
+
+/**
+  * Creates a notebook object and adds an entry.
+  * @param {import('@playwright/test').Page} page
+  * @param {string} myItemsFolderName
+  */
+async function createClockAndDisplayLayout(page, myItemsFolderName) {
+    //Go to baseURL
+    await page.goto('./', { waitUntil: 'networkidle' });
+
+    // Click button:has-text("Create")
+    await page.locator('button:has-text("Create")').click();
+    // Click li:has-text("Notebook")
+    await page.locator('li:has-text("Clock")').click();
+    // Click button:has-text("OK")
+    await Promise.all([
+        page.waitForNavigation(),
+        page.locator('button:has-text("OK")').click()
+    ]);
+
+    // Click a:has-text("My Items")
+    await Promise.all([
+        page.waitForNavigation(),
+        page.locator(`a:has-text("${myItemsFolderName}") >> nth=0`).click()
+    ]);
+    // Click button:has-text("Create")
+    await page.locator('button:has-text("Create")').click();
+    // Click li:has-text("Notebook")
+    await page.locator('li:has-text("Display Layout")').click();
+    // Click button:has-text("OK")
+    await Promise.all([
+        page.waitForNavigation(),
+        page.locator('button:has-text("OK")').click()
+    ]);
+}
diff --git a/e2e/tests/smoke.e2e.spec.js b/e2e/tests/functional/smoke.e2e.spec.js
similarity index 90%
rename from e2e/tests/smoke.e2e.spec.js
rename to e2e/tests/functional/smoke.e2e.spec.js
index fac459c95e..12cb25d124 100644
--- a/e2e/tests/smoke.e2e.spec.js
+++ b/e2e/tests/functional/smoke.e2e.spec.js
@@ -33,8 +33,7 @@ comfortable running this test during a live mission?" Avoid creating or deleting
 Make no assumptions about the order that elements appear in the DOM.
 */
 
-const { test } = require('../fixtures.js');
-const { expect } = require('@playwright/test');
+const { test, expect } = require('../../pluginFixtures');
 
 test('Verify that the create button appears and that the Folder Domain Object is available for selection', async ({ page }) => {
 
@@ -48,12 +47,13 @@ test('Verify that the create button appears and that the Folder Domain Object is
     await expect(page.locator(':nth-match(:text("Folder"), 2)')).toBeEnabled();
 });
 
-test('Verify that My Items Tree appears @ipad', async ({ page }) => {
+test('Verify that My Items Tree appears @ipad', async ({ page, openmctConfig }) => {
+    const { myItemsFolderName } = openmctConfig;
     //Test.slow annotation is currently broken. Needs to be fixed in https://github.com/nasa/openmct/issues/5374
     test.slow();
     //Go to baseURL
     await page.goto('./');
 
     //My Items to be visible
-    await expect(page.locator('a:has-text("My Items")')).toBeEnabled();
+    await expect(page.locator(`a:has-text("${myItemsFolderName}")`)).toBeEnabled();
 });
diff --git a/e2e/tests/search.e2e.spec.js b/e2e/tests/search.e2e.spec.js
deleted file mode 100644
index 3b22798642..0000000000
--- a/e2e/tests/search.e2e.spec.js
+++ /dev/null
@@ -1,123 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/**
- * This test suite is dedicated to tests which verify search functionalities.
- */
-
-const { test, expect } = require("@playwright/test");
-
-test.describe("Search Tests", () => {
-    const searchResultSelector = '.c-gsearch-result__title';
-
-    test('Validate empty search result [no match search]', async ({ page }) => {
-        // Go to baseURL
-        await page.goto("/", { waitUntil: "networkidle" });
-
-        // Invalid search for objects
-        await page.type("input[type=search]", 'not found');
-
-        // Wait for search to complete
-        await waitForSearchCompletion(page);
-
-        // Get the search results
-        const searchResults = await page.locator(searchResultSelector);
-
-        // Verify that no results are found
-        expect(await searchResults.count()).toBe(0);
-    });
-
-    test('Validate single object in search result [full search]', async ({ page }) => {
-        //Go to baseURL
-        await page.goto("/", { waitUntil: "networkidle" });
-
-        // Create a folder object
-        const folderName = 'testFolder';
-        await createFolderObject(page, folderName);
-
-        // Full search for object
-        await page.type("input[type=search]", folderName);
-
-        // Wait for search to complete
-        await waitForSearchCompletion(page);
-
-        // Get the search results
-        const searchResults = await page.locator(searchResultSelector);
-
-        // Verify that one result is found
-        expect(await searchResults.count()).toBe(1);
-        await expect(searchResults).toHaveText(folderName);
-    });
-
-    test("Validate multiple objects in search results [partial search]", async ({ page }) => {
-        test.info().annotations.push({
-            type: 'issue',
-            description: 'https://github.com/nasa/openmct/issues/4667'
-        });
-
-        // Go to baseURL
-        await page.goto("/", { waitUntil: "networkidle" });
-
-        // Create folder objects
-        const folderName = "e928a26e-e924-4ea0";
-        const folderName2 = "e928a26e-e924-4001";
-
-        await createFolderObject(page, folderName);
-        await createFolderObject(page, folderName2);
-
-        // Partial search for objects
-        await page.type("input[type=search]", 'e928a26e');
-
-        // Wait for search to finish
-        await waitForSearchCompletion(page);
-
-        // Get the search results
-        const searchResults = await page.locator(searchResultSelector);
-
-        // Verify that the search result/s correctly match the search query
-        expect(await searchResults.count()).toBe(2);
-        await expect(await searchResults.first()).toHaveText(folderName);
-        await expect(await searchResults.last()).toHaveText(folderName2);
-    });
-});
-
-async function createFolderObject(page, folderName) {
-    // Open Create menu
-    await page.locator('button:has-text("Create")').click();
-
-    // Select Folder object
-    await page.locator('text=Folder').nth(1).click();
-
-    // Click folder title to enter edit mode
-    await page.locator('text=Properties Title Notes >> input[type="text"]').click();
-
-    // Enter folder name
-    await page.locator('text=Properties Title Notes >> input[type="text"]').fill(folderName);
-
-    // Create folder object
-    await page.locator('text=OK').click();
-}
-
-async function waitForSearchCompletion(page) {
-    // Wait loading spinner to disappear
-    await page.waitForSelector('.c-tree-and-search__loading', { state: 'detached' });
-}
diff --git a/e2e/tests/visual/addInit.visual.spec.js b/e2e/tests/visual/addInit.visual.spec.js
index f192ee2524..71e8a34616 100644
--- a/e2e/tests/visual/addInit.visual.spec.js
+++ b/e2e/tests/visual/addInit.visual.spec.js
@@ -31,46 +31,40 @@ to "fail" on assertions. Instead, they should be used to detect changes between
 Note: Larger testsuite sizes are OK due to the setup time associated with these tests.
 */
 
-const { test } = require('../../fixtures.js');
+// eslint-disable-next-line no-unused-vars
+const { test, expect } = require('../../baseFixtures.js');
 const percySnapshot = require('@percy/playwright');
 const path = require('path');
-const sinon = require('sinon');
 
 const VISUAL_GRACE_PERIOD = 5 * 1000; //Lets the application "simmer" before the snapshot is taken
 
 const CUSTOM_NAME = 'CUSTOM_NAME';
 
-// Snippet from https://github.com/microsoft/playwright/issues/6347#issuecomment-965887758
-// Will replace with cy.clock() equivalent
-test.beforeEach(async ({ context }) => {
-    await context.addInitScript({
-        path: path.join(__dirname, '../../..', './node_modules/sinon/pkg/sinon.js')
-    });
-    await context.addInitScript(() => {
-        window.__clock = sinon.useFakeTimers({
-            now: 0,
+test.describe('Visual - addInit', () => {
+    test.use({
+        clockOptions: {
             shouldAdvanceTime: true
-        }); //Set browser clock to UNIX Epoch
+        }
+    });
+
+    test('Restricted Notebook is visually correct @addInit', async ({ page }) => {
+        // eslint-disable-next-line no-undef
+        await page.addInitScript({ path: path.join(__dirname, '../../helper', './addInitRestrictedNotebook.js') });
+        //Go to baseURL
+        await page.goto('./#/browse/mine?hideTree=true', { waitUntil: 'networkidle' });
+        //Click the Create button
+        await page.click('button:has-text("Create")');
+        // Click text=CUSTOM_NAME
+        await page.click(`text=${CUSTOM_NAME}`);
+        // Click text=OK
+        await Promise.all([
+            page.waitForNavigation({waitUntil: 'networkidle'}),
+            page.click('text=OK')
+        ]);
+
+        // Take a snapshot of the newly created CUSTOM_NAME notebook
+        await page.waitForTimeout(VISUAL_GRACE_PERIOD);
+        await percySnapshot(page, 'Restricted Notebook with CUSTOM_NAME');
+
     });
 });
-
-test('Visual - Restricted Notebook is visually correct @addInit', async ({ page }) => {
-    // eslint-disable-next-line no-undef
-    await page.addInitScript({ path: path.join(__dirname, '../plugins/notebook', './addInitRestrictedNotebook.js') });
-    //Go to baseURL
-    await page.goto('./', { waitUntil: 'networkidle' });
-    //Click the Create button
-    await page.click('button:has-text("Create")');
-    // Click text=CUSTOM_NAME
-    await page.click(`text=${CUSTOM_NAME}`);
-    // Click text=OK
-    await Promise.all([
-        page.waitForNavigation({waitUntil: 'networkidle'}),
-        page.click('text=OK')
-    ]);
-
-    // Take a snapshot of the newly created CUSTOM_NAME notebook
-    await page.waitForTimeout(VISUAL_GRACE_PERIOD);
-    await percySnapshot(page, 'Restricted Notebook with CUSTOM_NAME');
-
-});
diff --git a/e2e/tests/visual/controlledClock.visual.spec.js b/e2e/tests/visual/controlledClock.visual.spec.js
index 0f936b177f..f753590c07 100644
--- a/e2e/tests/visual/controlledClock.visual.spec.js
+++ b/e2e/tests/visual/controlledClock.visual.spec.js
@@ -32,40 +32,31 @@ to "fail" on assertions. Instead, they should be used to detect changes between
 Note: Larger testsuite sizes are OK due to the setup time associated with these tests.
 */
 
-const { test } = require('../../fixtures.js');
-const { expect } = require('@playwright/test');
+const { test, expect } = require('../../baseFixtures.js');
 const percySnapshot = require('@percy/playwright');
-const path = require('path');
-const sinon = require('sinon');
 
-// Snippet from https://github.com/microsoft/playwright/issues/6347#issuecomment-965887758
-// Will replace with cy.clock() equivalent
-test.beforeEach(async ({ context }) => {
-    await context.addInitScript({
-        // eslint-disable-next-line no-undef
-        path: path.join(__dirname, '../../..', './node_modules/sinon/pkg/sinon.js')
-    });
-    await context.addInitScript(() => {
-        window.__clock = sinon.useFakeTimers({
+test.describe('Visual - Controlled Clock', () => {
+    test.use({
+        storageState: './e2e/test-data/VisualTestData_storage.json',
+        clockOptions: {
             now: 0, //Set browser clock to UNIX Epoch
             shouldAdvanceTime: false, //Don't advance the clock
             toFake: ["setTimeout", "nextTick"]
-        });
+        }
+    });
+
+    test('Overlay Plot Loading Indicator @localstorage', async ({ page }) => {
+        // Go to baseURL
+        await page.goto('./#/browse/mine?hideTree=true', { waitUntil: 'networkidle' });
+
+        await page.locator('a:has-text("Unnamed Overlay Plot Overlay Plot")').click();
+        //Ensure that we're on the Unnamed Overlay Plot object
+        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Overlay Plot');
+
+        //Wait for canvas to be rendered and stop animating
+        await page.locator('canvas >> nth=1').hover({trial: true});
+
+        //Take snapshot of Sine Wave Generator within Overlay Plot
+        await percySnapshot(page, 'SineWaveInOverlayPlot');
     });
 });
-test.use({ storageState: './e2e/test-data/VisualTestData_storage.json' });
-
-test('Visual - Overlay Plot Loading Indicator @localstorage', async ({ page }) => {
-    // Go to baseURL
-    await page.goto('./', { waitUntil: 'networkidle' });
-
-    await page.locator('a:has-text("Unnamed Overlay Plot Overlay Plot")').click();
-    //Ensure that we're on the Unnamed Overlay Plot object
-    await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Overlay Plot');
-
-    //Wait for canvas to be rendered and stop animating
-    await page.locator('canvas >> nth=1').hover({trial: true});
-
-    //Take snapshot of Sine Wave Generator within Overlay Plot
-    await percySnapshot(page, 'SineWaveInOverlayPlot');
-});
diff --git a/e2e/tests/visual/default.visual.spec.js b/e2e/tests/visual/default.visual.spec.js
index 8dcf6a829b..747f9fbf18 100644
--- a/e2e/tests/visual/default.visual.spec.js
+++ b/e2e/tests/visual/default.visual.spec.js
@@ -32,201 +32,190 @@ to "fail" on assertions. Instead, they should be used to detect changes between
 Note: Larger testsuite sizes are OK due to the setup time associated with these tests.
 */
 
-const { test } = require('../../fixtures.js');
-const { expect } = require('@playwright/test');
+const { test, expect } = require('../../baseFixtures.js');
 const percySnapshot = require('@percy/playwright');
-const path = require('path');
-const sinon = require('sinon');
-
 const VISUAL_GRACE_PERIOD = 5 * 1000; //Lets the application "simmer" before the snapshot is taken
 
-// Snippet from https://github.com/microsoft/playwright/issues/6347#issuecomment-965887758
-// Will replace with cy.clock() equivalent
-test.beforeEach(async ({ context }) => {
-    await context.addInitScript({
-        // eslint-disable-next-line no-undef
-        path: path.join(__dirname, '../../..', './node_modules/sinon/pkg/sinon.js')
-    });
-    await context.addInitScript(() => {
-        window.__clock = sinon.useFakeTimers({
+test.describe('Visual - Default', () => {
+    test.use({
+        clockOptions: {
             now: 0,
             shouldAdvanceTime: true
-        }); //Set browser clock to UNIX Epoch
+        }
+    });
+
+    test('Visual - Root and About', async ({ page }) => {
+        // Go to baseURL
+        await page.goto('./#/browse/mine?hideTree=true', { waitUntil: 'networkidle' });
+
+        // Verify that Create button is actionable
+        await expect(page.locator('button:has-text("Create")')).toBeEnabled();
+
+        // Take a snapshot of the Dashboard
+        await page.waitForTimeout(VISUAL_GRACE_PERIOD);
+        await percySnapshot(page, 'Root');
+
+        // Click About button
+        await page.click('.l-shell__app-logo');
+
+        // Modify the Build information in 'about' to be consistent run-over-run
+        const versionInformationLocator = page.locator('ul.t-info.l-info.s-info');
+        await expect(versionInformationLocator).toBeEnabled();
+        await versionInformationLocator.evaluate(node => node.innerHTML = '<li>Version: visual-snapshot</li> <li>Build Date: Mon Nov 15 2021 08:07:51 GMT-0800 (Pacific Standard Time)</li> <li>Revision: 93049cdbc6c047697ca204893db9603b864b8c9f</li> <li>Branch: master</li>');
+
+        // Take a snapshot of the About modal
+        await page.waitForTimeout(VISUAL_GRACE_PERIOD);
+        await percySnapshot(page, 'About');
+    });
+
+    test('Visual - Default Condition Set', async ({ page }) => {
+        //Go to baseURL
+        await page.goto('/', { waitUntil: 'networkidle' });
+
+        //Click the Create button
+        await page.click('button:has-text("Create")');
+
+        // Click text=Condition Set
+        await page.click('text=Condition Set');
+
+        // Click text=OK
+        await page.click('text=OK');
+
+        // Take a snapshot of the newly created Condition Set object
+        await page.waitForTimeout(VISUAL_GRACE_PERIOD);
+        await percySnapshot(page, 'Default Condition Set');
+    });
+
+    test.fixme('Visual - Default Condition Widget', async ({ page }) => {
+        test.info().annotations.push({
+            type: 'issue',
+            description: 'https://github.com/nasa/openmct/issues/5349'
+        });
+        //Go to baseURL
+        await page.goto('/', { waitUntil: 'networkidle' });
+
+        //Click the Create button
+        await page.click('button:has-text("Create")');
+
+        // Click text=Condition Widget
+        await page.click('text=Condition Widget');
+
+        // Click text=OK
+        await page.click('text=OK');
+
+        // Take a snapshot of the newly created Condition Widget object
+        await page.waitForTimeout(VISUAL_GRACE_PERIOD);
+        await percySnapshot(page, 'Default Condition Widget');
+    });
+
+    test('Visual - Time Conductor start time is less than end time', async ({ page }) => {
+        //Go to baseURL
+        await page.goto('/', { waitUntil: 'networkidle' });
+        const year = new Date().getFullYear();
+
+        let startDate = 'xxxx-01-01 01:00:00.000Z';
+        startDate = year + startDate.substring(4);
+
+        let endDate = 'xxxx-01-01 02:00:00.000Z';
+        endDate = year + endDate.substring(4);
+
+        await page.locator('input[type="text"]').nth(1).fill(endDate.toString());
+        await page.locator('input[type="text"]').first().fill(startDate.toString());
+
+        //  verify no error msg
+        await page.waitForTimeout(VISUAL_GRACE_PERIOD);
+        await percySnapshot(page, 'Default Time conductor');
+
+        startDate = (year + 1) + startDate.substring(4);
+        await page.locator('input[type="text"]').first().fill(startDate.toString());
+        await page.locator('input[type="text"]').nth(1).click();
+
+        //  verify error msg for start time (unable to capture snapshot of popup)
+        await page.waitForTimeout(VISUAL_GRACE_PERIOD);
+        await percySnapshot(page, 'Start time error');
+
+        startDate = (year - 1) + startDate.substring(4);
+        await page.locator('input[type="text"]').first().fill(startDate.toString());
+
+        endDate = (year - 2) + endDate.substring(4);
+        await page.locator('input[type="text"]').nth(1).fill(endDate.toString());
+
+        await page.locator('input[type="text"]').first().click();
+
+        //  verify error msg for end time (unable to capture snapshot of popup)
+        await page.waitForTimeout(VISUAL_GRACE_PERIOD);
+        await percySnapshot(page, 'End time error');
+    });
+
+    test('Visual - Sine Wave Generator Form', async ({ page }) => {
+        //Go to baseURL
+        await page.goto('/', { waitUntil: 'networkidle' });
+
+        //Click the Create button
+        await page.click('button:has-text("Create")');
+
+        // Click text=Sine Wave Generator
+        await page.click('text=Sine Wave Generator');
+
+        await page.waitForTimeout(VISUAL_GRACE_PERIOD);
+        await percySnapshot(page, 'Default Sine Wave Generator Form');
+
+        await page.locator('.field.control.l-input-sm input').first().click();
+        await page.locator('.field.control.l-input-sm input').first().fill('');
+
+        // Validate red x mark
+        await page.waitForTimeout(VISUAL_GRACE_PERIOD);
+        await percySnapshot(page, 'removed amplitude property value');
+    });
+
+    test('Visual - Save Successful Banner', async ({ page }) => {
+        //Go to baseURL
+        await page.goto('/', { waitUntil: 'networkidle' });
+
+        //Click the Create button
+        await page.click('button:has-text("Create")');
+
+        //NOTE Something other than example imagery
+        await page.click('text=Timer');
+
+        // Click text=OK
+        await page.click('text=OK');
+        await page.locator('.c-message-banner__message').hover({ trial: true });
+        await percySnapshot(page, 'Banner message shown');
+
+        //Wait until Save Banner is gone
+        await page.waitForSelector('.c-message-banner__message', { state: 'detached'});
+        await percySnapshot(page, 'Banner message gone');
+    });
+
+    test('Visual - Display Layout Icon is correct', async ({ page }) => {
+        //Go to baseURL
+        await page.goto('/', { waitUntil: 'networkidle' });
+
+        //Click the Create button
+        await page.click('button:has-text("Create")');
+
+        //Hover on Display Layout option.
+        await page.locator('text=Display Layout').hover();
+        await percySnapshot(page, 'Display Layout Create Menu');
+
+    });
+
+    test('Visual - Default Gauge is correct', async ({ page }) => {
+
+        //Go to baseURL
+        await page.goto('/', { waitUntil: 'networkidle' });
+
+        //Click the Create button
+        await page.click('button:has-text("Create")');
+
+        await page.click('text=Gauge');
+
+        await page.click('text=OK');
+
+        // Take a snapshot of the newly created Gauge object
+        await page.waitForTimeout(VISUAL_GRACE_PERIOD);
+        await percySnapshot(page, 'Default Gauge');
+
     });
 });
-
-test('Visual - Root and About', async ({ page }) => {
-    // Go to baseURL
-    await page.goto('./', { waitUntil: 'networkidle' });
-
-    // Verify that Create button is actionable
-    await expect(page.locator('button:has-text("Create")')).toBeEnabled();
-
-    // Take a snapshot of the Dashboard
-    await page.waitForTimeout(VISUAL_GRACE_PERIOD);
-    await percySnapshot(page, 'Root');
-
-    // Click About button
-    await page.click('.l-shell__app-logo');
-
-    // Modify the Build information in 'about' to be consistent run-over-run
-    const versionInformationLocator = page.locator('ul.t-info.l-info.s-info');
-    await expect(versionInformationLocator).toBeEnabled();
-    await versionInformationLocator.evaluate(node => node.innerHTML = '<li>Version: visual-snapshot</li> <li>Build Date: Mon Nov 15 2021 08:07:51 GMT-0800 (Pacific Standard Time)</li> <li>Revision: 93049cdbc6c047697ca204893db9603b864b8c9f</li> <li>Branch: master</li>');
-
-    // Take a snapshot of the About modal
-    await page.waitForTimeout(VISUAL_GRACE_PERIOD);
-    await percySnapshot(page, 'About');
-});
-
-test('Visual - Default Condition Set', async ({ page }) => {
-    //Go to baseURL
-    await page.goto('./', { waitUntil: 'networkidle' });
-
-    //Click the Create button
-    await page.click('button:has-text("Create")');
-
-    // Click text=Condition Set
-    await page.click('text=Condition Set');
-
-    // Click text=OK
-    await page.click('text=OK');
-
-    // Take a snapshot of the newly created Condition Set object
-    await page.waitForTimeout(VISUAL_GRACE_PERIOD);
-    await percySnapshot(page, 'Default Condition Set');
-});
-
-test.fixme('Visual - Default Condition Widget', async ({ page }) => {
-    test.info().annotations.push({
-        type: 'issue',
-        description: 'https://github.com/nasa/openmct/issues/5349'
-    });
-    //Go to baseURL
-    await page.goto('./', { waitUntil: 'networkidle' });
-
-    //Click the Create button
-    await page.click('button:has-text("Create")');
-
-    // Click text=Condition Widget
-    await page.click('text=Condition Widget');
-
-    // Click text=OK
-    await page.click('text=OK');
-
-    // Take a snapshot of the newly created Condition Widget object
-    await page.waitForTimeout(VISUAL_GRACE_PERIOD);
-    await percySnapshot(page, 'Default Condition Widget');
-});
-
-test('Visual - Time Conductor start time is less than end time', async ({ page }) => {
-    //Go to baseURL
-    await page.goto('./', { waitUntil: 'networkidle' });
-    const year = new Date().getFullYear();
-
-    let startDate = 'xxxx-01-01 01:00:00.000Z';
-    startDate = year + startDate.substring(4);
-
-    let endDate = 'xxxx-01-01 02:00:00.000Z';
-    endDate = year + endDate.substring(4);
-
-    await page.locator('input[type="text"]').nth(1).fill(endDate.toString());
-    await page.locator('input[type="text"]').first().fill(startDate.toString());
-
-    //  verify no error msg
-    await page.waitForTimeout(VISUAL_GRACE_PERIOD);
-    await percySnapshot(page, 'Default Time conductor');
-
-    startDate = (year + 1) + startDate.substring(4);
-    await page.locator('input[type="text"]').first().fill(startDate.toString());
-    await page.locator('input[type="text"]').nth(1).click();
-
-    //  verify error msg for start time (unable to capture snapshot of popup)
-    await page.waitForTimeout(VISUAL_GRACE_PERIOD);
-    await percySnapshot(page, 'Start time error');
-
-    startDate = (year - 1) + startDate.substring(4);
-    await page.locator('input[type="text"]').first().fill(startDate.toString());
-
-    endDate = (year - 2) + endDate.substring(4);
-    await page.locator('input[type="text"]').nth(1).fill(endDate.toString());
-
-    await page.locator('input[type="text"]').first().click();
-
-    //  verify error msg for end time (unable to capture snapshot of popup)
-    await page.waitForTimeout(VISUAL_GRACE_PERIOD);
-    await percySnapshot(page, 'End time error');
-});
-
-test('Visual - Sine Wave Generator Form', async ({ page }) => {
-    //Go to baseURL
-    await page.goto('./', { waitUntil: 'networkidle' });
-
-    //Click the Create button
-    await page.click('button:has-text("Create")');
-
-    // Click text=Sine Wave Generator
-    await page.click('text=Sine Wave Generator');
-
-    await page.waitForTimeout(VISUAL_GRACE_PERIOD);
-    await percySnapshot(page, 'Default Sine Wave Generator Form');
-
-    await page.locator('.field.control.l-input-sm input').first().click();
-    await page.locator('.field.control.l-input-sm input').first().fill('');
-
-    // Validate red x mark
-    await page.waitForTimeout(VISUAL_GRACE_PERIOD);
-    await percySnapshot(page, 'removed amplitude property value');
-});
-
-test('Visual - Save Successful Banner', async ({ page }) => {
-    //Go to baseURL
-    await page.goto('./', { waitUntil: 'networkidle' });
-
-    //Click the Create button
-    await page.click('button:has-text("Create")');
-
-    //NOTE Something other than example imagery
-    await page.click('text=Timer');
-
-    // Click text=OK
-    await page.click('text=OK');
-    await page.locator('.c-message-banner__message').hover({ trial: true });
-    await percySnapshot(page, 'Banner message shown');
-
-    //Wait until Save Banner is gone
-    await page.waitForSelector('.c-message-banner__message', { state: 'detached'});
-    await percySnapshot(page, 'Banner message gone');
-});
-
-test('Visual - Display Layout Icon is correct', async ({ page }) => {
-    //Go to baseURL
-    await page.goto('./', { waitUntil: 'networkidle' });
-
-    //Click the Create button
-    await page.click('button:has-text("Create")');
-
-    //Hover on Display Layout option.
-    await page.locator('text=Display Layout').hover();
-    await percySnapshot(page, 'Display Layout Create Menu');
-
-});
-
-test('Visual - Default Gauge is correct', async ({ page }) => {
-
-    //Go to baseURL
-    await page.goto('./', { waitUntil: 'networkidle' });
-
-    //Click the Create button
-    await page.click('button:has-text("Create")');
-
-    await page.click('text=Gauge');
-
-    await page.click('text=OK');
-
-    // Take a snapshot of the newly created Gauge object
-    await page.waitForTimeout(VISUAL_GRACE_PERIOD);
-    await percySnapshot(page, 'Default Gauge');
-
-});
-
diff --git a/e2e/tests/visual/search.visual.spec.js b/e2e/tests/visual/search.visual.spec.js
index 464b57423b..b181fdb573 100644
--- a/e2e/tests/visual/search.visual.spec.js
+++ b/e2e/tests/visual/search.visual.spec.js
@@ -24,8 +24,7 @@
 This test suite is dedicated to tests which verify search functionality.
 */
 
-const { test } = require('../../fixtures.js');
-const { expect } = require('@playwright/test');
+const { test, expect } = require('../../baseFixtures.js');
 const percySnapshot = require('@percy/playwright');
 
 /**
diff --git a/karma.conf.js b/karma.conf.js
index e07aa94671..a24f6d0f31 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -58,23 +58,19 @@ module.exports = (config) => {
                 base: 'Chrome',
                 flags: ['--remote-debugging-port=9222'],
                 debug: true
-            },
-            FirefoxESR: {
-                base: 'FirefoxHeadless',
-                name: 'FirefoxESR'
             }
         },
         colors: true,
         logLevel: config.LOG_INFO,
         autoWatch: true,
         junitReporter: {
-            outputDir: "dist/reports/tests",
-            outputFile: "test-results.xml",
-            useBrowserName: false
+            outputDir: "dist/reports/tests", //Useful for CircleCI
+            outputFile: "test-results.xml", //Useful for CircleCI
+            useBrowserName: false //Disable since we only want chrome
         },
         coverageIstanbulReporter: {
             fixWebpackSourcePaths: true,
-            dir: "coverage/unit",
+            dir: "coverage/unit", //Sets coverage file to be consumed by codecov.io
             reports: ['lcovonly']
         },
         specReporter: {
diff --git a/package.json b/package.json
index d20f5fe1fa..5b1bb72306 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,6 @@
     "karma-cli": "2.0.0",
     "karma-coverage": "2.2.0",
     "karma-coverage-istanbul-reporter": "3.0.3",
-    "karma-firefox-launcher": "2.1.2",
     "karma-jasmine": "5.1.0",
     "karma-junit-reporter": "2.0.1",
     "karma-sourcemap-loader": "0.3.8",
@@ -89,10 +88,10 @@
     "build:watch": "webpack --config webpack.dev.js --watch",
     "info": "npx envinfo --system --browsers --npmPackages --binaries --languages --markdown",
     "test": "cross-env NODE_ENV=test NODE_OPTIONS=\"--max_old_space_size=4096\" karma start --single-run",
-    "test:firefox": "cross-env NODE_ENV=test NODE_OPTIONS=\"--max_old_space_size=4096\" karma start --single-run --browsers=FirefoxHeadless",
     "test:debug": "cross-env NODE_ENV=debug karma start --no-single-run",
     "test:e2e": "npx playwright test",
-    "test:e2e:ci": "npx playwright test --config=e2e/playwright-ci.config.js --project=chrome visual smoke branding default condition timeConductor clock persistence performance grandsearch tags",
+    "test:e2e:stable": "npx playwright test --config=e2e/playwright-ci.config.js --project=chrome --grep-invert @unstable",
+    "test:e2e:unstable": "npx playwright test --config=e2e/playwright-ci.config.js --project=chrome --grep @unstable",
     "test:e2e:local": "npx playwright test --config=e2e/playwright-local.config.js --project=chrome",
     "test:e2e:updatesnapshots": "npx playwright test --config=e2e/playwright-ci.config.js --project=chrome --grep @snapshot --update-snapshots",
     "test:e2e:visual": "percy exec --config ./e2e/.percy.yml -- npx playwright test --config=e2e/playwright-visual.config.js",
@@ -106,7 +105,7 @@
     "docs": "npm run jsdoc ; npm run otherdoc",
     "cov:e2e:report":"nyc report --reporter=lcovonly --report-dir=./coverage/e2e",
     "cov:e2e:full:publish":"codecov --disable=gcov -f ./coverage/e2e/lcov.info -F e2e-full",
-    "cov:e2e:ci:publish":"codecov --disable=gcov -f ./coverage/e2e/lcov.info -F e2e-ci",
+    "cov:e2e:stable:publish":"codecov --disable=gcov -f ./coverage/e2e/lcov.info -F e2e-stable",
     "cov:unit:publish":"codecov --disable=gcov -f ./coverage/unit/lcov.info -F unit",
     "prepare": "npm run build:prod"
   },