Merge branch 'master' into mct6555-v2

Cleanup
Removed status.getStatusRoleForCurrentUser
2023-06-16 20:03:03 -05:00 · 2023-06-16 18:19:48 -05:00 · 2023-06-16 18:18:30 -05:00 · 2023-06-16 22:14:38 +00:00 · 2023-06-16 19:45:59 +00:00 · 2023-06-16 08:03:56 -07:00
1025 changed files with 124555 additions and 115196 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,19 +2,23 @@ version: 2.1
 executors:
  pw-focal-development:
    docker:
-      - image: mcr.microsoft.com/playwright:v1.29.0-focal
+      - image: mcr.microsoft.com/playwright:v1.32.3-focal
    environment:
      NODE_ENV: development # Needed to ensure 'dist' folder created and devDependencies installed
      PERCY_POSTINSTALL_BROWSER: 'true' # Needed to store the percy browser in cache deps
      PERCY_LOGLEVEL: 'debug' # Enable DEBUG level logging for Percy (Issue: https://github.com/nasa/openmct/issues/5742)
+  ubuntu:
+    machine:
+      image: ubuntu-2204:current
+      docker_layer_caching: true
 parameters:
  BUST_CACHE:
-    description: "Set this with the CircleCI UI Trigger Workflow button (boolean = true) to bust the cache!"
+    description: 'Set this with the CircleCI UI Trigger Workflow button (boolean = true) to bust the cache!'
    default: false
    type: boolean
 commands:
  build_and_install:
-    description: "All steps used to build and install. Will use cache if found"
+    description: 'All steps used to build and install. Will use cache if found'
    parameters:
      node-version:
        type: string
@@ -23,11 +27,10 @@ commands:
      - restore_cache_cmd:
          node-version: << parameters.node-version >>
      - node/install:
-          install-npm: true
          node-version: << parameters.node-version >>
-      - run: npm install --prefer-offline --no-audit --progress=false
+      - run: npm install --no-audit --progress=false
  restore_cache_cmd:
-    description: "Custom command for restoring cache with the ability to bust cache. When BUST_CACHE is set to true, jobs will not restore cache"
+    description: 'Custom command for restoring cache with the ability to bust cache. When BUST_CACHE is set to true, jobs will not restore cache'
    parameters:
      node-version:
        type: string
@@ -37,31 +40,31 @@ commands:
            equal: [false, << pipeline.parameters.BUST_CACHE >>]
          steps:
            - restore_cache:
-                key: deps-{{ .Branch }}--<< parameters.node-version >>--{{ checksum "package.json" }}-{{ checksum ".circleci/config.yml" }}
+                key: deps--{{ arch }}--{{ .Branch }}--<< parameters.node-version >>--{{ checksum "package.json" }}-{{ checksum ".circleci/config.yml" }}
  save_cache_cmd:
-    description: "Custom command for saving cache."
+    description: 'Custom command for saving cache.'
    parameters:
      node-version:
        type: string
    steps:
      - save_cache:
-          key: deps-{{ .Branch }}--<< parameters.node-version >>--{{ checksum "package.json" }}-{{ checksum ".circleci/config.yml" }}
+          key: deps--{{ arch }}--{{ .Branch }}--<< parameters.node-version >>--{{ checksum "package.json" }}-{{ checksum ".circleci/config.yml" }}
          paths:
            - ~/.npm
            - node_modules
  generate_and_store_version_and_filesystem_artifacts:
-    description: "Track important packages and files"
+    description: 'Track important packages and files'
    steps:
      - run: |
-          mkdir /tmp/artifacts
-          printenv NODE_ENV >> /tmp/artifacts/NODE_ENV.txt
+          [[ $EUID -ne 0 ]] && (sudo mkdir -p /tmp/artifacts && sudo chmod 777 /tmp/artifacts) || (mkdir -p /tmp/artifacts && chmod 777 /tmp/artifacts)
+          printenv NODE_ENV >> /tmp/artifacts/NODE_ENV.txt || true
          npm -v >> /tmp/artifacts/npm-version.txt
          node -v >> /tmp/artifacts/node-version.txt
          ls -latR >> /tmp/artifacts/dir.txt
      - store_artifacts:
          path: /tmp/artifacts/
  generate_e2e_code_cov_report:
-   description: "Generate e2e code coverage artifacts and publish to codecov.io. Needed to that we can ignore the exit code status of the npm run test"
+    description: 'Generate e2e code coverage artifacts and publish to codecov.io. Needed to that we can ignore the exit code status of the npm run test'
    parameters:
      suite:
        type: string
@@ -69,7 +72,7 @@ commands:
      - run: npm run cov:e2e:report || true
      - run: npm run cov:e2e:<<parameters.suite>>:publish
 orbs:
-  node: circleci/node@4.9.0
+  node: circleci/node@5.1.0
  browser-tools: circleci/browser-tools@1.3.0
 jobs:
  npm-audit:
@@ -110,6 +113,10 @@ jobs:
          path: dist/reports/tests/
      - store_artifacts:
          path: coverage
+      - when:
+          condition:
+            equal: [42, 42] # Always generate version artifacts regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
+          steps:
            - generate_and_store_version_and_filesystem_artifacts
  e2e-test:
    parameters:
@@ -118,15 +125,20 @@ jobs:
      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 $$$
          condition:
-            equal: [ "full", <<parameters.suite>> ]
+            equal: ['full', <<parameters.suite>>]
          steps:
            - run: npx playwright install chrome-beta
      - run: SHARD="$((${CIRCLE_NODE_INDEX}+1))"; npm run test:e2e:<<parameters.suite>> -- --shard=${SHARD}/${CIRCLE_NODE_TOTAL}
+      - when:
+          condition:
+            equal: [42, 42] # Always run codecov reports regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
+          steps:
            - generate_e2e_code_cov_report:
                suite: <<parameters.suite>>
      - store_test_results:
@@ -137,6 +149,45 @@ jobs:
          path: coverage
      - store_artifacts:
          path: html-test-results
+      - when:
+          condition:
+            equal: [42, 42] # Always generate version artifacts regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
+          steps:
+            - generate_and_store_version_and_filesystem_artifacts
+  e2e-couchdb:
+    parameters:
+      node-version:
+        type: string
+    executor: ubuntu
+    steps:
+      - build_and_install:
+          node-version: <<parameters.node-version>>
+      - run: npx playwright@1.32.3 install #Necessary for bare ubuntu machine
+      - run: |
+          export $(cat src/plugins/persistence/couch/.env.ci | xargs)
+          docker-compose -f src/plugins/persistence/couch/couchdb-compose.yaml up --detach
+          sleep 3
+          bash src/plugins/persistence/couch/setup-couchdb.sh
+      - run: sh src/plugins/persistence/couch/replace-localstorage-with-couchdb-indexhtml.sh #Replace LocalStorage Plugin with CouchDB
+      - run: npm run test:e2e:couchdb
+      - when:
+          condition:
+            equal: [42, 42] # Always run codecov reports regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
+          steps:
+            - generate_e2e_code_cov_report:
+                suite: full #add to full suite
+      - store_test_results:
+          path: test-results/results.xml
+      - store_artifacts:
+          path: test-results
+      - store_artifacts:
+          path: coverage
+      - store_artifacts:
+          path: html-test-results
+      - when:
+          condition:
+            equal: [42, 42] # Always generate version artifacts regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
+          steps:
            - generate_and_store_version_and_filesystem_artifacts
  perf-test:
    parameters:
@@ -153,6 +204,10 @@ jobs:
          path: test-results
      - store_artifacts:
          path: html-test-results
+      - when:
+          condition:
+            equal: [42, 42] # Always run codecov reports regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
+          steps:
            - generate_and_store_version_and_filesystem_artifacts
  visual-test:
    parameters:
@@ -169,43 +224,52 @@ jobs:
          path: test-results
      - store_artifacts:
          path: html-test-results
+      - when:
+          condition:
+            equal: [42, 42] # Always generate version artifacts regardless of test failure https://discuss.circleci.com/t/make-custom-command-run-always-with-when-always/38957/2
+          steps:
            - generate_and_store_version_and_filesystem_artifacts
 workflows:
  overall-circleci-commit-status: #These jobs run on every commit
    jobs:
+      - lint:
+          name: node16-lint
+          node-version: lts/gallium
+      - unit-test:
+          name: node18-chrome
+          node-version: lts/hydrogen
      - e2e-test:
-          name: e2e-full
-          node-version: lts/gallium
-          suite: full
+          name: e2e-stable
+          node-version: lts/hydrogen
+          suite: stable
      - perf-test:
-          node-version: lts/gallium
+          node-version: lts/hydrogen
      - visual-test:
-          node-version: lts/gallium
+          node-version: lts/hydrogen

  the-nightly: #These jobs do not run on PRs, but against master at night
    jobs:
-      - unit-test:
-          name: node14-chrome-nightly
-          node-version: lts/fermium
      - unit-test:
          name: node16-chrome-nightly
          node-version: lts/gallium
      - unit-test:
          name: node18-chrome
-          node-version: "18"
+          node-version: lts/hydrogen
      - npm-audit:
-          node-version: lts/gallium
+          node-version: lts/hydrogen
      - e2e-test:
          name: e2e-full-nightly
-          node-version: lts/gallium
+          node-version: lts/hydrogen
          suite: full
      - perf-test:
-          node-version: lts/gallium
+          node-version: lts/hydrogen
      - visual-test:
-          node-version: lts/gallium
+          node-version: lts/hydrogen
+      - e2e-couchdb:
+          node-version: lts/hydrogen
    triggers:
      - schedule:
-          cron: "0 0 * * *"
+          cron: '0 0 * * *'
          filters:
            branches:
              only:
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,270 +1,165 @@
-const LEGACY_FILES = ["example/**"];
+const LEGACY_FILES = ['example/**'];
 module.exports = {
-    "env": {
-        "browser": true,
-        "es6": true,
-        "jasmine": true,
-        "amd": true
+  env: {
+    browser: true,
+    es6: true,
+    jasmine: true,
+    amd: true
  },
-    "globals": {
-        "_": "readonly"
+  globals: {
+    _: 'readonly'
  },
-    "extends": [
-        "eslint:recommended",
-        "plugin:compat/recommended",
-        "plugin:vue/recommended",
-        "plugin:you-dont-need-lodash-underscore/compatible"
+  plugins: ['prettier'],
+  extends: [
+    'eslint:recommended',
+    'plugin:compat/recommended',
+    'plugin:vue/recommended',
+    'plugin:you-dont-need-lodash-underscore/compatible',
+    'plugin:prettier/recommended'
  ],
-    "parser": "vue-eslint-parser",
-    "parserOptions": {
-        "parser": "@babel/eslint-parser",
-        "requireConfigFile": false,
-        "allowImportExportEverywhere": true,
-        "ecmaVersion": 2015,
-        "ecmaFeatures": {
-            "impliedStrict": true
+  parser: 'vue-eslint-parser',
+  parserOptions: {
+    parser: '@babel/eslint-parser',
+    requireConfigFile: false,
+    allowImportExportEverywhere: true,
+    ecmaVersion: 2015,
+    ecmaFeatures: {
+      impliedStrict: true
    }
  },
-    "rules": {
-        "you-dont-need-lodash-underscore/omit": "off",
-        "you-dont-need-lodash-underscore/throttle": "off",
-        "you-dont-need-lodash-underscore/flatten": "off",
-        "you-dont-need-lodash-underscore/get": "off",
-        "no-bitwise": "error",
-        "curly": "error",
-        "eqeqeq": "error",
-        "guard-for-in": "error",
-        "no-extend-native": "error",
-        "no-inner-declarations": "off",
-        "no-use-before-define": ["error", "nofunc"],
-        "no-caller": "error",
-        "no-irregular-whitespace": "error",
-        "no-new": "error",
-        "no-shadow": "error",
-        "no-undef": "error",
-        "no-unused-vars": [
-            "error",
+  rules: {
+    'prettier/prettier': 'error',
+    'you-dont-need-lodash-underscore/omit': 'off',
+    'you-dont-need-lodash-underscore/throttle': 'off',
+    'you-dont-need-lodash-underscore/flatten': 'off',
+    'you-dont-need-lodash-underscore/get': 'off',
+    'no-bitwise': 'error',
+    curly: 'error',
+    eqeqeq: 'error',
+    'guard-for-in': 'error',
+    'no-extend-native': 'error',
+    'no-inner-declarations': 'off',
+    'no-use-before-define': ['error', 'nofunc'],
+    'no-caller': 'error',
+    'no-irregular-whitespace': 'error',
+    'no-new': 'error',
+    'no-shadow': 'error',
+    'no-undef': 'error',
+    'no-unused-vars': [
+      'error',
      {
-                "vars": "all",
-                "args": "none"
+        vars: 'all',
+        args: 'none'
      }
    ],
-        "no-console": "off",
-        "no-trailing-spaces": "error",
-        "space-before-function-paren": [
-            "error",
+    'no-console': 'off',
+    'new-cap': [
+      'error',
      {
-                "anonymous": "always",
-                "asyncArrow": "always",
-                "named": "never"
+        capIsNew: false,
+        properties: false
      }
    ],
-        "array-bracket-spacing": "error",
-        "space-in-parens": "error",
-        "space-before-blocks": "error",
-        "comma-dangle": "error",
-        "eol-last": "error",
-        "new-cap": [
-            "error",
-            {
-                "capIsNew": false,
-                "properties": false
-            }
-        ],
-        "dot-notation": "error",
-        "indent": ["error", 4],
+    'dot-notation': 'error',

    // https://eslint.org/docs/rules/no-case-declarations
-        "no-case-declarations": "error",
+    'no-case-declarations': 'error',
    // https://eslint.org/docs/rules/max-classes-per-file
-        "max-classes-per-file": ["error", 1],
+    'max-classes-per-file': ['error', 1],
    // https://eslint.org/docs/rules/no-eq-null
-        "no-eq-null": "error",
+    'no-eq-null': 'error',
    // https://eslint.org/docs/rules/no-eval
-        "no-eval": "error",
-        // https://eslint.org/docs/rules/no-floating-decimal
-        "no-floating-decimal": "error",
+    'no-eval': 'error',
    // https://eslint.org/docs/rules/no-implicit-globals
-        "no-implicit-globals": "error",
+    'no-implicit-globals': 'error',
    // https://eslint.org/docs/rules/no-implied-eval
-        "no-implied-eval": "error",
+    'no-implied-eval': 'error',
    // https://eslint.org/docs/rules/no-lone-blocks
-        "no-lone-blocks": "error",
+    'no-lone-blocks': 'error',
    // https://eslint.org/docs/rules/no-loop-func
-        "no-loop-func": "error",
+    'no-loop-func': 'error',
    // https://eslint.org/docs/rules/no-new-func
-        "no-new-func": "error",
+    'no-new-func': 'error',
    // https://eslint.org/docs/rules/no-new-wrappers
-        "no-new-wrappers": "error",
+    'no-new-wrappers': 'error',
    // https://eslint.org/docs/rules/no-octal-escape
-        "no-octal-escape": "error",
+    'no-octal-escape': 'error',
    // https://eslint.org/docs/rules/no-proto
-        "no-proto": "error",
+    'no-proto': 'error',
    // https://eslint.org/docs/rules/no-return-await
-        "no-return-await": "error",
+    'no-return-await': 'error',
    // https://eslint.org/docs/rules/no-script-url
-        "no-script-url": "error",
+    'no-script-url': 'error',
    // https://eslint.org/docs/rules/no-self-compare
-        "no-self-compare": "error",
+    'no-self-compare': 'error',
    // https://eslint.org/docs/rules/no-sequences
-        "no-sequences": "error",
+    'no-sequences': 'error',
    // https://eslint.org/docs/rules/no-unmodified-loop-condition
-        "no-unmodified-loop-condition": "error",
+    'no-unmodified-loop-condition': 'error',
    // https://eslint.org/docs/rules/no-useless-call
-        "no-useless-call": "error",
-        // https://eslint.org/docs/rules/wrap-iife
-        "wrap-iife": "error",
+    'no-useless-call': 'error',
    // https://eslint.org/docs/rules/no-nested-ternary
-        "no-nested-ternary": "error",
-        // https://eslint.org/docs/rules/switch-colon-spacing
-        "switch-colon-spacing": "error",
+    'no-nested-ternary': 'error',
    // https://eslint.org/docs/rules/no-useless-computed-key
-        "no-useless-computed-key": "error",
-        // https://eslint.org/docs/rules/rest-spread-spacing
-        "rest-spread-spacing": ["error"],
+    'no-useless-computed-key': 'error',
    // https://eslint.org/docs/rules/no-var
-        "no-var": "error",
+    'no-var': 'error',
    // https://eslint.org/docs/rules/one-var
-        "one-var": ["error", "never"],
+    'one-var': ['error', 'never'],
    // https://eslint.org/docs/rules/default-case-last
-        "default-case-last": "error",
+    'default-case-last': 'error',
    // https://eslint.org/docs/rules/default-param-last
-        "default-param-last": "error",
+    'default-param-last': 'error',
    // https://eslint.org/docs/rules/grouped-accessor-pairs
-        "grouped-accessor-pairs": "error",
+    'grouped-accessor-pairs': 'error',
    // https://eslint.org/docs/rules/no-constructor-return
-        "no-constructor-return": "error",
+    'no-constructor-return': 'error',
    // https://eslint.org/docs/rules/array-callback-return
-        "array-callback-return": "error",
+    'array-callback-return': 'error',
    // https://eslint.org/docs/rules/no-invalid-this
-        "no-invalid-this": "error", // Believe this one actually surfaces some bugs
+    'no-invalid-this': 'error', // Believe this one actually surfaces some bugs
    // https://eslint.org/docs/rules/func-style
-        "func-style": ["error", "declaration"],
+    'func-style': ['error', 'declaration'],
    // https://eslint.org/docs/rules/no-unused-expressions
-        "no-unused-expressions": "error",
+    'no-unused-expressions': 'error',
    // https://eslint.org/docs/rules/no-useless-concat
-        "no-useless-concat": "error",
+    'no-useless-concat': 'error',
    // https://eslint.org/docs/rules/radix
-        "radix": "error",
+    radix: 'error',
    // https://eslint.org/docs/rules/require-await
-        "require-await": "error",
+    'require-await': 'error',
    // https://eslint.org/docs/rules/no-alert
-        "no-alert": "error",
+    'no-alert': 'error',
    // https://eslint.org/docs/rules/no-useless-constructor
-        "no-useless-constructor": "error",
+    'no-useless-constructor': 'error',
    // https://eslint.org/docs/rules/no-duplicate-imports
-        "no-duplicate-imports": "error",
+    'no-duplicate-imports': 'error',

    // https://eslint.org/docs/rules/no-implicit-coercion
-        "no-implicit-coercion": "error",
+    'no-implicit-coercion': 'error',
    //https://eslint.org/docs/rules/no-unneeded-ternary
-        "no-unneeded-ternary": "error",
-        // https://eslint.org/docs/rules/semi
-        "semi": ["error", "always"],
-        // https://eslint.org/docs/rules/no-multi-spaces
-        "no-multi-spaces": "error",
-        // https://eslint.org/docs/rules/key-spacing
-        "key-spacing": ["error", {
-            "afterColon": true
-        }],
-        // https://eslint.org/docs/rules/keyword-spacing
-        "keyword-spacing": ["error", {
-            "before": true,
-            "after": true
-        }],
-        // https://eslint.org/docs/rules/comma-spacing
-        // Also requires one line code fix
-        "comma-spacing": ["error", {
-            "after": true
-        }],
-        //https://eslint.org/docs/rules/no-whitespace-before-property
-        "no-whitespace-before-property": "error",
-        // https://eslint.org/docs/rules/object-curly-newline
-        "object-curly-newline": ["error", {
-            "consistent": true,
-            "multiline": true
-        }],
-        // https://eslint.org/docs/rules/object-property-newline
-        "object-property-newline": "error",
-        // https://eslint.org/docs/rules/brace-style
-        "brace-style": "error",
-        // https://eslint.org/docs/rules/no-multiple-empty-lines
-        "no-multiple-empty-lines": ["error", {"max": 1}],
-        // https://eslint.org/docs/rules/operator-linebreak
-        "operator-linebreak": ["error", "before", {"overrides": {"=": "after"}}],
-        // https://eslint.org/docs/rules/padding-line-between-statements
-        "padding-line-between-statements": ["error", {
-            "blankLine": "always",
-            "prev": "multiline-block-like",
-            "next": "*"
-        }, {
-            "blankLine": "always",
-            "prev": "*",
-            "next": "return"
-        }],
-        // https://eslint.org/docs/rules/space-infix-ops
-        "space-infix-ops": "error",
-        // https://eslint.org/docs/rules/space-unary-ops
-        "space-unary-ops": ["error", {
-            "words": true,
-            "nonwords": false
-        }],
-        // https://eslint.org/docs/rules/arrow-spacing
-        "arrow-spacing": "error",
-        // https://eslint.org/docs/rules/semi-spacing
-        "semi-spacing": ["error", {
-            "before": false,
-            "after": true
-        }],
-
-        "vue/html-indent": [
-            "error",
-            4,
-            {
-                "attribute": 1,
-                "baseIndent": 0,
-                "closeBracket": 0,
-                "alignAttributesVertically": true,
-                "ignores": []
-            }
-        ],
-        "vue/html-self-closing": ["error",
-            {
-                "html": {
-                    "void": "never",
-                    "normal": "never",
-                    "component": "always"
+    'no-unneeded-ternary': 'error',
+    'vue/first-attribute-linebreak': 'error',
+    'vue/multiline-html-element-content-newline': 'off',
+    'vue/singleline-html-element-content-newline': 'off',
+    'vue/multi-word-component-names': 'off', // TODO enable, align with conventions
+    'vue/no-mutating-props': 'off'
  },
-                "svg": "always",
-                "math": "always"
+  overrides: [
+    {
+      files: LEGACY_FILES,
+      rules: {
+        'no-unused-vars': [
+          'warn',
+          {
+            vars: 'all',
+            args: 'none',
+            varsIgnorePattern: 'controller'
          }
        ],
-        "vue/max-attributes-per-line": ["error", {
-            "singleline": 1,
-            "multiline": 1,
-        }],
-        "vue/first-attribute-linebreak": "error",
-        "vue/multiline-html-element-content-newline": "off",
-        "vue/singleline-html-element-content-newline": "off",
-        "vue/multi-word-component-names": "off", // TODO enable, align with conventions
-        "vue/no-mutating-props": "off"
-
-    },
-    "overrides": [
-        {
-            "files": LEGACY_FILES,
-            "rules": {
-                "no-unused-vars": [
-                    "warn",
-                    {
-                        "vars": "all",
-                        "args": "none",
-                        "varsIgnorePattern": "controller"
-                    }
-                ],
-                "no-nested-ternary": "off",
-                "no-var": "off",
-                "one-var": "off"
+        'no-nested-ternary': 'off',
+        'no-var': 'off',
+        'one-var': 'off'
      }
    }
  ]
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,12 @@
+# git-blame ignored revisions
+# To configure, run:
+#   git config blame.ignoreRevsFile .git-blame-ignore-revs
+# Requires Git > 2.23
+# See https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt
+
+# Copyright year update 2022
+4a9744e916d24122a81092f6b7950054048ba860
+# Copyright year update 2023
+8040b275fcf2ba71b42cd72d4daa64bb25c19c2d
+# Apply `prettier` formatting
+caa7bc6faebc204f67aedae3e35fb0d0d3ce27a7
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,35 +1,38 @@
-
 version: 2
 updates:
-  - package-ecosystem: "npm"
-    directory: "/"
+  - package-ecosystem: 'npm'
+    directory: '/'
    schedule:
-      interval: "daily"  
+      interval: 'weekly'
    open-pull-requests-limit: 10
    labels:
-      - "pr:e2e"
-      - "type:maintenance"
-      - "dependencies"
-      - "pr:daveit"
-      - "pr:platform"
+      - 'pr:daveit'
+      - 'pr:e2e'
+      - 'type:maintenance'
+      - 'dependencies'
+      - 'pr:platform'
    ignore:
      #We have to source the playwright container which is not detected by Dependabot
-      - dependency-name: "@playwright/test"
-      - dependency-name: "playwright-core"
+      - dependency-name: '@playwright/test'
+      - dependency-name: 'playwright-core'
      #Lots of noise in these type patch releases.
-      - dependency-name: "@babel/eslint-parser"
-        update-types: ["version-update:semver-patch"] 
-      - dependency-name: "eslint-plugin-vue"
-        update-types: ["version-update:semver-patch"]
-      - dependency-name: "babel-loader"
-        update-types: ["version-update:semver-patch"]
-      - dependency-name: "sinon"
-        update-types: ["version-update:semver-patch"]
-  - package-ecosystem: "github-actions"
-    directory: "/"
+      - dependency-name: '@babel/eslint-parser'
+        update-types: ['version-update:semver-patch']
+      - dependency-name: 'eslint-plugin-vue'
+        update-types: ['version-update:semver-patch']
+      - dependency-name: 'babel-loader'
+        update-types: ['version-update:semver-patch']
+      - dependency-name: 'sinon'
+        update-types: ['version-update:semver-patch']
+      - dependency-name: 'moment-timezone'
+        update-types: ['version-update:semver-patch']
+      - dependency-name: '@types/lodash'
+        update-types: ['version-update:semver-patch']
+  - package-ecosystem: 'github-actions'
+    directory: '/'
    schedule:
-      interval: "daily"    
+      interval: 'daily'
    labels:
-      - "type:maintenance"
-      - "dependencies"
-      - "pr:daveit"
+      - 'pr:daveit'
+      - 'type:maintenance'
+      - 'dependencies'
--- a/.github/workflows/e2e-couchdb.yml
+++ b/.github/workflows/e2e-couchdb.yml
@@ -1,38 +1,60 @@
-name: "e2e-couchdb"
+name: 'e2e-couchdb'
 on:
  workflow_dispatch:
  pull_request:
    types:
      - labeled
      - opened
-env:
-  OPENMCT_DATABASE_NAME: openmct
-  COUCH_ADMIN_USER: admin
-  COUCH_ADMIN_PASSWORD: password
-  COUCH_BASE_LOCAL: http://localhost:5984
-  COUCH_NODE_NAME: nonode@nohost
 jobs:
  e2e-couchdb:
-    if: ${{ github.event.label.name == 'pr:e2e:couchdb' }}
+    if: ${{ github.event.label.name == 'pr:e2e:couchdb' }} || ${{ github.event.action == 'opened' }}
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
-      - run : docker-compose -f src/plugins/persistence/couch/couchdb-compose.yaml up --detach
-      - run : sleep 3 # wait until CouchDB has started (TODO: there must be a better way)
-      - run : bash src/plugins/persistence/couch/setup-couchdb.sh
      - uses: actions/setup-node@v3
        with:
-          node-version: '16'
-      - run: npx playwright@1.29.0 install
+          node-version: 'lts/gallium'
+      - run: npx playwright@1.32.3 install
      - run: npm install
-      - run: sh src/plugins/persistence/couch/replace-localstorage-with-couchdb-indexhtml.sh
-      - run: npm run test:e2e:couchdb
-      - run: ls -latr
+      - name: Start CouchDB Docker Container and Init with Setup Scripts
+        run: |
+          export $(cat src/plugins/persistence/couch/.env.ci | xargs)
+          docker-compose -f src/plugins/persistence/couch/couchdb-compose.yaml up --detach
+          sleep 3
+          bash src/plugins/persistence/couch/setup-couchdb.sh
+          bash src/plugins/persistence/couch/replace-localstorage-with-couchdb-indexhtml.sh
+      - name: Run CouchDB Tests and publish to deploysentinel
+        env:
+          DEPLOYSENTINEL_API_KEY: ${{ secrets.DEPLOYSENTINEL_API_KEY }}
+        run: npm run test:e2e:couchdb
+      - name: Publish Results to Codecov.io
+        env:
+          SUPER_SECRET: ${{ secrets.CODECOV_TOKEN }}
+        run: npm run cov:e2e:full:publish
      - name: Archive test results
+        if: success() || failure()
        uses: actions/upload-artifact@v3
        with:
          path: test-results
      - name: Archive html test results
+        if: success() || failure()
        uses: actions/upload-artifact@v3
        with:
          path: html-test-results
+      - name: Remove pr:e2e:couchdb label (if present)
+        if: ${{ contains(github.event.pull_request.labels.*.name, 'pr:e2e:couchdb') }}
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const { owner, repo, number } = context.issue;
+            const labelToRemove = 'pr:e2e:couchdb';
+            try {
+              await github.rest.issues.removeLabel({
+                owner,
+                repo,
+                issue_number: number,
+                name: labelToRemove
+              });
+            } catch (error) {
+              core.warning(`Failed to remove 'pr:e2e:couchdb' label: ${error.message}`);
+            }
--- a/.github/workflows/e2e-pr.yml
+++ b/.github/workflows/e2e-pr.yml
@@ -1,11 +1,10 @@
-name: "e2e-pr"
+name: 'e2e-pr'
 on:
  workflow_dispatch:
  pull_request:
    types:
      - labeled
      - opened
-
 jobs:
  e2e-full:
    if: ${{ github.event.label.name == 'pr:e2e' }}
@@ -30,11 +29,18 @@ jobs:
      - uses: actions/setup-node@v3
        with:
          node-version: '16'
-      - run: npx playwright@1.29.0 install
+      - run: npx playwright@1.32.3 install
      - run: npx playwright install chrome-beta
      - run: npm install
-      - run: npm run test:e2e:full
+      - run: npm run test:e2e:full -- --max-failures=40
+      - run: npm run cov:e2e:report || true
+      - shell: bash
+        env:
+          SUPER_SECRET: ${{ secrets.CODECOV_TOKEN }}
+        run: |
+          npm run cov:e2e:full:publish
      - name: Archive test results
+        if: success() || failure()
        uses: actions/upload-artifact@v3
        with:
          path: test-results
@@ -60,3 +66,20 @@ jobs:
              repo: "openmct",
              body: 'Failure ❌ ! Build artifacts are here: https://github.com/nasa/openmct/actions/runs/' + context.runId
            })
+      - name: Remove pr:e2e label (if present)
+        if: ${{ contains(github.event.pull_request.labels.*.name, 'pr:e2e') }}
+        uses: actions/github-script@v6
+        with:
+          script: |
+            const { owner, repo, number } = context.issue;
+            const labelToRemove = 'pr:e2e';
+            try {
+              await github.rest.issues.removeLabel({
+                owner,
+                repo,
+                issue_number: number,
+                name: labelToRemove
+              });
+            } catch (error) {
+              core.warning(`Failed to remove 'pr:e2e' label: ${error.message}`);
+            }
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -1,21 +0,0 @@
-name: "e2e"
-on:
-  workflow_dispatch:
-    inputs: 
-      version:
-        description: 'Which branch do you want to test?' # Limited to branch for now
-        required: false
-        default: 'master' 
-jobs:
-  e2e:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.inputs.version }}
-      - uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-      - run: npm install
-      - name: Run the e2e tests
-        run: npm run test:e2e:ci
--- a/.github/workflows/pr-platform.yml
+++ b/.github/workflows/pr-platform.yml
@@ -1,4 +1,4 @@
-name: "pr-platform"
+name: 'pr-platform'
 on:
  workflow_dispatch:
  pull_request:
@@ -16,7 +16,6 @@ jobs:
          - macos-latest
          - windows-latest
        node_version:
-          - 14
          - 16
          - 18
        architecture:
--- a/.github/workflows/prcop.yml
+++ b/.github/workflows/prcop.yml
@@ -22,5 +22,5 @@ jobs:
      - name: Linting Pull Request
        uses: makaroni4/prcop@v1.0.35
        with:
-          config-file: ".github/workflows/prcop-config.json"
+          config-file: '.github/workflows/prcop-config.json'
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.prettierignore
+++ b/.prettierignore
@@ -0,0 +1,27 @@
+# Docs
+*.md
+
+# Build output
+target
+dist
+
+# Mac OS X Finder
+.DS_Store
+
+# Node dependencies
+node_modules
+
+# npm-debug log
+npm-debug.log
+
+# karma reports
+report.*.json
+
+# e2e test artifacts
+test-results
+html-test-results
+
+# codecov artifacts
+.nyc_output
+coverage
+codecov
--- a/.prettierrc
+++ b/.prettierrc
@@ -0,0 +1,5 @@
+{
+  "trailingComma": "none",
+  "singleQuote": true,
+  "printWidth": 100
+}
--- a/.webpack/webpack.common.js
+++ b/.webpack/webpack.common.js
@@ -8,80 +8,67 @@ This is the OpenMCT common webpack file. It is imported by the other three webpa
 There are separate npm scripts to use these configurations, though simply running `npm install`
 will use the default production configuration.
 */
-const path = require("path");
-const packageDefinition = require("../package.json");
-const CopyWebpackPlugin = require("copy-webpack-plugin");
-const webpack = require("webpack");
-const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+const path = require('path');
+const packageDefinition = require('../package.json');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+const webpack = require('webpack');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');

-const { VueLoaderPlugin } = require("vue-loader");
-let gitRevision = "error-retrieving-revision";
-let gitBranch = "error-retrieving-branch";
+const { VueLoaderPlugin } = require('vue-loader');
+let gitRevision = 'error-retrieving-revision';
+let gitBranch = 'error-retrieving-branch';

 try {
-    gitRevision = require("child_process")
-        .execSync("git rev-parse HEAD")
-        .toString()
-        .trim();
-    gitBranch = require("child_process")
-        .execSync("git rev-parse --abbrev-ref HEAD")
+  gitRevision = require('child_process').execSync('git rev-parse HEAD').toString().trim();
+  gitBranch = require('child_process')
+    .execSync('git rev-parse --abbrev-ref HEAD')
    .toString()
    .trim();
 } catch (err) {
  console.warn(err);
 }

-const projectRootDir = path.resolve(__dirname, "..");
+const projectRootDir = path.resolve(__dirname, '..');

 /** @type {import('webpack').Configuration} */
 const config = {
  context: projectRootDir,
  entry: {
-        openmct: "./openmct.js",
-        generatorWorker: "./example/generator/generatorWorker.js",
-        couchDBChangesFeed:
-            "./src/plugins/persistence/couch/CouchChangesFeed.js",
-        inMemorySearchWorker: "./src/api/objects/InMemorySearchWorker.js",
-        espressoTheme: "./src/plugins/themes/espresso-theme.scss",
-        snowTheme: "./src/plugins/themes/snow-theme.scss"
+    openmct: './openmct.js',
+    generatorWorker: './example/generator/generatorWorker.js',
+    couchDBChangesFeed: './src/plugins/persistence/couch/CouchChangesFeed.js',
+    inMemorySearchWorker: './src/api/objects/InMemorySearchWorker.js',
+    espressoTheme: './src/plugins/themes/espresso-theme.scss',
+    snowTheme: './src/plugins/themes/snow-theme.scss'
  },
  output: {
-        globalObject: "this",
-        filename: "[name].js",
-        path: path.resolve(projectRootDir, "dist"),
-        library: "openmct",
-        libraryTarget: "umd",
-        publicPath: "",
-        hashFunction: "xxhash64",
+    globalObject: 'this',
+    filename: '[name].js',
+    path: path.resolve(projectRootDir, 'dist'),
+    library: 'openmct',
+    libraryTarget: 'umd',
+    publicPath: '',
+    hashFunction: 'xxhash64',
    clean: true
  },
  resolve: {
    alias: {
-            "@": path.join(projectRootDir, "src"),
-            legacyRegistry: path.join(projectRootDir, "src/legacyRegistry"),
-            saveAs: "file-saver/src/FileSaver.js",
-            csv: "comma-separated-values",
-            EventEmitter: "eventemitter3",
-            bourbon: "bourbon.scss",
-            "plotly-basic": "plotly.js-basic-dist",
-            "plotly-gl2d": "plotly.js-gl2d-dist",
-            "d3-scale": path.join(
-                projectRootDir,
-                "node_modules/d3-scale/dist/d3-scale.min.js"
-            ),
-            printj: path.join(
-                projectRootDir,
-                "node_modules/printj/dist/printj.min.js"
-            ),
-            styles: path.join(projectRootDir, "src/styles"),
-            MCT: path.join(projectRootDir, "src/MCT"),
-            testUtils: path.join(projectRootDir, "src/utils/testUtils.js"),
-            objectUtils: path.join(
-                projectRootDir,
-                "src/api/objects/object-utils.js"
-            ),
-            "kdbush": path.join(projectRootDir, "node_modules/kdbush/kdbush.min.js"),
-            utils: path.join(projectRootDir, "src/utils")
+      '@': path.join(projectRootDir, 'src'),
+      legacyRegistry: path.join(projectRootDir, 'src/legacyRegistry'),
+      saveAs: 'file-saver/src/FileSaver.js',
+      csv: 'comma-separated-values',
+      EventEmitter: 'eventemitter3',
+      bourbon: 'bourbon.scss',
+      'plotly-basic': 'plotly.js-basic-dist',
+      'plotly-gl2d': 'plotly.js-gl2d-dist',
+      'd3-scale': path.join(projectRootDir, 'node_modules/d3-scale/dist/d3-scale.min.js'),
+      printj: path.join(projectRootDir, 'node_modules/printj/dist/printj.min.js'),
+      styles: path.join(projectRootDir, 'src/styles'),
+      MCT: path.join(projectRootDir, 'src/MCT'),
+      testUtils: path.join(projectRootDir, 'src/utils/testUtils.js'),
+      objectUtils: path.join(projectRootDir, 'src/api/objects/object-utils.js'),
+      kdbush: path.join(projectRootDir, 'node_modules/kdbush/kdbush.min.js'),
+      utils: path.join(projectRootDir, 'src/utils')
    }
  },
  plugins: [
@@ -95,24 +82,24 @@ const config = {
    new CopyWebpackPlugin({
      patterns: [
        {
-                    from: "src/images/favicons",
-                    to: "favicons"
+          from: 'src/images/favicons',
+          to: 'favicons'
        },
        {
-                    from: "./index.html",
+          from: './index.html',
          transform: function (content) {
-                        return content.toString().replace(/dist\//g, "");
+            return content.toString().replace(/dist\//g, '');
          }
        },
        {
-                    from: "src/plugins/imagery/layers",
-                    to: "imagery"
+          from: 'src/plugins/imagery/layers',
+          to: 'imagery'
        }
      ]
    }),
    new MiniCssExtractPlugin({
-            filename: "[name].css",
-            chunkFilename: "[name].css"
+      filename: '[name].css',
+      chunkFilename: '[name].css'
    })
  ],
  module: {
@@ -122,49 +109,49 @@ const config = {
        use: [
          MiniCssExtractPlugin.loader,
          {
-                        loader: "css-loader"
+            loader: 'css-loader'
          },
          {
-                        loader: "resolve-url-loader"
+            loader: 'resolve-url-loader'
          },
          {
-                        loader: "sass-loader",
+            loader: 'sass-loader',
            options: { sourceMap: true }
          }
        ]
      },
      {
        test: /\.vue$/,
-                use: "vue-loader"
+        use: 'vue-loader'
      },
      {
        test: /\.html$/,
-                type: "asset/source"
+        type: 'asset/source'
      },
      {
        test: /\.(jpg|jpeg|png|svg)$/,
-                type: "asset/resource",
+        type: 'asset/resource',
        generator: {
-                    filename: "images/[name][ext]"
+          filename: 'images/[name][ext]'
        }
      },
      {
        test: /\.ico$/,
-                type: "asset/resource",
+        type: 'asset/resource',
        generator: {
-                    filename: "icons/[name][ext]"
+          filename: 'icons/[name][ext]'
        }
      },
      {
        test: /\.(woff|woff2?|eot|ttf)$/,
-                type: "asset/resource",
+        type: 'asset/resource',
        generator: {
-                    filename: "fonts/[name][ext]"
+          filename: 'fonts/[name][ext]'
        }
      }
    ]
  },
-    stats: "errors-warnings",
+  stats: 'errors-warnings',
  performance: {
    // We should eventually consider chunking to decrease
    // these values
--- a/.webpack/webpack.coverage.js
+++ b/.webpack/webpack.coverage.js
@@ -6,9 +6,9 @@ OpenMCT Continuous Integration servers use this configuration to add code covera
 information to pull requests.
 */

-const config = require("./webpack.dev");
+const config = require('./webpack.dev');
 // eslint-disable-next-line no-undef
-const CI = process.env.CI === "true";
+const CI = process.env.CI === 'true';

 config.devtool = CI ? false : undefined;

@@ -18,15 +18,15 @@ config.module.rules.push({
  test: /\.js$/,
  exclude: /(Spec\.js$)|(node_modules)/,
  use: {
-        loader: "babel-loader",
+    loader: 'babel-loader',
    options: {
      retainLines: true,
      // eslint-disable-next-line no-undef
      plugins: [
        [
-                    "babel-plugin-istanbul",
+          'babel-plugin-istanbul',
          {
-                        extension: [".js", ".vue"]
+            extension: ['.js', '.vue']
          }
        ]
      ]
--- a/.webpack/webpack.dev.js
+++ b/.webpack/webpack.dev.js
@@ -5,29 +5,29 @@ This configuration should be used for development purposes. It contains full sou
 devServer (which be invoked using by `npm start`), and a non-minified Vue.js distribution.
 If OpenMCT is to be used for a production server, use webpack.prod.js instead.
 */
-const path = require("path");
-const webpack = require("webpack");
-const { merge } = require("webpack-merge");
+const path = require('path');
+const webpack = require('webpack');
+const { merge } = require('webpack-merge');

-const common = require("./webpack.common");
-const projectRootDir = path.resolve(__dirname, "..");
+const common = require('./webpack.common');
+const projectRootDir = path.resolve(__dirname, '..');

 module.exports = merge(common, {
-    mode: "development",
+  mode: 'development',
  watchOptions: {
    // Since we use require.context, webpack is watching the entire directory.
    // We need to exclude any files we don't want webpack to watch.
    // See: https://webpack.js.org/configuration/watch/#watchoptions-exclude
    ignored: [
-            "**/{node_modules,dist,docs,e2e}", // All files in node_modules, dist, docs, e2e,
-            "**/{*.yml,Procfile,webpack*.js,babel*.js,package*.json,tsconfig.json}", // Config files
-            "**/*.{sh,md,png,ttf,woff,svg}", // Non source files
-            "**/.*" // dotfiles and dotfolders
+      '**/{node_modules,dist,docs,e2e}', // All files in node_modules, dist, docs, e2e,
+      '**/{*.yml,Procfile,webpack*.js,babel*.js,package*.json,tsconfig.json}', // Config files
+      '**/*.{sh,md,png,ttf,woff,svg}', // Non source files
+      '**/.*' // dotfiles and dotfolders
    ]
  },
  resolve: {
    alias: {
-            vue: path.join(projectRootDir, "node_modules/vue/dist/vue.js")
+      vue: path.join(projectRootDir, 'node_modules/vue/dist/vue.js')
    }
  },
  plugins: [
@@ -35,25 +35,29 @@ module.exports = merge(common, {
      __OPENMCT_ROOT_RELATIVE__: '"dist/"'
    })
  ],
-    devtool: "eval-source-map",
+  devtool: 'eval-source-map',
  devServer: {
    devMiddleware: {
      writeToDisk: (filePathString) => {
        const filePath = path.parse(filePathString);
-                const shouldWrite = !filePath.base.includes("hot-update");
+        const shouldWrite = !filePath.base.includes('hot-update');

        return shouldWrite;
      }
    },
-        watchFiles: ["**/*.css"],
+    watchFiles: ['**/*.css'],
    static: {
-            directory: path.join(__dirname, "..", "/dist"),
-            publicPath: "/dist",
+      directory: path.join(__dirname, '..', '/dist'),
+      publicPath: '/dist',
      watch: false
    },
    client: {
      progress: true,
-            overlay: true
+      overlay: {
+        // Disable overlay for runtime errors.
+        // See: https://github.com/webpack/webpack-dev-server/issues/4771
+        runtimeErrors: false
+      }
    }
  }
 });
--- a/.webpack/webpack.prod.js
+++ b/.webpack/webpack.prod.js
@@ -4,18 +4,18 @@
 This configuration should be used for production installs.
 It is the default webpack configuration.
 */
-const path = require("path");
-const webpack = require("webpack");
-const { merge } = require("webpack-merge");
+const path = require('path');
+const webpack = require('webpack');
+const { merge } = require('webpack-merge');

-const common = require("./webpack.common");
-const projectRootDir = path.resolve(__dirname, "..");
+const common = require('./webpack.common');
+const projectRootDir = path.resolve(__dirname, '..');

 module.exports = merge(common, {
-    mode: "production",
+  mode: 'production',
  resolve: {
    alias: {
-            vue: path.join(projectRootDir, "node_modules/vue/dist/vue.min.js")
+      vue: path.join(projectRootDir, 'node_modules/vue/dist/vue.min.js')
    }
  },
  plugins: [
@@ -23,5 +23,5 @@ module.exports = merge(common, {
      __OPENMCT_ROOT_RELATIVE__: '""'
    })
  ],
-    devtool: "source-map"
+  devtool: 'source-map'
 });
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,7 +24,7 @@ The short version:

 Open MCT uses git for software version control, and for branching and
 merging. The central repository is at
-https://github.com/nasa/openmct.git.
+<https://github.com/nasa/openmct.git>.

 ### Roles

@@ -116,6 +116,7 @@ the pull request containing the reviewer checklist (from below) and complete
 the merge back to the master branch.

 Additionally:
+
 * Every pull request must link to the issue that it addresses. Eg. “Addresses #1234” or “Closes #1234”. This is the responsibility of the pull request’s __author__. If no issue exists, [create one](https://github.com/nasa/openmct/issues/new/choose).
 * Every __author__ must include testing instructions. These instructions should identify the areas of code affected, and some minimal test steps. If addressing a bug, reproduction steps should be included, if they were not included in the original issue. If reproduction steps were included on the original issue, and are sufficient, refer to them.
 * A pull request that closes an issue should say so in the description. Including the text “Closes #1234” will cause the linked issue to be automatically closed when the pull request is merged. This is the responsibility of the pull request’s __author__.
@@ -132,14 +133,15 @@ changes.

 ### Code Standards

-JavaScript sources in Open MCT must satisfy the ESLint rules defined in 
-this repository. This is verified by the command line build.
+JavaScript sources in Open MCT must satisfy the [ESLint](https://eslint.org/) rules defined in
+this repository. [Prettier](https://prettier.io/) is used in conjunction with ESLint to enforce code style
+via automated formatting. These are verified by the command line build.

 #### Code Guidelines

 The following guidelines are provided for anyone contributing source code to the Open MCT project:

-1. Write clean code. Here’s a good summary - https://github.com/ryanmcdermott/clean-code-javascript.
+1. Write clean code. Here’s a good summary - <https://github.com/ryanmcdermott/clean-code-javascript>.
 1. Include JSDoc for any exposed API (e.g. public methods, classes).
 1. Include non-JSDoc comments as-needed for explaining private variables,
   methods, or algorithms when they are non-obvious. Otherwise code
@@ -159,17 +161,21 @@ The following guidelines are provided for anyone contributing source code to the
   (e.g. as arguments to a forEach call). Anonymous functions should always be arrow functions.
 1. Named functions are preferred over functions assigned to variables.
   eg.
+
   ```JavaScript
   function renameObject(object, newName) {
       Object.name = newName;
   }
   ```
+
   is preferable to
+
   ```JavaScript
   const rename = (object, newName) => {
       Object.name = newName;
   }
   ```
+
 1. Avoid deep nesting (especially of functions), except where necessary
   (e.g. due to closure scope).
 1. End with a single new-line character.
@@ -182,19 +188,24 @@ The following guidelines are provided for anyone contributing source code to the
   * Finally, the returned value. A single return statement at the end of the function should be used, except where an early return would improve code clarity.
 1. Avoid the use of "magic" values.
   eg.
+
   ```JavaScript
   const UNAUTHORIZED = 401;
   if (responseCode === UNAUTHORIZED)
   ```
+
   is preferable to
+
   ```JavaScript
   if (responseCode === 401)
   ```
+
 1. Use the ternary operator only for simple cases such as variable assignment. Nested ternaries should be avoided in all cases.
-1. Test specs should reside alongside the source code they test, not in a separate directory.
+1. Unit Test specs should reside alongside the source code they test, not in a separate directory.
 1. Organize code by feature, not by type.
   eg.
-   ```
+
+   ```txt
   - telemetryTable
       - row
           TableRow.js
@@ -206,8 +217,10 @@ The following guidelines are provided for anyone contributing source code to the
       plugin.js
       pluginSpec.js
   ```
+
   is preferable to
-   ```
+
+   ```txt
   - telemetryTable
       - components
           TableRow.vue
@@ -219,47 +232,10 @@ The following guidelines are provided for anyone contributing source code to the
       plugin.js
       pluginSpec.js
   ```
+
 Deviations from Open MCT code style guidelines require two-party agreement,
 typically from the author of the change and its reviewer.

-### Test Standards
-
-Automated testing shall occur whenever changes are merged into the main
-development branch and must be confirmed alongside any pull request.
-
-Automated tests are tests which exercise plugins, API, and utility classes. 
-Tests are subject to code review along with the actual implementation, to 
-ensure that tests are applicable and useful.
-
-Examples of useful tests:
-* Tests which replicate bugs (or their root causes) to verify their
-  resolution.
-* Tests which reflect details from software specifications.
-* Tests which exercise edge or corner cases among inputs.
-* Tests which verify expected interactions with other components in the
-  system.
-
-#### Guidelines
-* 100% statement coverage is achievable and desirable.
-* Do blackbox testing. Test external behaviors, not internal details. Write tests that describe what your plugin is supposed to do. How it does this doesn't matter, so don't test it.
-* Unit test specs for plugins should be defined at the plugin level. Start with one test spec per plugin named pluginSpec.js, and as this test spec grows too big, break it up into multiple test specs that logically group related tests.
-* Unit tests for API or for utility functions and classes may be defined at a per-source file level.
-* Wherever possible only use and mock public API, builtin functions, and UI in your test specs. Do not directly invoke any private functions. ie. only call or mock functions and objects exposed by openmct.* (eg. openmct.telemetry, openmct.objectView, etc.), and builtin browser functions (fetch, requestAnimationFrame, setTimeout, etc.).
-* Where builtin functions have been mocked, be sure to clear them between tests.
-* Test at an appropriate level of isolation. Eg. 
-    * If you’re testing a view, you do not need to test the whole application UI, you can just fetch the view provider using the public API and render the view into an element that you have created. 
-    * You do not need to test that the view switcher works, there should be separate tests for that. 
-    * You do not need to test that telemetry providers work, you can mock openmct.telemetry.request() to feed test data to the view.
-    * Use your best judgement when deciding on appropriate scope.
-* Automated tests for plugins should start by actually installing the plugin being tested, and then test that installing the plugin adds the desired features and behavior to Open MCT, observing the above rules.
-* All variables used in a test spec, including any instances of the Open MCT API should be declared inside of an appropriate block scope (not at the root level of the source file), and should be initialized in the relevant beforeEach block. `beforeEach` is preferable to `beforeAll` to avoid leaking of state between tests.
-* A `afterEach` or `afterAll` should be used to do any clean up necessary to prevent leakage of state between test specs. This can happen when functions on `window` are wrapped, or when the URL is changed. [A convenience function](https://github.com/nasa/openmct/blob/master/src/utils/testing.js#L59) is provided for resetting the URL and clearing builtin spies between tests.
-* If writing unit tests for legacy Angular code be sure to follow [best practices in order to avoid memory leaks](https://www.thecodecampus.de/blog/avoid-memory-leaks-angularjs-unit-tests/).
-
-#### Examples
-* [Example of an automated test spec for an object view plugin](https://github.com/nasa/openmct/blob/master/src/plugins/telemetryTable/pluginSpec.js)
-* [Example of an automated test spec for API](https://github.com/nasa/openmct/blob/master/src/api/time/TimeAPISpec.js)
-
 ### Commit Message Standards

 Commit messages should:
@@ -295,13 +271,13 @@ these standards.

 ## Issue Reporting

-Issues are tracked at https://github.com/nasa/openmct/issues.
+Issues are tracked at <https://github.com/nasa/openmct/issues>.

 Issue severity is categorized as follows (in ascending order):

 * _Trivial_: Minimal impact on the usefulness and functionality of the software; a "nice-to-have." Visual impact without functional impact,
 * _Medium_: Some impairment of use, but simple workarounds exist
-* _Critical_: Significant loss of functionality or impairment of use. Display of telemetry data is not affected though.
+* _Critical_: Significant loss of functionality or impairment of use. Display of telemetry data is not affected though. Complex workarounds exist.
 * _Blocker_: Major functionality is impaired or lost, threatening mission success. Display of telemetry data is impaired or blocked by the bug, which could lead to loss of situational awareness.

 ## Check Lists
@@ -310,22 +286,4 @@ The following check lists should be completed and attached to pull requests
 when they are filed (author checklist) and when they are merged (reviewer
 checklist).

-### Author Checklist
-
 [Within PR Template](.github/PULL_REQUEST_TEMPLATE.md)
-
-### Reviewer Checklist
-
-* [ ] Changes appear to address issue?
-* [ ] Changes appear not to be breaking changes?
-* [ ] Appropriate unit tests included?
-* [ ] Code style and in-line documentation are appropriate?
-* [ ] Commit messages meet standards?
-* [ ] Has associated issue been labelled `unverified`? (only applicable if this PR closes the issue)
-* [ ] Has associated issue been labelled `bug`? (only applicable if this PR is for a bug fix)
-* [ ] List of Acceptance Tests Performed.
-
-Write out a small list of tests performed with just enough detail for another developer on the team 
-to execute. 
-
-i.e. ```When Clicking on Add button, new `object` appears in dropdown.```
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 # Open MCT License

-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, Copyright (c) 2014-2023, 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.

--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Open MCT [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) [![Language grade: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/nasa/openmct.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/nasa/openmct/context:javascript) [![codecov](https://codecov.io/gh/nasa/openmct/branch/master/graph/badge.svg?token=7DQIipp3ej)](https://codecov.io/gh/nasa/openmct) [![This project is using Percy.io for visual regression testing.](https://percy.io/static/images/percy-badge.svg)](https://percy.io/b2e34b17/openmct) [![npm version](https://img.shields.io/npm/v/openmct.svg)](https://www.npmjs.com/package/openmct) 
+# Open MCT [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) [![codecov](https://codecov.io/gh/nasa/openmct/branch/master/graph/badge.svg?token=7DQIipp3ej)](https://codecov.io/gh/nasa/openmct) [![This project is using Percy.io for visual regression testing.](https://percy.io/static/images/percy-badge.svg)](https://percy.io/b2e34b17/openmct) [![npm version](https://img.shields.io/npm/v/openmct.svg)](https://www.npmjs.com/package/openmct) 

 Open MCT (Open Mission Control Technologies) is a next-generation mission control framework for visualization of data on desktop and mobile devices. It is developed at NASA's Ames Research Center, and is being used by NASA for data analysis of spacecraft missions, as well as planning and operation of experimental rover systems. As a generalizable and open source framework, Open MCT could be used as the basis for building applications for planning, operation, and analysis of any systems producing telemetry data.

@@ -98,7 +98,7 @@ To run the performance tests:
 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/). The list of CWE coverage items is avaiable in the [CodeQL docs](https://codeql.github.com/codeql-query-help/javascript-cwe/). The CodeQL workflow is specified in the [CodeQL analysis file](./.github/workflows/codeql-analysis.yml) and the custom [CodeQL config](./.github/codeql/codeql-config.yml).
+Each commit is analyzed for known security vulnerabilities using [CodeQL](https://codeql.github.com/docs/codeql-language-guides/codeql-library-for-javascript/). The list of CWE coverage items is avaiable in the [CodeQL docs](https://codeql.github.com/codeql-query-help/javascript-cwe/). The CodeQL workflow is specified in the [CodeQL analysis file](./.github/workflows/codeql-analysis.yml) and the custom [CodeQL config](./.github/codeql/codeql-config.yml).

 ### Test Reporting and Code Coverage

--- a/TESTING.md
+++ b/TESTING.md
@@ -0,0 +1,50 @@
+# Testing
+Open MCT Testing is iterating and improving at a rapid pace. This document serves to capture and index existing testing documentation and house documentation which no other obvious location as our testing evolves.
+
+## General Testing Process
+Documentation located [here](./docs/src/process/testing/plan.md)
+
+## Unit Testing
+Unit testing is essential part of our test strategy and complements our e2e testing strategy.
+
+#### Unit Test Guidelines
+* Unit Test specs should reside alongside the source code they test, not in a separate directory.
+* Unit test specs for plugins should be defined at the plugin level. Start with one test spec per plugin named pluginSpec.js, and as this test spec grows too big, break it up into multiple test specs that logically group related tests.
+* Unit tests for API or for utility functions and classes may be defined at a per-source file level.
+* Wherever possible only use and mock public API, builtin functions, and UI in your test specs. Do not directly invoke any private functions. ie. only call or mock functions and objects exposed by openmct.* (eg. openmct.telemetry, openmct.objectView, etc.), and builtin browser functions (fetch, requestAnimationFrame, setTimeout, etc.).
+* Where builtin functions have been mocked, be sure to clear them between tests.
+* Test at an appropriate level of isolation. Eg. 
+    * If you’re testing a view, you do not need to test the whole application UI, you can just fetch the view provider using the public API and render the view into an element that you have created. 
+    * You do not need to test that the view switcher works, there should be separate tests for that. 
+    * You do not need to test that telemetry providers work, you can mock openmct.telemetry.request() to feed test data to the view.
+    * Use your best judgement when deciding on appropriate scope.
+* Automated tests for plugins should start by actually installing the plugin being tested, and then test that installing the plugin adds the desired features and behavior to Open MCT, observing the above rules.
+* All variables used in a test spec, including any instances of the Open MCT API should be declared inside of an appropriate block scope (not at the root level of the source file), and should be initialized in the relevant beforeEach block. `beforeEach` is preferable to `beforeAll` to avoid leaking of state between tests.
+* A `afterEach` or `afterAll` should be used to do any clean up necessary to prevent leakage of state between test specs. This can happen when functions on `window` are wrapped, or when the URL is changed. [A convenience function](https://github.com/nasa/openmct/blob/master/src/utils/testing.js#L59) is provided for resetting the URL and clearing builtin spies between tests.
+
+#### Unit Test Examples
+* [Example of an automated test spec for an object view plugin](https://github.com/nasa/openmct/blob/master/src/plugins/telemetryTable/pluginSpec.js)
+* [Example of an automated test spec for API](https://github.com/nasa/openmct/blob/master/src/api/time/TimeAPISpec.js)
+
+#### Unit Testing Execution
+
+The unit tests can be executed in one of two ways:
+`npm run test` which runs the entire suite against headless chrome
+`npm run test:debug` for debugging the tests in realtime in an active chrome session.
+
+## e2e, performance, and visual testing
+Documentation located [here](./e2e/README.md)
+
+## Code Coverage
+
+* 100% statement coverage is achievable and desirable.
+
+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.
+
+### Limitations in our code coverage reporting
+
+Our code coverage implementation has two known limitations:
+- [Variability and accuracy](https://github.com/nasa/openmct/issues/5811)
+- [Vue instrumentation](https://github.com/nasa/openmct/issues/4973)
--- a/build-docs.sh
+++ b/build-docs.sh
@@ -1,7 +1,7 @@
 #!/bin/bash

 #*****************************************************************************
-#* Open MCT, Copyright (c) 2014-2022, United States Government
+#* Open MCT, Copyright (c) 2014-2023, United States Government
 #* as represented by the Administrator of the National Aeronautics and Space
 #* Administration. All rights reserved.
 #*
--- a/codecov.yml
+++ b/codecov.yml
@@ -11,18 +11,18 @@ coverage:
        informational: true
  precision: 2
  round: down
-  range: "66...100"
+  range: '66...100'

 flags:
  unit:
-    carryforward: true 
-  e2e-ci:
-    carryforward: true
+    carryforward: false
+  e2e-stable:
+    carryforward: false
  e2e-full:
    carryforward: true

 comment:
-  layout: "reach,diff,flags,files,footer"
+  layout: 'diff,flags,files,footer'
  behavior: default
  require_changes: false
  show_carryforward_flags: true
--- a/copyright-notice.html
+++ b/copyright-notice.html
@@ -1,5 +1,5 @@
 <!--
- Open MCT, Copyright (c) 2014-2022, United States Government
+ Open MCT, Copyright (c) 2014-2023, United States Government
 as represented by the Administrator of the National Aeronautics and Space
 Administration. All rights reserved.

--- a/copyright-notice.js
+++ b/copyright-notice.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/e2e/.eslintrc.js
+++ b/e2e/.eslintrc.js
@@ -1,14 +1,14 @@
 /* eslint-disable no-undef */
 module.exports = {
-    "extends": ["plugin:playwright/playwright-test"],
-    "rules": {
-        "playwright/max-nested-describe": ["error", { "max": 1 }]
+  extends: ['plugin:playwright/playwright-test'],
+  rules: {
+    'playwright/max-nested-describe': ['error', { max: 1 }]
  },
-    "overrides": [
+  overrides: [
    {
-            "files": ["tests/visual/*.spec.js"],
-            "rules": {
-                "playwright/no-wait-for-timeout": "off"
+      files: ['tests/visual/*.spec.js'],
+      rules: {
+        'playwright/no-wait-for-timeout': 'off'
      }
    }
  ]
--- a/e2e/README.md
+++ b/e2e/README.md
@@ -92,7 +92,9 @@ Read more about [Playwright Snapshots](https://playwright.dev/docs/test-snapshot
 - Snapshots need to be executed within the official Playwright container to ensure we're using the exact rendering platform in CI and locally. To do a valid comparison locally:

 ```sh
-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
+// Replace {X.X.X} with the current Playwright version 
+// from our package.json or circleCI configuration file
+docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:v{X.X.X}-focal /bin/bash
 npm install
 npx playwright test --config=e2e/playwright-ci.config.js --project=chrome --grep @snapshot
 ```
@@ -104,17 +106,20 @@ When the `@snapshot` tests fail, they will need to be evaluated to determine if
 To compare a snapshot, run a test and open the html report with the 'Expected' vs 'Actual' screenshot. If the actual screenshot is preferred, then the source-controlled 'Expected' snapshots will need to be updated with the following scripts.

 MacOS
+
 ```
 npm run test:e2e:updatesnapshots
 ```

 Linux/CI
+
 ```sh
 // Replace {X.X.X} with the current Playwright version 
 // from our package.json or circleCI configuration file
 docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/playwright:v{X.X.X}-focal /bin/bash
 npm install
 npm run test:e2e:updatesnapshots
+```

 ## Performance Testing

@@ -134,16 +139,18 @@ These tests are expected to become blocking and gating with assertions as we ext

 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.
+|File Path|Description|
+|:-:|-|
+|`./helper`                    | Contains helper functions or scripts which are leveraged directly within the test suites (e.g.: non-default plugin scripts injected into the DOM)|
+|`./test-data`                 | Contains test data which is leveraged or generated in the functional, performance, or visual test suites (e.g.: 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 (e.g.: Sine Wave Generator).|
+|`./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 testing framework's functionality and assumptions will continue to work based on further refactoring or Playwright version changes (e.g.: verifying custom fixtures and appActions).|
+|`./tests/performance/`        | Performance tests.|
+|`./tests/visual/`             | Visual tests.|
+|`./appActions.js`             | Contains common methods which can be leveraged by test case authors to quickly move through the application when writing new tests.|
+|`./baseFixture.js`            | Contains base fixtures which only extend default `@playwright/test` functionality. The expectation is that these fixtures will be removed as the native Playwright API improves|

 Our functional tests end in `*.e2e.spec.js`, visual tests in `*.visual.spec.js` and performance tests in `*.perf.spec.js`.

@@ -153,10 +160,12 @@ Where possible, we try to run Open MCT without modification or configuration cha

 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
+|Config File|Description|
+|:-:|-|
+|`./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

@@ -164,13 +173,15 @@ Test tags are a great way of organizing tests outside of a file structure. To le

 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 `npm start`.
- `@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.
- `@2p` - Indicates that multiple users are involved, or multiple tabs/pages are used. Useful for testing multi-user interactivity.
+|Test Tag|Description|
+|:-:|-|
+|`@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 `npm start`.|
+|`@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.|
+|`@2p` | Indicates that multiple users are involved, or multiple tabs/pages are used. Useful for testing multi-user interactivity.|

 ### Continuous Integration

@@ -195,6 +206,7 @@ CircleCI
 Github Actions / Workflow

 - Full suite against all browsers/projects. Triggered with Github Label Event 'pr:e2e'
+- CouchDB Tests. Triggered on PR Create and again with Github Label Event 'pr:e2e:couchdb'
 - Visual Tests. Triggered with Github Label Event 'pr:visual'

 #### 3. Scheduled / Batch Testing
@@ -226,7 +238,8 @@ At the same time, we don't want to waste CI resources on parallel runs, so we've

 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.
+- 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:

@@ -287,13 +300,24 @@ Skipping based on browser version (Rarely used): <https://github.com/microsoft/p
 - How to make tests robust to function in other contexts (VISTA, VIPER, etc.)
  - Leverage the use of `appActions.js` methods such as `createDomainObjectWithDefaults()`
 - How to make tests faster and more resilient
-  - When possible, navigate directly by URL
-  - Leverage `await page.goto('./', { waitUntil: 'networkidle' });`
+  - When possible, navigate directly by URL:
+
+  ```javascript
+    // You can capture the CreatedObjectInfo returned from this appAction:
+    const clock = await createDomainObjectWithDefaults(page, { type: 'Clock' });
+
+    // ...and use its `url` property to navigate directly to it later in the test:
+    await page.goto(clock.url);
+  ```
+
+  - Leverage `await page.goto('./', { waitUntil: 'domcontentloaded' });`
+    - Initial navigation should _almost_ always use the `{ waitUntil: 'domcontentloaded' }` option.
  - Avoid repeated setup to test to test a single assertion. Write longer tests with multiple soft assertions.

 ### How to write a great test (WIP)

 - Use our [App Actions](./appActions.js) for performing common actions whenever applicable.
+  - Use `waitForPlotsToRender()` before asserting against anything that is dependent upon plot series data being loaded and drawn.
 - If you create an object outside of using the `createDomainObjectWithDefaults` App Action, make sure to fill in the 'Notes' section of your object with `page.testNotes`:

  ```js
@@ -340,12 +364,16 @@ We leverage the following official Playwright reporters:
 - 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 running the tests locally with the `npm run test:e2e: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

+Our e2e code coverage is captured and combined with our unit test coverage. For more information, please see our [code coverage documentation](../TESTING.md)
+
+#### Generating 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```
@@ -356,10 +384,6 @@ At this point, the nyc linecov report can be published to [codecov.io](https://a
 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
--- a/e2e/appActions.js
+++ b/e2e/appActions.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -55,6 +55,7 @@

 const Buffer = require('buffer').Buffer;
 const genUuid = require('uuid').v4;
+const { expect } = require('@playwright/test');

 /**
 * This common function creates a domain object with the default options. It is the preferred way of creating objects
@@ -74,7 +75,6 @@ async function createDomainObjectWithDefaults(page, { type, name, parent = 'mine
  // Navigate to the parent object. This is necessary to create the object
  // in the correct location, such as a folder, layout, or plot.
  await page.goto(`${parentUrl}?hideTree=true`);
-    await page.waitForLoadState('networkidle');

  //Click the Create button
  await page.click('button:has-text("Create")');
@@ -84,7 +84,7 @@ async function createDomainObjectWithDefaults(page, { type, name, parent = 'mine

  // Modify the name input field of the domain object to accept 'name'
  const nameInput = page.locator('form[name="mctForm"] .first input[type="text"]');
-    await nameInput.fill("");
+  await nameInput.fill('');
  await nameInput.fill(name);

  if (page.testNotes) {
@@ -140,6 +140,7 @@ async function createNotification(page, createNotificationOptions) {
 }

 /**
+ * Expand an item in the tree by a given object name.
 * @param {import('@playwright/test').Page} page
 * @param {string} name
 */
@@ -159,6 +160,10 @@ async function expandTreePaneItemByName(page, name) {
 * @returns {Promise<CreatedObjectInfo>} An object containing information about the newly created domain object.
 */
 async function createPlanFromJSON(page, { name, json, parent = 'mine' }) {
+  if (!name) {
+    name = `Plan:${genUuid()}`;
+  }
+
  const parentUrl = await getHashUrlToDomainObject(page, parent);

  // Navigate to the parent object. This is necessary to create the object
@@ -172,11 +177,9 @@ async function createPlanFromJSON(page, { name, json, parent = 'mine' }) {
  await page.click(`li:text("Plan")`);

  // Modify the name input field of the domain object to accept 'name'
-    if (name) {
  const nameInput = page.locator('form[name="mctForm"] .first input[type="text"]');
-        await nameInput.fill("");
+  await nameInput.fill('');
  await nameInput.fill(name);
-    }

  // Upload buffer from memory
  await page.locator('input#fileElem').setInputFiles({
@@ -194,7 +197,7 @@ async function createPlanFromJSON(page, { name, json, parent = 'mine' }) {
  ]);

  // Wait until the URL is updated
-    await page.waitForURL(`**/mine/*`);
+  await page.waitForURL(`**/${parent}/*`);
  const uuid = await getFocusedObjectUuid(page);
  const objectUrl = await getHashUrlToDomainObject(page, uuid);

@@ -225,15 +228,17 @@ async function openObjectTreeContextMenu(page, url) {
 * @param {import('@playwright/test').Page} page
 * @param {"Main Tree" | "Create Modal Tree"} [treeName="Main Tree"]
 */
-async function expandEntireTree(page, treeName = "Main Tree") {
+async function expandEntireTree(page, treeName = 'Main Tree') {
  const treeLocator = page.getByRole('tree', {
    name: treeName
  });
-    const collapsedTreeItems = treeLocator.getByRole('treeitem', {
+  const collapsedTreeItems = treeLocator
+    .getByRole('treeitem', {
      expanded: false
-    }).locator('span.c-disclosure-triangle.is-enabled');
+    })
+    .locator('span.c-disclosure-triangle.is-enabled');

-    while (await collapsedTreeItems.count() > 0) {
+  while ((await collapsedTreeItems.count()) > 0) {
    await collapsedTreeItems.nth(0).click();

    // FIXME: Replace hard wait with something event-driven.
@@ -270,9 +275,13 @@ async function getFocusedObjectUuid(page) {
 * @returns {Promise<string>} the url of the object
 */
 async function getHashUrlToDomainObject(page, uuid) {
+  await page.waitForLoadState('load'); //Add some determinism
  const hashUrl = await page.evaluate(async (objectUuid) => {
    const path = await window.openmct.objects.getOriginalPath(objectUuid);
-        let url = './#/browse/' + [...path].reverse()
+    let url =
+      './#/browse/' +
+      [...path]
+        .reverse()
        .map((object) => window.openmct.objects.makeKeyString(object.identifier))
        .join('/');

@@ -383,18 +392,124 @@ async function setEndOffset(page, offset) {
  await setTimeConductorOffset(page, offset, endOffsetButton);
 }

+/**
+ * Selects an inspector tab based on the provided tab name
+ *
+ * @param {import('@playwright/test').Page} page
+ * @param {String} name the name of the tab
+ */
+async function selectInspectorTab(page, name) {
+  const inspectorTabs = page.getByRole('tablist');
+  const inspectorTab = inspectorTabs.getByTitle(name);
+  const inspectorTabClass = await inspectorTab.getAttribute('class');
+  const isSelectedInspectorTab = inspectorTabClass.includes('is-current');
+
+  // do not click a tab that is already selected or it will timeout your test
+  // do to a { pointer-events: none; } on selected tabs
+  if (!isSelectedInspectorTab) {
+    await inspectorTab.click();
+  }
+}
+
+/**
+ * Waits and asserts that all plot series data on the page
+ * is loaded and drawn.
+ *
+ * In lieu of a better way to detect when a plot is done rendering,
+ * we [attach a class to the '.gl-plot' element](https://github.com/nasa/openmct/blob/5924d7ea95a0c2d4141c602a3c7d0665cb91095f/src/plugins/plot/MctPlot.vue#L27)
+ * once all pending series data has been loaded. The following appAction retrieves
+ * all plots on the page and waits up to the default timeout for the class to be
+ * attached to each plot.
+ * @param {import('@playwright/test').Page} page
+ */
+async function waitForPlotsToRender(page) {
+  const plotLocator = page.locator('.gl-plot');
+  for (const plot of await plotLocator.all()) {
+    await expect(plot).toHaveClass(/js-series-data-loaded/);
+  }
+}
+
+/**
+ * @typedef {Object} PlotPixel
+ * @property {number} r The value of the red channel (0-255)
+ * @property {number} g The value of the green channel (0-255)
+ * @property {number} b The value of the blue channel (0-255)
+ * @property {number} a The value of the alpha channel (0-255)
+ * @property {string} strValue The rgba string value of the pixel
+ */
+
+/**
+ * Wait for all plots to render and then retrieve and return an array
+ * of canvas plot pixel data (RGBA values).
+ * @param {import('@playwright/test').Page} page
+ * @param {string} canvasSelector The selector for the canvas element
+ * @return {Promise<PlotPixel[]>}
+ */
+async function getCanvasPixels(page, canvasSelector) {
+  const getTelemValuePromise = new Promise((resolve) =>
+    page.exposeFunction('getCanvasValue', resolve)
+  );
+  const canvasHandle = await page.evaluateHandle(
+    (canvas) => document.querySelector(canvas),
+    canvasSelector
+  );
+  const canvasContextHandle = await page.evaluateHandle(
+    (canvas) => canvas.getContext('2d'),
+    canvasHandle
+  );
+
+  await waitForPlotsToRender(page);
+  await page.evaluate(
+    ([canvas, ctx]) => {
+      // The document canvas is where the plot points and lines are drawn.
+      // The only way to access the canvas is using document (using page.evaluate)
+      /** @type {ImageData} */
+      const data = ctx.getImageData(0, 0, canvas.width, canvas.height).data;
+      /** @type {number[]} */
+      const imageDataValues = Object.values(data);
+      /** @type {PlotPixel[]} */
+      const plotPixels = [];
+      // Each pixel consists of four values within the ImageData.data array. The for loop iterates by multiples of four.
+      // The values associated with each pixel are R (red), G (green), B (blue), and A (alpha), in that order.
+      for (let i = 0; i < imageDataValues.length; ) {
+        if (imageDataValues[i] > 0) {
+          plotPixels.push({
+            r: imageDataValues[i],
+            g: imageDataValues[i + 1],
+            b: imageDataValues[i + 2],
+            a: imageDataValues[i + 3],
+            strValue: `rgb(${imageDataValues[i]}, ${imageDataValues[i + 1]}, ${
+              imageDataValues[i + 2]
+            }, ${imageDataValues[i + 3]})`
+          });
+        }
+
+        i = i + 4;
+      }
+
+      window.getCanvasValue(plotPixels);
+    },
+    [canvasHandle, canvasContextHandle]
+  );
+
+  return getTelemValuePromise;
+}
+
 // eslint-disable-next-line no-undef
 module.exports = {
  createDomainObjectWithDefaults,
  createNotification,
-    expandTreePaneItemByName,
-    expandEntireTree,
  createPlanFromJSON,
-    openObjectTreeContextMenu,
+  expandEntireTree,
+  expandTreePaneItemByName,
+  getCanvasPixels,
  getHashUrlToDomainObject,
  getFocusedObjectUuid,
+  openObjectTreeContextMenu,
  setFixedTimeMode,
  setRealTimeMode,
  setStartOffset,
-    setEndOffset
+  setEndOffset,
+  selectInspectorTab,
+  waitForPlotsToRender
 };
--- a/e2e/baseFixtures.js
+++ b/e2e/baseFixtures.js
@@ -1,6 +1,6 @@
 /* eslint-disable no-undef */
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -56,12 +56,9 @@ function _consoleMessageToString(msg) {
 * @return {Promise<Animation[]>}
 */
 function waitForAnimations(locator) {
-    return locator
-        .evaluate((element) =>
-            Promise.all(
-                element
-                    .getAnimations({ subtree: true })
-                    .map((animation) => animation.finished)));
+  return locator.evaluate((element) =>
+    Promise.all(element.getAnimations({ subtree: true }).map((animation) => animation.finished))
+  );
 }

 /**
@@ -90,7 +87,8 @@ exports.test = base.test.extend({
   * @see {@link https://github.com/sinonjs/fake-timers/#var-clock--faketimersinstallconfig SinonJS FakeTimers Config}
   */
  clockOptions: [undefined, { option: true }],
-    overrideClock: [async ({ context, clockOptions }, use) => {
+  overrideClock: [
+    async ({ context, clockOptions }, use) => {
      if (clockOptions !== undefined) {
        await context.addInitScript({
          path: path.join(__dirname, '../', './node_modules/sinon/pkg/sinon.js')
@@ -101,10 +99,12 @@ exports.test = base.test.extend({
      }

      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}
@@ -112,19 +112,24 @@ exports.test = base.test.extend({
  context: async ({ context }, use) => {
    await context.addInitScript(() =>
      window.addEventListener('beforeunload', () =>
-                (window).collectIstanbulCoverage(JSON.stringify((window).__coverage__))
+        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);
+        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__)));
+      await page.evaluate(() =>
+        window.collectIstanbulCoverage(JSON.stringify(window.__coverage__))
+      );
    }
  },
  /**
@@ -147,8 +152,10 @@ exports.test = base.test.extend({

    // Assert against console errors during teardown
    if (failOnConsoleError) {
-            messages.forEach(
-                msg => expect.soft(msg.type(), `Console error detected: ${_consoleMessageToString(msg)}`).not.toEqual('error')
+      messages.forEach((msg) =>
+        expect
+          .soft(msg.type(), `Console error detected: ${_consoleMessageToString(msg)}`)
+          .not.toEqual('error')
      );
    }
  },
@@ -170,5 +177,6 @@ exports.test = base.test.extend({
    }
  }
 });
+
 exports.expect = expect;
 exports.waitForAnimations = waitForAnimations;
--- a/e2e/helper/addInitExampleFaultProvider.js
+++ b/e2e/helper/addInitExampleFaultProvider.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/e2e/helper/addInitExampleFaultProviderStatic.js
+++ b/e2e/helper/addInitExampleFaultProviderStatic.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/e2e/helper/addInitFaultManagementPlugin.js
+++ b/e2e/helper/addInitFaultManagementPlugin.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/e2e/helper/addInitFileInputObject.js
+++ b/e2e/helper/addInitFileInputObject.js
@@ -6,8 +6,7 @@ class DomainObjectViewProvider {
  }

  canView(domainObject) {
-        return domainObject.type === 'imageFileInput'
-            || domainObject.type === 'jsonFileInput';
+    return domainObject.type === 'imageFileInput' || domainObject.type === 'jsonFileInput';
  }

  view(domainObject, objectPath) {
@@ -36,7 +35,7 @@ document.addEventListener('DOMContentLoaded', () => {

  openmct.types.addType('jsonFileInput', {
    key: 'jsonFileInput',
-        name: "JSON File Input Object",
+    name: 'JSON File Input Object',
    creatable: true,
    form: [
      {
@@ -46,16 +45,14 @@ document.addEventListener('DOMContentLoaded', () => {
        required: true,
        text: 'Select File...',
        type: 'application/json',
-                property: [
-                    "selectFile"
-                ]
+        property: ['selectFile']
      }
    ]
  });

  openmct.types.addType('imageFileInput', {
    key: 'imageFileInput',
-        name: "Image File Input Object",
+    name: 'Image File Input Object',
    creatable: true,
    form: [
      {
@@ -65,9 +62,7 @@ document.addEventListener('DOMContentLoaded', () => {
        required: true,
        text: 'Select File...',
        type: 'image/*',
-                property: [
-                    "selectFile"
-                ]
+        property: ['selectFile']
      }
    ]
  });
--- a/e2e/helper/addInitNotebookWithUrls.js
+++ b/e2e/helper/addInitNotebookWithUrls.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/e2e/helper/addInitRestrictedNotebook.js
+++ b/e2e/helper/addInitRestrictedNotebook.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/e2e/helper/addNoneditableObject.js
+++ b/e2e/helper/addNoneditableObject.js
@@ -24,4 +24,4 @@
      }
    });
  });
-}());
+})();
--- a/e2e/helper/faultUtils.js
+++ b/e2e/helper/faultUtils.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -19,14 +19,13 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-
+/* global __dirname */
 const path = require('path');

 /**
 * @param {import('@playwright/test').Page} page
 */
 async function navigateToFaultManagementWithExample(page) {
-    // eslint-disable-next-line no-undef
  await page.addInitScript({ path: path.join(__dirname, './', 'addInitExampleFaultProvider.js') });

  await navigateToFaultItemInTree(page);
@@ -36,8 +35,9 @@ async function navigateToFaultManagementWithExample(page) {
 * @param {import('@playwright/test').Page} page
 */
 async function navigateToFaultManagementWithStaticExample(page) {
-    // eslint-disable-next-line no-undef
-    await page.addInitScript({ path: path.join(__dirname, './', 'addInitExampleFaultProviderStatic.js') });
+  await page.addInitScript({
+    path: path.join(__dirname, './', 'addInitExampleFaultProviderStatic.js')
+  });

  await navigateToFaultItemInTree(page);
 }
@@ -46,7 +46,6 @@ async function navigateToFaultManagementWithStaticExample(page) {
 * @param {import('@playwright/test').Page} page
 */
 async function navigateToFaultManagementWithoutExample(page) {
-    // eslint-disable-next-line no-undef
  await page.addInitScript({ path: path.join(__dirname, './', 'addInitFaultManagementPlugin.js') });

  await navigateToFaultItemInTree(page);
@@ -58,8 +57,16 @@ async function navigateToFaultManagementWithoutExample(page) {
 async function navigateToFaultItemInTree(page) {
  await page.goto('./', { waitUntil: 'networkidle' });

-    // Click text=Fault Management
-    await page.click('text=Fault Management'); // this verifies the plugin has been added
+  const faultManagementTreeItem = page
+    .getByRole('tree', {
+      name: 'Main Tree'
+    })
+    .getByRole('treeitem', {
+      name: 'Fault Management'
+    });
+
+  // Navigate to "Fault Management" from the tree
+  await faultManagementTreeItem.click();
 }

 /**
@@ -70,7 +77,6 @@ async function acknowledgeFault(page, rowNumber) {
  await page.locator('.c-menu >> text="Acknowledge"').click();
  // Click [aria-label="Save"]
  await page.locator('[aria-label="Save"]').click();
-
 }

 /**
@@ -141,8 +147,7 @@ async function clearSearch(page) {
 * @param {import('@playwright/test').Page} page
 */
 async function selectFaultItem(page, rowNumber) {
-    // eslint-disable-next-line playwright/no-force-option
-    await page.check(`.c-fault-mgmt-item > input >> nth=${rowNumber - 1}`, { force: true }); // this will not work without force true, saw this may be a pw bug
+  await page.locator(`.c-fault-mgmt-item > input >> nth=${rowNumber - 1}`).check();
 }

 /**
@@ -190,7 +195,9 @@ async function getFaultResultCount(page) {
 * @param {import('@playwright/test').Page} page
 */
 function getFault(page, rowNumber) {
-    const fault = page.locator(`.c-faults-list-view-item-body > .c-fault-mgmt__list >> nth=${rowNumber - 1}`);
+  const fault = page.locator(
+    `.c-faults-list-view-item-body > .c-fault-mgmt__list >> nth=${rowNumber - 1}`
+  );

  return fault;
 }
@@ -208,7 +215,9 @@ function getFaultByName(page, name) {
 * @param {import('@playwright/test').Page} page
 */
 async function getFaultName(page, rowNumber) {
-    const faultName = await page.locator(`.c-fault-mgmt__list-faultname >> nth=${rowNumber - 1}`).textContent();
+  const faultName = await page
+    .locator(`.c-fault-mgmt__list-faultname >> nth=${rowNumber - 1}`)
+    .textContent();

  return faultName;
 }
@@ -217,7 +226,9 @@ async function getFaultName(page, rowNumber) {
 * @param {import('@playwright/test').Page} page
 */
 async function getFaultSeverity(page, rowNumber) {
-    const faultSeverity = await page.locator(`.c-faults-list-view-item-body .c-fault-mgmt__list-severity >> nth=${rowNumber - 1}`).getAttribute('title');
+  const faultSeverity = await page
+    .locator(`.c-faults-list-view-item-body .c-fault-mgmt__list-severity >> nth=${rowNumber - 1}`)
+    .getAttribute('title');

  return faultSeverity;
 }
@@ -226,7 +237,9 @@ async function getFaultSeverity(page, rowNumber) {
 * @param {import('@playwright/test').Page} page
 */
 async function getFaultNamespace(page, rowNumber) {
-    const faultNamespace = await page.locator(`.c-fault-mgmt__list-path >> nth=${rowNumber - 1}`).textContent();
+  const faultNamespace = await page
+    .locator(`.c-fault-mgmt__list-path >> nth=${rowNumber - 1}`)
+    .textContent();

  return faultNamespace;
 }
@@ -235,7 +248,9 @@ async function getFaultNamespace(page, rowNumber) {
 * @param {import('@playwright/test').Page} page
 */
 async function getFaultTriggerTime(page, rowNumber) {
-    const faultTriggerTime = await page.locator(`.c-fault-mgmt__list-trigTime >> nth=${rowNumber - 1} >> .c-fault-mgmt-item__value`).textContent();
+  const faultTriggerTime = await page
+    .locator(`.c-fault-mgmt__list-trigTime >> nth=${rowNumber - 1} >> .c-fault-mgmt-item__value`)
+    .textContent();

  return faultTriggerTime.toString().trim();
 }
@@ -245,8 +260,9 @@ async function getFaultTriggerTime(page, rowNumber) {
 */
 async function openFaultRowMenu(page, rowNumber) {
  // select
-    await page.locator(`.c-fault-mgmt-item > .c-fault-mgmt__list-action-button >> nth=${rowNumber - 1}`).click();
-
+  await page
+    .locator(`.c-fault-mgmt-item > .c-fault-mgmt__list-action-button >> nth=${rowNumber - 1}`)
+    .click();
 }

 // eslint-disable-next-line no-undef
--- a/e2e/helper/notebookUtils.js
+++ b/e2e/helper/notebookUtils.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -28,13 +28,12 @@ const NOTEBOOK_DROP_AREA = '.c-notebook__drag-area';
 * @param {import('@playwright/test').Page} page
 */
 async function enterTextEntry(page, text) {
-    // Click .c-notebook__drag-area
+  // Click the 'Add Notebook Entry' area
  await page.locator(NOTEBOOK_DROP_AREA).click();

  // enter text
-    await page.locator('div.c-ne__text').click();
-    await page.locator('div.c-ne__text').fill(text);
-    await page.locator('div.c-ne__text').press('Enter');
+  await page.locator('[aria-label="Notebook Entry"].is-selected div.c-ne__text').fill(text);
+  await commitEntry(page);
 }

 /**
@@ -43,7 +42,7 @@ async function enterTextEntry(page, text) {
 async function dragAndDropEmbed(page, notebookObject) {
  // Create example telemetry object
  const swg = await createDomainObjectWithDefaults(page, {
-        type: "Sine Wave Generator"
+    type: 'Sine Wave Generator'
  });
  // Navigate to notebook
  await page.goto(notebookObject.url);
@@ -51,6 +50,16 @@ async function dragAndDropEmbed(page, notebookObject) {
  await page.click('button[title="Show selected item in tree"]');
  // Drag and drop the SWG into the notebook
  await page.dragAndDrop(`text=${swg.name}`, NOTEBOOK_DROP_AREA);
+  await commitEntry(page);
+}
+
+/**
+ * @private
+ * @param {import('@playwright/test').Page} page
+ */
+async function commitEntry(page) {
+  //Click the Commit Entry button
+  await page.locator('.c-ne__save-button > button').click();
 }

 // eslint-disable-next-line no-undef
--- a/e2e/helper/planningUtils.js
+++ b/e2e/helper/planningUtils.js
@@ -0,0 +1,101 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2023, 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.
+ *****************************************************************************/
+
+import { expect } from '../pluginFixtures';
+
+/**
+ * Asserts that the number of activities in the plan view matches the number of
+ * activities in the plan data within the specified time bounds. Performs an assertion
+ * for each activity in the plan data per group, using the earliest activity's
+ * start time as the start bound and the current activity's end time as the end bound.
+ * @param {import('@playwright/test').Page} page the page
+ * @param {object} plan The raw plan json to assert against
+ * @param {string} objectUrl The URL of the object to assert against (plan or gantt chart)
+ */
+export async function assertPlanActivities(page, plan, objectUrl) {
+  const groups = Object.keys(plan);
+  for (const group of groups) {
+    for (let i = 0; i < plan[group].length; i++) {
+      // Set the startBound to the start time of the first activity in the group
+      const startBound = plan[group][0].start;
+      // Set the endBound to the end time of the current activity
+      let endBound = plan[group][i].end;
+      if (endBound === startBound) {
+        // Prevent oddities with setting start and end bound equal
+        // via URL params
+        endBound += 1;
+      }
+
+      // Switch to fixed time mode with all plan events within the bounds
+      await page.goto(
+        `${objectUrl}?tc.mode=fixed&tc.startBound=${startBound}&tc.endBound=${endBound}&tc.timeSystem=utc&view=plan.view`
+      );
+
+      // Assert that the number of activities in the plan view matches the number of
+      // activities in the plan data within the specified time bounds
+      const eventCount = await page.locator('.activity-bounds').count();
+      expect(eventCount).toEqual(
+        Object.values(plan)
+          .flat()
+          .filter((event) =>
+            activitiesWithinTimeBounds(event.start, event.end, startBound, endBound)
+          ).length
+      );
+    }
+  }
+}
+
+/**
+ * Returns true if the activities time bounds overlap, false otherwise.
+ * @param {number} start1 the start time of the first activity
+ * @param {number} end1 the end time of the first activity
+ * @param {number} start2 the start time of the second activity
+ * @param {number} end2 the end time of the second activity
+ * @returns {boolean} true if the activities overlap, false otherwise
+ */
+function activitiesWithinTimeBounds(start1, end1, start2, end2) {
+  return (
+    (start1 >= start2 && start1 <= end2) ||
+    (end1 >= start2 && end1 <= end2) ||
+    (start2 >= start1 && start2 <= end1) ||
+    (end2 >= start1 && end2 <= end1)
+  );
+}
+
+/**
+ * Navigate to the plan view, switch to fixed time mode,
+ * and set the bounds to span all activities.
+ * @param {import('@playwright/test').Page} page
+ * @param {object} planJson
+ * @param {string} planObjectUrl
+ */
+export async function setBoundsToSpanAllActivities(page, planJson, planObjectUrl) {
+  const activities = Object.values(planJson).flat();
+  // Get the earliest start value
+  const start = Math.min(...activities.map((activity) => activity.start));
+  // Get the latest end value
+  const end = Math.max(...activities.map((activity) => activity.end));
+  // Set the start and end bounds to the earliest start and latest end
+  await page.goto(
+    `${planObjectUrl}?tc.mode=fixed&tc.startBound=${start}&tc.endBound=${end}&tc.timeSystem=utc&view=plan.view`
+  );
+}
--- a/e2e/helper/useSnowTheme.js
+++ b/e2e/helper/useSnowTheme.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/e2e/playwright-ci.config.js
+++ b/e2e/playwright-ci.config.js
@@ -9,16 +9,17 @@ const NUM_WORKERS = 2;

 /** @type {import('@playwright/test').PlaywrightTestConfig} */
 const config = {
-    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
+  retries: 2, //Retries 2 times for a total of 3 runs. When running sharded and with max-failures=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,
  webServer: {
    command: 'npm run start:coverage',
    url: 'http://localhost:8080/#',
    timeout: 200 * 1000,
    reuseExistingServer: false
  },
-    //maxFailures: MAX_FAILURES, //Limits failures to 5 to reduce CI Waste
+  maxFailures: MAX_FAILURES, //Limits failures to 5 to reduce CI Waste
  workers: NUM_WORKERS, //Limit to 2 for CircleCI Agent
  use: {
    baseURL: 'http://localhost:8080/',
@@ -68,12 +69,16 @@ const config = {
  ],
  reporter: [
    ['list'],
-        ['html', {
+    [
+      'html',
+      {
        open: 'never',
        outputFolder: '../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840
-        }],
-        ['junit', { outputFile: 'test-results/results.xml' }],
-        ['github']
+      }
+    ],
+    ['junit', { outputFile: '../test-results/results.xml' }],
+    ['github'],
+    ['@deploysentinel/playwright']
  ]
 };

--- a/e2e/playwright-local.config.js
+++ b/e2e/playwright-local.config.js
@@ -19,7 +19,7 @@ const config = {
  },
  workers: 1,
  use: {
-        browserName: "chromium",
+    browserName: 'chromium',
    baseURL: 'http://localhost:8080/',
    headless: false,
    ignoreHTTPSErrors: true,
@@ -94,10 +94,13 @@ const config = {
  ],
  reporter: [
    ['list'],
-        ['html', {
+    [
+      'html',
+      {
        open: 'on-failure',
        outputFolder: '../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840
-        }]
+      }
+    ]
  ]
 };

--- a/e2e/playwright-performance.config.js
+++ b/e2e/playwright-performance.config.js
@@ -17,7 +17,7 @@ const config = {
    reuseExistingServer: !CI
  },
  use: {
-        browserName: "chromium",
+    browserName: 'chromium',
    baseURL: 'http://localhost:8080/',
    headless: CI, //Only if running locally
    ignoreHTTPSErrors: true,
@@ -35,8 +35,8 @@ const config = {
  ],
  reporter: [
    ['list'],
-        ['junit', { outputFile: 'test-results/results.xml' }],
-        ['json', { outputFile: 'test-results/results.json' }]
+    ['junit', { outputFile: '../test-results/results.xml' }],
+    ['json', { outputFile: '../test-results/results.json' }]
  ]
 };

--- a/e2e/playwright-visual.config.js
+++ b/e2e/playwright-visual.config.js
@@ -40,11 +40,14 @@ const config = {
  ],
  reporter: [
    ['list'],
-        ['junit', { outputFile: 'test-results/results.xml' }],
-        ['html', {
+    ['junit', { outputFile: '../test-results/results.xml' }],
+    [
+      'html',
+      {
        open: 'on-failure',
        outputFolder: '../html-test-results' //Must be in different location due to https://github.com/microsoft/playwright/issues/12840
-        }]
+      }
+    ]
  ]
 };

--- a/e2e/pluginFixtures.js
+++ b/e2e/pluginFixtures.js
@@ -1,6 +1,6 @@
 /* eslint-disable no-undef */
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -120,7 +120,7 @@ const theme = 'espresso';
 *
 * @type {string}
 */
-const myItemsFolderName = "My Items";
+const myItemsFolderName = 'My Items';

 exports.test = test.extend({
  // This should follow in the Project's configuration. Can be set to 'snow' in playwright config.js
@@ -136,10 +136,7 @@ exports.test = test.extend({
    // Attach info about the currently running test and its project.
    // This will be used by appActions to fill in the created
    // domain object's notes.
-        page.testNotes = [
-            `${testInfo.titlePath.join('\n')}`,
-            `${testInfo.project.name}`
-        ].join('\n');
+    page.testNotes = [`${testInfo.titlePath.join('\n')}`, `${testInfo.project.name}`].join('\n');

    await use(page);
  },
@@ -150,3 +147,17 @@ exports.test = test.extend({
  }
 });
 exports.expect = expect;
+
+/**
+ * Takes a readable stream and returns a string.
+ * @param {ReadableStream} readable - the readable stream
+ * @return {Promise<String>} the stringified stream
+ */
+exports.streamToString = async function (readable) {
+  let result = '';
+  for await (const chunk of readable) {
+    result += chunk;
+  }
+
+  return result;
+};
--- a/e2e/test-data/ExampleLayouts.json
+++ b/e2e/test-data/ExampleLayouts.json
@@ -274,10 +274,7 @@
            "id": "ac0d7eb1-b485-458f-bd2a-a63aa87a3a8a"
          }
        ],
-        "layoutGrid": [
-          10,
-          10
-        ],
+        "layoutGrid": [10, 10],
        "objectStyles": {
          "ed63cc29-80e2-4e2b-a472-3d6d4adbf310": {
            "staticStyle": {
@@ -1455,9 +1452,7 @@
                  "id": "64e49fe7-5b36-43db-8347-4550b910de4c",
                  "telemetry": "any",
                  "operation": "greaterThan",
-                  "input": [
-                    "120"
-                  ],
+                  "input": ["120"],
                  "metadata": "sin"
                }
              ]
@@ -1475,10 +1470,7 @@
                  "id": "59f1c4bf-5d36-450c-9668-6546955fc066",
                  "telemetry": "any",
                  "operation": "between",
-                  "input": [
-                    "120",
-                    "-20"
-                  ],
+                  "input": ["120", "-20"],
                  "metadata": "sin"
                }
              ]
@@ -1496,9 +1488,7 @@
                  "id": "6707be12-6a6e-4535-bb97-ab5c86f99934",
                  "telemetry": "any",
                  "operation": "lessThan",
-                  "input": [
-                    "-20"
-                  ],
+                  "input": ["-20"],
                  "metadata": "sin"
                }
              ]
@@ -1550,9 +1540,7 @@
                  "id": "64e49fe7-5b36-43db-8347-4550b910de4c",
                  "telemetry": "any",
                  "operation": "greaterThan",
-                  "input": [
-                    "120"
-                  ],
+                  "input": ["120"],
                  "metadata": "sin"
                }
              ]
@@ -1570,10 +1558,7 @@
                  "id": "59f1c4bf-5d36-450c-9668-6546955fc066",
                  "telemetry": "any",
                  "operation": "between",
-                  "input": [
-                    "120",
-                    "-20"
-                  ],
+                  "input": ["120", "-20"],
                  "metadata": "sin"
                }
              ]
@@ -1591,9 +1576,7 @@
                  "id": "6707be12-6a6e-4535-bb97-ab5c86f99934",
                  "telemetry": "any",
                  "operation": "lessThan",
-                  "input": [
-                    "-20"
-                  ],
+                  "input": ["-20"],
                  "metadata": "sin"
                }
              ]
@@ -1645,9 +1628,7 @@
                  "id": "64e49fe7-5b36-43db-8347-4550b910de4c",
                  "telemetry": "any",
                  "operation": "greaterThan",
-                  "input": [
-                    "150"
-                  ],
+                  "input": ["150"],
                  "metadata": "sin"
                }
              ]
@@ -1665,10 +1646,7 @@
                  "id": "59f1c4bf-5d36-450c-9668-6546955fc066",
                  "telemetry": "any",
                  "operation": "between",
-                  "input": [
-                    "50",
-                    "-50"
-                  ],
+                  "input": ["50", "-50"],
                  "metadata": "sin"
                }
              ]
@@ -1720,9 +1698,7 @@
                  "id": "64e49fe7-5b36-43db-8347-4550b910de4c",
                  "telemetry": "any",
                  "operation": "greaterThan",
-                  "input": [
-                    "150"
-                  ],
+                  "input": ["150"],
                  "metadata": "sin"
                }
              ]
@@ -1740,10 +1716,7 @@
                  "id": "59f1c4bf-5d36-450c-9668-6546955fc066",
                  "telemetry": "any",
                  "operation": "between",
-                  "input": [
-                    "50",
-                    "-50"
-                  ],
+                  "input": ["50", "-50"],
                  "metadata": "sin"
                }
              ]
--- a/e2e/test-data/PerformanceDisplayLayout.json
+++ b/e2e/test-data/PerformanceDisplayLayout.json
@@ -1 +1,90 @@
-{"openmct":{"b3cee102-86dd-4c0a-8eec-4d5d276f8691":{"identifier":{"key":"b3cee102-86dd-4c0a-8eec-4d5d276f8691","namespace":""},"name":"Performance Display Layout","type":"layout","composition":[{"key":"9666e7b4-be0c-47a5-94b8-99accad7155e","namespace":""}],"configuration":{"items":[{"width":32,"height":18,"x":12,"y":9,"identifier":{"key":"9666e7b4-be0c-47a5-94b8-99accad7155e","namespace":""},"hasFrame":true,"fontSize":"default","font":"default","type":"subobject-view","id":"23ca351d-a67d-46aa-a762-290eb742d2f1"}],"layoutGrid":[10,10]},"modified":1654299875432,"location":"mine","persisted":1654299878751},"9666e7b4-be0c-47a5-94b8-99accad7155e":{"identifier":{"key":"9666e7b4-be0c-47a5-94b8-99accad7155e","namespace":""},"name":"Performance Example Imagery","type":"example.imagery","configuration":{"imageLocation":"","imageLoadDelayInMilliSeconds":20000,"imageSamples":[],"layers":[{"source":"dist/imagery/example-imagery-layer-16x9.png","name":"16:9","visible":false},{"source":"dist/imagery/example-imagery-layer-safe.png","name":"Safe","visible":false},{"source":"dist/imagery/example-imagery-layer-scale.png","name":"Scale","visible":false}]},"telemetry":{"values":[{"name":"Name","key":"name"},{"name":"Time","key":"utc","format":"utc","hints":{"domain":2}},{"name":"Local Time","key":"local","format":"local-format","hints":{"domain":1}},{"name":"Image","key":"url","format":"image","hints":{"image":1},"layers":[{"source":"dist/imagery/example-imagery-layer-16x9.png","name":"16:9"},{"source":"dist/imagery/example-imagery-layer-safe.png","name":"Safe"},{"source":"dist/imagery/example-imagery-layer-scale.png","name":"Scale"}]},{"name":"Image Download Name","key":"imageDownloadName","format":"imageDownloadName","hints":{"imageDownloadName":1}}]},"modified":1654299840077,"location":"b3cee102-86dd-4c0a-8eec-4d5d276f8691","persisted":1654299840078}},"rootId":"b3cee102-86dd-4c0a-8eec-4d5d276f8691"}
+{
+  "openmct": {
+    "b3cee102-86dd-4c0a-8eec-4d5d276f8691": {
+      "identifier": { "key": "b3cee102-86dd-4c0a-8eec-4d5d276f8691", "namespace": "" },
+      "name": "Performance Display Layout",
+      "type": "layout",
+      "composition": [{ "key": "9666e7b4-be0c-47a5-94b8-99accad7155e", "namespace": "" }],
+      "configuration": {
+        "items": [
+          {
+            "width": 32,
+            "height": 18,
+            "x": 12,
+            "y": 9,
+            "identifier": { "key": "9666e7b4-be0c-47a5-94b8-99accad7155e", "namespace": "" },
+            "hasFrame": true,
+            "fontSize": "default",
+            "font": "default",
+            "type": "subobject-view",
+            "id": "23ca351d-a67d-46aa-a762-290eb742d2f1"
+          }
+        ],
+        "layoutGrid": [10, 10]
+      },
+      "modified": 1654299875432,
+      "location": "mine",
+      "persisted": 1654299878751
+    },
+    "9666e7b4-be0c-47a5-94b8-99accad7155e": {
+      "identifier": { "key": "9666e7b4-be0c-47a5-94b8-99accad7155e", "namespace": "" },
+      "name": "Performance Example Imagery",
+      "type": "example.imagery",
+      "configuration": {
+        "imageLocation": "",
+        "imageLoadDelayInMilliSeconds": 20000,
+        "imageSamples": [],
+        "layers": [
+          {
+            "source": "dist/imagery/example-imagery-layer-16x9.png",
+            "name": "16:9",
+            "visible": false
+          },
+          {
+            "source": "dist/imagery/example-imagery-layer-safe.png",
+            "name": "Safe",
+            "visible": false
+          },
+          {
+            "source": "dist/imagery/example-imagery-layer-scale.png",
+            "name": "Scale",
+            "visible": false
+          }
+        ]
+      },
+      "telemetry": {
+        "values": [
+          { "name": "Name", "key": "name" },
+          { "name": "Time", "key": "utc", "format": "utc", "hints": { "domain": 2 } },
+          {
+            "name": "Local Time",
+            "key": "local",
+            "format": "local-format",
+            "hints": { "domain": 1 }
+          },
+          {
+            "name": "Image",
+            "key": "url",
+            "format": "image",
+            "hints": { "image": 1 },
+            "layers": [
+              { "source": "dist/imagery/example-imagery-layer-16x9.png", "name": "16:9" },
+              { "source": "dist/imagery/example-imagery-layer-safe.png", "name": "Safe" },
+              { "source": "dist/imagery/example-imagery-layer-scale.png", "name": "Scale" }
+            ]
+          },
+          {
+            "name": "Image Download Name",
+            "key": "imageDownloadName",
+            "format": "imageDownloadName",
+            "hints": { "imageDownloadName": 1 }
+          }
+        ]
+      },
+      "modified": 1654299840077,
+      "location": "b3cee102-86dd-4c0a-8eec-4d5d276f8691",
+      "persisted": 1654299840078
+    }
+  },
+  "rootId": "b3cee102-86dd-4c0a-8eec-4d5d276f8691"
+}
--- a/e2e/test-data/PerformanceNotebook.json
+++ b/e2e/test-data/PerformanceNotebook.json
@@ -1 +1,96 @@
-{"openmct":{"6d2fa9fd-f2aa-461a-a1e1-164ac44bec9d":{"identifier":{"key":"6d2fa9fd-f2aa-461a-a1e1-164ac44bec9d","namespace":""},"name":"Performance Notebook","type":"notebook","configuration":{"defaultSort":"oldest","entries":{"3e31c412-33ba-4757-8ade-e9821f6ba321":{"8c8f6035-631c-45af-8c24-786c60295335":[{"id":"entry-1652815305457","createdOn":1652815305457,"createdBy":"","text":"Existing Entry 1","embeds":[]},{"id":"entry-1652815313465","createdOn":1652815313465,"createdBy":"","text":"Existing Entry 2","embeds":[]},{"id":"entry-1652815399955","createdOn":1652815399955,"createdBy":"","text":"Existing Entry 3","embeds":[]}]}},"imageMigrationVer":"v1","pageTitle":"Page","sections":[{"id":"3e31c412-33ba-4757-8ade-e9821f6ba321","isDefault":false,"isSelected":false,"name":"Section1","pages":[{"id":"8c8f6035-631c-45af-8c24-786c60295335","isDefault":false,"isSelected":false,"name":"Page1","pageTitle":"Page"},{"id":"36555942-c9aa-439c-bbdb-0aaf50db50f5","isDefault":false,"isSelected":false,"name":"Page2","pageTitle":"Page"}],"sectionTitle":"Section"},{"id":"dab0bd1d-2c5a-405c-987f-107123d6189a","isDefault":false,"isSelected":true,"name":"Section2","pages":[{"id":"f625a86a-cb99-4898-8082-80543c8de534","isDefault":false,"isSelected":false,"name":"Page1","pageTitle":"Page"},{"id":"e77ef810-f785-42a7-942e-07e999b79c59","isDefault":false,"isSelected":true,"name":"Page2","pageTitle":"Page"}],"sectionTitle":"Section"}],"sectionTitle":"Section","type":"General","showTime":"0"},"modified":1652815915219,"location":"mine","persisted":1652815915222}},"rootId":"6d2fa9fd-f2aa-461a-a1e1-164ac44bec9d"}
+{
+  "openmct": {
+    "6d2fa9fd-f2aa-461a-a1e1-164ac44bec9d": {
+      "identifier": { "key": "6d2fa9fd-f2aa-461a-a1e1-164ac44bec9d", "namespace": "" },
+      "name": "Performance Notebook",
+      "type": "notebook",
+      "configuration": {
+        "defaultSort": "oldest",
+        "entries": {
+          "3e31c412-33ba-4757-8ade-e9821f6ba321": {
+            "8c8f6035-631c-45af-8c24-786c60295335": [
+              {
+                "id": "entry-1652815305457",
+                "createdOn": 1652815305457,
+                "createdBy": "",
+                "text": "Existing Entry 1",
+                "embeds": []
+              },
+              {
+                "id": "entry-1652815313465",
+                "createdOn": 1652815313465,
+                "createdBy": "",
+                "text": "Existing Entry 2",
+                "embeds": []
+              },
+              {
+                "id": "entry-1652815399955",
+                "createdOn": 1652815399955,
+                "createdBy": "",
+                "text": "Existing Entry 3",
+                "embeds": []
+              }
+            ]
+          }
+        },
+        "imageMigrationVer": "v1",
+        "pageTitle": "Page",
+        "sections": [
+          {
+            "id": "3e31c412-33ba-4757-8ade-e9821f6ba321",
+            "isDefault": false,
+            "isSelected": false,
+            "name": "Section1",
+            "pages": [
+              {
+                "id": "8c8f6035-631c-45af-8c24-786c60295335",
+                "isDefault": false,
+                "isSelected": false,
+                "name": "Page1",
+                "pageTitle": "Page"
+              },
+              {
+                "id": "36555942-c9aa-439c-bbdb-0aaf50db50f5",
+                "isDefault": false,
+                "isSelected": false,
+                "name": "Page2",
+                "pageTitle": "Page"
+              }
+            ],
+            "sectionTitle": "Section"
+          },
+          {
+            "id": "dab0bd1d-2c5a-405c-987f-107123d6189a",
+            "isDefault": false,
+            "isSelected": true,
+            "name": "Section2",
+            "pages": [
+              {
+                "id": "f625a86a-cb99-4898-8082-80543c8de534",
+                "isDefault": false,
+                "isSelected": false,
+                "name": "Page1",
+                "pageTitle": "Page"
+              },
+              {
+                "id": "e77ef810-f785-42a7-942e-07e999b79c59",
+                "isDefault": false,
+                "isSelected": true,
+                "name": "Page2",
+                "pageTitle": "Page"
+              }
+            ],
+            "sectionTitle": "Section"
+          }
+        ],
+        "sectionTitle": "Section",
+        "type": "General",
+        "showTime": "0"
+      },
+      "modified": 1652815915219,
+      "location": "mine",
+      "persisted": 1652815915222
+    }
+  },
+  "rootId": "6d2fa9fd-f2aa-461a-a1e1-164ac44bec9d"
+}
--- a/e2e/test-data/examplePlans/ExamplePlan_Large.json
+++ b/e2e/test-data/examplePlans/ExamplePlan_Large.json
--- a/e2e/test-data/examplePlans/ExamplePlan_Small1.json
+++ b/e2e/test-data/examplePlans/ExamplePlan_Small1.json
@@ -0,0 +1,44 @@
+{
+  "Group 1": [
+    {
+      "name": "Past event 1",
+      "start": 1660320408000,
+      "end": 1660343797000,
+      "type": "Group 1",
+      "color": "orange",
+      "textColor": "white"
+    },
+    {
+      "name": "Past event 2",
+      "start": 1660406808000,
+      "end": 1660429160000,
+      "type": "Group 1",
+      "color": "orange",
+      "textColor": "white"
+    },
+    {
+      "name": "Past event 3",
+      "start": 1660493208000,
+      "end": 1660503981000,
+      "type": "Group 1",
+      "color": "orange",
+      "textColor": "white"
+    },
+    {
+      "name": "Past event 4",
+      "start": 1660579608000,
+      "end": 1660624108000,
+      "type": "Group 1",
+      "color": "orange",
+      "textColor": "white"
+    },
+    {
+      "name": "Past event 5",
+      "start": 1660666008000,
+      "end": 1660681529000,
+      "type": "Group 1",
+      "color": "orange",
+      "textColor": "white"
+    }
+  ]
+}
--- a/e2e/test-data/examplePlans/ExamplePlan_Small2.json
+++ b/e2e/test-data/examplePlans/ExamplePlan_Small2.json
@@ -0,0 +1,38 @@
+{
+  "Group 1": [
+    {
+      "name": "Group 1 event 1",
+      "start": 1650320408000,
+      "end": 1660343797000,
+      "type": "Group 1",
+      "color": "orange",
+      "textColor": "white"
+    },
+    {
+      "name": "Group 1 event 2",
+      "start": 1660005808000,
+      "end": 1660429160000,
+      "type": "Group 1",
+      "color": "yellow",
+      "textColor": "white"
+    }
+  ],
+  "Group 2": [
+    {
+      "name": "Group 2 event 1",
+      "start": 1660320408000,
+      "end": 1660420408000,
+      "type": "Group 2",
+      "color": "green",
+      "textColor": "white"
+    },
+    {
+      "name": "Group 2 event 2",
+      "start": 1660406808000,
+      "end": 1690429160000,
+      "type": "Group 2",
+      "color": "blue",
+      "textColor": "white"
+    }
+  ]
+}
--- a/e2e/tests/framework/appActions.e2e.spec.js
+++ b/e2e/tests/framework/appActions.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -21,11 +21,15 @@
 *****************************************************************************/

 const { test, expect } = require('../../pluginFixtures.js');
-const { createDomainObjectWithDefaults, createNotification, expandEntireTree } = require('../../appActions.js');
+const {
+  createDomainObjectWithDefaults,
+  createNotification,
+  expandEntireTree
+} = require('../../appActions.js');

 test.describe('AppActions', () => {
  test('createDomainObjectsWithDefaults', async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    const e2eFolder = await createDomainObjectWithDefaults(page, {
      type: 'Folder',
@@ -85,8 +89,8 @@ test.describe('AppActions', () => {
      expect(folder3.url).toBe(`${e2eFolder.url}/${folder1.uuid}/${folder2.uuid}/${folder3.uuid}`);
    });
  });
-    test("createNotification", async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
+  test('createNotification', async ({ page }) => {
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
    await createNotification(page, {
      message: 'Test info notification',
      severity: 'info'
@@ -110,7 +114,7 @@ test.describe('AppActions', () => {
    await page.locator('[aria-label="Dismiss"]').click();
  });
  test('expandEntireTree', async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    const rootFolder = await createDomainObjectWithDefaults(page, {
      type: 'Folder'
@@ -144,7 +148,7 @@ test.describe('AppActions', () => {
    await page.goto('./#/browse/mine');
    await expandEntireTree(page);
    const treePane = page.getByRole('tree', {
-            name: "Main Tree"
+      name: 'Main Tree'
    });
    const treePaneCollapsedItems = treePane.getByRole('treeitem', { expanded: false });
    expect(await treePaneCollapsedItems.count()).toBe(0);
@@ -155,9 +159,9 @@ test.describe('AppActions', () => {

    // Click the object specified by 'type'
    await page.click(`li[role='menuitem']:text("Clock")`);
-        await expandEntireTree(page, "Create Modal Tree");
-        const locatorTree = page.getByRole("tree", {
-            name: "Create Modal Tree"
+    await expandEntireTree(page, 'Create Modal Tree');
+    const locatorTree = page.getByRole('tree', {
+      name: 'Create Modal Tree'
    });
    const locatorTreeCollapsedItems = locatorTree.locator('role=treeitem[expanded=false]');
    expect(await locatorTreeCollapsedItems.count()).toBe(0);
--- a/e2e/tests/framework/baseFixtures.e2e.spec.js
+++ b/e2e/tests/framework/baseFixtures.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -32,24 +32,22 @@ test.describe('baseFixtures tests', () => {
  test('Verify that tests fail if console.error is thrown', async ({ page }) => {
    test.fail();
    //Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    //Verify that ../fixtures.js detects console log errors
    await Promise.all([
      page.evaluate(() => console.error('This should result in a failure')),
      page.waitForEvent('console') // always wait for the event to happen while triggering it!
    ]);
-
  });
  test('Verify that tests pass if console.warn is thrown', async ({ page }) => {
    //Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    //Verify that ../fixtures.js detects console log errors
    await Promise.all([
      page.evaluate(() => console.warn('This should result in a pass')),
      page.waitForEvent('console') // always wait for the event to happen while triggering it!
    ]);
-
  });
 });
--- a/e2e/tests/framework/exampleTemplate.e2e.spec.js
+++ b/e2e/tests/framework/exampleTemplate.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -63,7 +63,7 @@ test.describe('Renaming Timer Object', () => {
  let timer;
  test.beforeEach(async ({ page }) => {
    // Open a browser, navigate to the main page, and wait until all network events to resolve
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    // We provide some helper functions in appActions like `createDomainObjectWithDefaults()`.
    // This example will create a Timer object with default properties, under the root folder:
@@ -79,7 +79,7 @@ test.describe('Renaming Timer Object', () => {
   * some hint as to what went wrong if the test fails.
   */
  test('An existing Timer object can be renamed via the 3dot actions menu', async ({ page }) => {
-        const newObjectName = "Renamed Timer";
+    const newObjectName = 'Renamed Timer';

    // We've created an example of a shared function which pases the page and newObjectName values
    await renameTimerFrom3DotMenu(page, timer.url, newObjectName);
@@ -89,8 +89,8 @@ test.describe('Renaming Timer Object', () => {
  });

  test('An existing Timer object can be renamed twice', async ({ page }) => {
-        const newObjectName = "Renamed Timer";
-        const newObjectName2 = "Re-Renamed Timer";
+    const newObjectName = 'Renamed Timer';
+    const newObjectName2 = 'Re-Renamed Timer';

    await renameTimerFrom3DotMenu(page, timer.url, newObjectName);

--- a/e2e/tests/framework/generateVisualTestData.e2e.spec.js
+++ b/e2e/tests/framework/generateVisualTestData.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -36,7 +36,7 @@ const { test, expect } = require('../../pluginFixtures.js');

 test('Generate Visual Test Data @localStorage', async ({ page, context }) => {
  //Go to baseURL
-    await page.goto('./', { waitUntil: 'networkidle' });
+  await page.goto('./', { waitUntil: 'domcontentloaded' });
  const overlayPlot = await createDomainObjectWithDefaults(page, { type: 'Overlay Plot' });

  // click create button
--- a/e2e/tests/framework/pluginFixtures.e2e.spec.js
+++ b/e2e/tests/framework/pluginFixtures.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -31,14 +31,12 @@ const { test } = require('../../pluginFixtures.js');
 test.describe.skip('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);
--- a/e2e/tests/framework/testData.e2e.spec.js
+++ b/e2e/tests/framework/testData.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -30,7 +30,6 @@ 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' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
  });
 });
-
--- a/e2e/tests/functional/branding.e2e.spec.js
+++ b/e2e/tests/functional/branding.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -29,7 +29,7 @@ const { test, expect } = require('../../baseFixtures.js');
 test.describe('Branding tests', () => {
  test('About Modal launches with basic branding properties', async ({ page }) => {
    // Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    // Click About button
    await page.click('.l-shell__app-logo');
@@ -41,13 +41,15 @@ test.describe('Branding tests', () => {
    const versionInformationLocator = page.locator('ul.t-info.l-info.s-info').first();
    await expect(versionInformationLocator).toBeEnabled();
    await expect.soft(versionInformationLocator).toContainText(/Version: \d/);
-        await expect.soft(versionInformationLocator).toContainText(/Build Date: ((?:Mon|Tue|Wed|Thu|Fri|Sat|Sun))/);
+    await expect
+      .soft(versionInformationLocator)
+      .toContainText(/Build Date: ((?:Mon|Tue|Wed|Thu|Fri|Sat|Sun))/);
    await expect.soft(versionInformationLocator).toContainText(/Revision: \b[0-9a-f]{5,40}\b/);
    await expect.soft(versionInformationLocator).toContainText(/Branch: ./);
  });
  test('Verify Links in About Modal @2p', async ({ page }) => {
    // Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    // Click About button
    await page.click('.l-shell__app-logo');
--- a/e2e/tests/functional/couchdb.e2e.spec.js
+++ b/e2e/tests/functional/couchdb.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -27,11 +27,11 @@

 const { test, expect } = require('../../pluginFixtures');

-test.describe("CouchDB Status Indicator with mocked responses @couchdb", () => {
+test.describe('CouchDB Status Indicator with mocked responses @couchdb', () => {
  test.use({ failOnConsoleError: false });
  //TODO BeforeAll Verify CouchDB Connectivity with APIContext
  test('Shows green if connected', async ({ page }) => {
-        await page.route('**/openmct/mine', route => {
+    await page.route('**/openmct/mine', (route) => {
      route.fulfill({
        status: 200,
        contentType: 'application/json',
@@ -40,11 +40,13 @@ test.describe("CouchDB Status Indicator with mocked responses @couchdb", () => {
    });

    //Go to baseURL
-        await page.goto('./#/browse/mine?hideTree=true&hideInspector=true', { waitUntil: 'networkidle' });
+    await page.goto('./#/browse/mine?hideTree=true&hideInspector=true', {
+      waitUntil: 'networkidle'
+    });
    await expect(page.locator('div:has-text("CouchDB is connected")').nth(3)).toBeVisible();
  });
  test('Shows red if not connected', async ({ page }) => {
-        await page.route('**/openmct/**', route => {
+    await page.route('**/openmct/**', (route) => {
      route.fulfill({
        status: 503,
        contentType: 'application/json',
@@ -53,11 +55,13 @@ test.describe("CouchDB Status Indicator with mocked responses @couchdb", () => {
    });

    //Go to baseURL
-        await page.goto('./#/browse/mine?hideTree=true&hideInspector=true', { waitUntil: 'networkidle' });
+    await page.goto('./#/browse/mine?hideTree=true&hideInspector=true', {
+      waitUntil: 'networkidle'
+    });
    await expect(page.locator('div:has-text("CouchDB is offline")').nth(3)).toBeVisible();
  });
  test('Shows unknown if it receives an unexpected response code', async ({ page }) => {
-        await page.route('**/openmct/mine', route => {
+    await page.route('**/openmct/mine', (route) => {
      route.fulfill({
        status: 418,
        contentType: 'application/json',
@@ -66,12 +70,14 @@ test.describe("CouchDB Status Indicator with mocked responses @couchdb", () => {
    });

    //Go to baseURL
-        await page.goto('./#/browse/mine?hideTree=true&hideInspector=true', { waitUntil: 'networkidle' });
+    await page.goto('./#/browse/mine?hideTree=true&hideInspector=true', {
+      waitUntil: 'networkidle'
+    });
    await expect(page.locator('div:has-text("CouchDB connectivity unknown")').nth(3)).toBeVisible();
  });
 });

-test.describe("CouchDB initialization with mocked responses @couchdb", () => {
+test.describe('CouchDB initialization with mocked responses @couchdb', () => {
  test.use({ failOnConsoleError: false });
  test("'My Items' folder is created if it doesn't exist", async ({ page }) => {
    const mockedMissingObjectResponsefromCouchDB = {
@@ -83,29 +89,30 @@ test.describe("CouchDB initialization with mocked responses @couchdb", () => {
    // Override the first request to GET openmct/mine to return a 404.
    // This simulates the case of starting Open MCT with a fresh database
    // and no "My Items" folder created yet.
-        await page.route('**/mine', route => {
+    await page.route(
+      '**/mine',
+      (route) => {
        route.fulfill(mockedMissingObjectResponsefromCouchDB);
-        }, { times: 1 });
+      },
+      { times: 1 }
+    );

    // Set up promise to verify that a PUT request to create "My Items"
    // folder was made.
-        const putMineFolderRequest = page.waitForRequest(req =>
-            req.url().endsWith('/mine')
-            && req.method() === 'PUT');
+    const putMineFolderRequest = page.waitForRequest(
+      (req) => req.url().endsWith('/mine') && req.method() === 'PUT'
+    );

    // Set up promise to verify that a GET request to retrieve "My Items"
    // folder was made.
-        const getMineFolderRequest = page.waitForRequest(req =>
-            req.url().endsWith('/mine')
-            && req.method() === 'GET');
+    const getMineFolderRequest = page.waitForRequest(
+      (req) => req.url().endsWith('/mine') && req.method() === 'GET'
+    );

    // Go to baseURL.
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    // Wait for both requests to resolve.
-        await Promise.all([
-            putMineFolderRequest,
-            getMineFolderRequest
-        ]);
+    await Promise.all([putMineFolderRequest, getMineFolderRequest]);
  });
 });
--- a/e2e/tests/functional/example/eventGenerator.e2e.spec.js
+++ b/e2e/tests/functional/example/eventGenerator.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -30,7 +30,7 @@ const { createDomainObjectWithDefaults } = require('../../../appActions');
 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' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    //Create a name for the object
    const newObjectName = 'Test Event Generator';
@@ -47,7 +47,6 @@ test.describe('Example Event Generator CRUD Operations', () => {
 });

 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
--- a/e2e/tests/functional/example/generator/sineWaveLimitProvider.e2e.spec.js
+++ b/e2e/tests/functional/example/generator/sineWaveLimitProvider.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -27,12 +27,15 @@ This test suite is dedicated to tests which verify the basic operations surround
 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 }) => {
+  test('Create new Sine Wave Generator Object and validate create Form Logic', async ({
+    page,
+    browserName
+  }) => {
    // eslint-disable-next-line playwright/no-skipped-test
    test.skip(browserName === 'firefox', 'This test needs to be updated to work with firefox');

    //Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    //Click the Create button
    await page.click('button:has-text("Create")');
@@ -45,7 +48,9 @@ test.describe('Sine Wave Generator', () => {
    await expect(page.locator('.c-form-row__state-indicator').first()).toHaveClass(/req/);

    // Verify that the Notes row does not have a required indicator
-        await expect(page.locator('.c-form__section div:nth-child(3) .form-row .c-form-row__state-indicator')).not.toContain('.req');
+    await expect(
+      page.locator('.c-form__section div:nth-child(3) .form-row .c-form-row__state-indicator')
+    ).not.toContain('.req');
    await page.locator('textarea[type="text"]').fill('Optional Note Text');

    // Period
@@ -67,20 +72,32 @@ test.describe('Sine Wave Generator', () => {
    await expect(page.locator('div:nth-child(9) .c-form-row__state-indicator')).toHaveClass(/req/);

    // Verify that by removing value from required text field shows invalid indicator
-        await page.locator('text=Properties Title Notes Period Amplitude Offset Data Rate (hz) Phase (radians) Ra >> input[type="text"]').fill('');
+    await page
+      .locator(
+        'text=Properties Title Notes Period Amplitude Offset Data Rate (hz) Phase (radians) Ra >> input[type="text"]'
+      )
+      .fill('');
    await expect(page.locator('.c-form-row__state-indicator').first()).toHaveClass(/invalid/);

    // Verify that by adding value to empty required text field changes invalid to valid indicator
-        await page.locator('text=Properties Title Notes Period Amplitude Offset Data Rate (hz) Phase (radians) Ra >> input[type="text"]').fill('New Sine Wave Generator');
+    await page
+      .locator(
+        'text=Properties Title Notes Period Amplitude Offset Data Rate (hz) Phase (radians) Ra >> input[type="text"]'
+      )
+      .fill('New Sine Wave Generator');
    await expect(page.locator('.c-form-row__state-indicator').first()).toHaveClass(/valid/);

    // Verify that by removing value from required number field shows invalid indicator
    await page.locator('.field.control.l-input-sm input').first().fill('');
-        await expect(page.locator('div:nth-child(4) .c-form-row__state-indicator')).toHaveClass(/invalid/);
+    await expect(page.locator('div:nth-child(4) .c-form-row__state-indicator')).toHaveClass(
+      /invalid/
+    );

    // Verify that by adding value to empty required number field changes invalid to valid indicator
    await page.locator('.field.control.l-input-sm input').first().fill('3');
-        await expect(page.locator('div:nth-child(4) .c-form-row__state-indicator')).toHaveClass(/valid/);
+    await expect(page.locator('div:nth-child(4) .c-form-row__state-indicator')).toHaveClass(
+      /valid/
+    );

    // Verify that can change value of number field by up/down arrows keys
    // Click .field.control.l-input-sm input >> nth=0
@@ -94,17 +111,19 @@ test.describe('Sine Wave Generator', () => {
    await expect(value).toBe('6');

    //Click text=OK
-        await Promise.all([
-            page.waitForNavigation(),
-            page.click('button:has-text("OK")')
-        ]);
+    await Promise.all([page.waitForNavigation(), page.click('button:has-text("OK")')]);

    // Verify that the Sine Wave Generator is displayed and correct
    // Verify object properties
-        await expect(page.locator('.l-browse-bar__object-name')).toContainText('New Sine Wave Generator');
+    await expect(page.locator('.l-browse-bar__object-name')).toContainText(
+      'New Sine Wave Generator'
+    );

    // Verify canvas rendered and can be interacted with
-        await page.locator('canvas').nth(1).click({
+    await page
+      .locator('canvas')
+      .nth(1)
+      .click({
        position: {
          x: 341,
          y: 28
@@ -113,7 +132,8 @@ test.describe('Sine Wave Generator', () => {

    // Verify that where we click on canvas shows the number we clicked on
    // Note that any number will do, we just care that a number exists
-        await expect(page.locator('.value-to-display-nearestValue')).toContainText(/[+-]?([0-9]*[.])?[0-9]+/);
-
+    await expect(page.locator('.value-to-display-nearestValue')).toContainText(
+      /[+-]?([0-9]*[.])?[0-9]+/
+    );
  });
 });
--- a/e2e/tests/functional/forms.e2e.spec.js
+++ b/e2e/tests/functional/forms.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -19,7 +19,7 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-
+/* global __dirname */
 /*
 This test suite is dedicated to tests which verify form functionality in isolation
 */
@@ -34,9 +34,11 @@ const jsonFilePath = 'e2e/test-data/ExampleLayouts.json';
 const imageFilePath = 'e2e/test-data/rick.jpg';

 test.describe('Form Validation Behavior', () => {
-    test('Required Field indicators appear if title is empty and can be corrected', async ({ page }) => {
+  test('Required Field indicators appear if title is empty and can be corrected', async ({
+    page
+  }) => {
    //Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    await page.click('button:has-text("Create")');
    await page.click(':nth-match(:text("Folder"), 2)');
@@ -60,10 +62,7 @@ test.describe('Form Validation Behavior', () => {
    await expect(page.locator('.c-form-row__state-indicator').first()).not.toHaveClass(/invalid/);

    //Finish Creating Domain Object
-        await Promise.all([
-            page.waitForNavigation(),
-            page.click('button:has-text("OK")')
-        ]);
+    await Promise.all([page.waitForNavigation(), page.click('button:has-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);
@@ -72,12 +71,13 @@ test.describe('Form Validation Behavior', () => {

 test.describe('Form File Input Behavior', () => {
  test.beforeEach(async ({ page }) => {
-        // eslint-disable-next-line no-undef
-        await page.addInitScript({ path: path.join(__dirname, '../../helper', 'addInitFileInputObject.js') });
+    await page.addInitScript({
+      path: path.join(__dirname, '../../helper', 'addInitFileInputObject.js')
+    });
  });

  test('Can select a JSON file type', async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    await page.getByRole('button', { name: ' Create ' }).click();
    await page.getByRole('menuitem', { name: 'JSON File Input Object' }).click();
@@ -91,7 +91,7 @@ test.describe('Form File Input Behavior', () => {
  });

  test('Can select an image file type', async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    await page.getByRole('button', { name: ' Create ' }).click();
    await page.getByRole('menuitem', { name: 'Image File Input Object' }).click();
@@ -108,8 +108,9 @@ test.describe('Form File Input Behavior', () => {
 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') });
+    await page.addInitScript({
+      path: path.join(__dirname, '../../helper', 'addNoneditableObject.js')
+    });
  });

  test('Persistability should be respected in the create form location field', async ({ page }) => {
@@ -117,7 +118,7 @@ test.describe('Persistence operations @addInit', () => {
      type: 'issue',
      description: 'https://github.com/nasa/openmct/issues/4323'
    });
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    await page.click('button:has-text("Create")');

@@ -132,13 +133,15 @@ test.describe('Persistence operations @addInit', () => {

 test.describe('Persistence operations @couchdb', () => {
  test.use({ failOnConsoleError: false });
-    test('Editing object properties should generate a single persistence operation', async ({ page }) => {
+  test('Editing object properties should generate a single persistence operation', async ({
+    page
+  }) => {
    test.info().annotations.push({
      type: 'issue',
      description: 'https://github.com/nasa/openmct/issues/5616'
    });

-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    // Create a new 'Clock' object with default settings
    const clock = await createDomainObjectWithDefaults(page, {
@@ -147,7 +150,7 @@ test.describe('Persistence operations @couchdb', () => {

    // Count all persistence operations (PUT requests) for this specific object
    let putRequestCount = 0;
-        page.on('request', req => {
+    page.on('request', (req) => {
      if (req.method() === 'PUT' && req.url().endsWith(clock.uuid)) {
        putRequestCount += 1;
      }
@@ -158,20 +161,28 @@ test.describe('Persistence operations @couchdb', () => {
    await page.click('li[title="Edit properties of this object."]');

    // Modify the display format from default 12hr -> 24hr and click 'Save'
-        await page.locator('select[aria-label="12 or 24 hour clock"]').selectOption({ value: 'clock24' });
+    await page
+      .locator('select[aria-label="12 or 24 hour clock"]')
+      .selectOption({ value: 'clock24' });
    await page.click('button[aria-label="Save"]');

-        await expect.poll(() => putRequestCount, {
+    await expect
+      .poll(() => putRequestCount, {
        message: 'Verify a single PUT request was made to persist the object',
        timeout: 1000
-        }).toEqual(1);
+      })
+      .toEqual(1);
  });
-    test('Can create an object after a conflict error @couchdb @2p', async ({ page }) => {
+  test('Can create an object after a conflict error @couchdb @2p', async ({
+    page,
+    openmctConfig
+  }) => {
    test.info().annotations.push({
      type: 'issue',
      description: 'https://github.com/nasa/openmct/issues/5982'
    });
-
+    const { myItemsFolderName } = openmctConfig;
+    // Instantiate a second page/tab
    const page2 = await page.context().newPage();

    // Both pages: Go to baseURL
@@ -180,6 +191,10 @@ test.describe('Persistence operations @couchdb', () => {
      page2.goto('./', { waitUntil: 'networkidle' })
    ]);

+    //Slow down the test a bit
+    await expect(page.getByRole('treeitem', { name: `  ${myItemsFolderName}` })).toBeVisible();
+    await expect(page2.getByRole('treeitem', { name: `  ${myItemsFolderName}` })).toBeVisible();
+
    // Both pages: Click the Create button
    await Promise.all([
      page.click('button:has-text("Create")'),
@@ -198,9 +213,9 @@ test.describe('Persistence operations @couchdb', () => {

    // Both pages: Fill in the 'Name' form field.
    await Promise.all([
-            nameInput.fill(""),
+      nameInput.fill(''),
      nameInput.fill(`Clock:${genUuid()}`),
-            nameInput2.fill(""),
+      nameInput2.fill(''),
      nameInput2.fill(`Clock:${genUuid()}`)
    ]);

@@ -209,10 +224,7 @@ test.describe('Persistence operations @couchdb', () => {
    const testNotes = page.testNotes;
    const notesInput = page.locator('form[name="mctForm"] #notes-textarea');
    const notesInput2 = page2.locator('form[name="mctForm"] #notes-textarea');
-        await Promise.all([
-            notesInput.fill(testNotes),
-            notesInput2.fill(testNotes)
-        ]);
+    await Promise.all([notesInput.fill(testNotes), notesInput2.fill(testNotes)]);

    // Page 2: Click "OK" to create the domain object and wait for navigation.
    // This will update the composition of the parent folder, setting the
@@ -238,9 +250,11 @@ test.describe('Persistence operations @couchdb', () => {
    ]);

    // Page 1: Verify that the conflict has occurred and an error notification is displayed.
-        await expect(page.locator('.c-message-banner__message', {
-            hasText: "Conflict detected while saving mine"
-        })).toBeVisible();
+    await expect(
+      page.locator('.c-message-banner__message', {
+        hasText: 'Conflict detected while saving mine'
+      })
+    ).toBeVisible();

    // Page 1: Start logging console errors from this point on
    let errors = [];
@@ -256,14 +270,19 @@ test.describe('Persistence operations @couchdb', () => {
    });

    // Page 1: Wait for save progress dialog to appear/disappear
-        await page.locator('.c-message-banner__message', {
-            hasText: 'Do not navigate away from this page or close this browser tab while this message is displayed.',
+    await page
+      .locator('.c-message-banner__message', {
+        hasText:
+          'Do not navigate away from this page or close this browser tab while this message is displayed.',
        state: 'visible'
-        }).waitFor({ state: 'hidden' });
+      })
+      .waitFor({ state: 'hidden' });

    // Page 1: Navigate to 'My Items' and verify that the second clock was created
    await page.goto('./#/browse/mine');
-        await expect(page.locator(`.c-grid-item__name[title="${clockAfterConflict.name}"]`)).toBeVisible();
+    await expect(
+      page.locator(`.c-grid-item__name[title="${clockAfterConflict.name}"]`)
+    ).toBeVisible();

    // Verify no console errors occurred
    expect(errors).toHaveLength(0);
--- a/e2e/tests/functional/menu.e2e.spec.js
+++ b/e2e/tests/functional/menu.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -19,7 +19,7 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-
+/* global __dirname */
 /*
 This test suite is dedicated to tests which verify persistability checks
 */
@@ -31,12 +31,13 @@ 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, '../../helper', 'addNoneditableObject.js') });
+    await page.addInitScript({
+      path: path.join(__dirname, '../../helper', 'addNoneditableObject.js')
+    });
  });

  test('Non-persistable objects should not show persistence related actions', async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    await page.locator('text=Persistence Testing').first().click({
      button: 'right'
@@ -45,6 +46,14 @@ test.describe('Persistence operations @addInit', () => {
    const menuOptions = page.locator('.c-menu li');

    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']);
+    await expect(menuOptions).not.toContainText([
+      'Move',
+      'Duplicate',
+      'Remove',
+      'Add New Folder',
+      'Edit Properties...',
+      'Export as JSON',
+      'Import from JSON'
+    ]);
  });
 });
--- a/e2e/tests/functional/moveAndLinkObjects.e2e.spec.js
+++ b/e2e/tests/functional/moveAndLinkObjects.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -28,7 +28,10 @@ const { test, expect } = require('../../pluginFixtures');
 const { createDomainObjectWithDefaults } = require('../../appActions');

 test.describe('Move & link item tests', () => {
-    test('Create a basic object and verify that it can be moved to another folder', async ({ page, openmctConfig }) => {
+  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
@@ -55,18 +58,22 @@ test.describe('Move & link item tests', () => {
    const treePane = page.getByRole('tree', {
      name: 'Main Tree'
    });
-        await treePane.getByRole('treeitem', {
+    await treePane
+      .getByRole('treeitem', {
        name: 'Parent Folder'
-        }).click({
+      })
+      .click({
        button: 'right'
      });

-        await page.getByRole('menuitem', {
+    await page
+      .getByRole('menuitem', {
        name: /Move/
-        }).click();
+      })
+      .click();

    const createModalTree = page.getByRole('tree', {
-            name: "Create Modal Tree"
+      name: 'Create Modal Tree'
    });
    const myItemsLocatorTreeItem = createModalTree.getByRole('treeitem', {
      name: myItemsFolderName
@@ -100,14 +107,18 @@ test.describe('Move & link item tests', () => {
    await page.locator('[aria-label="Cancel"]').click();

    // Move Child Folder from Parent Folder to My Items
-        await treePane.getByRole('treeitem', {
+    await treePane
+      .getByRole('treeitem', {
        name: new RegExp(childFolder.name)
-        }).click({
+      })
+      .click({
        button: 'right'
      });
-        await page.getByRole('menuitem', {
+    await page
+      .getByRole('menuitem', {
        name: /Move/
-        }).click();
+      })
+      .click();
    await myItemsLocatorTreeItem.click();

    await page.locator('[aria-label="Save"]').click();
@@ -118,7 +129,10 @@ test.describe('Move & link item tests', () => {
    // Expect that Child Folder is in My Items, the root folder
    expect(myItemsPaneTreeItem.locator('nth=0:has(text=Child Folder)')).toBeTruthy();
  });
-    test('Create a basic object and verify that it cannot be moved to telemetry object without Composition Provider', async ({ page, openmctConfig }) => {
+  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
@@ -158,11 +172,10 @@ test.describe('Move & link item tests', () => {
    await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();

    // Select Folder Object and select Move from context menu
-        await Promise.all([
-            page.waitForNavigation(),
-            page.locator(`a:has-text("${folder}")`).click()
-        ]);
-        await page.locator('.c-tree__item.is-navigated-object .c-tree__item__label .c-tree__item__type-icon').click({
+    await Promise.all([page.waitForNavigation(), page.locator(`a:has-text("${folder}")`).click()]);
+    await page
+      .locator('.c-tree__item.is-navigated-object .c-tree__item__label .c-tree__item__type-icon')
+      .click({
        button: 'right'
      });
    await page.locator('li.icon-move').click();
@@ -175,7 +188,10 @@ test.describe('Move & link item tests', () => {
    expect(okButtonStateDisabled2).toBeTruthy();
  });

-    test('Create a basic object and verify that it can be linked to another folder', async ({ page, openmctConfig }) => {
+  test('Create a basic object and verify that it can be linked to another folder', async ({
+    page,
+    openmctConfig
+  }) => {
    const { myItemsFolderName } = openmctConfig;

    // Go to Open MCT
@@ -202,18 +218,22 @@ test.describe('Move & link item tests', () => {
    const treePane = page.getByRole('tree', {
      name: 'Main Tree'
    });
-        await treePane.getByRole('treeitem', {
+    await treePane
+      .getByRole('treeitem', {
        name: 'Parent Folder'
-        }).click({
+      })
+      .click({
        button: 'right'
      });

-        await page.getByRole('menuitem', {
+    await page
+      .getByRole('menuitem', {
        name: /Move/
-        }).click();
+      })
+      .click();

    const createModalTree = page.getByRole('tree', {
-            name: "Create Modal Tree"
+      name: 'Create Modal Tree'
    });
    const myItemsLocatorTreeItem = createModalTree.getByRole('treeitem', {
      name: myItemsFolderName
@@ -247,14 +267,18 @@ test.describe('Move & link item tests', () => {
    await page.locator('[aria-label="Cancel"]').click();

    // Move Child Folder from Parent Folder to My Items
-        await treePane.getByRole('treeitem', {
+    await treePane
+      .getByRole('treeitem', {
        name: new RegExp(childFolder.name)
-        }).click({
+      })
+      .click({
        button: 'right'
      });
-        await page.getByRole('menuitem', {
+    await page
+      .getByRole('menuitem', {
        name: /Link/
-        }).click();
+      })
+      .click();
    await myItemsLocatorTreeItem.click();

    await page.locator('[aria-label="Save"]').click();
@@ -267,10 +291,13 @@ test.describe('Move & link item tests', () => {
  });
 });

-test.fixme('Cannot move a previously created domain object to non-peristable object in Move Modal', async ({ page }) => {
+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
-});
+  }
+);
--- a/e2e/tests/functional/notification.e2e.spec.js
+++ b/e2e/tests/functional/notification.e2e.spec.js
@@ -24,30 +24,69 @@
 This test suite is dedicated to tests which verify Open MCT's Notification functionality
 */

-// FIXME: Remove this eslint exception once tests are implemented
-// eslint-disable-next-line no-unused-vars
-const { createDomainObjectWithDefaults } = require('../../appActions');
+const { createDomainObjectWithDefaults, createNotification } = require('../../appActions');
 const { test, expect } = require('../../pluginFixtures');

 test.describe('Notifications List', () => {
-    test.fixme('Notifications can be dismissed individually', async ({ page }) => {
-        // Create some persistent notifications
-        // Verify that they are present in the notifications list
-        // Dismiss one of the notifications
-        // Verify that it is no longer present in the notifications list
-        // Verify that the other notifications are still present in the notifications list
+  test('Notifications can be dismissed individually', async ({ page }) => {
+    test.info().annotations.push({
+      type: 'issue',
+      description: 'https://github.com/nasa/openmct/issues/6122'
+    });
+
+    // Go to baseURL
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+
+    // Create an error notification with the message "Error message"
+    await createNotification(page, {
+      severity: 'error',
+      message: 'Error message'
+    });
+
+    // Create an alert notification with the message "Alert message"
+    await createNotification(page, {
+      severity: 'alert',
+      message: 'Alert message'
+    });
+
+    // Verify that there is a button with aria-label "Review 2 Notifications"
+    expect(await page.locator('button[aria-label="Review 2 Notifications"]').count()).toBe(1);
+
+    // Click on button with aria-label "Review 2 Notifications"
+    await page.click('button[aria-label="Review 2 Notifications"]');
+
+    // Click on button with aria-label="Dismiss notification of Error message"
+    await page.click('button[aria-label="Dismiss notification of Error message"]');
+
+    // Verify there is no a notification (listitem) with the text "Error message" since it was dismissed
+    expect(await page.locator('div[role="dialog"] div[role="listitem"]').innerText()).not.toContain(
+      'Error message'
+    );
+
+    // Verify there is still a notification (listitem) with the text "Alert message"
+    expect(await page.locator('div[role="dialog"] div[role="listitem"]').innerText()).toContain(
+      'Alert message'
+    );
+
+    // Click on button with aria-label="Dismiss notification of Alert message"
+    await page.click('button[aria-label="Dismiss notification of Alert message"]');
+
+    // Verify that there is no dialog since the notification overlay was closed automatically after all notifications were dismissed
+    expect(await page.locator('div[role="dialog"]').count()).toBe(0);
  });
 });

 test.describe('Notification Overlay', () => {
-    test('Closing notification list after notification banner disappeared does not cause it to open automatically', async ({ page }) => {
+  test('Closing notification list after notification banner disappeared does not cause it to open automatically', async ({
+    page
+  }) => {
    test.info().annotations.push({
      type: 'issue',
      description: 'https://github.com/nasa/openmct/issues/6130'
    });

    // Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    // Create a new Display Layout object
    await createDomainObjectWithDefaults(page, { type: 'Display Layout' });
--- a/e2e/tests/functional/planning/ganttChart.e2e.spec.js
+++ b/e2e/tests/functional/planning/ganttChart.e2e.spec.js
@@ -0,0 +1,127 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2023, 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.
+ *****************************************************************************/
+const { test, expect } = require('../../../pluginFixtures');
+const {
+  createPlanFromJSON,
+  createDomainObjectWithDefaults,
+  selectInspectorTab
+} = require('../../../appActions');
+const testPlan1 = require('../../../test-data/examplePlans/ExamplePlan_Small1.json');
+const testPlan2 = require('../../../test-data/examplePlans/ExamplePlan_Small2.json');
+const {
+  assertPlanActivities,
+  setBoundsToSpanAllActivities
+} = require('../../../helper/planningUtils');
+const { getPreciseDuration } = require('../../../../src/utils/duration');
+
+test.describe('Gantt Chart', () => {
+  let ganttChart;
+  let plan;
+  test.beforeEach(async ({ page }) => {
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+    ganttChart = await createDomainObjectWithDefaults(page, {
+      type: 'Gantt Chart'
+    });
+    plan = await createPlanFromJSON(page, {
+      json: testPlan1,
+      parent: ganttChart.uuid
+    });
+  });
+
+  test('Displays all plan events', async ({ page }) => {
+    await page.goto(ganttChart.url);
+
+    await assertPlanActivities(page, testPlan1, ganttChart.url);
+  });
+  test('Replaces a plan with a new plan', async ({ page }) => {
+    await assertPlanActivities(page, testPlan1, ganttChart.url);
+    await createPlanFromJSON(page, {
+      json: testPlan2,
+      parent: ganttChart.uuid
+    });
+    const replaceModal = page
+      .getByRole('dialog')
+      .filter({ hasText: 'This action will replace the current Plan. Do you want to continue?' });
+    await expect(replaceModal).toBeVisible();
+    await page.getByRole('button', { name: 'OK' }).click();
+
+    await assertPlanActivities(page, testPlan2, ganttChart.url);
+  });
+  test('Can select a single activity and display its details in the inspector', async ({
+    page
+  }) => {
+    test.slow();
+    await page.goto(ganttChart.url);
+
+    await setBoundsToSpanAllActivities(page, testPlan1, ganttChart.url);
+
+    const activities = Object.values(testPlan1).flat();
+    const activity = activities[0];
+    await page
+      .locator('g')
+      .filter({ hasText: new RegExp(activity.name) })
+      .click();
+    await selectInspectorTab(page, 'Activity');
+
+    const startDateTime = await page
+      .locator(
+        '.c-inspect-properties__label:has-text("Start DateTime")+.c-inspect-properties__value'
+      )
+      .innerText();
+    const endDateTime = await page
+      .locator('.c-inspect-properties__label:has-text("End DateTime")+.c-inspect-properties__value')
+      .innerText();
+    const duration = await page
+      .locator('.c-inspect-properties__label:has-text("duration")+.c-inspect-properties__value')
+      .innerText();
+
+    const expectedStartDate = new Date(activity.start).toISOString();
+    const actualStartDate = new Date(startDateTime).toISOString();
+    const expectedEndDate = new Date(activity.end).toISOString();
+    const actualEndDate = new Date(endDateTime).toISOString();
+    const expectedDuration = getPreciseDuration(activity.end - activity.start);
+    const actualDuration = duration;
+
+    expect(expectedStartDate).toEqual(actualStartDate);
+    expect(expectedEndDate).toEqual(actualEndDate);
+    expect(expectedDuration).toEqual(actualDuration);
+  });
+  test("Displays a Plan's draft status", async ({ page }) => {
+    test.info().annotations.push({
+      type: 'issue',
+      description: 'https://github.com/nasa/openmct/issues/6641'
+    });
+
+    // Mark the Plan's status as draft in the OpenMCT API
+    await page.evaluate(async (planObject) => {
+      await window.openmct.status.set(planObject.uuid, 'draft');
+    }, plan);
+
+    // Navigate to the Gantt Chart
+    await page.goto(ganttChart.url);
+
+    // Assert that the Plan's status is displayed as draft
+    expect(await page.locator('.u-contents.c-swimlane.is-status--draft').count()).toBe(
+      Object.keys(testPlan1).length
+    );
+  });
+});
--- a/e2e/tests/functional/planning/plan.e2e.spec.js
+++ b/e2e/tests/functional/planning/plan.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -19,69 +19,21 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-const { test, expect } = require('../../../pluginFixtures');
+const { test } = require('../../../pluginFixtures');
 const { createPlanFromJSON } = require('../../../appActions');
+const testPlan1 = require('../../../test-data/examplePlans/ExamplePlan_Small1.json');
+const { assertPlanActivities } = require('../../../helper/planningUtils');

-const testPlan = {
-    "TEST_GROUP": [
-        {
-            "name": "Past event 1",
-            "start": 1660320408000,
-            "end": 1660343797000,
-            "type": "TEST-GROUP",
-            "color": "orange",
-            "textColor": "white"
-        },
-        {
-            "name": "Past event 2",
-            "start": 1660406808000,
-            "end": 1660429160000,
-            "type": "TEST-GROUP",
-            "color": "orange",
-            "textColor": "white"
-        },
-        {
-            "name": "Past event 3",
-            "start": 1660493208000,
-            "end": 1660503981000,
-            "type": "TEST-GROUP",
-            "color": "orange",
-            "textColor": "white"
-        },
-        {
-            "name": "Past event 4",
-            "start": 1660579608000,
-            "end": 1660624108000,
-            "type": "TEST-GROUP",
-            "color": "orange",
-            "textColor": "white"
-        },
-        {
-            "name": "Past event 5",
-            "start": 1660666008000,
-            "end": 1660681529000,
-            "type": "TEST-GROUP",
-            "color": "orange",
-            "textColor": "white"
-        }
-    ]
-};
-
-test.describe("Plan", () => {
-    test("Create a Plan and display all plan events @unstable", async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        const plan = await createPlanFromJSON(page, {
-            name: 'Test Plan',
-            json: testPlan
-        });
-        const startBound = testPlan.TEST_GROUP[0].start;
-        const endBound = testPlan.TEST_GROUP[testPlan.TEST_GROUP.length - 1].end;
-
-        // Switch to fixed time mode with all plan events within the bounds
-        await page.goto(`${plan.url}?tc.mode=fixed&tc.startBound=${startBound}&tc.endBound=${endBound}&tc.timeSystem=utc&view=plan.view`);
-        const eventCount = await page.locator('.activity-bounds').count();
-        expect(eventCount).toEqual(testPlan.TEST_GROUP.length);
+test.describe('Plan', () => {
+  let plan;
+  test.beforeEach(async ({ page }) => {
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+    plan = await createPlanFromJSON(page, {
+      json: testPlan1
    });
  });

+  test('Displays all plan events', async ({ page }) => {
+    await assertPlanActivities(page, testPlan1, plan.url);
+  });
+});
--- a/e2e/tests/functional/planning/timelist.e2e.spec.js
+++ b/e2e/tests/functional/planning/timelist.e2e.spec.js
@@ -0,0 +1,122 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2023, 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.
+ *****************************************************************************/
+
+const { test, expect } = require('../../../pluginFixtures');
+const { createDomainObjectWithDefaults, createPlanFromJSON } = require('../../../appActions');
+
+const testPlan = {
+  TEST_GROUP: [
+    {
+      name: 'Past event 1',
+      start: 1660320408000,
+      end: 1660343797000,
+      type: 'TEST-GROUP',
+      color: 'orange',
+      textColor: 'white'
+    },
+    {
+      name: 'Past event 2',
+      start: 1660406808000,
+      end: 1660429160000,
+      type: 'TEST-GROUP',
+      color: 'orange',
+      textColor: 'white'
+    },
+    {
+      name: 'Past event 3',
+      start: 1660493208000,
+      end: 1660503981000,
+      type: 'TEST-GROUP',
+      color: 'orange',
+      textColor: 'white'
+    },
+    {
+      name: 'Past event 4',
+      start: 1660579608000,
+      end: 1660624108000,
+      type: 'TEST-GROUP',
+      color: 'orange',
+      textColor: 'white'
+    },
+    {
+      name: 'Past event 5',
+      start: 1660666008000,
+      end: 1660681529000,
+      type: 'TEST-GROUP',
+      color: 'orange',
+      textColor: 'white'
+    }
+  ]
+};
+
+test.describe('Time List', () => {
+  test('Create a Time List, add a single Plan to it and verify all the activities are displayed with no milliseconds', async ({
+    page
+  }) => {
+    // Goto baseURL
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+
+    const timelist = await test.step('Create a Time List', async () => {
+      const createdTimeList = await createDomainObjectWithDefaults(page, { type: 'Time List' });
+      const objectName = await page.locator('.l-browse-bar__object-name').innerText();
+      expect(objectName).toBe(createdTimeList.name);
+
+      return createdTimeList;
+    });
+
+    await test.step('Create a Plan and add it to the timelist', async () => {
+      const createdPlan = await createPlanFromJSON(page, {
+        name: 'Test Plan',
+        json: testPlan
+      });
+
+      await page.goto(timelist.url);
+      // Expand the tree to show the plan
+      await page.click("button[title='Show selected item in tree']");
+      await page.dragAndDrop(`role=treeitem[name=/${createdPlan.name}/]`, '.c-object-view');
+      await page.click("button[title='Save']");
+      await page.click("li[title='Save and Finish Editing']");
+      const startBound = testPlan.TEST_GROUP[0].start;
+      const endBound = testPlan.TEST_GROUP[testPlan.TEST_GROUP.length - 1].end;
+
+      // Switch to fixed time mode with all plan events within the bounds
+      await page.goto(
+        `${timelist.url}?tc.mode=fixed&tc.startBound=${startBound}&tc.endBound=${endBound}&tc.timeSystem=utc&view=timelist.view`
+      );
+
+      // Verify all events are displayed
+      const eventCount = await page.locator('.js-list-item').count();
+      expect(eventCount).toEqual(testPlan.TEST_GROUP.length);
+    });
+
+    await test.step('Does not show milliseconds in times', async () => {
+      // Get the first activity
+      const row = await page.locator('.js-list-item').first();
+      // Verify that none fo the times have milliseconds displayed.
+      // Example: 2024-11-17T16:00:00Z is correct and 2024-11-17T16:00:00.000Z is wrong
+
+      await expect(row.locator('.--start')).not.toContainText('.');
+      await expect(row.locator('.--end')).not.toContainText('.');
+      await expect(row.locator('.--duration')).not.toContainText('.');
+    });
+  });
+});
--- a/e2e/tests/functional/planning/timestrip.e2e.spec.js
+++ b/e2e/tests/functional/planning/timestrip.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -24,65 +24,69 @@ const { test, expect } = require('../../../pluginFixtures');
 const { createDomainObjectWithDefaults, createPlanFromJSON } = require('../../../appActions');

 const testPlan = {
-    "TEST_GROUP": [
+  TEST_GROUP: [
    {
-            "name": "Past event 1",
-            "start": 1660320408000,
-            "end": 1660343797000,
-            "type": "TEST-GROUP",
-            "color": "orange",
-            "textColor": "white"
+      name: 'Past event 1',
+      start: 1660320408000,
+      end: 1660343797000,
+      type: 'TEST-GROUP',
+      color: 'orange',
+      textColor: 'white'
    },
    {
-            "name": "Past event 2",
-            "start": 1660406808000,
-            "end": 1660429160000,
-            "type": "TEST-GROUP",
-            "color": "orange",
-            "textColor": "white"
+      name: 'Past event 2',
+      start: 1660406808000,
+      end: 1660429160000,
+      type: 'TEST-GROUP',
+      color: 'orange',
+      textColor: 'white'
    },
    {
-            "name": "Past event 3",
-            "start": 1660493208000,
-            "end": 1660503981000,
-            "type": "TEST-GROUP",
-            "color": "orange",
-            "textColor": "white"
+      name: 'Past event 3',
+      start: 1660493208000,
+      end: 1660503981000,
+      type: 'TEST-GROUP',
+      color: 'orange',
+      textColor: 'white'
    },
    {
-            "name": "Past event 4",
-            "start": 1660579608000,
-            "end": 1660624108000,
-            "type": "TEST-GROUP",
-            "color": "orange",
-            "textColor": "white"
+      name: 'Past event 4',
+      start: 1660579608000,
+      end: 1660624108000,
+      type: 'TEST-GROUP',
+      color: 'orange',
+      textColor: 'white'
    },
    {
-            "name": "Past event 5",
-            "start": 1660666008000,
-            "end": 1660681529000,
-            "type": "TEST-GROUP",
-            "color": "orange",
-            "textColor": "white"
+      name: 'Past event 5',
+      start: 1660666008000,
+      end: 1660681529000,
+      type: 'TEST-GROUP',
+      color: 'orange',
+      textColor: 'white'
    }
  ]
 };

-test.describe("Time Strip", () => {
-    test("Create two Time Strips, add a single Plan to both, and verify they can have separate Indepdenent Time Contexts @unstable", async ({ page }) => {
+test.describe('Time Strip', () => {
+  test('Create two Time Strips, add a single Plan to both, and verify they can have separate Indepdenent Time Contexts @unstable', async ({
+    page
+  }) => {
    test.info().annotations.push({
      type: 'issue',
      description: 'https://github.com/nasa/openmct/issues/5627'
    });

    // Constant locators
-        const independentTimeConductorInputs = page.locator('.l-shell__main-independent-time-conductor .c-input--datetime');
+    const independentTimeConductorInputs = page.locator(
+      '.l-shell__main-independent-time-conductor .c-input--datetime'
+    );
    const activityBounds = page.locator('.activity-bounds');

    // Goto baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

-        const timestrip = await test.step("Create a Time Strip", async () => {
+    const timestrip = await test.step('Create a Time Strip', async () => {
      const createdTimeStrip = await createDomainObjectWithDefaults(page, { type: 'Time Strip' });
      const objectName = await page.locator('.l-browse-bar__object-name').innerText();
      expect(objectName).toBe(createdTimeStrip.name);
@@ -90,7 +94,7 @@ test.describe("Time Strip", () => {
      return createdTimeStrip;
    });

-        const plan = await test.step("Create a Plan and add it to the timestrip", async () => {
+    const plan = await test.step('Create a Plan and add it to the timestrip', async () => {
      const createdPlan = await createPlanFromJSON(page, {
        name: 'Test Plan',
        json: testPlan
@@ -106,7 +110,9 @@ test.describe("Time Strip", () => {
      const endBound = testPlan.TEST_GROUP[testPlan.TEST_GROUP.length - 1].end;

      // Switch to fixed time mode with all plan events within the bounds
-            await page.goto(`${timestrip.url}?tc.mode=fixed&tc.startBound=${startBound}&tc.endBound=${endBound}&tc.timeSystem=utc&view=time-strip.view`);
+      await page.goto(
+        `${timestrip.url}?tc.mode=fixed&tc.startBound=${startBound}&tc.endBound=${endBound}&tc.timeSystem=utc&view=time-strip.view`
+      );

      // Verify all events are displayed
      const eventCount = await page.locator('.activity-bounds').count();
@@ -115,7 +121,7 @@ test.describe("Time Strip", () => {
      return createdPlan;
    });

-        await test.step("TimeStrip can use the Independent Time Conductor", async () => {
+    await test.step('TimeStrip can use the Independent Time Conductor', async () => {
      // Activate Independent Time Conductor in Fixed Time Mode
      await page.click('.c-toggle-switch__slider');
      expect(await activityBounds.count()).toEqual(0);
@@ -135,11 +141,11 @@ test.describe("Time Strip", () => {
      expect(await activityBounds.count()).toEqual(1);
    });

-        await test.step("Can have multiple TimeStrips with the same plan linked and different Independent Time Contexts", async () => {
+    await test.step('Can have multiple TimeStrips with the same plan linked and different Independent Time Contexts', async () => {
      // Create another Time Strip and verify that it has been created
      const createdTimeStrip = await createDomainObjectWithDefaults(page, {
        type: 'Time Strip',
-                name: "Another Time Strip"
+        name: 'Another Time Strip'
      });

      const objectName = await page.locator('.l-browse-bar__object-name').innerText();
--- a/e2e/tests/functional/plugins/clocks/clock.e2e.spec.js
+++ b/e2e/tests/functional/plugins/clocks/clock.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -27,14 +27,15 @@ This test suite is dedicated to tests which verify the basic operations surround
 const { test, expect } = require('../../../../baseFixtures');

 test.describe('Clock Generator CRUD Operations', () => {
-
-    test('Timezone dropdown will collapse when clicked outside or on dropdown icon again', async ({ page }) => {
+  test('Timezone dropdown will collapse when clicked outside or on dropdown icon again', async ({
+    page
+  }) => {
    test.info().annotations.push({
      type: 'issue',
      description: 'https://github.com/nasa/openmct/issues/4878'
    });
    //Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    //Click the Create button
    await page.click('button:has-text("Create")');
@@ -45,22 +46,21 @@ test.describe('Clock Generator CRUD Operations', () => {
    // Click .icon-arrow-down
    await page.locator('.icon-arrow-down').click();
    //verify if the autocomplete dropdown is visible
-        await expect(page.locator(".c-input--autocomplete__options")).toBeVisible();
+    await expect(page.locator('.c-input--autocomplete__options')).toBeVisible();
    // Click .icon-arrow-down
    await page.locator('.icon-arrow-down').click();

    // Verify clicking on the autocomplete arrow collapses the dropdown
-        await expect(page.locator(".c-input--autocomplete__options")).toBeHidden();
+    await expect(page.locator('.c-input--autocomplete__options')).toBeHidden();

    // Click timezone input to open dropdown
    await page.locator('.c-input--autocomplete__input').click();
    //verify if the autocomplete dropdown is visible
-        await expect(page.locator(".c-input--autocomplete__options")).toBeVisible();
+    await expect(page.locator('.c-input--autocomplete__options')).toBeVisible();

    // Verify clicking outside the autocomplete dropdown collapses it
    await page.locator('text=Timezone').click();
    // Verify clicking on the autocomplete arrow collapses the dropdown
-        await expect(page.locator(".c-input--autocomplete__options")).toBeHidden();
-
+    await expect(page.locator('.c-input--autocomplete__options')).toBeHidden();
  });
 });
--- a/e2e/tests/functional/plugins/clocks/remoteClock.e2e.spec.js
+++ b/e2e/tests/functional/plugins/clocks/remoteClock.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
--- a/e2e/tests/functional/plugins/conditionSet/conditionSet.e2e.spec.js
+++ b/e2e/tests/functional/plugins/conditionSet/conditionSet.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -37,25 +37,21 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage', () => {
    //TODO: This needs to be refactored
    const context = await browser.newContext();
    const page = await context.newPage();
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
    await page.click('button:has-text("Create")');

    await page.locator('li[role="menuitem"]:has-text("Condition Set")').click();

-        await Promise.all([
-            page.waitForNavigation(),
-            page.click('button:has-text("OK")')
-        ]);
+    await Promise.all([page.waitForNavigation(), page.click('button:has-text("OK")')]);

    //Save localStorage for future test execution
    await context.storageState({ path: './e2e/test-data/recycled_local_storage.json' });

    //Set object identifier from url
    conditionSetUrl = page.url();
-        console.log('conditionSetUrl ' + conditionSetUrl);

    getConditionSetIdentifierFromUrl = conditionSetUrl.split('/').pop().split('?')[0];
-        console.debug('getConditionSetIdentifierFromUrl ' + getConditionSetIdentifierFromUrl);
+    console.debug(`getConditionSetIdentifierFromUrl: ${getConditionSetIdentifierFromUrl}`);
    await page.close();
  });

@@ -63,27 +59,29 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage', () => {
  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 }) => {
+  test('Condition set object properties persist in main view and inspector @localStorage', async ({
+    page
+  }) => {
    //Navigate to baseURL with injected localStorage
    await page.goto(conditionSetUrl, { waitUntil: 'networkidle' });

    //Assertions on loaded Condition Set in main view. This is a stateful transition step after page.goto()
-        await expect.soft(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Condition Set');
+    await expect
+      .soft(page.locator('.l-browse-bar__object-name'))
+      .toContainText('Unnamed Condition Set');

    //Assertions on loaded Condition Set in Inspector
    expect.soft(page.locator('_vue=item.name=Unnamed Condition Set')).toBeTruthy();

    //Reload Page
-        await Promise.all([
-            page.reload(),
-            page.waitForLoadState('networkidle')
-        ]);
+    await Promise.all([page.reload(), page.waitForLoadState('networkidle')]);

    //Re-verify after reload
-        await expect.soft(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Condition Set');
+    await expect
+      .soft(page.locator('.l-browse-bar__object-name'))
+      .toContainText('Unnamed Condition Set');
    //Assertions on loaded Condition Set in Inspector
    expect.soft(page.locator('_vue=item.name=Unnamed Condition Set')).toBeTruthy();
-
  });
  test('condition set object can be modified on @localStorage', async ({ page, openmctConfig }) => {
    const { myItemsFolderName } = openmctConfig;
@@ -91,22 +89,37 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage', () => {
    await page.goto(conditionSetUrl, { waitUntil: 'networkidle' });

    //Assertions on loaded Condition Set in main view. This is a stateful transition step after page.goto()
-        await expect.soft(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Condition Set');
+    await expect
+      .soft(page.locator('.l-browse-bar__object-name'))
+      .toContainText('Unnamed Condition Set');

    //Update the Condition Set properties
    // Click Edit Button
    await page.locator('text=Conditions View Snapshot >> button').nth(3).click();

    //Edit Condition Set Name from main view
-        await page.locator('.l-browse-bar__object-name').filter({ hasText: 'Unnamed Condition Set' }).first().fill('Renamed Condition Set');
-        await page.locator('.l-browse-bar__object-name').filter({ hasText: 'Renamed Condition Set' }).first().press('Enter');
+    await page
+      .locator('.l-browse-bar__object-name')
+      .filter({ hasText: 'Unnamed Condition Set' })
+      .first()
+      .fill('Renamed Condition Set');
+    await page
+      .locator('.l-browse-bar__object-name')
+      .filter({ hasText: 'Renamed Condition Set' })
+      .first()
+      .press('Enter');
    // Click Save Button
-        await page.locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button').nth(1).click();
+    await page
+      .locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button')
+      .nth(1)
+      .click();
    // Click Save and Finish Editing Option
    await page.locator('text=Save and Finish Editing').click();

    //Verify Main section reflects updated Name Property
-        await expect.soft(page.locator('.l-browse-bar__object-name')).toContainText('Renamed Condition Set');
+    await expect
+      .soft(page.locator('.l-browse-bar__object-name'))
+      .toContainText('Renamed Condition Set');

    // Verify Inspector properties
    // Verify Inspector has updated Name property
@@ -124,13 +137,12 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage', () => {
    expect(page.locator('a:has-text("Renamed Condition Set")')).toBeTruthy();

    //Reload Page
-        await Promise.all([
-            page.reload(),
-            page.waitForLoadState('networkidle')
-        ]);
+    await Promise.all([page.reload(), page.waitForLoadState('networkidle')]);

    //Verify Main section reflects updated Name Property
-        await expect.soft(page.locator('.l-browse-bar__object-name')).toContainText('Renamed Condition Set');
+    await expect
+      .soft(page.locator('.l-browse-bar__object-name'))
+      .toContainText('Renamed Condition Set');

    // Verify Inspector properties
    // Verify Inspector has updated Name property
@@ -147,19 +159,30 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage', () => {
    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Renamed');
    expect(page.locator('a:has-text("Renamed Condition Set")')).toBeTruthy();
  });
-    test('condition set object can be deleted by Search Tree Actions menu on @localStorage', async ({ page }) => {
+  test('condition set object can be deleted by Search Tree Actions menu on @localStorage', async ({
+    page
+  }) => {
    //Navigate to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    //Assertions on loaded Condition Set in main view. This is a stateful transition step after page.goto()
-        await expect(page.locator('a:has-text("Unnamed Condition Set Condition Set") >> nth=0')).toBeVisible();
+    await expect(
+      page.locator('a:has-text("Unnamed Condition Set Condition Set") >> nth=0')
+    ).toBeVisible();

-        const numberOfConditionSetsToStart = await page.locator('a:has-text("Unnamed Condition Set Condition Set")').count();
+    const numberOfConditionSetsToStart = await page
+      .locator('a:has-text("Unnamed Condition Set Condition Set")')
+      .count();

    // Search for Unnamed Condition Set
-        await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Unnamed Condition Set');
+    await page
+      .locator('[aria-label="OpenMCT Search"] input[type="search"]')
+      .fill('Unnamed Condition Set');
    // Click Search Result
-        await page.locator('[aria-label="OpenMCT Search"] >> text=Unnamed Condition Set').first().click();
+    await page
+      .locator('[aria-label="OpenMCT Search"] >> text=Unnamed Condition Set')
+      .first()
+      .click();
    // Click hamburger button
    await page.locator('[title="More options"]').click();

@@ -168,7 +191,9 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage', () => {
    await page.locator('button:has-text("OK")').click();

    //Expect Unnamed Condition Set to be removed in Main View
-        const numberOfConditionSetsAtEnd = await page.locator('a:has-text("Unnamed Condition Set Condition Set")').count();
+    const numberOfConditionSetsAtEnd = await page
+      .locator('a:has-text("Unnamed Condition Set Condition Set")')
+      .count();

    expect(numberOfConditionSetsAtEnd).toEqual(numberOfConditionSetsToStart - 1);

@@ -176,19 +201,19 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage', () => {
    //Domain Object is still available by direct URL after delete
    await page.goto(conditionSetUrl, { waitUntil: 'networkidle' });
    await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Condition Set');
-
  });
 });

 test.describe('Basic Condition Set Use', () => {
+  test.beforeEach(async ({ page }) => {
+    // Open a browser, navigate to the main page, and wait until all network events to resolve
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+  });
  test('Can add a condition', async ({ page }) => {
-        //Navigate to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
-
    // Create a new condition set
    await createDomainObjectWithDefaults(page, {
      type: 'Condition Set',
-            name: "Test Condition Set"
+      name: 'Test Condition Set'
    });
    // Change the object to edit mode
    await page.locator('[title="Edit"]').click();
@@ -199,4 +224,145 @@ test.describe('Basic Condition Set Use', () => {
    const numOfUnnamedConditions = await page.locator('text=Unnamed Condition').count();
    expect(numOfUnnamedConditions).toEqual(1);
  });
+  test('ConditionSet should display appropriate view options', async ({ page }) => {
+    test.info().annotations.push({
+      type: 'issue',
+      description: 'https://github.com/nasa/openmct/issues/5924'
+    });
+
+    await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Alpha Sine Wave Generator'
+    });
+    await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Beta Sine Wave Generator'
+    });
+    const conditionSet1 = await createDomainObjectWithDefaults(page, {
+      type: 'Condition Set',
+      name: 'Test Condition Set'
+    });
+
+    // Change the object to edit mode
+    await page.locator('[title="Edit"]').click();
+
+    // Expand the 'My Items' folder in the left tree
+    await page.goto(conditionSet1.url);
+    page.click('button[title="Show selected item in tree"]');
+    // Add the Alpha & Beta Sine Wave Generator to the Condition Set and save changes
+    const treePane = page.getByRole('tree', {
+      name: 'Main Tree'
+    });
+    const alphaGeneratorTreeItem = treePane.getByRole('treeitem', {
+      name: 'Alpha Sine Wave Generator'
+    });
+    const betaGeneratorTreeItem = treePane.getByRole('treeitem', {
+      name: 'Beta Sine Wave Generator'
+    });
+    const conditionCollection = page.locator('#conditionCollection');
+
+    await alphaGeneratorTreeItem.dragTo(conditionCollection);
+    await betaGeneratorTreeItem.dragTo(conditionCollection);
+
+    const saveButtonLocator = page.locator('button[title="Save"]');
+    await saveButtonLocator.click();
+    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
+    await page.click('button[title="Change the current view"]');
+
+    await expect(page.getByRole('menuitem', { name: /Lad Table/ })).toBeHidden();
+    await expect(page.getByRole('menuitem', { name: /Conditions View/ })).toBeVisible();
+    await expect(page.getByRole('menuitem', { name: /Plot/ })).toBeVisible();
+    await expect(page.getByRole('menuitem', { name: /Telemetry Table/ })).toBeVisible();
+  });
+  test('ConditionSet should output blank instead of the default value', async ({ page }) => {
+    //Navigate to baseURL
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+
+    //Click the Create button
+    await page.click('button:has-text("Create")');
+
+    // Click the object specified by 'type'
+    await page.click(`li[role='menuitem']:text("Sine Wave Generator")`);
+    await page.getByRole('spinbutton', { name: 'Loading Delay (ms)' }).fill('8000');
+    const nameInput = page.locator('form[name="mctForm"] .first input[type="text"]');
+    await nameInput.fill('Delayed Sine Wave Generator');
+
+    // Click OK button and wait for Navigate event
+    await Promise.all([
+      page.waitForLoadState(),
+      page.click('[aria-label="Save"]'),
+      // Wait for Save Banner to appear
+      page.waitForSelector('.c-message-banner__message')
+    ]);
+
+    // Create a new condition set
+    await createDomainObjectWithDefaults(page, {
+      type: 'Condition Set',
+      name: 'Test Blank Output of Condition Set'
+    });
+    // Change the object to edit mode
+    await page.locator('[title="Edit"]').click();
+
+    // Click Add Condition button twice
+    await page.locator('#addCondition').click();
+    await page.locator('#addCondition').click();
+    await page.locator('#conditionCollection').getByRole('textbox').nth(0).fill('First Condition');
+    await page.locator('#conditionCollection').getByRole('textbox').nth(1).fill('Second Condition');
+
+    // Expand the 'My Items' folder in the left tree
+    await page.locator('.c-tree__item__view-control.c-disclosure-triangle').first().click();
+    // Add the Sine Wave Generator to the Condition Set and save changes
+    const treePane = page.getByRole('tree', {
+      name: 'Main Tree'
+    });
+    const sineWaveGeneratorTreeItem = treePane.getByRole('treeitem', {
+      name: 'Delayed Sine Wave Generator'
+    });
+    const conditionCollection = await page.locator('#conditionCollection');
+
+    await sineWaveGeneratorTreeItem.dragTo(conditionCollection);
+
+    const firstCriterionTelemetry = await page.locator(
+      '[aria-label="Criterion Telemetry Selection"] >> nth=0'
+    );
+    firstCriterionTelemetry.selectOption({ label: 'Delayed Sine Wave Generator' });
+
+    const secondCriterionTelemetry = await page.locator(
+      '[aria-label="Criterion Telemetry Selection"] >> nth=1'
+    );
+    secondCriterionTelemetry.selectOption({ label: 'Delayed Sine Wave Generator' });
+
+    const firstCriterionMetadata = await page.locator(
+      '[aria-label="Criterion Metadata Selection"] >> nth=0'
+    );
+    firstCriterionMetadata.selectOption({ label: 'Sine' });
+
+    const secondCriterionMetadata = await page.locator(
+      '[aria-label="Criterion Metadata Selection"] >> nth=1'
+    );
+    secondCriterionMetadata.selectOption({ label: 'Sine' });
+
+    const firstCriterionComparison = await page.locator(
+      '[aria-label="Criterion Comparison Selection"] >> nth=0'
+    );
+    firstCriterionComparison.selectOption({ label: 'is greater than or equal to' });
+
+    const secondCriterionComparison = await page.locator(
+      '[aria-label="Criterion Comparison Selection"] >> nth=1'
+    );
+    secondCriterionComparison.selectOption({ label: 'is less than' });
+
+    const firstCriterionInput = await page.locator('[aria-label="Criterion Input"] >> nth=0');
+    await firstCriterionInput.fill('0');
+
+    const secondCriterionInput = await page.locator('[aria-label="Criterion Input"] >> nth=1');
+    await secondCriterionInput.fill('0');
+
+    const saveButtonLocator = page.locator('button[title="Save"]');
+    await saveButtonLocator.click();
+    await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
+
+    const outputValue = await page.locator('[aria-label="Current Output Value"]');
+    await expect(outputValue).toHaveText('---');
+  });
 });
--- a/e2e/tests/functional/plugins/displayLayout/displayLayout.e2e.spec.js
+++ b/e2e/tests/functional/plugins/displayLayout/displayLayout.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -21,13 +21,18 @@
 *****************************************************************************/

 const { test, expect } = require('../../../../pluginFixtures');
-const { createDomainObjectWithDefaults, setStartOffset, setFixedTimeMode, setRealTimeMode } = require('../../../../appActions');
+const {
+  createDomainObjectWithDefaults,
+  setStartOffset,
+  setFixedTimeMode,
+  setRealTimeMode
+} = require('../../../../appActions');

 test.describe('Display Layout', () => {
  /** @type {import('../../../../appActions').CreatedObjectInfo} */
  let sineWaveObject;
  test.beforeEach(async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
    await setRealTimeMode(page);

    // Create Sine Wave Generator
@@ -35,11 +40,13 @@ test.describe('Display Layout', () => {
      type: 'Sine Wave Generator'
    });
  });
-    test('alpha-numeric widget telemetry value exactly matches latest telemetry value received in real time', async ({ page }) => {
+  test('alpha-numeric widget telemetry value exactly matches latest telemetry value received in real time', async ({
+    page
+  }) => {
    // Create a Display Layout
    await createDomainObjectWithDefaults(page, {
      type: 'Display Layout',
-            name: "Test Display Layout"
+      name: 'Test Display Layout'
    });
    // Edit Display Layout
    await page.locator('[title="Edit"]').click();
@@ -63,17 +70,21 @@ test.describe('Display Layout', () => {
    // from the Sine Wave Generator
    const getTelemValuePromise = await subscribeToTelemetry(page, sineWaveObject.uuid);
    const formattedTelemetryValue = getTelemValuePromise;
-        const displayLayoutValuePromise = await page.waitForSelector(`text="${formattedTelemetryValue}"`);
+    const displayLayoutValuePromise = await page.waitForSelector(
+      `text="${formattedTelemetryValue}"`
+    );
    const displayLayoutValue = await displayLayoutValuePromise.textContent();
    const trimmedDisplayValue = displayLayoutValue.trim();

    expect(trimmedDisplayValue).toBe(formattedTelemetryValue);
  });
-    test('alpha-numeric widget telemetry value exactly matches latest telemetry value received in fixed time', async ({ page }) => {
+  test('alpha-numeric widget telemetry value exactly matches latest telemetry value received in fixed time', async ({
+    page
+  }) => {
    // Create a Display Layout
    await createDomainObjectWithDefaults(page, {
      type: 'Display Layout',
-            name: "Test Display Layout"
+      name: 'Test Display Layout'
    });
    // Edit Display Layout
    await page.locator('[title="Edit"]').click();
@@ -101,17 +112,21 @@ test.describe('Display Layout', () => {
    // On getting data, check if the value found in the Display Layout is the most recent value
    // from the Sine Wave Generator
    const formattedTelemetryValue = getTelemValuePromise;
-        const displayLayoutValuePromise = await page.waitForSelector(`text="${formattedTelemetryValue}"`);
+    const displayLayoutValuePromise = await page.waitForSelector(
+      `text="${formattedTelemetryValue}"`
+    );
    const displayLayoutValue = await displayLayoutValuePromise.textContent();
    const trimmedDisplayValue = displayLayoutValue.trim();

    expect(trimmedDisplayValue).toBe(formattedTelemetryValue);
  });
-    test('items in a display layout can be removed with object tree context menu when viewing the display layout', async ({ page }) => {
+  test('items in a display layout can be removed with object tree context menu when viewing the display layout', async ({
+    page
+  }) => {
    // Create a Display Layout
    await createDomainObjectWithDefaults(page, {
      type: 'Display Layout',
-            name: "Test Display Layout"
+      name: 'Test Display Layout'
    });
    // Edit Display Layout
    await page.locator('[title="Edit"]').click();
@@ -144,7 +159,9 @@ test.describe('Display Layout', () => {

    expect(await page.locator('.l-layout .l-layout__frame').count()).toEqual(0);
  });
-    test('items in a display layout can be removed with object tree context menu when viewing another item', async ({ page }) => {
+  test('items in a display layout can be removed with object tree context menu when viewing another item', async ({
+    page
+  }) => {
    test.info().annotations.push({
      type: 'issue',
      description: 'https://github.com/nasa/openmct/issues/3117'
@@ -188,6 +205,71 @@ test.describe('Display Layout', () => {

    expect(await page.locator('.l-layout .l-layout__frame').count()).toEqual(0);
  });
+
+  test('When multiple plots are contained in a layout, we only ask for annotations once @couchdb', async ({
+    page
+  }) => {
+    // Create another Sine Wave Generator
+    const anotherSineWaveObject = await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator'
+    });
+    // Create a Display Layout
+    await createDomainObjectWithDefaults(page, {
+      type: 'Display Layout',
+      name: 'Test Display Layout'
+    });
+    // Edit Display Layout
+    await page.locator('[title="Edit"]').click();
+
+    // Expand the 'My Items' folder in the left tree
+    await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
+    // Add the Sine Wave Generator to the Display Layout and save changes
+    const treePane = page.getByRole('tree', {
+      name: 'Main Tree'
+    });
+    const sineWaveGeneratorTreeItem = treePane.getByRole('treeitem', {
+      name: new RegExp(sineWaveObject.name)
+    });
+
+    let layoutGridHolder = page.locator('.l-layout__grid-holder');
+    // eslint-disable-next-line playwright/no-force-option
+    await sineWaveGeneratorTreeItem.dragTo(layoutGridHolder, { force: true });
+
+    await page.getByText('View type').click();
+    await page.getByText('Overlay Plot').click();
+
+    const anotherSineWaveGeneratorTreeItem = treePane.getByRole('treeitem', {
+      name: new RegExp(anotherSineWaveObject.name)
+    });
+    layoutGridHolder = page.locator('.l-layout__grid-holder');
+    // eslint-disable-next-line playwright/no-force-option
+    await anotherSineWaveGeneratorTreeItem.dragTo(layoutGridHolder, { force: true });
+
+    await page.getByText('View type').click();
+    await page.getByText('Overlay Plot').click();
+
+    await page.locator('button[title="Save"]').click();
+    await page.locator('text=Save and Finish Editing').click();
+
+    // Time to inspect some network traffic
+    let networkRequests = [];
+    page.on('request', (request) => {
+      const searchRequest = request.url().endsWith('_find');
+      const fetchRequest = request.resourceType() === 'fetch';
+      if (searchRequest && fetchRequest) {
+        networkRequests.push(request);
+      }
+    });
+
+    await page.reload();
+
+    // wait for annotations requests to be batched and requested
+    await page.waitForLoadState('networkidle');
+
+    // Network requests for the composite telemetry with multiple items should be:
+    // 1.  a single batched request for annotations
+    expect(networkRequests.length).toBe(1);
+  });
 });

 /**
@@ -200,7 +282,9 @@ test.describe('Display Layout', () => {
 * @returns {Promise<string>} the formatted sin telemetry value
 */
 async function subscribeToTelemetry(page, objectIdentifier) {
-    const getTelemValuePromise = new Promise(resolve => page.exposeFunction('getTelemValue', resolve));
+  const getTelemValuePromise = new Promise((resolve) =>
+    page.exposeFunction('getTelemValue', resolve)
+  );

  await page.evaluate(async (telemetryIdentifier) => {
    const telemetryObject = await window.openmct.objects.get(telemetryIdentifier);
--- a/e2e/tests/functional/plugins/faultManagement/faultManagement.e2e.spec.js
+++ b/e2e/tests/functional/plugins/faultManagement/faultManagement.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -22,6 +22,7 @@

 const { test, expect } = require('../../../../pluginFixtures');
 const utils = require('../../../../helper/faultUtils');
+const { selectInspectorTab } = require('../../../../appActions');

 test.describe('The Fault Management Plugin using example faults', () => {
  test.beforeEach(async ({ page }) => {
@@ -35,27 +36,45 @@ test.describe('The Fault Management Plugin using example faults', () => {
    expect.soft(faultCount).toEqual(criticalityIconCount);
  });

-    test('When selecting a fault, it has an "is-selected" class and it\'s information shows in the inspector @unstable', async ({ page }) => {
+  test('When selecting a fault, it has an "is-selected" class and it\'s information shows in the inspector @unstable', async ({
+    page
+  }) => {
    await utils.selectFaultItem(page, 1);

-        const selectedFaultName = await page.locator('.c-fault-mgmt__list.is-selected .c-fault-mgmt__list-faultname').textContent();
-        const inspectorFaultNameCount = await page.locator(`.c-inspector__properties >> :text("${selectedFaultName}")`).count();
+    await selectInspectorTab(page, 'Fault Management Configuration');
+    const selectedFaultName = await page
+      .locator('.c-fault-mgmt__list.is-selected .c-fault-mgmt__list-faultname')
+      .textContent();
+    const inspectorFaultNameCount = await page
+      .locator(`.c-inspector__properties >> :text("${selectedFaultName}")`)
+      .count();

-        await expect.soft(page.locator('.c-faults-list-view-item-body > .c-fault-mgmt__list').first()).toHaveClass(/is-selected/);
+    await expect
+      .soft(page.locator('.c-faults-list-view-item-body > .c-fault-mgmt__list').first())
+      .toHaveClass(/is-selected/);
    expect.soft(inspectorFaultNameCount).toEqual(1);
  });

-    test('When selecting multiple faults, no specific fault information is shown in the inspector @unstable', async ({ page }) => {
+  test('When selecting multiple faults, no specific fault information is shown in the inspector @unstable', async ({
+    page
+  }) => {
    await utils.selectFaultItem(page, 1);
    await utils.selectFaultItem(page, 2);

-        const selectedRows = page.locator('.c-fault-mgmt__list.is-selected .c-fault-mgmt__list-faultname');
+    const selectedRows = page.locator(
+      '.c-fault-mgmt__list.is-selected .c-fault-mgmt__list-faultname'
+    );
    expect.soft(await selectedRows.count()).toEqual(2);

+    await selectInspectorTab(page, 'Fault Management Configuration');
    const firstSelectedFaultName = await selectedRows.nth(0).textContent();
    const secondSelectedFaultName = await selectedRows.nth(1).textContent();
-        const firstNameInInspectorCount = await page.locator(`.c-inspector__properties >> :text("${firstSelectedFaultName}")`).count();
-        const secondNameInInspectorCount = await page.locator(`.c-inspector__properties >> :text("${secondSelectedFaultName}")`).count();
+    const firstNameInInspectorCount = await page
+      .locator(`.c-inspector__properties >> :text("${firstSelectedFaultName}")`)
+      .count();
+    const secondNameInInspectorCount = await page
+      .locator(`.c-inspector__properties >> :text("${secondSelectedFaultName}")`)
+      .count();

    expect.soft(firstNameInInspectorCount).toEqual(0);
    expect.soft(secondNameInInspectorCount).toEqual(0);
@@ -205,7 +224,6 @@ test.describe('The Fault Management Plugin using example faults', () => {
    expect.soft(sortedHighestSeverity).toEqual(highestSeverity);
    expect.soft(sortedLowestSeverity).toEqual(lowestSeverity);
  });
-
 });

 test.describe('The Fault Management Plugin without using example faults', () => {
--- a/e2e/tests/functional/plugins/flexibleLayout/flexibleLayout.e2e.spec.js
+++ b/e2e/tests/functional/plugins/flexibleLayout/flexibleLayout.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -27,7 +27,7 @@ test.describe('Flexible Layout', () => {
  let sineWaveObject;
  let clockObject;
  test.beforeEach(async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    // Create Sine Wave Generator
    sineWaveObject = await createDomainObjectWithDefaults(page, {
@@ -39,7 +39,9 @@ test.describe('Flexible Layout', () => {
      type: 'Clock'
    });
  });
-    test('panes have the appropriate draggable attribute while in Edit and Browse modes', async ({ page }) => {
+  test('panes have the appropriate draggable attribute while in Edit and Browse modes', async ({
+    page
+  }) => {
    const treePane = page.getByRole('tree', {
      name: 'Main Tree'
    });
@@ -62,7 +64,9 @@ test.describe('Flexible Layout', () => {
    await sineWaveGeneratorTreeItem.dragTo(page.locator('.c-fl__container.is-empty').first());
    await clockTreeItem.dragTo(page.locator('.c-fl__container.is-empty'));
    // Check that panes can be dragged while Flexible Layout is in Edit mode
-        let dragWrapper = page.locator('.c-fl-container__frames-holder .c-fl-frame__drag-wrapper').first();
+    let dragWrapper = page
+      .locator('.c-fl-container__frames-holder .c-fl-frame__drag-wrapper')
+      .first();
    await expect(dragWrapper).toHaveAttribute('draggable', 'true');
    // Save Flexible Layout
    await page.locator('button[title="Save"]').click();
@@ -71,7 +75,9 @@ test.describe('Flexible Layout', () => {
    dragWrapper = page.locator('.c-fl-container__frames-holder .c-fl-frame__drag-wrapper').first();
    await expect(dragWrapper).toHaveAttribute('draggable', 'false');
  });
-    test('items in a flexible layout can be removed with object tree context menu when viewing the flexible layout', async ({ page }) => {
+  test('items in a flexible layout can be removed with object tree context menu when viewing the flexible layout', async ({
+    page
+  }) => {
    const treePane = page.getByRole('tree', {
      name: 'Main Tree'
    });
@@ -105,7 +111,9 @@ test.describe('Flexible Layout', () => {
    // Verify that the item has been removed from the layout
    expect(await page.locator('.c-fl-container__frame').count()).toEqual(0);
  });
-    test('items in a flexible layout can be removed with object tree context menu when viewing another item', async ({ page }) => {
+  test('items in a flexible layout can be removed with object tree context menu when viewing another item', async ({
+    page
+  }) => {
    test.info().annotations.push({
      type: 'issue',
      description: 'https://github.com/nasa/openmct/issues/3117'
--- a/e2e/tests/functional/plugins/gauge/gauge.e2e.spec.js
+++ b/e2e/tests/functional/plugins/gauge/gauge.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -31,7 +31,7 @@ const uuid = require('uuid').v4;
 test.describe('Gauge', () => {
  test.beforeEach(async ({ page }) => {
    // Open a browser, navigate to the main page, and wait until all networkevents to resolve
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
  });

  test('Can add and remove telemetry sources @unstable', async ({ page }) => {
@@ -63,7 +63,13 @@ test.describe('Gauge', () => {
    });

    // Verify that the 'Replace telemetry source' modal appears and accept it
-        await expect.soft(page.locator('text=This action will replace the current telemetry source. Do you want to continue?')).toBeVisible();
+    await expect
+      .soft(
+        page.locator(
+          'text=This action will replace the current telemetry source. Do you want to continue?'
+        )
+      )
+      .toBeVisible();
    await page.click('text=Ok');

    // Navigate to the gauge and verify that the new SWG
@@ -81,7 +87,13 @@ test.describe('Gauge', () => {
    await page.locator('li[title="Remove this object from its containing object."]').click();

    // Verify that the 'Remove object' confirmation modal appears and accept it
-        await expect.soft(page.locator('text=Warning! This action will remove this object. Are you sure you want to continue?')).toBeVisible();
+    await expect
+      .soft(
+        page.locator(
+          'text=Warning! This action will remove this object. Are you sure you want to continue?'
+        )
+      )
+      .toBeVisible();
    await page.click('text=Ok');

    // Verify that the elements pool shows no elements
--- a/e2e/tests/functional/plugins/imagery/exampleImagery.e2e.spec.js
+++ b/e2e/tests/functional/plugins/imagery/exampleImagery.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -29,15 +29,15 @@ const { waitForAnimations } = require('../../../../baseFixtures');
 const { test, expect } = require('../../../../pluginFixtures');
 const { createDomainObjectWithDefaults } = require('../../../../appActions');
 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';
+const panHotkey = process.platform === 'linux' ? ['Shift', 'Alt'] : ['Alt'];
+const expectedAltText = process.platform === 'linux' ? 'Shift+Alt drag to pan' : 'Alt drag to pan';
 const thumbnailUrlParamsRegexp = /\?w=100&h=100/;

 //The following block of tests verifies the basic functionality of example imagery and serves as a template for Imagery objects embedded in other objects.
 test.describe('Example Imagery Object', () => {
  test.beforeEach(async ({ page }) => {
    //Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    // Create a default 'Example Imagery' object
    const exampleImagery = await createDomainObjectWithDefaults(page, { type: 'Example Imagery' });
@@ -55,7 +55,10 @@ test.describe('Example Imagery Object', () => {
    await mouseZoomOnImageAndAssert(page, -2);
  });

-    test('Can adjust image brightness/contrast by dragging the sliders', async ({ page, browserName }) => {
+  test('Can adjust image brightness/contrast by dragging the sliders', async ({
+    page,
+    browserName
+  }) => {
    // eslint-disable-next-line playwright/no-skipped-test
    test.skip(browserName === 'firefox', 'This test needs to be updated to work with firefox');
    // Open the image filter menu
@@ -91,42 +94,41 @@ test.describe('Example Imagery Object', () => {
    expect(expectedAltText).toEqual(imageryHintsText);

    // pan right
-        await Promise.all(panHotkey.map(x => page.keyboard.down(x)));
+    await Promise.all(panHotkey.map((x) => page.keyboard.down(x)));
    await page.mouse.down();
    await page.mouse.move(imageCenterX - 200, imageCenterY, 10);
    await page.mouse.up();
-        await Promise.all(panHotkey.map(x => page.keyboard.up(x)));
+    await Promise.all(panHotkey.map((x) => page.keyboard.up(x)));
    const afterRightPanBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
    expect(zoomedBoundingBox.x).toBeGreaterThan(afterRightPanBoundingBox.x);

    // pan left
-        await Promise.all(panHotkey.map(x => page.keyboard.down(x)));
+    await Promise.all(panHotkey.map((x) => page.keyboard.down(x)));
    await page.mouse.down();
    await page.mouse.move(imageCenterX, imageCenterY, 10);
    await page.mouse.up();
-        await Promise.all(panHotkey.map(x => page.keyboard.up(x)));
+    await Promise.all(panHotkey.map((x) => page.keyboard.up(x)));
    const afterLeftPanBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
    expect(afterRightPanBoundingBox.x).toBeLessThan(afterLeftPanBoundingBox.x);

    // pan up
    await page.mouse.move(imageCenterX, imageCenterY);
-        await Promise.all(panHotkey.map(x => page.keyboard.down(x)));
+    await Promise.all(panHotkey.map((x) => page.keyboard.down(x)));
    await page.mouse.down();
    await page.mouse.move(imageCenterX, imageCenterY + 200, 10);
    await page.mouse.up();
-        await Promise.all(panHotkey.map(x => page.keyboard.up(x)));
+    await Promise.all(panHotkey.map((x) => page.keyboard.up(x)));
    const afterUpPanBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
    expect(afterUpPanBoundingBox.y).toBeGreaterThan(afterLeftPanBoundingBox.y);

    // pan down
-        await Promise.all(panHotkey.map(x => page.keyboard.down(x)));
+    await Promise.all(panHotkey.map((x) => page.keyboard.down(x)));
    await page.mouse.down();
    await page.mouse.move(imageCenterX, imageCenterY - 200, 10);
    await page.mouse.up();
-        await Promise.all(panHotkey.map(x => page.keyboard.up(x)));
+    await Promise.all(panHotkey.map((x) => page.keyboard.up(x)));
    const afterDownPanBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
    expect(afterDownPanBoundingBox.y).toBeLessThan(afterUpPanBoundingBox.y);
-
  });

  test('Can use + - buttons to zoom on the image @unstable', async ({ page }) => {
@@ -134,7 +136,7 @@ test.describe('Example Imagery Object', () => {
  });

  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");
+    test.slow(testInfo.project === 'chrome-beta', 'This test is slow in chrome-beta');
    // Get initial image dimensions
    const initialBoundingBox = await page.locator(backgroundImageSelector).boundingBox();

@@ -178,36 +180,23 @@ test.describe('Example Imagery in Display Layout', () => {
  let displayLayout;
  test.beforeEach(async ({ page }) => {
    // Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    displayLayout = await createDomainObjectWithDefaults(page, { type: 'Display Layout' });
    await page.goto(displayLayout.url);

-        /* Create Sine Wave Generator with minimum Image Load Delay */
-        // Click the Create button
-        await page.click('button:has-text("Create")');
+    await createImageryView(page);

-        // Click text=Example Imagery
-        await page.click('li[role="menuitem"]:has-text("Example Imagery")');
-
-        // Clear and set Image load delay to minimum value
-        await page.locator('input[type="number"]').fill('');
-        await page.locator('input[type="number"]').fill('5000');
-
-        // Click text=OK
-        await Promise.all([
-            page.waitForNavigation({waitUntil: 'networkidle'}),
-            page.click('button:has-text("OK")'),
-            //Wait for Save Banner to appear
-            page.waitForSelector('.c-message-banner__message')
-        ]);
-
-        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Example Imagery');
+    await expect(page.locator('.l-browse-bar__object-name')).toContainText(
+      'Unnamed Example Imagery'
+    );

    await page.goto(displayLayout.url);
  });

-    test('View Large action pauses imagery when in realtime and returns to realtime', async ({ page }) => {
+  test('View Large action pauses imagery when in realtime and returns to realtime', async ({
+    page
+  }) => {
    test.info().annotations.push({
      type: 'issue',
      description: 'https://github.com/nasa/openmct/issues/3647'
@@ -309,15 +298,53 @@ test.describe('Example Imagery in Display Layout', () => {
    await page.locator('div[title="Resize object height"] > input').click();
    await page.locator('div[title="Resize object height"] > input').fill('100');

-        expect(thumbsWrapperLocator.isVisible()).toBeTruthy();
+    await expect(thumbsWrapperLocator).toBeVisible();
    await expect(thumbsWrapperLocator).not.toHaveClass(/is-small-thumbs/);
  });
+
+  /**
+   * Toggle layer visibility checkbox by clicking on checkbox label
+   * - should toggle checkbox and layer visibility for that image view
+   * - should NOT toggle checkbox and layer visibity for the first image view in display
+   */
+  test('Toggle layer visibility by clicking on label', async ({ page }) => {
+    test.info().annotations.push({
+      type: 'issue',
+      description: 'https://github.com/nasa/openmct/issues/6709'
+    });
+    await createImageryView(page);
+    await page.goto(displayLayout.url);
+
+    const imageElements = page.locator('.c-imagery__main-image-wrapper');
+
+    await expect(imageElements).toHaveCount(2);
+
+    const imageOne = page.locator('.c-imagery__main-image-wrapper').nth(0);
+    const imageTwo = page.locator('.c-imagery__main-image-wrapper').nth(1);
+    const imageOneWrapper = imageOne.locator('.image-wrapper');
+    const imageTwoWrapper = imageTwo.locator('.image-wrapper');
+
+    await imageTwo.hover();
+
+    await imageTwo.locator('button[title="Layers"]').click();
+
+    const imageTwoLayersMenuContent = imageTwo.locator('button[title="Layers"] + div');
+    const imageTwoLayersToggleLabel = imageTwoLayersMenuContent.locator('label').last();
+
+    await imageTwoLayersToggleLabel.click();
+
+    const imageOneLayers = imageOneWrapper.locator('.layer-image');
+    const imageTwoLayers = imageTwoWrapper.locator('.layer-image');
+
+    await expect(imageOneLayers).toHaveCount(0);
+    await expect(imageTwoLayers).toHaveCount(1);
+  });
 });

 test.describe('Example Imagery in Flexible layout', () => {
  let flexibleLayout;
  test.beforeEach(async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    flexibleLayout = await createDomainObjectWithDefaults(page, { type: 'Flexible Layout' });
    await page.goto(flexibleLayout.url);
@@ -341,7 +368,9 @@ test.describe('Example Imagery in Flexible layout', () => {
      page.waitForSelector('.c-message-banner__message')
    ]);

-        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Example Imagery');
+    await expect(page.locator('.l-browse-bar__object-name')).toContainText(
+      'Unnamed Example Imagery'
+    );

    await page.goto(flexibleLayout.url);
  });
@@ -359,7 +388,7 @@ test.describe('Example Imagery in Flexible layout', () => {
 test.describe('Example Imagery in Tabs View', () => {
  let tabsView;
  test.beforeEach(async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    tabsView = await createDomainObjectWithDefaults(page, { type: 'Tabs View' });
    await page.goto(tabsView.url);
@@ -383,7 +412,9 @@ test.describe('Example Imagery in Tabs View', () => {
      page.waitForSelector('.c-message-banner__message')
    ]);

-        await expect(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Example Imagery');
+    await expect(page.locator('.l-browse-bar__object-name')).toContainText(
+      'Unnamed Example Imagery'
+    );

    await page.goto(tabsView.url);
  });
@@ -395,7 +426,7 @@ test.describe('Example Imagery in Tabs View', () => {
 test.describe('Example Imagery in Time Strip', () => {
  let timeStripObject;
  test.beforeEach(async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
    timeStripObject = await createDomainObjectWithDefaults(page, {
      type: 'Time Strip'
    });
@@ -417,7 +448,9 @@ test.describe('Example Imagery in Time Strip', () => {
    await page.locator('.c-imagery-tsv-container').hover();

    // Get the img src of the hovered image thumbnail
-        const hoveredThumbnailImg = page.locator('.c-imagery-tsv div.c-imagery-tsv__image-wrapper:hover img');
+    const hoveredThumbnailImg = page.locator(
+      '.c-imagery-tsv div.c-imagery-tsv__image-wrapper:hover img'
+    );
    const hoveredThumbnailImgSrc = await hoveredThumbnailImg.getAttribute('src');

    // Verify that imagery timestrip view uses the thumbnailUrl as img src for thumbnails
@@ -496,14 +529,19 @@ async function performImageryViewOperationsAndAssert(page) {

  // The imagery view should be updated when new images come in
  const imageCount = await page.locator('.c-imagery__thumb').count();
-    await expect.poll(async () => {
+  await expect
+    .poll(
+      async () => {
        const newImageCount = await page.locator('.c-imagery__thumb').count();

        return newImageCount;
-    }, {
-        message: "verify that old images are discarded",
+      },
+      {
+        message: 'verify that old images are discarded',
        timeout: 7 * 1000
-    }).toBe(imageCount);
+      }
+    )
+    .toBe(imageCount);

  // Verify selected image is still displayed
  await expect(selectedImage).toBeVisible();
@@ -586,24 +624,35 @@ async function assertBackgroundImageBrightness(page, expected) {
 async function assertBackgroundImageUrlFromBackgroundCss(page) {
  const backgroundImage = page.locator('.c-imagery__main-image__background-image');
  let backgroundImageUrl = await backgroundImage.evaluate((el) => {
-        return window.getComputedStyle(el).getPropertyValue('background-image').match(/url\(([^)]+)\)/)[1];
+    return window
+      .getComputedStyle(el)
+      .getPropertyValue('background-image')
+      .match(/url\(([^)]+)\)/)[1];
  });
  let backgroundImageUrl1 = backgroundImageUrl.slice(1, -1); //forgive me, padre
  console.log('backgroundImageUrl1 ' + backgroundImageUrl1);

  let backgroundImageUrl2;
-    await expect.poll(async () => {
+  await expect
+    .poll(
+      async () => {
        // Verify next image has updated
        let backgroundImageUrlNext = await backgroundImage.evaluate((el) => {
-            return window.getComputedStyle(el).getPropertyValue('background-image').match(/url\(([^)]+)\)/)[1];
+          return window
+            .getComputedStyle(el)
+            .getPropertyValue('background-image')
+            .match(/url\(([^)]+)\)/)[1];
        });
        backgroundImageUrl2 = backgroundImageUrlNext.slice(1, -1); //forgive me, padre

        return backgroundImageUrl2;
-    }, {
-        message: "verify next image has updated",
+      },
+      {
+        message: 'verify next image has updated',
        timeout: 7 * 1000
-    }).not.toBe(backgroundImageUrl1);
+      }
+    )
+    .not.toBe(backgroundImageUrl1);
  console.log('backgroundImageUrl2 ' + backgroundImageUrl2);
 }

@@ -618,39 +667,39 @@ async function panZoomAndAssertImageProperties(page) {
  const imageCenterY = zoomedBoundingBox.y + zoomedBoundingBox.height / 2;

  // Pan right
-    await Promise.all(panHotkey.map(x => page.keyboard.down(x)));
+  await Promise.all(panHotkey.map((x) => page.keyboard.down(x)));
  await page.mouse.down();
  await page.mouse.move(imageCenterX - 200, imageCenterY, 10);
  await page.mouse.up();
-    await Promise.all(panHotkey.map(x => page.keyboard.up(x)));
+  await Promise.all(panHotkey.map((x) => page.keyboard.up(x)));
  const afterRightPanBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
  expect(zoomedBoundingBox.x).toBeGreaterThan(afterRightPanBoundingBox.x);

  // Pan left
-    await Promise.all(panHotkey.map(x => page.keyboard.down(x)));
+  await Promise.all(panHotkey.map((x) => page.keyboard.down(x)));
  await page.mouse.down();
  await page.mouse.move(imageCenterX, imageCenterY, 10);
  await page.mouse.up();
-    await Promise.all(panHotkey.map(x => page.keyboard.up(x)));
+  await Promise.all(panHotkey.map((x) => page.keyboard.up(x)));
  const afterLeftPanBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
  expect(afterRightPanBoundingBox.x).toBeLessThan(afterLeftPanBoundingBox.x);

  // Pan up
  await page.mouse.move(imageCenterX, imageCenterY);
-    await Promise.all(panHotkey.map(x => page.keyboard.down(x)));
+  await Promise.all(panHotkey.map((x) => page.keyboard.down(x)));
  await page.mouse.down();
  await page.mouse.move(imageCenterX, imageCenterY + 200, 10);
  await page.mouse.up();
-    await Promise.all(panHotkey.map(x => page.keyboard.up(x)));
+  await Promise.all(panHotkey.map((x) => page.keyboard.up(x)));
  const afterUpPanBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
  expect(afterUpPanBoundingBox.y).toBeGreaterThanOrEqual(afterLeftPanBoundingBox.y);

  // Pan down
-    await Promise.all(panHotkey.map(x => page.keyboard.down(x)));
+  await Promise.all(panHotkey.map((x) => page.keyboard.down(x)));
  await page.mouse.down();
  await page.mouse.move(imageCenterX, imageCenterY - 200, 10);
  await page.mouse.up();
-    await Promise.all(panHotkey.map(x => page.keyboard.up(x)));
+  await Promise.all(panHotkey.map((x) => page.keyboard.up(x)));
  const afterDownPanBoundingBox = await page.locator(backgroundImageSelector).boundingBox();
  expect(afterDownPanBoundingBox.y).toBeLessThanOrEqual(afterUpPanBoundingBox.y);
 }
@@ -742,7 +791,9 @@ async function assertBackgroundImageContrast(page, expected) {
 */
 async function zoomIntoImageryByButton(page) {
  // FIXME: There should only be one set of imagery buttons, but there are two?
-    const zoomInBtn = page.locator("[role='toolbar'][aria-label='Image controls'] .t-btn-zoom-in").nth(0);
+  const zoomInBtn = page
+    .locator("[role='toolbar'][aria-label='Image controls'] .t-btn-zoom-in")
+    .nth(0);
  const backgroundImage = page.locator(backgroundImageSelector);
  if (!(await zoomInBtn.isVisible())) {
    await backgroundImage.hover({ trial: true });
@@ -759,7 +810,9 @@ async function zoomIntoImageryByButton(page) {
 */
 async function zoomOutOfImageryByButton(page) {
  // FIXME: There should only be one set of imagery buttons, but there are two?
-    const zoomOutBtn = page.locator("[role='toolbar'][aria-label='Image controls'] .t-btn-zoom-out").nth(0);
+  const zoomOutBtn = page
+    .locator("[role='toolbar'][aria-label='Image controls'] .t-btn-zoom-out")
+    .nth(0);
  const backgroundImage = page.locator(backgroundImageSelector);
  if (!(await zoomOutBtn.isVisible())) {
    await backgroundImage.hover({ trial: true });
@@ -776,7 +829,9 @@ async function zoomOutOfImageryByButton(page) {
 */
 async function resetImageryPanAndZoom(page) {
  // FIXME: There should only be one set of imagery buttons, but there are two?
-    const panZoomResetBtn = page.locator("[role='toolbar'][aria-label='Image controls'] .t-btn-zoom-reset").nth(0);
+  const panZoomResetBtn = page
+    .locator("[role='toolbar'][aria-label='Image controls'] .t-btn-zoom-reset")
+    .nth(0);
  const backgroundImage = page.locator(backgroundImageSelector);
  if (!(await panZoomResetBtn.isVisible())) {
    await backgroundImage.hover({ trial: true });
@@ -785,3 +840,26 @@ async function resetImageryPanAndZoom(page) {
  await panZoomResetBtn.click();
  await waitForAnimations(backgroundImage);
 }
+
+/**
+ * @param {import('@playwright/test').Page} page
+ */
+async function createImageryView(page) {
+  // Click the Create button
+  await page.click('button:has-text("Create")');
+
+  // Click text=Example Imagery
+  await page.click('li[role="menuitem"]:has-text("Example Imagery")');
+
+  // Clear and set Image load delay to minimum value
+  await page.locator('input[type="number"]').fill('');
+  await page.locator('input[type="number"]').fill('5000');
+
+  // Click text=OK
+  await Promise.all([
+    page.waitForNavigation({ waitUntil: 'networkidle' }),
+    page.click('button:has-text("OK")'),
+    //Wait for Save Banner to appear
+    page.waitForSelector('.c-message-banner__message')
+  ]);
+}
--- a/e2e/tests/functional/plugins/importAndExportAsJSON/exportAsJson.e2e.spec.js
+++ b/e2e/tests/functional/plugins/importAndExportAsJSON/exportAsJson.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -29,22 +29,31 @@ This test suite is dedicated to tests which verify the basic operations surround
 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 }) => {
+  test.fixme(
+    'Create a basic object and verify that it can be exported as JSON from Tree',
+    async ({ page }) => {
      //Create domain object
      //Save Domain Object
      //Verify that the newly created domain object can be exported as JSON from the Tree
-    });
-    test.fixme('Create a basic object and verify that it can be exported as JSON from 3 dot menu', async ({ page }) => {
+    }
+  );
+  test.fixme(
+    'Create a basic object and verify that it can be exported as JSON from 3 dot menu',
+    async ({ page }) => {
      //Create domain object
      //Save Domain Object
      //Verify that the newly created domain object can be exported as JSON from the 3 dot menu
-    });
+    }
+  );
  test.fixme('Verify that a nested Object can be exported as JSON', async ({ page }) => {
    // Create 2 objects with hierarchy
    // Export as JSON
    // Verify Hiearchy
  });
-    test.fixme('Verify that the ExportAsJSON dropdown does not appear for the item X', async ({ page }) => {
+  test.fixme(
+    'Verify that the ExportAsJSON dropdown does not appear for the item X',
+    async ({ page }) => {
      // Other than non-persistible objects
-    });
+    }
+  );
 });
--- a/e2e/tests/functional/plugins/importAndExportAsJSON/importAsJson.e2e.spec.js
+++ b/e2e/tests/functional/plugins/importAndExportAsJSON/importAsJson.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -33,16 +33,22 @@ test.describe('ExportAsJSON', () => {
    //Verify that an testdata JSON file can be imported from Tree
    //Verify correctness of imported domain object
  });
-    test.fixme('Verify that domain object can be importAsJSON from 3 dot menu on folder', async ({ page }) => {
+  test.fixme(
+    'Verify that domain object can be importAsJSON from 3 dot menu on folder',
+    async ({ page }) => {
      //Verify that an testdata JSON file can be imported from 3 dot menu on folder domain object
      //Verify correctness of imported domain object
-    });
+    }
+  );
  test.fixme('Verify that a nested Objects can be importAsJSON', async ({ page }) => {
    // Testdata with hierarchy
    // ImportAsJSON on Tree
    // Verify Hierarchy
  });
-    test.fixme('Verify that the ImportAsJSON dropdown does not appear for the item X', async ({ page }) => {
+  test.fixme(
+    'Verify that the ImportAsJSON dropdown does not appear for the item X',
+    async ({ page }) => {
      // Other than non-persistible objects
-    });
+    }
+  );
 });
--- a/e2e/tests/functional/plugins/lad/lad.e2e.spec.js
+++ b/e2e/tests/functional/plugins/lad/lad.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -21,25 +21,148 @@
 *****************************************************************************/

 const { test, expect } = require('../../../../pluginFixtures');
-const { createDomainObjectWithDefaults, setStartOffset, setFixedTimeMode, setRealTimeMode } = require('../../../../appActions');
+const {
+  createDomainObjectWithDefaults,
+  setStartOffset,
+  setFixedTimeMode,
+  setRealTimeMode,
+  selectInspectorTab
+} = require('../../../../appActions');
+
+test.describe('Testing LAD table configuration', () => {
+  test.beforeEach(async ({ page }) => {
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+
+    // Create LAD table
+    const ladTable = await createDomainObjectWithDefaults(page, {
+      type: 'LAD Table',
+      name: 'Test LAD Table'
+    });
+
+    // Create Sine Wave Generator
+    await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Test Sine Wave Generator',
+      parent: ladTable.uuid
+    });
+
+    await page.goto(ladTable.url);
+  });
+  test('in edit mode, LAD Tables provide ability to hide columns', async ({ page }) => {
+    // Edit LAD table
+    await page.locator('[title="Edit"]').click();
+
+    // // Expand the 'My Items' folder in the left tree
+    // await page.locator('.c-tree__item__view-control.c-disclosure-triangle').click();
+    // // Add the Sine Wave Generator to the LAD table and save changes
+    // await page.dragAndDrop('role=treeitem[name=/Test Sine Wave Generator/]', '.c-lad-table-wrapper');
+    // select configuration tab in inspector
+    await selectInspectorTab(page, 'LAD Table Configuration');
+
+    // make sure headers are visible initially
+    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'Units' })).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'Type' })).toBeVisible();
+
+    // hide timestamp column
+    await page.getByLabel('Timestamp').uncheck();
+    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeHidden();
+    await expect(page.getByRole('cell', { name: 'Units' })).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'Type' })).toBeVisible();
+
+    // hide units & type column
+    await page.getByLabel('Units').uncheck();
+    await page.getByLabel('Type').uncheck();
+    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeHidden();
+    await expect(page.getByRole('cell', { name: 'Units' })).toBeHidden();
+    await expect(page.getByRole('cell', { name: 'Type' })).toBeHidden();
+
+    // save and reload and verify they columns are still hidden
+    await page.locator('button[title="Save"]').click();
+    await page.locator('text=Save and Finish Editing').click();
+    await page.reload();
+    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeHidden();
+    await expect(page.getByRole('cell', { name: 'Units' })).toBeHidden();
+    await expect(page.getByRole('cell', { name: 'Type' })).toBeHidden();
+
+    // Edit LAD table
+    await page.locator('[title="Edit"]').click();
+    await selectInspectorTab(page, 'LAD Table Configuration');
+
+    // show timestamp column
+    await page.getByLabel('Timestamp').check();
+    await expect(page.getByRole('cell', { name: 'Units' })).toBeHidden();
+    await expect(page.getByRole('cell', { name: 'Type' })).toBeHidden();
+    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeVisible();
+
+    // save and reload and make sure only timestamp is still visible
+    await page.locator('button[title="Save"]').click();
+    await page.locator('text=Save and Finish Editing').click();
+    await page.reload();
+    await expect(page.getByRole('cell', { name: 'Units' })).toBeHidden();
+    await expect(page.getByRole('cell', { name: 'Type' })).toBeHidden();
+    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeVisible();
+
+    // Edit LAD table
+    await page.locator('[title="Edit"]').click();
+    await selectInspectorTab(page, 'LAD Table Configuration');
+
+    // show units and type columns
+    await page.getByLabel('Units').check();
+    await page.getByLabel('Type').check();
+    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'Units' })).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'Type' })).toBeVisible();
+
+    // save and reload and make sure all columns are still visible
+    await page.locator('button[title="Save"]').click();
+    await page.locator('text=Save and Finish Editing').click();
+    await page.reload();
+    await expect(page.getByRole('cell', { name: 'Timestamp' })).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'Units' })).toBeVisible();
+    await expect(page.getByRole('cell', { name: 'Type' })).toBeVisible();
+  });
+
+  test("LAD Tables don't allow selection of rows but does show context click menus", async ({
+    page
+  }) => {
+    const cell = await page.locator('.js-first-data');
+    const userSelectable = await cell.evaluate((el) => {
+      return window.getComputedStyle(el).getPropertyValue('user-select');
+    });
+
+    expect(userSelectable).toBe('none');
+    // Right-click on the LAD table row
+    await cell.click({
+      button: 'right'
+    });
+    const menuOptions = page.locator('.c-menu ul');
+    await expect.soft(menuOptions).toContainText('View Full Datum');
+    await expect.soft(menuOptions).toContainText('View Historical Data');
+    await expect.soft(menuOptions).toContainText('Remove');
+    // await page.locator('li[title="Remove this object from its containing object."]').click();
+  });
+});

 test.describe('Testing LAD table @unstable', () => {
  let sineWaveObject;
  test.beforeEach(async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
    await setRealTimeMode(page);

    // Create Sine Wave Generator
    sineWaveObject = await createDomainObjectWithDefaults(page, {
      type: 'Sine Wave Generator',
-            name: "Test Sine Wave Generator"
+      name: 'Test Sine Wave Generator'
    });
  });
-    test('telemetry value exactly matches latest telemetry value received in real time', async ({ page }) => {
+  test('telemetry value exactly matches latest telemetry value received in real time', async ({
+    page
+  }) => {
    // Create LAD table
    await createDomainObjectWithDefaults(page, {
      type: 'LAD Table',
-            name: "Test LAD Table"
+      name: 'Test LAD Table'
    });
    // Edit LAD table
    await page.locator('[title="Edit"]').click();
@@ -61,11 +184,13 @@ test.describe('Testing LAD table @unstable', () => {

    expect(ladTableValue).toBe(subscribeTelemValue);
  });
-    test('telemetry value exactly matches latest telemetry value received in fixed time', async ({ page }) => {
+  test('telemetry value exactly matches latest telemetry value received in fixed time', async ({
+    page
+  }) => {
    // Create LAD table
    await createDomainObjectWithDefaults(page, {
      type: 'LAD Table',
-            name: "Test LAD Table"
+      name: 'Test LAD Table'
    });
    // Edit LAD table
    await page.locator('[title="Edit"]').click();
@@ -103,7 +228,9 @@ test.describe('Testing LAD table @unstable', () => {
 * @returns {Promise<string>} the formatted sin telemetry value
 */
 async function subscribeToTelemetry(page, objectIdentifier) {
-    const getTelemValuePromise = new Promise(resolve => page.exposeFunction('getTelemValue', resolve));
+  const getTelemValuePromise = new Promise((resolve) =>
+    page.exposeFunction('getTelemValue', resolve)
+  );

  await page.evaluate(async (telemetryIdentifier) => {
    const telemetryObject = await window.openmct.objects.get(telemetryIdentifier);
--- a/e2e/tests/functional/plugins/notebook/notebook.e2e.spec.js
+++ b/e2e/tests/functional/plugins/notebook/notebook.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -19,12 +19,12 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-
+/* global __dirname */
 /*
 This test suite is dedicated to tests which verify the basic operations surrounding Notebooks.
 */

-const { test, expect } = require('../../../../pluginFixtures');
+const { test, expect, streamToString } = require('../../../../pluginFixtures');
 const { createDomainObjectWithDefaults } = require('../../../../appActions');
 const nbUtils = require('../../../../helper/notebookUtils');
 const path = require('path');
@@ -50,50 +50,70 @@ test.describe('Default Notebook', () => {
  //     `JSON.parse(localStorage.getItem('notebook-storage'));`
  // 1.  - Clear default notebook:
  //     `localStorage.setItem('notebook-storage', null);`
-    test.fixme('A newly created Notebook is automatically set as the default notebook if no other notebooks exist', async ({ page }) => {
+  test.fixme(
+    'A newly created Notebook is automatically set as the default notebook if no other notebooks exist',
+    async ({ page }) => {
      //Create new notebook
      //Verify Default Notebook Characteristics
-    });
-    test.fixme('A newly created Notebook is automatically set as the default notebook if at least one other notebook exists', async ({ page }) => {
+    }
+  );
+  test.fixme(
+    'A newly created Notebook is automatically set as the default notebook if at least one other notebook exists',
+    async ({ page }) => {
      //Create new notebook A
      //Create second notebook B
      //Verify Non-Default Notebook A Characteristics
      //Verify Default Notebook B Characteristics
-    });
-    test.fixme('If a default notebook is deleted, the second most recent notebook becomes the default', async ({ page }) => {
+    }
+  );
+  test.fixme(
+    'If a default notebook is deleted, the second most recent notebook becomes the default',
+    async ({ page }) => {
      //Create new notebook A
      //Create second notebook B
      //Delete Notebook B
      //Verify Default Notebook A Characteristics
-    });
+    }
+  );
 });

 test.describe('Notebook section tests', () => {
  //The following test cases are associated with Notebook Sections
  test.beforeEach(async ({ page }) => {
    //Navigate to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    // Create Notebook
    await createDomainObjectWithDefaults(page, {
      type: NOTEBOOK_NAME
    });
  });
-    test('Default and new sections are automatically named Unnamed Section with Unnamed Page', async ({ page }) => {
+  test('Default and new sections are automatically named Unnamed Section with Unnamed Page', async ({
+    page
+  }) => {
+    const notebookSectionNames = page.locator('.c-notebook__sections .c-list__item__name');
+    const notebookPageNames = page.locator('.c-notebook__pages .c-list__item__name');
+    await expect(notebookSectionNames).toBeHidden();
+    await expect(notebookPageNames).toBeHidden();
+    // Expand sidebar
+    await page.locator('.c-notebook__toggle-nav-button').click();
    // Check that the default section and page are created and the name matches the defaults
-        const defaultSectionName = await page.locator('.c-notebook__sections .c-list__item__name').textContent();
+    const defaultSectionName = await notebookSectionNames.innerText();
+    await expect(notebookSectionNames).toBeVisible();
    expect(defaultSectionName).toBe('Unnamed Section');
-        const defaultPageName = await page.locator('.c-notebook__pages .c-list__item__name').textContent();
+    const defaultPageName = await notebookPageNames.innerText();
+    await expect(notebookPageNames).toBeVisible();
    expect(defaultPageName).toBe('Unnamed Page');

-        // Expand sidebar and add a section
-        await page.locator('.c-notebook__toggle-nav-button').click();
+    // Add a section
    await page.locator('.js-sidebar-sections .c-icon-button.icon-plus').click();

    // Check that new section and page within the new section match the defaults
-        const newSectionName = await page.locator('.c-notebook__sections .c-list__item__name').nth(1).textContent();
+    const newSectionName = await notebookSectionNames.nth(1).innerText();
+    await expect(notebookSectionNames.nth(1)).toBeVisible();
    expect(newSectionName).toBe('Unnamed Section');
-        const newPageName = await page.locator('.c-notebook__pages .c-list__item__name').textContent();
+    const newPageName = await notebookPageNames.innerText();
+    await expect(notebookPageNames).toBeVisible();
    expect(newPageName).toBe('Unnamed Page');
  });
  test.fixme('Section selection operations and associated behavior', async ({ page }) => {
@@ -133,7 +153,7 @@ test.describe('Notebook page tests', () => {
  //The following test cases are associated with Notebook Pages
  test.beforeEach(async ({ page }) => {
    //Navigate to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    // Create Notebook
    await createDomainObjectWithDefaults(page, {
@@ -142,7 +162,9 @@ test.describe('Notebook page tests', () => {
  });
  //Test will need to be implemented after a refactor in #5713
  // eslint-disable-next-line playwright/no-skipped-test
-    test.skip('Delete page popup is removed properly on clicking dropdown again', async ({ page }) => {
+  test.skip('Delete page popup is removed properly on clicking dropdown again', async ({
+    page
+  }) => {
    test.info().annotations.push({
      type: 'issue',
      description: 'https://github.com/nasa/openmct/issues/5713'
@@ -198,6 +220,36 @@ test.describe('Notebook page tests', () => {
  });
 });

+test.describe('Notebook export tests', () => {
+  test.beforeEach(async ({ page }) => {
+    //Navigate to baseURL
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+
+    // Create Notebook
+    await createDomainObjectWithDefaults(page, {
+      type: NOTEBOOK_NAME
+    });
+  });
+  test('can export notebook as text', async ({ page }) => {
+    await nbUtils.enterTextEntry(page, `Foo bar entry`);
+    // Click on 3 Dot Menu
+    await page.locator('button[title="More options"]').click();
+    const downloadPromise = page.waitForEvent('download');
+
+    await page.getByRole('menuitem', { name: /Export Notebook as Text/ }).click();
+
+    await page.getByRole('button', { name: 'Save' }).click();
+    const download = await downloadPromise;
+    const readStream = await download.createReadStream();
+    const exportedText = await streamToString(readStream);
+    expect(exportedText).toContain('Foo bar entry');
+  });
+  test.fixme('can export multiple notebook entries as text ', async ({ page }) => {});
+  test.fixme('can export all notebook entry metdata', async ({ page }) => {});
+  test.fixme('can export all notebook tags', async ({ page }) => {});
+  test.fixme('can export all notebook snapshots', async ({ page }) => {});
+});
+
 test.describe('Notebook search tests', () => {
  test.fixme('Can search for a single result', async ({ page }) => {});
  test.fixme('Can search for many results', async ({ page }) => {});
@@ -212,17 +264,29 @@ test.describe('Notebook entry tests', () => {
  let notebookObject;
  test.beforeEach(async ({ page }) => {
    // eslint-disable-next-line no-undef
-        await page.addInitScript({ path: path.join(__dirname, '../../../../helper/', 'addInitNotebookWithUrls.js') });
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.addInitScript({
+      path: path.join(__dirname, '../../../../helper/', 'addInitNotebookWithUrls.js')
+    });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    notebookObject = await createDomainObjectWithDefaults(page, {
      type: NOTEBOOK_NAME
    });
  });
-    test.fixme('When a new entry is created, it should be focused', async ({ page }) => {});
-    test('When an object is dropped into a notebook, a new entry is created and it should be focused @unstable', async ({ page }) => {
+  test('When a new entry is created, it should be focused and selected', async ({ page }) => {
+    // Navigate to the notebook object
+    await page.goto(notebookObject.url);
+
+    // Click .c-notebook__drag-area
+    await page.locator('.c-notebook__drag-area').click();
+    await expect(page.locator('[aria-label="Notebook Entry Input"]')).toBeVisible();
+    await expect(page.locator('[aria-label="Notebook Entry"]')).toHaveClass(/is-selected/);
+  });
+  test('When an object is dropped into a notebook, a new entry is created and it should be focused @unstable', async ({
+    page
+  }) => {
    // Create Overlay Plot
-        await createDomainObjectWithDefaults(page, {
+    const overlayPlot = await createDomainObjectWithDefaults(page, {
      type: 'Overlay Plot'
    });

@@ -232,17 +296,21 @@ test.describe('Notebook entry tests', () => {
    // Reveal the notebook in the tree
    await page.getByTitle('Show selected item in tree').click();

-        await page.dragAndDrop('role=treeitem[name=/Dropped Overlay Plot/]', '.c-notebook__drag-area');
+    await page
+      .getByRole('treeitem', { name: overlayPlot.name })
+      .dragTo(page.locator('.c-notebook__drag-area'));

    const embed = page.locator('.c-ne__embed__link');
-        const embedName = await embed.textContent();
+    const embedName = await embed.innerText();

    await expect(embed).toHaveClass(/icon-plot-overlay/);
-        expect(embedName).toBe('Dropped Overlay Plot');
+    expect(embedName).toBe(overlayPlot.name);
  });
-    test('When an object is dropped into a notebooks existing entry, it should be focused @unstable', async ({ page }) => {
+  test('When an object is dropped into a notebooks existing entry, it should be focused @unstable', async ({
+    page
+  }) => {
    // Create Overlay Plot
-        await createDomainObjectWithDefaults(page, {
+    const overlayPlot = await createDomainObjectWithDefaults(page, {
      type: 'Overlay Plot'
    });

@@ -253,18 +321,42 @@ test.describe('Notebook entry tests', () => {
    await page.getByTitle('Show selected item in tree').click();

    await nbUtils.enterTextEntry(page, 'Entry to drop into');
-        await page.dragAndDrop('role=treeitem[name=/Dropped Overlay Plot/]', 'text=Entry to drop into');
+    await page
+      .getByRole('treeitem', { name: overlayPlot.name })
+      .dragTo(page.locator('text=Entry to drop into'));

-        const existingEntry = page.locator('.c-ne__content', { has: page.locator('text="Entry to drop into"') });
+    const existingEntry = page.locator('.c-ne__content', {
+      has: page.locator('text="Entry to drop into"')
+    });
    const embed = existingEntry.locator('.c-ne__embed__link');
-        const embedName = await embed.textContent();
+    const embedName = await embed.innerText();

    await expect(embed).toHaveClass(/icon-plot-overlay/);
-        expect(embedName).toBe('Dropped Overlay Plot');
+    expect(embedName).toBe(overlayPlot.name);
  });
  test.fixme('new entries persist through navigation events without save', async ({ page }) => {});
-    test.fixme('previous and new entries can be deleted', async ({ page }) => {});
-    test('when a valid link is entered into a notebook entry, it becomes clickable when viewing', async ({ page }) => {
+  test('previous and new entries can be deleted', async ({ page }) => {
+    // Navigate to the notebook object
+    await page.goto(notebookObject.url);
+
+    await nbUtils.enterTextEntry(page, 'First Entry');
+    await page.hover('text="First Entry"');
+    await page.click('button[title="Delete this entry"]');
+    await page.getByRole('button', { name: 'Ok' }).filter({ hasText: 'Ok' }).click();
+    await expect(page.locator('text="First Entry"')).toBeHidden();
+    await nbUtils.enterTextEntry(page, 'Another First Entry');
+    await nbUtils.enterTextEntry(page, 'Second Entry');
+    await nbUtils.enterTextEntry(page, 'Third Entry');
+    await page.hover('[aria-label="Notebook Entry"] >> nth=2');
+    await page.click('button[title="Delete this entry"] >> nth=2');
+    await page.getByRole('button', { name: 'Ok' }).filter({ hasText: 'Ok' }).click();
+    await expect(page.locator('text="Third Entry"')).toBeHidden();
+    await expect(page.locator('text="Another First Entry"')).toBeVisible();
+    await expect(page.locator('text="Second Entry"')).toBeVisible();
+  });
+  test('when a valid link is entered into a notebook entry, it becomes clickable when viewing', async ({
+    page
+  }) => {
    const TEST_LINK = 'http://www.google.com';

    // Navigate to the notebook object
@@ -289,7 +381,9 @@ test.describe('Notebook entry tests', () => {

    expect(await validLink.count()).toBe(1);
  });
-    test('when an invalid link is entered into a notebook entry, it does not become clickable when viewing', async ({ page }) => {
+  test('when an invalid link is entered into a notebook entry, it does not become clickable when viewing', async ({
+    page
+  }) => {
    const TEST_LINK = 'www.google.com';

    // Navigate to the notebook object
@@ -304,7 +398,9 @@ test.describe('Notebook entry tests', () => {

    expect(await invalidLink.count()).toBe(0);
  });
-    test('when a link is entered, but it is not in the whitelisted urls, it does not become clickable when viewing', async ({ page }) => {
+  test('when a link is entered, but it is not in the whitelisted urls, it does not become clickable when viewing', async ({
+    page
+  }) => {
    const TEST_LINK = 'http://www.bing.com';

    // Navigate to the notebook object
@@ -319,7 +415,9 @@ test.describe('Notebook entry tests', () => {

    expect(await invalidLink.count()).toBe(0);
  });
-    test('when a valid link with a subdomain and a valid domain in the whitelisted urls is entered into a notebook entry, it becomes clickable when viewing', async ({ page }) => {
+  test('when a valid link with a subdomain and a valid domain in the whitelisted urls is entered into a notebook entry, it becomes clickable when viewing', async ({
+    page
+  }) => {
    const INVALID_TEST_LINK = 'http://bing.google.com';

    // Navigate to the notebook object
@@ -334,7 +432,9 @@ test.describe('Notebook entry tests', () => {

    expect(await validLink.count()).toBe(1);
  });
-    test('when a valid secure link is entered into a notebook entry, it becomes clickable when viewing', async ({ page }) => {
+  test('when a valid secure link is entered into a notebook entry, it becomes clickable when viewing', async ({
+    page
+  }) => {
    const TEST_LINK = 'https://www.google.com';

    // Navigate to the notebook object
@@ -359,7 +459,9 @@ test.describe('Notebook entry tests', () => {

    expect(await validLink.count()).toBe(1);
  });
-    test('when a nefarious link is entered into a notebook entry, it is sanitized when viewing', async ({ page }) => {
+  test('when a nefarious link is entered into a notebook entry, it is sanitized when viewing', async ({
+    page
+  }) => {
    const TEST_LINK = 'http://www.google.com?bad=';
    const TEST_LINK_BAD = `http://www.google.com?bad=<script>alert('gimme your cookies')</script>`;

@@ -369,7 +471,10 @@ test.describe('Notebook entry tests', () => {
    // Reveal the notebook in the tree
    await page.getByTitle('Show selected item in tree').click();

-        await nbUtils.enterTextEntry(page, `This should be a link, BUT not a bad link: ${TEST_LINK_BAD} is it?`);
+    await nbUtils.enterTextEntry(
+      page,
+      `This should be a link, BUT not a bad link: ${TEST_LINK_BAD} is it?`
+    );

    const sanitizedLink = page.locator(`a[href="${TEST_LINK}"]`);
    const unsanitizedLink = page.locator(`a[href="${TEST_LINK_BAD}"]`);
--- a/e2e/tests/functional/plugins/notebook/notebookSnapshots.e2e.spec.js
+++ b/e2e/tests/functional/plugins/notebook/notebookSnapshots.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -29,14 +29,19 @@ const { test, expect } = require('../../../../pluginFixtures');
 // const nbUtils = require('../../../../helper/notebookUtils');

 test.describe('Snapshot Menu tests', () => {
-    test.fixme('When no default notebook is selected, Snapshot Menu dropdown should only have a single option', async ({ page }) => {
+  test.fixme(
+    'When no default notebook is selected, Snapshot Menu dropdown should only have a single option',
+    async ({ page }) => {
      // There should be no default notebook
      // Clear default notebook if exists using `localStorage.setItem('notebook-storage', null);`
      // refresh page
      // Click on 'Notebook Snaphot Menu'
      // 'save to Notebook Snapshots' should be only option there
-    });
-    test.fixme('When default notebook is updated selected, Snapshot Menu dropdown should list it as the newest option', async ({ page }) => {
+    }
+  );
+  test.fixme(
+    'When default notebook is updated selected, Snapshot Menu dropdown should list it as the newest option',
+    async ({ page }) => {
      // Create 2a notebooks
      // Set Notebook A as Default
      // Open Snapshot Menu and note that Notebook A is listed
@@ -44,7 +49,8 @@ test.describe('Snapshot Menu tests', () => {
      // Set Default Notebook to Notebook B
      // Open Snapshot Notebook and note that Notebook B is listed
      // Select Default Notebook Option and verify that Snapshot is added to Notebook B
-    });
+    }
+  );
  test.fixme('Can add Snapshots via Snapshot Menu and details are correct', async ({ page }) => {
    //Note this should be a visual test, too
    // Create Telemetry object
@@ -66,7 +72,7 @@ test.describe('Snapshot Menu tests', () => {
 test.describe('Snapshot Container tests', () => {
  test.beforeEach(async ({ page }) => {
    //Navigate to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    // Create Notebook
    // const notebook = await createDomainObjectWithDefaults(page, {
@@ -82,12 +88,19 @@ test.describe('Snapshot Container tests', () => {
    await page.getByRole('button', { name: ' Snapshot ' }).click();
    await page.getByRole('menuitem', { name: ' Save to Notebook Snapshots' }).click();
    await page.getByRole('button', { name: 'Show' }).click();
-
  });
  test.fixme('5 Snapshots can be added to a container', async ({ page }) => {});
-    test.fixme('5 Snapshots can be added to a container and Deleted with Delete All action', async ({ page }) => {});
-    test.fixme('A snapshot can be Deleted from Container with 3 dot action menu', async ({ page }) => {});
-    test.fixme('A snapshot can be Viewed, Annotated, display deleted, and saved from Container with 3 dot action menu', async ({ page }) => {
+  test.fixme(
+    '5 Snapshots can be added to a container and Deleted with Delete All action',
+    async ({ page }) => {}
+  );
+  test.fixme(
+    'A snapshot can be Deleted from Container with 3 dot action menu',
+    async ({ page }) => {}
+  );
+  test.fixme(
+    'A snapshot can be Viewed, Annotated, display deleted, and saved from Container with 3 dot action menu',
+    async ({ page }) => {
      await page.locator('.c-snapshot.c-ne__embed').first().getByTitle('More options').click();
      await page.getByRole('menuitem', { name: ' View Snapshot' }).click();
      await expect(page.locator('.c-overlay__outer')).toBeVisible();
@@ -98,16 +111,25 @@ test.describe('Snapshot Container tests', () => {
      await page.getByRole('button', { name: 'Save' }).click();
      await page.getByRole('button', { name: 'Done' }).click();
      //await expect(await page.locator)
-    });
+    }
+  );
  test('A snapshot can be Quick Viewed from Container with 3 dot action menu', async ({ page }) => {
    await page.locator('.c-snapshot.c-ne__embed').first().getByTitle('More options').click();
    await page.getByRole('menuitem', { name: 'Quick View' }).click();
    await expect(page.locator('.c-overlay__outer')).toBeVisible();
  });
-    test.fixme('A snapshot can be Navigated To from Container with 3 dot action menu', async ({ page }) => {});
-    test.fixme('A snapshot can be Navigated To Item in Time from Container with 3 dot action menu', async ({ page }) => {});
+  test.fixme(
+    'A snapshot can be Navigated To from Container with 3 dot action menu',
+    async ({ page }) => {}
+  );
+  test.fixme(
+    'A snapshot can be Navigated To Item in Time from Container with 3 dot action menu',
+    async ({ page }) => {}
+  );
  test.fixme('A snapshot Container can be open and closed', async ({ page }) => {});
-    test.fixme('Can add object to Snapshot container and pull into notebook and create a new entry', async ({ page }) => {
+  test.fixme(
+    'Can add object to Snapshot container and pull into notebook and create a new entry',
+    async ({ page }) => {
      //Create Notebook
      //Create Telemetry Object
      //From Telemetry Object, use 'save to Notebook Snapshots'
@@ -116,8 +138,11 @@ test.describe('Snapshot Container tests', () => {
      //Drag and Drop onto droppable area for new entry
      //New Entry created with given snapshot added
      //Snapshot removed from container?
-    });
-    test.fixme('Can add object to Snapshot container and pull into notebook and existing entry', async ({ page }) => {
+    }
+  );
+  test.fixme(
+    'Can add object to Snapshot container and pull into notebook and existing entry',
+    async ({ page }) => {
      //Create Notebook
      //Create Telemetry Object
      //From Telemetry Object, use 'save to Notebook Snapshots'
@@ -126,9 +151,13 @@ test.describe('Snapshot Container tests', () => {
      //Drag and Drop into exiting entry
      //Existing Entry updated with given snapshot
      //Snapshot removed from container?
-    });
-    test.fixme('Verify Embedded options for PNG, JPG, and Annotate work correctly', async ({ page }) => {
+    }
+  );
+  test.fixme(
+    'Verify Embedded options for PNG, JPG, and Annotate work correctly',
+    async ({ page }) => {
      //Add snapshot to container
      //Verify PNG, JPG, and Annotate buttons work correctly
-    });
+    }
+  );
 });
--- a/e2e/tests/functional/plugins/notebook/notebookWithCouchDB.e2e.spec.js
+++ b/e2e/tests/functional/plugins/notebook/notebookWithCouchDB.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -26,60 +26,62 @@ This test suite is dedicated to tests which verify the basic operations surround

 const { test, expect } = require('../../../../pluginFixtures');
 const { createDomainObjectWithDefaults } = require('../../../../appActions');
+const nbUtils = require('../../../../helper/notebookUtils');

 test.describe('Notebook Tests with CouchDB @couchdb', () => {
  let testNotebook;
+
  test.beforeEach(async ({ page }) => {
    //Navigate to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    // Create Notebook
-        testNotebook = await createDomainObjectWithDefaults(page, {
-            type: 'Notebook',
-            name: "TestNotebook"
-        });
+    testNotebook = await createDomainObjectWithDefaults(page, { type: 'Notebook' });
+    await page.goto(testNotebook.url, { waitUntil: 'networkidle' });
  });

  test('Inspect Notebook Entry Network Requests', async ({ page }) => {
+    //Ensure we're on the annotations Tab in the inspector
    await page.getByText('Annotations').click();
    // Expand sidebar
    await page.locator('.c-notebook__toggle-nav-button').click();

    // Collect all request events to count and assert after notebook action
-        let addingNotebookElementsRequests = [];
-        page.on('request', (request) => addingNotebookElementsRequests.push(request));
+    let notebookElementsRequests = [];
+    page.on('request', (request) => notebookElementsRequests.push(request));

+    //Clicking Add Page generates
    let [notebookUrlRequest, allDocsRequest] = await Promise.all([
      // Waits for the next request with the specified url
      page.waitForRequest(`**/openmct/${testNotebook.uuid}`),
      page.waitForRequest('**/openmct/_all_docs?include_docs=true'),
      // Triggers the request
-            page.click('[aria-label="Add Page"]'),
-            // Ensures that there are no other network requests
-            page.waitForLoadState('networkidle')
+      page.click('[aria-label="Add Page"]')
    ]);
+    // Ensures that there are no other network requests
+    await page.waitForLoadState('networkidle');
+
    // Assert that only two requests are made
    // Network Requests are:
    // 1) The actual POST to create the page
    // 2) The shared worker event from 👆 request
-        expect(addingNotebookElementsRequests.length).toBe(2);
+    expect(notebookElementsRequests.length).toBe(2);

    // Assert on request object
-        expect(notebookUrlRequest.postDataJSON().metadata.name).toBe('TestNotebook');
-        expect(notebookUrlRequest.postDataJSON().model.persisted).toBeGreaterThanOrEqual(notebookUrlRequest.postDataJSON().model.modified);
+    expect(notebookUrlRequest.postDataJSON().metadata.name).toBe(testNotebook.name);
+    expect(notebookUrlRequest.postDataJSON().model.persisted).toBeGreaterThanOrEqual(
+      notebookUrlRequest.postDataJSON().model.modified
+    );
    expect(allDocsRequest.postDataJSON().keys).toContain(testNotebook.uuid);

    // Add an entry
    // Network Requests are:
    // 1) The actual POST to create the entry
    // 2) The shared worker event from 👆 POST request
-        addingNotebookElementsRequests = [];
-        await page.locator('text=To start a new entry, click here or drag and drop any object').click();
-        await page.locator('[aria-label="Notebook Entry Input"]').click();
-        await page.locator('[aria-label="Notebook Entry Input"]').fill(`First Entry`);
-        await page.locator('[aria-label="Notebook Entry Input"]').press('Enter');
+    notebookElementsRequests = [];
+    await nbUtils.enterTextEntry(page, 'First Entry');
    await page.waitForLoadState('networkidle');
-        expect(addingNotebookElementsRequests.length).toBeLessThanOrEqual(2);
+    expect(notebookElementsRequests.length).toBeLessThanOrEqual(2);

    // Add some tags
    // Network Requests are for each tag creation are:
@@ -95,32 +97,17 @@ test.describe('Notebook Tests with CouchDB @couchdb', () => {
    // 10) Entry is timestamped
    // 11) The shared worker event from 👆 POST request

-        addingNotebookElementsRequests = [];
-        await page.hover(`button:has-text("Add Tag")`);
-        await page.locator(`button:has-text("Add Tag")`).click();
-        await page.locator('[placeholder="Type to select tag"]').click();
-        await page.locator('[aria-label="Autocomplete Options"] >> text=Driving').click();
-        await page.waitForSelector('[aria-label="Tag"]:has-text("Driving")');
-        page.waitForLoadState('networkidle');
-        expect(filterNonFetchRequests(addingNotebookElementsRequests).length).toBeLessThanOrEqual(11);
+    notebookElementsRequests = [];
+    await addTagAndAwaitNetwork(page, 'Driving');
+    expect(filterNonFetchRequests(notebookElementsRequests).length).toBeLessThanOrEqual(11);

-        addingNotebookElementsRequests = [];
-        await page.hover(`button:has-text("Add Tag")`);
-        await page.locator(`button:has-text("Add Tag")`).click();
-        await page.locator('[placeholder="Type to select tag"]').click();
-        await page.locator('[aria-label="Autocomplete Options"] >> text=Drilling').click();
-        await page.waitForSelector('[aria-label="Tag"]:has-text("Drilling")');
-        page.waitForLoadState('networkidle');
-        expect(filterNonFetchRequests(addingNotebookElementsRequests).length).toBeLessThanOrEqual(11);
+    notebookElementsRequests = [];
+    await addTagAndAwaitNetwork(page, 'Drilling');
+    expect(filterNonFetchRequests(notebookElementsRequests).length).toBeLessThanOrEqual(11);

-        addingNotebookElementsRequests = [];
-        await page.hover(`button:has-text("Add Tag")`);
-        await page.locator(`button:has-text("Add Tag")`).click();
-        await page.locator('[placeholder="Type to select tag"]').click();
-        await page.locator('[aria-label="Autocomplete Options"] >> text=Science').click();
-        await page.waitForSelector('[aria-label="Tag"]:has-text("Science")');
-        page.waitForLoadState('networkidle');
-        expect(filterNonFetchRequests(addingNotebookElementsRequests).length).toBeLessThanOrEqual(11);
+    notebookElementsRequests = [];
+    await addTagAndAwaitNetwork(page, 'Science');
+    expect(filterNonFetchRequests(notebookElementsRequests).length).toBeLessThanOrEqual(11);

    // Delete all the tags
    // Network requests are:
@@ -129,58 +116,25 @@ test.describe('Notebook Tests with CouchDB @couchdb', () => {
    // 3) Timestamp update on entry
    // 4) The shared worker event from 👆 POST request
    // This happens for 3 tags so 12 requests
-        addingNotebookElementsRequests = [];
-        await page.hover('[aria-label="Tag"]:has-text("Driving")');
-        await page.locator('[aria-label="Tag"]:has-text("Driving") ~ .c-completed-tag-deletion').click();
-        await page.waitForSelector('[aria-label="Tag"]:has-text("Driving")', {state: 'hidden'});
-        await page.hover('[aria-label="Tag"]:has-text("Drilling")');
-        await page.locator('[aria-label="Tag"]:has-text("Drilling") ~ .c-completed-tag-deletion').click();
-        await page.waitForSelector('[aria-label="Tag"]:has-text("Drilling")', {state: 'hidden'});
-        page.hover('[aria-label="Tag"]:has-text("Science")');
-        await page.locator('[aria-label="Tag"]:has-text("Science") ~ .c-completed-tag-deletion').click();
-        await page.waitForSelector('[aria-label="Tag"]:has-text("Science")', {state: 'hidden'});
-        page.waitForLoadState('networkidle');
-        expect(filterNonFetchRequests(addingNotebookElementsRequests).length).toBeLessThanOrEqual(12);
+    notebookElementsRequests = [];
+    await removeTagAndAwaitNetwork(page, 'Driving');
+    await removeTagAndAwaitNetwork(page, 'Drilling');
+    await removeTagAndAwaitNetwork(page, 'Science');
+    expect(filterNonFetchRequests(notebookElementsRequests).length).toBeLessThanOrEqual(12);

    // Add two more pages
    await page.click('[aria-label="Add Page"]');
    await page.click('[aria-label="Add Page"]');

    // Add three entries
-        await page.locator('text=To start a new entry, click here or drag and drop any object').click();
-        await page.locator('[aria-label="Notebook Entry Input"]').click();
-        await page.locator('[aria-label="Notebook Entry Input"]').fill(`First Entry`);
-        await page.locator('[aria-label="Notebook Entry Input"]').press('Enter');
-
-        await page.locator('text=To start a new entry, click here or drag and drop any object').click();
-        await page.locator('[aria-label="Notebook Entry Input"] >> nth=1').click();
-        await page.locator('[aria-label="Notebook Entry Input"] >> nth=1').fill(`Second Entry`);
-        await page.locator('[aria-label="Notebook Entry Input"] >> nth=1').press('Enter');
-
-        await page.locator('text=To start a new entry, click here or drag and drop any object').click();
-        await page.locator('[aria-label="Notebook Entry Input"] >> nth=2').click();
-        await page.locator('[aria-label="Notebook Entry Input"] >> nth=2').fill(`Third Entry`);
-        await page.locator('[aria-label="Notebook Entry Input"] >> nth=2').press('Enter');
+    await nbUtils.enterTextEntry(page, 'First Entry');
+    await nbUtils.enterTextEntry(page, 'Second Entry');
+    await nbUtils.enterTextEntry(page, 'Third Entry');

    // Add three tags
-        await page.hover(`button:has-text("Add Tag")`);
-        await page.locator(`button:has-text("Add Tag")`).click();
-        await page.locator('[placeholder="Type to select tag"]').click();
-        await page.locator('[aria-label="Autocomplete Options"] >> text=Science').click();
-        await page.waitForSelector('[aria-label="Tag"]:has-text("Science")');
-
-        await page.hover(`button:has-text("Add Tag")`);
-        await page.locator(`button:has-text("Add Tag")`).click();
-        await page.locator('[placeholder="Type to select tag"]').click();
-        await page.locator('[aria-label="Autocomplete Options"] >> text=Drilling').click();
-        await page.waitForSelector('[aria-label="Tag"]:has-text("Drilling")');
-
-        await page.hover(`button:has-text("Add Tag")`);
-        await page.locator(`button:has-text("Add Tag")`).click();
-        await page.locator('[placeholder="Type to select tag"]').click();
-        await page.locator('[aria-label="Autocomplete Options"] >> text=Driving').click();
-        await page.waitForSelector('[aria-label="Tag"]:has-text("Driving")');
-        page.waitForLoadState('networkidle');
+    await addTagAndAwaitNetwork(page, 'Science');
+    await addTagAndAwaitNetwork(page, 'Drilling');
+    await addTagAndAwaitNetwork(page, 'Driving');

    // Add a fourth entry
    // Network requests are:
@@ -188,14 +142,11 @@ test.describe('Notebook Tests with CouchDB @couchdb', () => {
    // 2) The shared worker event from 👆 POST request
    // 3) Timestamp update on entry
    // 4) The shared worker event from 👆 POST request
-        addingNotebookElementsRequests = [];
-        await page.locator('text=To start a new entry, click here or drag and drop any object').click();
-        await page.locator('[aria-label="Notebook Entry Input"] >> nth=3').click();
-        await page.locator('[aria-label="Notebook Entry Input"] >> nth=3').fill(`Fourth Entry`);
-        await page.locator('[aria-label="Notebook Entry Input"] >> nth=3').press('Enter');
+    notebookElementsRequests = [];
+    await nbUtils.enterTextEntry(page, 'Fourth Entry');
    page.waitForLoadState('networkidle');

-        expect(filterNonFetchRequests(addingNotebookElementsRequests).length).toBeLessThanOrEqual(4);
+    expect(filterNonFetchRequests(notebookElementsRequests).length).toBeLessThanOrEqual(4);

    // Add a fifth entry
    // Network requests are:
@@ -203,28 +154,22 @@ test.describe('Notebook Tests with CouchDB @couchdb', () => {
    // 2) The shared worker event from 👆 POST request
    // 3) Timestamp update on entry
    // 4) The shared worker event from 👆 POST request
-        addingNotebookElementsRequests = [];
-        await page.locator('text=To start a new entry, click here or drag and drop any object').click();
-        await page.locator('[aria-label="Notebook Entry Input"] >> nth=4').click();
-        await page.locator('[aria-label="Notebook Entry Input"] >> nth=4').fill(`Fifth Entry`);
-        await page.locator('[aria-label="Notebook Entry Input"] >> nth=4').press('Enter');
+    notebookElementsRequests = [];
+    await nbUtils.enterTextEntry(page, 'Fifth Entry');
    page.waitForLoadState('networkidle');

-        expect(filterNonFetchRequests(addingNotebookElementsRequests).length).toBeLessThanOrEqual(4);
+    expect(filterNonFetchRequests(notebookElementsRequests).length).toBeLessThanOrEqual(4);

    // Add a sixth entry
    // 1) Send POST to add new entry
    // 2) The shared worker event from 👆 POST request
    // 3) Timestamp update on entry
    // 4) The shared worker event from 👆 POST request
-        addingNotebookElementsRequests = [];
-        await page.locator('text=To start a new entry, click here or drag and drop any object').click();
-        await page.locator('[aria-label="Notebook Entry Input"] >> nth=5').click();
-        await page.locator('[aria-label="Notebook Entry Input"] >> nth=5').fill(`Sixth Entry`);
-        await page.locator('[aria-label="Notebook Entry Input"] >> nth=5').press('Enter');
+    notebookElementsRequests = [];
+    await nbUtils.enterTextEntry(page, 'Sixth Entry');
    page.waitForLoadState('networkidle');

-        expect(filterNonFetchRequests(addingNotebookElementsRequests).length).toBeLessThanOrEqual(4);
+    expect(filterNonFetchRequests(notebookElementsRequests).length).toBeLessThanOrEqual(4);
  });

  test('Search tests', async ({ page }) => {
@@ -233,35 +178,23 @@ test.describe('Notebook Tests with CouchDB @couchdb', () => {
      description: 'https://github.com/akhenry/openmct-yamcs/issues/69'
    });
    await page.getByText('Annotations').click();
-        await page.locator('text=To start a new entry, click here or drag and drop any object').click();
-        await page.locator('[aria-label="Notebook Entry Input"]').click();
-        await page.locator('[aria-label="Notebook Entry Input"]').fill(`First Entry`);
-        await page.locator('[aria-label="Notebook Entry Input"]').press('Enter');
+    await nbUtils.enterTextEntry(page, 'First Entry');

    // Add three tags
-        await page.hover(`button:has-text("Add Tag")`);
-        await page.locator(`button:has-text("Add Tag")`).click();
-        await page.locator('[placeholder="Type to select tag"]').click();
-        await page.locator('[aria-label="Autocomplete Options"] >> text=Science').click();
-        await page.waitForSelector('[aria-label="Tag"]:has-text("Science")');
-
-        await page.hover(`button:has-text("Add Tag")`);
-        await page.locator(`button:has-text("Add Tag")`).click();
-        await page.locator('[placeholder="Type to select tag"]').click();
-        await page.locator('[aria-label="Autocomplete Options"] >> text=Drilling').click();
-        await page.waitForSelector('[aria-label="Tag"]:has-text("Drilling")');
-
-        await page.hover(`button:has-text("Add Tag")`);
-        await page.locator(`button:has-text("Add Tag")`).click();
-        await page.locator('[placeholder="Type to select tag"]').click();
-        await page.locator('[aria-label="Autocomplete Options"] >> text=Driving').click();
-        await page.waitForSelector('[aria-label="Tag"]:has-text("Driving")');
+    await addTagAndAwaitNetwork(page, 'Science');
+    await addTagAndAwaitNetwork(page, 'Drilling');
+    await addTagAndAwaitNetwork(page, 'Driving');

    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
+    //Partial match for "Science" should only return Science
    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Sc');
-        await expect(page.locator('[aria-label="Search Result"]').first()).toContainText("Science");
-        await expect(page.locator('[aria-label="Search Result"]').first()).not.toContainText("Driving");
+    await expect(page.locator('[aria-label="Search Result"]').first()).toContainText('Science');
+    await expect(page.locator('[aria-label="Search Result"]').first()).not.toContainText('Driving');
+    await expect(page.locator('[aria-label="Search Result"]').first()).not.toContainText(
+      'Drilling'
+    );

+    //Searching for a tag which does not exist should return an empty result
    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Xq');
    await expect(page.locator('text=No results found')).toBeVisible();
@@ -271,7 +204,46 @@ test.describe('Notebook Tests with CouchDB @couchdb', () => {
 // Try to reduce indeterminism of browser requests by only returning fetch requests.
 // Filter out preflight CORS, fetching stylesheets, page icons, etc. that can occur during tests
 function filterNonFetchRequests(requests) {
-    return requests.filter(request => {
-        return (request.resourceType() === 'fetch');
+  return requests.filter((request) => {
+    return request.resourceType() === 'fetch';
  });
 }
+
+/**
+ * Add a tag to a notebook entry by providing a tagName.
+ * Reduces indeterminism by waiting until all necessary requests are completed.
+ * @param {import('@playwright/test').Page} page
+ * @param {string} tagName
+ */
+async function addTagAndAwaitNetwork(page, tagName) {
+  await page.hover(`button:has-text("Add Tag")`);
+  await page.locator(`button:has-text("Add Tag")`).click();
+  await page.locator('[placeholder="Type to select tag"]').click();
+  await Promise.all([
+    // Waits for the next request with the specified url
+    page.waitForRequest('**/openmct/_all_docs?include_docs=true'),
+    // Triggers the request
+    page.locator(`[aria-label="Autocomplete Options"] >> text=${tagName}`).click(),
+    expect(page.locator(`[aria-label="Tag"]:has-text("${tagName}")`)).toBeVisible()
+  ]);
+  await page.waitForLoadState('networkidle');
+}
+
+/**
+ * Remove a tag to a notebook entry by providing a tagName.
+ * Reduces indeterminism by waiting until all necessary requests are completed.
+ * @param {import('@playwright/test').Page} page
+ * @param {string} tagName
+ */
+async function removeTagAndAwaitNetwork(page, tagName) {
+  await page.hover(`[aria-label="Tag"]:has-text("${tagName}")`);
+  await Promise.all([
+    page.locator(`[aria-label="Remove tag ${tagName}"]`).click(),
+    //With this pattern, we're awaiting the response but asserting on the request payload.
+    page.waitForResponse(
+      (resp) => resp.request().postData().includes(`"_deleted":true`) && resp.status() === 201
+    )
+  ]);
+  await expect(page.locator(`[aria-label="Tag"]:has-text("${tagName}")`)).toBeHidden();
+  await page.waitForLoadState('networkidle');
+}
--- a/e2e/tests/functional/plugins/notebook/restrictedNotebook.e2e.spec.js
+++ b/e2e/tests/functional/plugins/notebook/restrictedNotebook.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -19,9 +19,12 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-
-const { test, expect } = require('../../../../pluginFixtures');
-const { openObjectTreeContextMenu, createDomainObjectWithDefaults } = require('../../../../appActions');
+/* global __dirname */
+const { test, expect, streamToString } = require('../../../../pluginFixtures');
+const {
+  openObjectTreeContextMenu,
+  createDomainObjectWithDefaults
+} = require('../../../../appActions');
 const path = require('path');
 const nbUtils = require('../../../../helper/notebookUtils');

@@ -65,13 +68,11 @@ test.describe('Restricted Notebook', () => {
  });

  test('Can be locked if at least one page has one entry @addInit', async ({ page }) => {
-
    await nbUtils.enterTextEntry(page, TEST_TEXT);

    const commitButton = page.locator('button:has-text("Commit Entries")');
    expect(await commitButton.count()).toEqual(1);
  });
-
 });

 test.describe('Restricted Notebook with at least one entry and with the page locked @addInit', () => {
@@ -85,11 +86,15 @@ test.describe('Restricted Notebook with at least one entry and with the page loc
    await page.locator('button.c-notebook__toggle-nav-button').click();
  });

-    test('Locked page should now be in a locked state @addInit @unstable', async ({ page }, testInfo) => {
+  test('Locked page should now be in a locked state @addInit @unstable', async ({
+    page
+  }, testInfo) => {
    // eslint-disable-next-line playwright/no-skipped-test
-        test.skip(testInfo.project === 'chrome-beta', "Test is unreliable on chrome-beta");
+    test.skip(testInfo.project === 'chrome-beta', 'Test is unreliable on chrome-beta');
    // main lock message on page
-        const lockMessage = page.locator('text=This page has been committed and cannot be modified or removed');
+    const lockMessage = page.locator(
+      'text=This page has been committed and cannot be modified or removed'
+    );
    expect.soft(await lockMessage.count()).toEqual(1);

    // lock icon on page in sidebar
@@ -103,19 +108,18 @@ test.describe('Restricted Notebook with at least one entry and with the page loc
    await expect(menuOptions).not.toContainText('Remove');
  });

-    test('Can still: add page, rename, add entry, delete unlocked pages @addInit', async ({ page }) => {
-        // Click text=Page Add >> button
-        await Promise.all([
-            page.waitForNavigation(),
-            page.locator('text=Page Add >> button').click()
-        ]);
-        // Click text=Unnamed Page >> nth=1
-        await page.locator('text=Unnamed Page').nth(1).click();
-        // Press a with modifiers
-        await page.locator('text=Unnamed Page').nth(1).fill(TEST_TEXT_NAME);
+  test('Can still: add page, rename, add entry, delete unlocked pages @addInit', async ({
+    page
+  }) => {
+    // Add a new page to the section
+    await page.getByRole('button', { name: 'Add Page' }).click();
+    // Focus the new page by clicking it
+    await page.getByText('Unnamed Page').nth(1).click();
+    // Rename the new page
+    await page.getByText('Unnamed Page').nth(1).fill(TEST_TEXT_NAME);

    // expect to be able to rename unlocked pages
-        const newPageElement = page.locator(`text=${TEST_TEXT_NAME}`);
+    const newPageElement = page.getByText(TEST_TEXT_NAME);
    const newPageCount = await newPageElement.count();
    await newPageElement.press('Enter'); // exit contenteditable state
    expect.soft(newPageCount).toEqual(1);
@@ -124,27 +128,23 @@ test.describe('Restricted Notebook with at least one entry and with the page loc
    await nbUtils.enterTextEntry(page, TEST_TEXT);

    // expect new page to be lockable
-        const commitButton = page.locator('BUTTON:HAS-TEXT("COMMIT ENTRIES")');
+    const commitButton = page.getByRole('button', { name: ' Commit Entries' });
    expect.soft(await commitButton.count()).toEqual(1);

-        // Click text=Unnamed PageTest Page >> button
-        await page.locator('text=Unnamed PageTest Page >> button').click();
-        // Click text=Delete Page
-        await page.locator('text=Delete Page').click();
-        // Click text=Ok
-        await Promise.all([
-            page.waitForNavigation(),
-            page.locator('button:has-text("OK")').click()
-        ]);
+    // Click the context menu button for the new page
+    await page.getByTitle('Open context menu').click();
+    // Delete the page
+    await page.getByRole('listitem', { name: 'Delete Page' }).click();
+    // Click OK button
+    await page.getByRole('button', { name: 'Ok' }).click();

    // deleted page, should no longer exist
-        const deletedPageElement = page.locator(`text=${TEST_TEXT_NAME}`);
+    const deletedPageElement = page.getByText(TEST_TEXT_NAME);
    expect(await deletedPageElement.count()).toEqual(0);
  });
 });

 test.describe('Restricted Notebook with a page locked and with an embed @addInit', () => {
-
  test.beforeEach(async ({ page }) => {
    const notebook = await startAndAddRestrictedNotebookObject(page);
    await nbUtils.dragAndDropEmbed(page, notebook);
@@ -166,16 +166,42 @@ test.describe('Restricted Notebook with a page locked and with an embed @addInit
    const embedMenu = page.locator('body >> .c-menu');
    await expect(embedMenu).not.toContainText('Remove This Embed');
  });
+});

+test.describe('can export restricted notebook as text', () => {
+  test.beforeEach(async ({ page }) => {
+    await startAndAddRestrictedNotebookObject(page);
+  });
+
+  test('basic functionality ', async ({ page }) => {
+    await nbUtils.enterTextEntry(page, `Foo bar entry`);
+    // Click on 3 Dot Menu
+    await page.locator('button[title="More options"]').click();
+    const downloadPromise = page.waitForEvent('download');
+
+    await page.getByRole('menuitem', { name: /Export Notebook as Text/ }).click();
+
+    await page.getByRole('button', { name: 'Save' }).click();
+    const download = await downloadPromise;
+    const readStream = await download.createReadStream();
+    const exportedText = await streamToString(readStream);
+    expect(exportedText).toContain('Foo bar entry');
+  });
+
+  test.fixme('can export multiple notebook entries as text ', async ({ page }) => {});
+  test.fixme('can export all notebook entry metdata', async ({ page }) => {});
+  test.fixme('can export all notebook tags', async ({ page }) => {});
+  test.fixme('can export all notebook snapshots', async ({ page }) => {});
 });

 /**
 * @param {import('@playwright/test').Page} page
 */
 async function startAndAddRestrictedNotebookObject(page) {
-    // eslint-disable-next-line no-undef
-    await page.addInitScript({ path: path.join(__dirname, '../../../../helper/', 'addInitRestrictedNotebook.js') });
-    await page.goto('./', { waitUntil: 'networkidle' });
+  await page.addInitScript({
+    path: path.join(__dirname, '../../../../helper/', 'addInitRestrictedNotebook.js')
+  });
+  await page.goto('./', { waitUntil: 'domcontentloaded' });

  return createDomainObjectWithDefaults(page, { type: CUSTOM_NAME });
 }
--- a/e2e/tests/functional/plugins/notebook/tags.e2e.spec.js
+++ b/e2e/tests/functional/plugins/notebook/tags.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -21,11 +21,12 @@
 *****************************************************************************/

 /*
-This test suite is dedicated to tests which verify form functionality.
+This test suite is dedicated to tests which verify notebook tag functionality.
 */

 const { test, expect } = require('../../../../pluginFixtures');
-const { createDomainObjectWithDefaults } = require('../../../../appActions');
+const { createDomainObjectWithDefaults, selectInspectorTab } = require('../../../../appActions');
+const nbUtils = require('../../../../helper/notebookUtils');

 /**
 * Creates a notebook object and adds an entry.
@@ -33,18 +34,10 @@ const { createDomainObjectWithDefaults } = require('../../../../appActions');
 * @param {number} [iterations = 1] - the number of entries to create
 */
 async function createNotebookAndEntry(page, iterations = 1) {
-    //Go to baseURL
-    await page.goto('./', { waitUntil: 'networkidle' });
-
  const notebook = createDomainObjectWithDefaults(page, { type: 'Notebook' });

  for (let iteration = 0; iteration < iterations; iteration++) {
-        // Create an entry
-        await page.locator('text=To start a new entry, click here or drag and drop any object').click();
-        const entryLocator = `[aria-label="Notebook Entry Input"] >> nth = ${iteration}`;
-        await page.locator(entryLocator).click();
-        await page.locator(entryLocator).fill(`Entry ${iteration}`);
-        await page.locator(entryLocator).press('Enter');
+    await nbUtils.enterTextEntry(page, `Entry ${iteration}`);
  }

  return notebook;
@@ -57,7 +50,7 @@ async function createNotebookAndEntry(page, iterations = 1) {
 */
 async function createNotebookEntryAndTags(page, iterations = 1) {
  const notebook = await createNotebookAndEntry(page, iterations);
-    await page.locator('text=Annotations').click();
+  await selectInspectorTab(page, 'Annotations');

  for (let iteration = 0; iteration < iterations; iteration++) {
    // Hover and click "Add Tag" button
@@ -85,60 +78,113 @@ async function createNotebookEntryAndTags(page, iterations = 1) {
 }

 test.describe('Tagging in Notebooks @addInit', () => {
+  test.beforeEach(async ({ page }) => {
+    //Go to baseURL
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+  });
  test('Can load tags', async ({ page }) => {
    await createNotebookAndEntry(page);

-        await page.locator('text=Annotations').click();
+    await selectInspectorTab(page, 'Annotations');

    await page.locator('button:has-text("Add Tag")').click();

    await page.locator('[placeholder="Type to select tag"]').click();

-        await expect(page.locator('[aria-label="Autocomplete Options"]')).toContainText("Science");
-        await expect(page.locator('[aria-label="Autocomplete Options"]')).toContainText("Drilling");
-        await expect(page.locator('[aria-label="Autocomplete Options"]')).toContainText("Driving");
+    await expect(page.locator('[aria-label="Autocomplete Options"]')).toContainText('Science');
+    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);

-        await expect(page.locator('[aria-label="Notebook Entry"]')).toContainText("Science");
-        await expect(page.locator('[aria-label="Notebook Entry"]')).toContainText("Driving");
+    await expect(page.locator('[aria-label="Notebook Entry"]')).toContainText('Science');
+    await expect(page.locator('[aria-label="Notebook Entry"]')).toContainText('Driving');

    await page.locator('button:has-text("Add Tag")').click();
    await page.locator('[placeholder="Type to select tag"]').click();

-        await expect(page.locator('[aria-label="Autocomplete Options"]')).not.toContainText("Science");
-        await expect(page.locator('[aria-label="Autocomplete Options"]')).not.toContainText("Driving");
-        await expect(page.locator('[aria-label="Autocomplete Options"]')).toContainText("Drilling");
+    await expect(page.locator('[aria-label="Autocomplete Options"]')).not.toContainText('Science');
+    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 }) => {
+  test('Can add tags with blank entry', async ({ page }) => {
+    await createDomainObjectWithDefaults(page, { type: 'Notebook' });
+    await selectInspectorTab(page, 'Annotations');
+
+    await nbUtils.enterTextEntry(page, '');
+    await page.hover(`button:has-text("Add Tag")`);
+    await page.locator(`button:has-text("Add Tag")`).click();
+
+    // Click inside the tag search input
+    await page.locator('[placeholder="Type to select tag"]').click();
+    // Select the "Driving" tag
+    await page.locator('[aria-label="Autocomplete Options"] >> text=Driving').click();
+
+    await expect(page.locator('[aria-label="Notebook Entry"]')).toContainText('Driving');
+  });
+  test('Can cancel adding tags', async ({ page }) => {
+    await createNotebookAndEntry(page);
+
+    await selectInspectorTab(page, 'Annotations');
+
+    // Test canceling adding a tag after we click "Type to select tag"
+    await page.locator('button:has-text("Add Tag")').click();
+
+    await page.locator('[placeholder="Type to select tag"]').click();
+
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
+
+    await expect(page.locator('button:has-text("Add Tag")')).toBeVisible();
+
+    // Test canceling adding a tag after we just click "Add Tag"
+    await page.locator('button:has-text("Add Tag")').click();
+
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
+
+    await expect(page.locator('button:has-text("Add Tag")')).toBeVisible();
+  });
+  test('Can search for tags and preview works properly', async ({ page }) => {
    await createNotebookEntryAndTags(page);
    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('sc');
-        await expect(page.locator('[aria-label="Search Result"]')).toContainText("Science");
-        await expect(page.locator('[aria-label="Search Result"]')).not.toContainText("Driving");
+    await expect(page.locator('[aria-label="Search Result"]')).toContainText('Science');
+    await expect(page.locator('[aria-label="Search Result"]')).not.toContainText('Driving');

    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Sc');
-        await expect(page.locator('[aria-label="Search Result"]')).toContainText("Science");
-        await expect(page.locator('[aria-label="Search Result"]')).not.toContainText("Driving");
+    await expect(page.locator('[aria-label="Search Result"]')).toContainText('Science');
+    await expect(page.locator('[aria-label="Search Result"]')).not.toContainText('Driving');

    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Xq');
    await expect(page.locator('text=No results found')).toBeVisible();
+
+    await createDomainObjectWithDefaults(page, {
+      type: 'Display Layout'
+    });
+
+    // Go back into edit mode for the display layout
+    await page.locator('button[title="Edit"]').click();
+
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Sc');
+    await expect(page.locator('[aria-label="Search Result"]')).toContainText('Science');
+    await page.getByText('Entry 0').click();
+    await expect(page.locator('.js-preview-window')).toBeVisible();
  });

  test('Can delete tags', async ({ page }) => {
    await createNotebookEntryAndTags(page);
    // Delete Driving
    await page.hover('[aria-label="Tag"]:has-text("Driving")');
-        await page.locator('[aria-label="Tag"]:has-text("Driving") ~ .c-completed-tag-deletion').click();
+    await page.locator('[aria-label="Remove tag Driving"]').click();

-        await expect(page.locator('[aria-label="Tags Inspector"]')).toContainText("Science");
-        await expect(page.locator('[aria-label="Tags Inspector"]')).not.toContainText("Driving");
+    await expect(page.locator('[aria-label="Tags Inspector"]')).toContainText('Science');
+    await expect(page.locator('[aria-label="Tags Inspector"]')).not.toContainText('Driving');

    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('sc');
-        await expect(page.locator('[aria-label="Search Result"]')).not.toContainText("Driving");
+    await expect(page.locator('[aria-label="Search Result"]')).not.toContainText('Driving');
  });

  test('Can delete entries without tags', async ({ page }) => {
@@ -157,9 +203,13 @@ test.describe('Tagging in Notebooks @addInit', () => {

    await page.hover('[aria-label="Notebook Entry Input"] >> nth=1');
    await page.locator('button[title="Delete this entry"]').last().click();
-        await expect(page.locator('text=This action will permanently delete this entry. Do you wish to continue?')).toBeVisible();
+    await expect(
+      page.locator('text=This action will permanently delete this entry. Do you wish to continue?')
+    ).toBeVisible();
    await page.locator('button:has-text("Ok")').click();
-        await expect(page.locator('text=This action will permanently delete this entry. Do you wish to continue?')).toBeHidden();
+    await expect(
+      page.locator('text=This action will permanently delete this entry. Do you wish to continue?')
+    ).toBeHidden();
  });

  test('Can delete objects with tags and neither return in search', async ({ page }) => {
@@ -168,7 +218,7 @@ test.describe('Tagging in Notebooks @addInit', () => {
    await page.locator('button[title="More options"]').click();
    await page.locator('li[title="Remove this object from its containing object."]').click();
    await page.locator('button:has-text("OK")').click();
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Unnamed');
    await expect(page.locator('text=No results found')).toBeVisible();
@@ -179,56 +229,47 @@ test.describe('Tagging in Notebooks @addInit', () => {
  });
  test('Tags persist across reload', async ({ page }) => {
    //Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
-
-        const clock = await createDomainObjectWithDefaults(page, { type: 'Clock' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    const ITERATIONS = 4;
    const notebook = await createNotebookEntryAndTags(page, ITERATIONS);
+    await page.goto(notebook.url);

+    // Verify tags are present
    for (let iteration = 0; iteration < ITERATIONS; iteration++) {
      const entryLocator = `[aria-label="Notebook Entry"] >> nth = ${iteration}`;
-            await expect(page.locator(entryLocator)).toContainText("Science");
-            await expect(page.locator(entryLocator)).toContainText("Driving");
-        }
-
-        await Promise.all([
-            page.waitForNavigation(),
-            page.goto('./#/browse/mine?hideTree=false'),
-            page.click('.c-disclosure-triangle')
-        ]);
-
-        const treePane = page.getByRole('tree', {
-            name: 'Main Tree'
-        });
-        // Click Clock
-        await treePane.getByRole('treeitem', {
-            name: clock.name
-        }).click();
-        // Click Notebook
-        await page.getByRole('treeitem', {
-            name: notebook.name
-        }).click();
-
-        for (let iteration = 0; iteration < ITERATIONS; iteration++) {
-            const entryLocator = `[aria-label="Notebook Entry"] >> nth = ${iteration}`;
-            await expect(page.locator(entryLocator)).toContainText("Science");
-            await expect(page.locator(entryLocator)).toContainText("Driving");
+      await expect(page.locator(entryLocator)).toContainText('Science');
+      await expect(page.locator(entryLocator)).toContainText('Driving');
    }

    //Reload Page
-        await Promise.all([
-            page.reload(),
-            page.waitForLoadState('networkidle')
-        ]);
-
-        // Click Notebook
-        await page.click(`text="${notebook.name}"`);
+    await page.reload({ waitUntil: 'domcontentloaded' });

+    // Verify tags persist across reload
    for (let iteration = 0; iteration < ITERATIONS; iteration++) {
      const entryLocator = `[aria-label="Notebook Entry"] >> nth = ${iteration}`;
-            await expect(page.locator(entryLocator)).toContainText("Science");
-            await expect(page.locator(entryLocator)).toContainText("Driving");
+      await expect(page.locator(entryLocator)).toContainText('Science');
+      await expect(page.locator(entryLocator)).toContainText('Driving');
    }
  });
+  test('Can cancel adding a tag', async ({ page }) => {
+    await createNotebookAndEntry(page);
+
+    await selectInspectorTab(page, 'Annotations');
+
+    // Click on the "Add Tag" button
+    await page.locator('button:has-text("Add Tag")').click();
+
+    // Click inside the AutoComplete field
+    await page.locator('[placeholder="Type to select tag"]').click();
+
+    // Click on the "Tags" header (simulating a click outside the autocomplete)
+    await page.locator('div.c-inspect-properties__header:has-text("Tags")').click();
+
+    // Verify there is a button with text "Add Tag"
+    await expect(page.locator('button:has-text("Add Tag")')).toBeVisible();
+
+    // Verify the AutoComplete field is hidden
+    await expect(page.locator('[placeholder="Type to select tag"]')).toBeHidden();
+  });
 });
--- a/e2e/tests/functional/plugins/operatorStatus/operatorStatus.e2e.spec.js
+++ b/e2e/tests/functional/plugins/operatorStatus/operatorStatus.e2e.spec.js
@@ -19,7 +19,7 @@
 * this source code distribution or the Licensing information page available
 * at runtime from the About dialog for additional information.
 *****************************************************************************/
-
+/* global __dirname */
 /*
 * This test suite is dedicated to testing the operator status plugin.
 */
@@ -40,11 +40,13 @@ STUB (test.fixme) Rolling through each
 test.describe('Operator Status', () => {
  test.beforeEach(async ({ page }) => {
    // FIXME: determine if plugins will be added to index.html or need to be injected
-        // eslint-disable-next-line no-undef
-        await page.addInitScript({ path: path.join(__dirname, '../../../../helper/', 'addInitExampleUser.js')});
-        // eslint-disable-next-line no-undef
-        await page.addInitScript({ path: path.join(__dirname, '../../../../helper/', 'addInitOperatorStatus.js')});
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.addInitScript({
+      path: path.join(__dirname, '../../../../helper/', 'addInitExampleUser.js')
+    });
+    await page.addInitScript({
+      path: path.join(__dirname, '../../../../helper/', 'addInitOperatorStatus.js')
+    });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
  });

  // verify that operator status is visible
@@ -90,8 +92,9 @@ test.describe('Operator Status', () => {
    const rowValuesArr = rowValues.split('\t');
    const COLUMN_STATUS_INDEX = 1;
    // check initial set value matches status table
-        expect(rowValuesArr[COLUMN_STATUS_INDEX].toLowerCase())
-            .toEqual(initialStatusValue.toLowerCase());
+    expect(rowValuesArr[COLUMN_STATUS_INDEX].toLowerCase()).toEqual(
+      initialStatusValue.toLowerCase()
+    );

    // change user status
    await statusPollIndicator.click();
@@ -105,9 +108,9 @@ test.describe('Operator Status', () => {
    const updatedRowValues = await updatedRow.innerText();
    const updatedRowValuesArr = updatedRowValues.split('\t');

-        expect(updatedRowValuesArr[COLUMN_STATUS_INDEX].toLowerCase())
-            .toEqual(updatedStatusValue.toLowerCase());
-
+    expect(updatedRowValuesArr[COLUMN_STATUS_INDEX].toLowerCase()).toEqual(
+      updatedStatusValue.toLowerCase()
+    );
  });

  test('clear poll button removes poll responses', async ({ page }) => {
@@ -134,8 +137,9 @@ test.describe('Operator Status', () => {
    const rowValuesArr = rowValues.split('\t');
    const COLUMN_STATUS_INDEX = 1;
    // check initial set value matches status table
-        expect(rowValuesArr[COLUMN_STATUS_INDEX].toLowerCase())
-            .toEqual(initialStatusValue.toLowerCase());
+    expect(rowValuesArr[COLUMN_STATUS_INDEX].toLowerCase()).toEqual(
+      initialStatusValue.toLowerCase()
+    );

    // clear the poll
    await page.locator('button[title="Clear the previous poll question"]').click();
@@ -144,13 +148,10 @@ test.describe('Operator Status', () => {
    const updatedRowValues = await updatedRow.innerText();
    const updatedRowValuesArr = updatedRowValues.split('\t');
    const UNSET_VALUE_LABEL = 'Not set';
-        expect(updatedRowValuesArr[COLUMN_STATUS_INDEX])
-            .toEqual(UNSET_VALUE_LABEL);
-
+    expect(updatedRowValuesArr[COLUMN_STATUS_INDEX]).toEqual(UNSET_VALUE_LABEL);
  });

  test.fixme('iterate through all possible response values', async ({ page }) => {
    // test all possible respone values for the poll
  });
-
 });
--- a/e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js
+++ b/e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -24,6 +24,7 @@
 Testsuite for plot autoscale.
 */

+const { selectInspectorTab } = require('../../../../appActions');
 const { test, expect } = require('../../../../pluginFixtures');
 test.use({
  viewport: {
@@ -39,7 +40,7 @@ test.describe('Autoscale', () => {
    //This is necessary due to the size of the test suite.
    test.slow();

-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    await setTimeRange(page);

@@ -50,6 +51,7 @@ test.describe('Autoscale', () => {
    // enter edit mode
    await page.click('button[title="Edit"]');

+    await selectInspectorTab(page, 'Config');
    await turnOffAutoscale(page);

    await setUserDefinedMinAndMax(page, '-2', '2');
@@ -66,13 +68,26 @@ test.describe('Autoscale', () => {
    await page.waitForSelector('.c-message-banner__message', { state: 'detached' });

    // Make sure that after turning off autoscale, the user entered range values are reflexted in the ticks.
-        await testYTicks(page, ['-2.00', '-1.50', '-1.00', '-0.50', '0.00', '0.50', '1.00', '1.50', '2.00']);
+    await testYTicks(page, [
+      '-2.00',
+      '-1.50',
+      '-1.00',
+      '-0.50',
+      '0.00',
+      '0.50',
+      '1.00',
+      '1.50',
+      '2.00'
+    ]);

    const canvas = page.locator('canvas').nth(1);

    await canvas.hover({ trial: true });
+    await expect(page.locator('.js-series-data-loaded')).toBeVisible();

-        expect.soft(await canvas.screenshot()).toMatchSnapshot('autoscale-canvas-prepan.png', { animations: 'disabled' });
+    expect
+      .soft(await canvas.screenshot())
+      .toMatchSnapshot('autoscale-canvas-prepan.png', { animations: 'disabled' });

    //Alt Drag Start
    await page.keyboard.down('Alt');
@@ -97,7 +112,9 @@ test.describe('Autoscale', () => {
    //Wait for canvas to stablize.
    await canvas.hover({ trial: true });

-        expect.soft(await canvas.screenshot()).toMatchSnapshot('autoscale-canvas-panned.png', { animations: 'disabled' });
+    expect
+      .soft(await canvas.screenshot())
+      .toMatchSnapshot('autoscale-canvas-panned.png', { animations: 'disabled' });
  });
 });

@@ -106,7 +123,11 @@ test.describe('Autoscale', () => {
 * @param {string} start
 * @param {string} end
 */
-async function setTimeRange(page, start = '2022-03-29 22:00:00.000Z', end = '2022-03-29 22:00:30.000Z') {
+async function setTimeRange(
+  page,
+  start = '2022-03-29 22:00:00.000Z',
+  end = '2022-03-29 22:00:30.000Z'
+) {
  // Set a specific time range for consistency, otherwise it will change
  // on every test to a range based on the current time.

@@ -139,7 +160,10 @@ async function createSinewaveOverlayPlot(page, myItemsFolderName) {
  await page.waitForSelector('.c-message-banner__message', { state: 'detached' });

  // save (exit edit mode)
-    await page.locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button').nth(1).click();
+  await page
+    .locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button')
+    .nth(1)
+    .click();
  await page.locator('text=Save and Finish Editing').click();

  // click create button
@@ -170,7 +194,7 @@ async function createSinewaveOverlayPlot(page, myItemsFolderName) {
 */
 async function turnOffAutoscale(page) {
  // uncheck autoscale
-    await page.getByRole('listitem').filter({ hasText: 'Auto scale' }).getByRole('checkbox').uncheck();
+  await page.getByRole('checkbox', { name: 'Auto scale' }).uncheck();
 }

 /**
@@ -180,14 +204,9 @@ async function turnOffAutoscale(page) {
 */
 async function setUserDefinedMinAndMax(page, min, max) {
  // set minimum value
-    const minRangeInput = page.getByRole('listitem').filter({ hasText: 'Minimum Value' }).locator('input[type="number"]');
-    await minRangeInput.click();
-    await minRangeInput.fill(min);
-
+  await page.getByRole('spinbutton').first().fill(min);
  // set maximum value
-    const maxRangeInput = page.getByRole('listitem').filter({ hasText: 'Maximum Value' }).locator('input[type="number"]');
-    await maxRangeInput.click();
-    await maxRangeInput.fill(max);
+  await page.getByRole('spinbutton').nth(1).fill(max);
 }

 /**
@@ -196,7 +215,7 @@ async function setUserDefinedMinAndMax(page, min, max) {
 async function testYTicks(page, values) {
  const yTicks = page.locator('.gl-plot-y-tick-label');
  await page.locator('canvas >> nth=1').hover();
-    let promises = [yTicks.count().then(c => expect(c).toBe(values.length))];
+  let promises = [yTicks.count().then((c) => expect(c).toBe(values.length))];

  for (let i = 0, l = values.length; i < l; i += 1) {
    promises.push(expect.soft(yTicks.nth(i)).toHaveText(values[i])); // eslint-disable-line
--- a/e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-linux.png
+++ b/e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-panned-chrome-linux.png
--- a/e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-linux.png
+++ b/e2e/tests/functional/plugins/plot/autoscale.e2e.spec.js-snapshots/autoscale-canvas-prepan-chrome-linux.png
--- a/e2e/tests/functional/plugins/plot/logPlot.e2e.spec.js
+++ b/e2e/tests/functional/plugins/plot/logPlot.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -26,8 +26,13 @@ necessarily be used for reference when writing new tests in this area.
 */

 const { test, expect } = require('../../../../pluginFixtures');
+const { selectInspectorTab } = require('../../../../appActions');
+
 test.describe('Log plot tests', () => {
-    test('Log Plot ticks are functionally correct in regular and log mode and after refresh', async ({ page, openmctConfig }) => {
+  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
@@ -36,6 +41,7 @@ test.describe('Log plot tests', () => {
    await makeOverlayPlot(page, myItemsFolderName);
    await testRegularTicks(page);
    await enableEditMode(page);
+    await selectInspectorTab(page, 'Config');
    await enableLogMode(page);
    await testLogTicks(page);
    await disableLogMode(page);
@@ -48,7 +54,9 @@ 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, openmctConfig }) => {
+  test.fixme(
+    'Verify that log mode option is reflected in import/export JSON',
+    async ({ page, openmctConfig }) => {
      const { myItemsFolderName } = openmctConfig;

      await makeOverlayPlot(page, myItemsFolderName);
@@ -63,7 +71,8 @@ test.describe('Log plot tests', () => {
      // TODO, the plot is slightly at different position that in the other test, so this fails.
      // ...We can fix it by copying all steps from the first test...
      // await testLogPlotPixels(page);
-    });
+    }
+  );
 });

 /**
@@ -73,7 +82,7 @@ test.describe('Log plot tests', () => {
 */
 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' });
+  await page.goto('./', { waitUntil: 'domcontentloaded' });

  // Set a specific time range for consistency, otherwise it will change
  // on every test to a range based on the current time.
@@ -144,7 +153,7 @@ async function makeOverlayPlot(page, myItemsFolderName) {
 * @param {import('@playwright/test').Page} page
 */
 async function testRegularTicks(page) {
-    const yTicks = await page.locator('.gl-plot-y-tick-label');
+  const yTicks = page.locator('.gl-plot-y-tick-label');
  expect(await yTicks.count()).toBe(7);
  await expect(yTicks.nth(0)).toHaveText('-2');
  await expect(yTicks.nth(1)).toHaveText('0');
@@ -159,7 +168,7 @@ async function testRegularTicks(page) {
 * @param {import('@playwright/test').Page} page
 */
 async function testLogTicks(page) {
-    const yTicks = await page.locator('.gl-plot-y-tick-label');
+  const yTicks = page.locator('.gl-plot-y-tick-label');
  expect(await yTicks.count()).toBe(9);
  await expect(yTicks.nth(0)).toHaveText('-2.98');
  await expect(yTicks.nth(1)).toHaveText('-1.51');
@@ -177,25 +186,24 @@ async function testLogTicks(page) {
 */
 async function enableEditMode(page) {
  // turn on edit mode
-    await page.locator('text=Unnamed Overlay Plot Snapshot >> button').nth(3).click();
-    await expect(await page.locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button').nth(1)).toBeVisible();
+  await page.getByRole('button', { name: 'Edit' }).click();
+  await expect(page.getByRole('button', { name: 'Save' })).toBeVisible();
 }

 /**
 * @param {import('@playwright/test').Page} page
 */
 async function enableLogMode(page) {
-    // turn on log mode
-    await page.getByRole('listitem').filter({ hasText: 'Log mode' }).getByRole('checkbox').check();
-    // await page.locator('text=Y Axis Label Log mode Auto scale Padding >> input[type="checkbox"]').first().check();
+  await expect(page.getByRole('checkbox', { name: 'Log mode' })).not.toBeChecked();
+  await page.getByRole('checkbox', { name: 'Log mode' }).check();
 }

 /**
 * @param {import('@playwright/test').Page} page
 */
 async function disableLogMode(page) {
-    // turn off log mode
-    await page.getByRole('listitem').filter({ hasText: 'Log mode' }).getByRole('checkbox').uncheck();
+  await expect(page.getByRole('checkbox', { name: 'Log mode' })).toBeChecked();
+  await page.getByRole('checkbox', { name: 'Log mode' }).uncheck();
 }

 /**
@@ -203,7 +211,10 @@ async function disableLogMode(page) {
 */
 async function saveOverlayPlot(page) {
  // save overlay plot
-    await page.locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button').nth(1).click();
+  await page
+    .locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button')
+    .nth(1)
+    .click();

  await Promise.all([
    page.locator('text=Save and Finish Editing').click(),
--- a/e2e/tests/functional/plugins/plot/missingPlotObj.e2e.spec.js
+++ b/e2e/tests/functional/plugins/plot/missingPlotObj.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -27,14 +27,18 @@ Tests to verify log plot functionality when objects are missing
 const { test, expect } = require('../../../../pluginFixtures');

 test.describe('Handle missing object for plots', () => {
-    test('Displays empty div for missing stacked plot item @unstable', async ({ page, browserName, openmctConfig }) => {
+  test('Displays empty div for missing stacked plot item @unstable', async ({
+    page,
+    browserName,
+    openmctConfig
+  }) => {
    // eslint-disable-next-line playwright/no-skipped-test
    test.skip(browserName === 'firefox', 'Firefox failing due to console events being missed');

    const { myItemsFolderName } = openmctConfig;
    const errorLogs = [];

-        page.on("console", (message) => {
+    page.on('console', (message) => {
      if (message.type() === 'warning' && message.text().includes('Missing domain object')) {
        errorLogs.push(message.text());
      }
@@ -52,18 +56,15 @@ test.describe('Handle missing object for plots', () => {
    delete parsedData[lastKey];

    //Sets local storage with missing object
-        await page.evaluate(
-            `window.localStorage.setItem('mct', '${JSON.stringify(parsedData)}')`
-        );
+    await page.evaluate(`window.localStorage.setItem('mct', '${JSON.stringify(parsedData)}')`);

    //Reloads page and clicks on stacked plot
-        await Promise.all([
-            page.reload(),
-            page.waitForLoadState('networkidle')
-        ]);
+    await Promise.all([page.reload(), page.waitForLoadState('networkidle')]);

    //Verify Main section is there on load
-        await expect.soft(page.locator('.l-browse-bar__object-name')).toContainText('Unnamed Stacked Plot');
+    await expect
+      .soft(page.locator('.l-browse-bar__object-name'))
+      .toContainText('Unnamed Stacked Plot');

    await page.locator(`text=Open MCT ${myItemsFolderName} >> span`).nth(3).click();
    await Promise.all([
@@ -72,7 +73,7 @@ test.describe('Handle missing object for plots', () => {
    ]);

    //Check that there is only one stacked item plot with a plot, the missing one will be empty
-        await expect(page.locator(".c-plot--stacked-container:has(.gl-plot)")).toHaveCount(1);
+    await expect(page.locator('.c-plot--stacked-container:has(.gl-plot)')).toHaveCount(1);
    //Verify that console.warn is thrown
    expect(errorLogs).toHaveLength(1);
  });
@@ -84,7 +85,7 @@ test.describe('Handle missing object for plots', () => {
 */
 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' });
+  await page.goto('./', { waitUntil: 'domcontentloaded' });

  // create stacked plot
  await page.locator('button.c-create-button').click();
@@ -127,7 +128,10 @@ async function makeStackedPlot(page, myItemsFolderName) {
 */
 async function saveStackedPlot(page) {
  // save stacked plot
-    await page.locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button').nth(1).click();
+  await page
+    .locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button')
+    .nth(1)
+    .click();

  await Promise.all([
    page.locator('text=Save and Finish Editing').click(),
--- a/e2e/tests/functional/plugins/plot/overlayPlot.e2e.spec.js
+++ b/e2e/tests/functional/plugins/plot/overlayPlot.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -26,109 +26,193 @@ necessarily be used for reference when writing new tests in this area.
 */

 const { test, expect } = require('../../../../pluginFixtures');
-const { createDomainObjectWithDefaults } = require('../../../../appActions');
+const {
+  createDomainObjectWithDefaults,
+  getCanvasPixels,
+  selectInspectorTab,
+  waitForPlotsToRender
+} = require('../../../../appActions');

 test.describe('Overlay Plot', () => {
  test.beforeEach(async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
  });

  test('Plot legend color is in sync with plot series color', async ({ page }) => {
    const overlayPlot = await createDomainObjectWithDefaults(page, {
-            type: "Overlay Plot"
+      type: 'Overlay Plot'
    });

    await createDomainObjectWithDefaults(page, {
-            type: "Sine Wave Generator",
+      type: 'Sine Wave Generator',
      parent: overlayPlot.uuid
    });

    await page.goto(overlayPlot.url);

+    await selectInspectorTab(page, 'Config');
+
    // navigate to plot series color palette
    await page.click('.l-browse-bar__actions__edit');
    await page.locator('li.c-tree__item.menus-to-left .c-disclosure-triangle').click();
    await page.locator('.c-click-swatch--menu').click();
    await page.locator('.c-palette__item[style="background: rgb(255, 166, 61);"]').click();
-
    // gets color for swatch located in legend
-        const element = await page.waitForSelector('.plot-series-color-swatch');
-        const color = await element.evaluate((el) => {
-            return window.getComputedStyle(el).getPropertyValue('background-color');
+    const seriesColorSwatch = page.locator(
+      '.gl-plot-y-label-swatch-container > .plot-series-color-swatch'
+    );
+    await expect(seriesColorSwatch).toHaveCSS('background-color', 'rgb(255, 166, 61)');
  });

-        expect(color).toBe('rgb(255, 166, 61)');
+  test('Limit lines persist when series is moved to another Y Axis and on refresh', async ({
+    page
+  }) => {
+    test.info().annotations.push({
+      type: 'issue',
+      description: 'https://github.com/nasa/openmct/issues/6338'
    });
-
-    test('The elements pool supports dragging series into multiple y-axis buckets', async ({ page }) => {
+    // Create an Overlay Plot with a default SWG
    const overlayPlot = await createDomainObjectWithDefaults(page, {
-            type: "Overlay Plot"
+      type: 'Overlay Plot'
    });

    const swgA = await createDomainObjectWithDefaults(page, {
-            type: "Sine Wave Generator",
+      type: 'Sine Wave Generator',
+      parent: overlayPlot.uuid
+    });
+
+    await page.goto(overlayPlot.url);
+
+    // Assert that no limit lines are shown by default
+    await page.waitForSelector('.js-limit-area', { state: 'attached' });
+    expect(await page.locator('.c-plot-limit-line').count()).toBe(0);
+
+    // Enter edit mode
+    await page.click('button[title="Edit"]');
+
+    // Expand the "Sine Wave Generator" plot series options and enable limit lines
+    await selectInspectorTab(page, 'Config');
+    await page
+      .getByRole('list', { name: 'Plot Series Properties' })
+      .locator('span')
+      .first()
+      .click();
+    await page
+      .getByRole('list', { name: 'Plot Series Properties' })
+      .locator('[title="Display limit lines"]~div input')
+      .check();
+
+    await assertLimitLinesExistAndAreVisible(page);
+
+    // Save (exit edit mode)
+    await page.locator('button[title="Save"]').click();
+    await page.locator('li[title="Save and Finish Editing"]').click();
+
+    await assertLimitLinesExistAndAreVisible(page);
+
+    await page.reload();
+
+    await assertLimitLinesExistAndAreVisible(page);
+
+    // Enter edit mode
+    await page.click('button[title="Edit"]');
+
+    await selectInspectorTab(page, 'Elements');
+
+    // Drag Sine Wave Generator series from Y Axis 1 into Y Axis 2
+    await page
+      .locator(`#inspector-elements-tree >> text=${swgA.name}`)
+      .dragTo(page.locator('[aria-label="Element Item Group Y Axis 2"]'));
+
+    await assertLimitLinesExistAndAreVisible(page);
+
+    // Save (exit edit mode)
+    await page.locator('button[title="Save"]').click();
+    await page.locator('li[title="Save and Finish Editing"]').click();
+
+    await assertLimitLinesExistAndAreVisible(page);
+
+    await page.reload();
+
+    await assertLimitLinesExistAndAreVisible(page);
+  });
+
+  test('The elements pool supports dragging series into multiple y-axis buckets', async ({
+    page
+  }) => {
+    const overlayPlot = await createDomainObjectWithDefaults(page, {
+      type: 'Overlay Plot'
+    });
+
+    const swgA = await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
      parent: overlayPlot.uuid
    });
    const swgB = await createDomainObjectWithDefaults(page, {
-            type: "Sine Wave Generator",
+      type: 'Sine Wave Generator',
      parent: overlayPlot.uuid
    });
    const swgC = await createDomainObjectWithDefaults(page, {
-            type: "Sine Wave Generator",
+      type: 'Sine Wave Generator',
      parent: overlayPlot.uuid
    });
    const swgD = await createDomainObjectWithDefaults(page, {
-            type: "Sine Wave Generator",
+      type: 'Sine Wave Generator',
      parent: overlayPlot.uuid
    });
    const swgE = await createDomainObjectWithDefaults(page, {
-            type: "Sine Wave Generator",
+      type: 'Sine Wave Generator',
      parent: overlayPlot.uuid
    });

    await page.goto(overlayPlot.url);
    await page.click('button[title="Edit"]');

-        // Expand the elements pool vertically
-        await page.locator('.l-pane.l-pane--vertical-handle-before', {
-            hasText: 'Elements'
-        }).locator('.l-pane__handle').hover();
-        await page.mouse.down();
-        await page.mouse.move(0, 100);
-        await page.mouse.up();
+    await selectInspectorTab(page, 'Elements');
+
+    // Drag swg a, c, e into Y Axis 2
+    await page
+      .locator(`#inspector-elements-tree >> text=${swgA.name}`)
+      .dragTo(page.locator('[aria-label="Element Item Group Y Axis 2"]'));
+    await page
+      .locator(`#inspector-elements-tree >> text=${swgC.name}`)
+      .dragTo(page.locator('[aria-label="Element Item Group Y Axis 2"]'));
+    await page
+      .locator(`#inspector-elements-tree >> text=${swgE.name}`)
+      .dragTo(page.locator('[aria-label="Element Item Group Y Axis 2"]'));
+
+    // Assert that Y Axis 1 and Y Axis 2 property groups are visible only
+    await selectInspectorTab(page, 'Config');

    const yAxis1PropertyGroup = page.locator('[aria-label="Y Axis Properties"]');
    const yAxis2PropertyGroup = page.locator('[aria-label="Y Axis 2 Properties"]');
    const yAxis3PropertyGroup = page.locator('[aria-label="Y Axis 3 Properties"]');

-        // Assert that Y Axis 1 property group is visible only
-        await expect(yAxis1PropertyGroup).toBeVisible();
-        await expect(yAxis2PropertyGroup).toBeHidden();
-        await expect(yAxis3PropertyGroup).toBeHidden();
-
-        // Drag swg a, c, e into Y Axis 2
-        await page.locator(`#inspector-elements-tree >> text=${swgA.name}`).dragTo(page.locator('[aria-label="Element Item Group Y Axis 2"]'));
-        await page.locator(`#inspector-elements-tree >> text=${swgC.name}`).dragTo(page.locator('[aria-label="Element Item Group Y Axis 2"]'));
-        await page.locator(`#inspector-elements-tree >> text=${swgE.name}`).dragTo(page.locator('[aria-label="Element Item Group Y Axis 2"]'));
-
-        // Assert that Y Axis 1 and Y Axis 2 property groups are visible only
    await expect(yAxis1PropertyGroup).toBeVisible();
    await expect(yAxis2PropertyGroup).toBeVisible();
    await expect(yAxis3PropertyGroup).toBeHidden();

-        const yAxis1Group = page.getByLabel("Y Axis 1");
-        const yAxis2Group = page.getByLabel("Y Axis 2");
-        const yAxis3Group = page.getByLabel("Y Axis 3");
+    const yAxis1Group = page.getByLabel('Y Axis 1');
+    const yAxis2Group = page.getByLabel('Y Axis 2');
+    const yAxis3Group = page.getByLabel('Y Axis 3');
+
+    await selectInspectorTab(page, 'Elements');

    // Drag swg b into Y Axis 3
-        await page.locator(`#inspector-elements-tree >> text=${swgB.name}`).dragTo(page.locator('[aria-label="Element Item Group Y Axis 3"]'));
+    await page
+      .locator(`#inspector-elements-tree >> text=${swgB.name}`)
+      .dragTo(page.locator('[aria-label="Element Item Group Y Axis 3"]'));

    // Assert that all Y Axis property groups are visible
+    await selectInspectorTab(page, 'Config');
+
    await expect(yAxis1PropertyGroup).toBeVisible();
    await expect(yAxis2PropertyGroup).toBeVisible();
    await expect(yAxis3PropertyGroup).toBeVisible();

    // Verify that the elements are in the correct buckets and in the correct order
+    await selectInspectorTab(page, 'Elements');
+
    expect(yAxis1Group.getByRole('listitem', { name: swgD.name })).toBeTruthy();
    expect(yAxis1Group.getByRole('listitem').nth(0).getByText(swgD.name)).toBeTruthy();
    expect(yAxis2Group.getByRole('listitem', { name: swgE.name })).toBeTruthy();
@@ -141,60 +225,46 @@ test.describe('Overlay Plot', () => {
    expect(yAxis3Group.getByRole('listitem').nth(0).getByText(swgB.name)).toBeTruthy();
  });

-    test('Clicking on an item in the elements pool brings up the plot preview with data points', async ({ page }) => {
+  test('Clicking on an item in the elements pool brings up the plot preview with data points', async ({
+    page
+  }) => {
    const overlayPlot = await createDomainObjectWithDefaults(page, {
-            type: "Overlay Plot"
+      type: 'Overlay Plot'
    });

    const swgA = await createDomainObjectWithDefaults(page, {
-            type: "Sine Wave Generator",
+      type: 'Sine Wave Generator',
      parent: overlayPlot.uuid
    });

    await page.goto(overlayPlot.url);
+    // Wait for plot series data to load and be drawn
+    await waitForPlotsToRender(page);
    await page.click('button[title="Edit"]');

+    await selectInspectorTab(page, 'Elements');
+
    await page.locator(`#inspector-elements-tree >> text=${swgA.name}`).click();
-        await page.locator('.js-overlay canvas').nth(1);
-        const plotPixelSize = await getCanvasPixelsWithData(page);
+
+    const plotPixels = await getCanvasPixels(page, '.js-overlay canvas');
+    const plotPixelSize = plotPixels.length;
    expect(plotPixelSize).toBeGreaterThan(0);
  });
 });

 /**
+ * Asserts that limit lines exist and are visible
 * @param {import('@playwright/test').Page} page
 */
-async function getCanvasPixelsWithData(page) {
-    const getTelemValuePromise = new Promise(resolve => page.exposeFunction('getCanvasValue', resolve));
-
-    await page.evaluate(() => {
-        // The document canvas is where the plot points and lines are drawn.
-        // The only way to access the canvas is using document (using page.evaluate)
-        let data;
-        let canvas;
-        let ctx;
-        canvas = document.querySelector('.js-overlay canvas');
-        ctx = canvas.getContext('2d');
-        data = ctx.getImageData(0, 0, canvas.width, canvas.height).data;
-        const imageDataValues = Object.values(data);
-        let plotPixels = [];
-        // Each pixel consists of four values within the ImageData.data array. The for loop iterates by multiples of four.
-        // The values associated with each pixel are R (red), G (green), B (blue), and A (alpha), in that order.
-        for (let i = 0; i < imageDataValues.length;) {
-            if (imageDataValues[i] > 0) {
-                plotPixels.push({
-                    startIndex: i,
-                    endIndex: i + 3,
-                    value: `rgb(${imageDataValues[i]}, ${imageDataValues[i + 1]}, ${imageDataValues[i + 2]}, ${imageDataValues[i + 3]})`
-                });
+async function assertLimitLinesExistAndAreVisible(page) {
+  // Wait for plot series data to load
+  await waitForPlotsToRender(page);
+  // Wait for limit lines to be created
+  await page.waitForSelector('.js-limit-area', { state: 'attached' });
+  const limitLineCount = await page.locator('.c-plot-limit-line').count();
+  // There should be 10 limit lines created by default
+  expect(await page.locator('.c-plot-limit-line').count()).toBe(10);
+  for (let i = 0; i < limitLineCount; i++) {
+    await expect(page.locator('.c-plot-limit-line').nth(i)).toBeVisible();
  }
-
-            i = i + 4;
-
-        }
-
-        window.getCanvasValue(plotPixels.length);
-    });
-
-    return getTelemValuePromise;
 }
--- a/e2e/tests/functional/plugins/plot/plotLegendSwatch.e2e.spec.js
+++ b/e2e/tests/functional/plugins/plot/plotLegendSwatch.e2e.spec.js
@@ -1,110 +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.
- *****************************************************************************/
-
-/*
-Tests to verify log plot functionality. Note this test suite if very much under active development and should not
-necessarily be used for reference when writing new tests in this area.
-*/
-
-const { test, expect } = require('../../../../pluginFixtures');
-
-test.describe('Legend color in sync with plot color', () => {
-    test('Testing', async ({ page }) => {
-        await makeOverlayPlot(page);
-
-        // navigate to plot series color palette
-        await page.click('.l-browse-bar__actions__edit');
-        await page.locator('li.c-tree__item.menus-to-left .c-disclosure-triangle').click();
-        await page.locator('.c-click-swatch--menu').click();
-        await page.locator('.c-palette__item[style="background: rgb(255, 166, 61);"]').click();
-
-        // gets color for swatch located in legend
-        const element = await page.waitForSelector('.plot-series-color-swatch');
-        const color = await element.evaluate((el) => {
-            return window.getComputedStyle(el).getPropertyValue('background-color');
-        });
-
-        expect(color).toBe('rgb(255, 166, 61)');
-    });
-});
-
-async function saveOverlayPlot(page) {
-    // save overlay plot
-    await page.locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button').nth(1).click();
-
-    await Promise.all([
-        page.locator('text=Save and Finish Editing').click(),
-        //Wait for Save Banner to appear
-        page.waitForSelector('.c-message-banner__message')
-    ]);
-    //Wait until Save Banner is gone
-    await page.locator('.c-message-banner__close-button').click();
-    await page.waitForSelector('.c-message-banner__message', { state: 'detached' });
-}
-
-async function makeOverlayPlot(page) {
-    // 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' });
-
-    // create overlay plot
-
-    await page.locator('button.c-create-button').click();
-    await page.locator('li[role="menuitem"]:has-text("Overlay Plot")').click();
-    await Promise.all([
-        page.waitForNavigation({ waitUntil: 'networkidle'}),
-        page.locator('button:has-text("OK")').click(),
-        //Wait for Save Banner to appear
-        page.waitForSelector('.c-message-banner__message')
-    ]);
-    //Wait until Save Banner is gone
-    await page.locator('.c-message-banner__close-button').click();
-    await page.waitForSelector('.c-message-banner__message', { state: 'detached'});
-
-    // save the overlay plot
-
-    await saveOverlayPlot(page);
-
-    // create a sinewave generator
-
-    await page.locator('button.c-create-button').click();
-    await page.locator('li[role="menuitem"]:has-text("Sine Wave Generator")').click();
-
-    // Click OK to make generator
-
-    await Promise.all([
-        page.waitForNavigation({ waitUntil: 'networkidle'}),
-        page.locator('button:has-text("OK")').click(),
-        //Wait for Save Banner to appear
-        page.waitForSelector('.c-message-banner__message')
-    ]);
-    //Wait until Save Banner is gone
-    await page.locator('.c-message-banner__close-button').click();
-    await page.waitForSelector('.c-message-banner__message', { state: 'detached'});
-
-    // click on overlay plot
-
-    await page.locator('text=Open MCT My Items >> span').nth(3).click();
-    await Promise.all([
-        page.waitForNavigation(),
-        page.locator('text=Unnamed Overlay Plot').first().click()
-    ]);
-}
--- a/e2e/tests/functional/plugins/plot/plotRendering.e2e.spec.js
+++ b/e2e/tests/functional/plugins/plot/plotRendering.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -26,15 +26,17 @@
 */

 const { test, expect } = require('../../../../pluginFixtures');
-const { createDomainObjectWithDefaults} = require('../../../../appActions');
+const { createDomainObjectWithDefaults, getCanvasPixels } = require('../../../../appActions');

-test.describe('Plot Integrity Testing @unstable', () => {
+test.describe('Plot Rendering', () => {
  let sineWaveGeneratorObject;

  test.beforeEach(async ({ page }) => {
    // Open a browser, navigate to the main page, and wait until all networkevents to resolve
-        await page.goto('./', { waitUntil: 'networkidle' });
-        sineWaveGeneratorObject = await createDomainObjectWithDefaults(page, { type: 'Sine Wave Generator' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+    sineWaveGeneratorObject = await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator'
+    });
  });

  test('Plots do not re-request data when a plot is clicked', async ({ page }) => {
@@ -44,8 +46,7 @@ test.describe('Plot Integrity Testing @unstable', () => {
    await page.locator('canvas').nth(1).click();
    // No request was made to get historical data
    const createMineFolderRequests = [];
-        page.on('request', req => {
-            // eslint-disable-next-line playwright/no-conditional-in-test
+    page.on('request', (req) => {
      createMineFolderRequests.push(req);
    });
    expect(createMineFolderRequests.length).toEqual(0);
@@ -56,7 +57,8 @@ test.describe('Plot Integrity Testing @unstable', () => {
    await editSineWaveToUseInfinityOption(page, sineWaveGeneratorObject);

    //Get pixel data from Canvas
-        const plotPixelSize = await getCanvasPixelsWithData(page);
+    const plotPixels = await getCanvasPixels(page, 'canvas');
+    const plotPixelSize = plotPixels.length;
    expect(plotPixelSize).toBeGreaterThan(0);
  });
 });
@@ -70,70 +72,23 @@ test.describe('Plot Integrity Testing @unstable', () => {
 */
 async function editSineWaveToUseInfinityOption(page, sineWaveGeneratorObject) {
  await page.goto(sineWaveGeneratorObject.url);
-    // Edit LAD table
+  // Edit SWG properties to include infinity values
  await page.locator('[title="More options"]').click();
  await page.locator('[title="Edit properties of this object."]').click();
-    // Modify the infinity option to true
-    const infinityInput = page.locator('[aria-label="Include Infinity Values"]');
-    await infinityInput.click();
+  await page
+    .getByRole('switch', {
+      name: 'Include Infinity Values'
+    })
+    .check();

-    // Click OK button and wait for Navigate event
-    await Promise.all([
-        page.waitForLoadState(),
-        page.click('[aria-label="Save"]'),
-        // Wait for Save Banner to appear
-        page.waitForSelector('.c-message-banner__message')
-    ]);
+  await page
+    .getByRole('button', {
+      name: 'Save'
+    })
+    .click();

  // FIXME: Changes to SWG properties should be reflected on save, but they're not?
  // Thus, navigate away and back to the object.
  await page.goto('./#/browse/mine');
  await page.goto(sineWaveGeneratorObject.url);
-
-    await page.locator('c-progress-bar c-telemetry-table__progress-bar').waitFor({
-        state: 'hidden'
-    });
-
-    // FIXME: The progress bar disappears on series data load, not on plot render,
-    // so wait for a half a second before evaluating the canvas.
-    // eslint-disable-next-line playwright/no-wait-for-timeout
-    await page.waitForTimeout(500);
-}
-
-/**
- * @param {import('@playwright/test').Page} page
- */
-async function getCanvasPixelsWithData(page) {
-    const getTelemValuePromise = new Promise(resolve => page.exposeFunction('getCanvasValue', resolve));
-
-    await page.evaluate(() => {
-        // The document canvas is where the plot points and lines are drawn.
-        // The only way to access the canvas is using document (using page.evaluate)
-        let data;
-        let canvas;
-        let ctx;
-        canvas = document.querySelector('canvas');
-        ctx = canvas.getContext('2d');
-        data = ctx.getImageData(0, 0, canvas.width, canvas.height).data;
-        const imageDataValues = Object.values(data);
-        let plotPixels = [];
-        // Each pixel consists of four values within the ImageData.data array. The for loop iterates by multiples of four.
-        // The values associated with each pixel are R (red), G (green), B (blue), and A (alpha), in that order.
-        for (let i = 0; i < imageDataValues.length;) {
-            if (imageDataValues[i] > 0) {
-                plotPixels.push({
-                    startIndex: i,
-                    endIndex: i + 3,
-                    value: `rgb(${imageDataValues[i]}, ${imageDataValues[i + 1]}, ${imageDataValues[i + 2]}, ${imageDataValues[i + 3]})`
-                });
-            }
-
-            i = i + 4;
-
-        }
-
-        window.getCanvasValue(plotPixels.length);
-    });
-
-    return getTelemValuePromise;
 }
--- a/e2e/tests/functional/plugins/plot/scatterPlot.e2e.spec.js
+++ b/e2e/tests/functional/plugins/plot/scatterPlot.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -25,7 +25,7 @@
 */

 const { test, expect } = require('../../../../pluginFixtures');
-const { createDomainObjectWithDefaults } = require('../../../../appActions');
+const { createDomainObjectWithDefaults, selectInspectorTab } = require('../../../../appActions');
 const uuid = require('uuid').v4;

 test.describe('Scatter Plot', () => {
@@ -33,15 +33,15 @@ test.describe('Scatter Plot', () => {

  test.beforeEach(async ({ page }) => {
    // Open a browser, navigate to the main page, and wait until all networkevents to resolve
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    // Create the Scatter Plot
    scatterPlot = await createDomainObjectWithDefaults(page, { type: 'Scatter Plot' });
  });

  test('Can add and remove telemetry sources', async ({ page }) => {
-        const editButtonLocator = page.locator('button[title="Edit"]');
-        const saveButtonLocator = page.locator('button[title="Save"]');
+    const editButton = page.locator('button[title="Edit"]');
+    const saveButton = page.locator('button[title="Save"]');

    // Create a sine wave generator within the scatter plot
    const swg1 = await createDomainObjectWithDefaults(page, {
@@ -53,9 +53,10 @@ test.describe('Scatter Plot', () => {
    // Navigate to the scatter plot and verify that
    // the SWG appears in the elements pool
    await page.goto(scatterPlot.url);
-        await editButtonLocator.click();
+    await editButton.click();
+    await selectInspectorTab(page, 'Elements');
    await expect.soft(page.locator(`#inspector-elements-tree >> text=${swg1.name}`)).toBeVisible();
-        await saveButtonLocator.click();
+    await saveButton.click();
    await page.locator('li[title="Save and Finish Editing"]').click();

    // Create another sine wave generator within the scatter plot
@@ -66,16 +67,25 @@ test.describe('Scatter Plot', () => {
    });

    // Verify that the 'Replace telemetry source' modal appears and accept it
-        await expect.soft(page.locator('text=This action will replace the current telemetry source. Do you want to continue?')).toBeVisible();
+    await expect
+      .soft(
+        page.locator(
+          'text=This action will replace the current telemetry source. Do you want to continue?'
+        )
+      )
+      .toBeVisible();
    await page.click('text=Ok');

    // Navigate to the scatter plot and verify that the new SWG
    // appears in the elements pool and the old one is gone
    await page.goto(scatterPlot.url);
-        await editButtonLocator.click();
+    await editButton.click();
+
+    // Click the "Elements" tab
+    await selectInspectorTab(page, 'Elements');
    await expect.soft(page.locator(`#inspector-elements-tree >> text=${swg1.name}`)).toBeHidden();
    await expect.soft(page.locator(`#inspector-elements-tree >> text=${swg2.name}`)).toBeVisible();
-        await saveButtonLocator.click();
+    await saveButton.click();

    // Right click on the new SWG in the elements pool and delete it
    await page.locator(`#inspector-elements-tree >> text=${swg2.name}`).click({
@@ -84,7 +94,13 @@ test.describe('Scatter Plot', () => {
    await page.locator('li[title="Remove this object from its containing object."]').click();

    // Verify that the 'Remove object' confirmation modal appears and accept it
-        await expect.soft(page.locator('text=Warning! This action will remove this object. Are you sure you want to continue?')).toBeVisible();
+    await expect
+      .soft(
+        page.locator(
+          'text=Warning! This action will remove this object. Are you sure you want to continue?'
+        )
+      )
+      .toBeVisible();
    await page.click('text=Ok');

    // Verify that the elements pool shows no elements
--- a/e2e/tests/functional/plugins/plot/stackedPlot.e2e.spec.js
+++ b/e2e/tests/functional/plugins/plot/stackedPlot.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -26,7 +26,7 @@ necessarily be used for reference when writing new tests in this area.
 */

 const { test, expect } = require('../../../../pluginFixtures');
-const { createDomainObjectWithDefaults } = require('../../../../appActions');
+const { createDomainObjectWithDefaults, selectInspectorTab } = require('../../../../appActions');

 test.describe('Stacked Plot', () => {
  let stackedPlot;
@@ -36,43 +36,49 @@ test.describe('Stacked Plot', () => {

  test.beforeEach(async ({ page }) => {
    // Open a browser, navigate to the main page, and wait until all networkevents to resolve
-        await page.goto('/', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+
    stackedPlot = await createDomainObjectWithDefaults(page, {
-            type: "Stacked Plot"
+      type: 'Stacked Plot'
    });

    swgA = await createDomainObjectWithDefaults(page, {
-            type: "Sine Wave Generator",
+      type: 'Sine Wave Generator',
      parent: stackedPlot.uuid
    });
    swgB = await createDomainObjectWithDefaults(page, {
-            type: "Sine Wave Generator",
+      type: 'Sine Wave Generator',
      parent: stackedPlot.uuid
    });
    swgC = await createDomainObjectWithDefaults(page, {
-            type: "Sine Wave Generator",
+      type: 'Sine Wave Generator',
      parent: stackedPlot.uuid
    });
  });

  test('Using the remove action removes the correct plot', async ({ page }) => {
-        const swgAElementsPoolItem = page.locator('#inspector-elements-tree').locator('.c-object-label', { hasText: swgA.name });
-        const swgBElementsPoolItem = page.locator('#inspector-elements-tree').locator('.c-object-label', { hasText: swgB.name });
-        const swgCElementsPoolItem = page.locator('#inspector-elements-tree').locator('.c-object-label', { hasText: swgC.name });
+    const swgAElementsPoolItem = page
+      .locator('#inspector-elements-tree')
+      .locator('.c-object-label', { hasText: swgA.name });
+    const swgBElementsPoolItem = page
+      .locator('#inspector-elements-tree')
+      .locator('.c-object-label', { hasText: swgB.name });
+    const swgCElementsPoolItem = page
+      .locator('#inspector-elements-tree')
+      .locator('.c-object-label', { hasText: swgC.name });

    await page.goto(stackedPlot.url);

    await page.click('button[title="Edit"]');

-        // Expand the elements pool vertically
-        await page.locator('.l-pane__handle').nth(2).hover({ trial: true });
-        await page.mouse.down();
-        await page.mouse.move(0, 100);
-        await page.mouse.up();
+    await selectInspectorTab(page, 'Elements');

    await swgBElementsPoolItem.click({ button: 'right' });
-        await page.getByRole('menuitem').filter({ hasText: /Remove/ }).click();
-        await page.getByRole('button').filter({ hasText: "OK" }).click();
+    await page
+      .getByRole('menuitem')
+      .filter({ hasText: /Remove/ })
+      .click();
+    await page.getByRole('button').filter({ hasText: 'OK' }).click();

    await expect(page.locator('#inspector-elements-tree .js-elements-pool__item')).toHaveCount(2);

@@ -82,58 +88,143 @@ test.describe('Stacked Plot', () => {
    await expect(swgCElementsPoolItem).toHaveCount(1);
  });

-    test('Selecting a child plot while in browse and edit modes shows its properties in the inspector', async ({ page }) => {
+  test('Can reorder Stacked Plot items', async ({ page }) => {
+    const swgAElementsPoolItem = page
+      .locator('#inspector-elements-tree')
+      .locator('.c-object-label', { hasText: swgA.name });
+    const swgBElementsPoolItem = page
+      .locator('#inspector-elements-tree')
+      .locator('.c-object-label', { hasText: swgB.name });
+    const swgCElementsPoolItem = page
+      .locator('#inspector-elements-tree')
+      .locator('.c-object-label', { hasText: swgC.name });
+
    await page.goto(stackedPlot.url);

+    await page.click('button[title="Edit"]');
+
+    await selectInspectorTab(page, 'Elements');
+
+    const stackedPlotItem1 = page.locator('.c-plot--stacked-container').nth(0);
+    const stackedPlotItem2 = page.locator('.c-plot--stacked-container').nth(1);
+    const stackedPlotItem3 = page.locator('.c-plot--stacked-container').nth(2);
+
+    // assert initial plot order - [swgA, swgB, swgC]
+    await expect(stackedPlotItem1).toHaveAttribute('aria-label', `Stacked Plot Item ${swgA.name}`);
+    await expect(stackedPlotItem2).toHaveAttribute('aria-label', `Stacked Plot Item ${swgB.name}`);
+    await expect(stackedPlotItem3).toHaveAttribute('aria-label', `Stacked Plot Item ${swgC.name}`);
+
+    // Drag and drop to reorder - [swgB, swgA, swgC]
+    await swgBElementsPoolItem.dragTo(swgAElementsPoolItem);
+
+    // assert plot order after reorder - [swgB, swgA, swgC]
+    await expect(stackedPlotItem1).toHaveAttribute('aria-label', `Stacked Plot Item ${swgB.name}`);
+    await expect(stackedPlotItem2).toHaveAttribute('aria-label', `Stacked Plot Item ${swgA.name}`);
+    await expect(stackedPlotItem3).toHaveAttribute('aria-label', `Stacked Plot Item ${swgC.name}`);
+
+    // Drag and drop to reorder - [swgB, swgC, swgA]
+    await swgCElementsPoolItem.dragTo(swgAElementsPoolItem);
+
+    // assert plot order after second reorder - [swgB, swgC, swgA]
+    await expect(stackedPlotItem1).toHaveAttribute('aria-label', `Stacked Plot Item ${swgB.name}`);
+    await expect(stackedPlotItem2).toHaveAttribute('aria-label', `Stacked Plot Item ${swgC.name}`);
+    await expect(stackedPlotItem3).toHaveAttribute('aria-label', `Stacked Plot Item ${swgA.name}`);
+
+    // collapse inspector
+    await page.locator('.l-shell__pane-inspector .l-pane__collapse-button').click();
+
+    // Save (exit edit mode)
+    await page.locator('button[title="Save"]').click();
+    await page.locator('li[title="Save and Finish Editing"]').click();
+
+    // assert plot order persists after save - [swgB, swgC, swgA]
+    await expect(stackedPlotItem1).toHaveAttribute('aria-label', `Stacked Plot Item ${swgB.name}`);
+    await expect(stackedPlotItem2).toHaveAttribute('aria-label', `Stacked Plot Item ${swgC.name}`);
+    await expect(stackedPlotItem3).toHaveAttribute('aria-label', `Stacked Plot Item ${swgA.name}`);
+  });
+
+  test('Selecting a child plot while in browse and edit modes shows its properties in the inspector', async ({
+    page
+  }) => {
+    await page.goto(stackedPlot.url);
+
+    await selectInspectorTab(page, 'Config');
+
    // Click on the 1st plot
    await page.locator(`[aria-label="Stacked Plot Item ${swgA.name}"] canvas`).nth(1).click();

    // Assert that the inspector shows the Y Axis properties for swgA
-        await expect(page.locator('[aria-label="Plot Series Properties"] >> h2')).toContainText("Plot Series");
-        await expect(page.getByRole('list', { name: "Y Axis Properties" }).locator("h2")).toContainText("Y Axis");
-        await expect(page.locator('[aria-label="Plot Series Properties"] .c-object-label')).toContainText(swgA.name);
+    await expect(page.locator('[aria-label="Plot Series Properties"] >> h2')).toContainText(
+      'Plot Series'
+    );
+    await expect(page.getByRole('heading', { name: 'Y Axis' })).toBeVisible();
+    await expect(
+      page.locator('[aria-label="Plot Series Properties"] .c-object-label')
+    ).toContainText(swgA.name);

    // Click on the 2nd plot
    await page.locator(`[aria-label="Stacked Plot Item ${swgB.name}"] canvas`).nth(1).click();

    // Assert that the inspector shows the Y Axis properties for swgB
-        await expect(page.locator('[aria-label="Plot Series Properties"] >> h2')).toContainText("Plot Series");
-        await expect(page.getByRole('list', { name: "Y Axis Properties" }).locator("h2")).toContainText("Y Axis");
-        await expect(page.locator('[aria-label="Plot Series Properties"] .c-object-label')).toContainText(swgB.name);
+    await expect(page.locator('[aria-label="Plot Series Properties"] >> h2')).toContainText(
+      'Plot Series'
+    );
+    await expect(page.getByRole('heading', { name: 'Y Axis' })).toBeVisible();
+    await expect(
+      page.locator('[aria-label="Plot Series Properties"] .c-object-label')
+    ).toContainText(swgB.name);

    // Click on the 3rd plot
    await page.locator(`[aria-label="Stacked Plot Item ${swgC.name}"] canvas`).nth(1).click();

    // Assert that the inspector shows the Y Axis properties for swgC
-        await expect(page.locator('[aria-label="Plot Series Properties"] >> h2')).toContainText("Plot Series");
-        await expect(page.getByRole('list', { name: "Y Axis Properties" }).locator("h2")).toContainText("Y Axis");
-        await expect(page.locator('[aria-label="Plot Series Properties"] .c-object-label')).toContainText(swgC.name);
+    await expect(page.locator('[aria-label="Plot Series Properties"] >> h2')).toContainText(
+      'Plot Series'
+    );
+    await expect(page.getByRole('heading', { name: 'Y Axis' })).toBeVisible();
+    await expect(
+      page.locator('[aria-label="Plot Series Properties"] .c-object-label')
+    ).toContainText(swgC.name);

    // Go into edit mode
    await page.click('button[title="Edit"]');

+    await selectInspectorTab(page, 'Config');
+
    // Click on canvas for the 1st plot
    await page.locator(`[aria-label="Stacked Plot Item ${swgA.name}"]`).click();

    // Assert that the inspector shows the Y Axis properties for swgA
-        await expect(page.locator('[aria-label="Plot Series Properties"] >> h2')).toContainText("Plot Series");
-        await expect(page.getByRole('list', { name: "Y Axis Properties" }).locator("h2")).toContainText("Y Axis");
-        await expect(page.locator('[aria-label="Plot Series Properties"] .c-object-label')).toContainText(swgA.name);
+    await expect(page.locator('[aria-label="Plot Series Properties"] >> h2')).toContainText(
+      'Plot Series'
+    );
+    await expect(page.getByRole('heading', { name: 'Y Axis' })).toBeVisible();
+    await expect(
+      page.locator('[aria-label="Plot Series Properties"] .c-object-label')
+    ).toContainText(swgA.name);

    //Click on canvas for the 2nd plot
    await page.locator(`[aria-label="Stacked Plot Item ${swgB.name}"]`).click();

    // Assert that the inspector shows the Y Axis properties for swgB
-        await expect(page.locator('[aria-label="Plot Series Properties"] >> h2')).toContainText("Plot Series");
-        await expect(page.getByRole('list', { name: "Y Axis Properties" }).locator("h2")).toContainText("Y Axis");
-        await expect(page.locator('[aria-label="Plot Series Properties"] .c-object-label')).toContainText(swgB.name);
+    await expect(page.locator('[aria-label="Plot Series Properties"] >> h2')).toContainText(
+      'Plot Series'
+    );
+    await expect(page.getByRole('heading', { name: 'Y Axis' })).toBeVisible();
+    await expect(
+      page.locator('[aria-label="Plot Series Properties"] .c-object-label')
+    ).toContainText(swgB.name);

    //Click on canvas for the 3rd plot
    await page.locator(`[aria-label="Stacked Plot Item ${swgC.name}"]`).click();

    // Assert that the inspector shows the Y Axis properties for swgC
-        await expect(page.locator('[aria-label="Plot Series Properties"] >> h2')).toContainText("Plot Series");
-        await expect(page.getByRole('list', { name: "Y Axis Properties" }).locator("h2")).toContainText("Y Axis");
-        await expect(page.locator('[aria-label="Plot Series Properties"] .c-object-label')).toContainText(swgC.name);
+    await expect(page.locator('[aria-label="Plot Series Properties"] >> h2')).toContainText(
+      'Plot Series'
+    );
+    await expect(page.getByRole('heading', { name: 'Y Axis' })).toBeVisible();
+    await expect(
+      page.locator('[aria-label="Plot Series Properties"] .c-object-label')
+    ).toContainText(swgC.name);
  });
 });
--- a/e2e/tests/functional/plugins/plot/tagging.e2e.spec.js
+++ b/e2e/tests/functional/plugins/plot/tagging.e2e.spec.js
@@ -0,0 +1,274 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2023, 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.
+ *****************************************************************************/
+
+/*
+Tests to verify plot tagging functionality.
+*/
+
+const { test, expect } = require('../../../../pluginFixtures');
+const {
+  createDomainObjectWithDefaults,
+  setRealTimeMode,
+  setFixedTimeMode,
+  waitForPlotsToRender
+} = require('../../../../appActions');
+
+test.describe('Plot Tagging', () => {
+  /**
+   * Given a canvas and a set of points, tags the points on the canvas.
+   * @param {import('@playwright/test').Page} page
+   * @param {HTMLCanvasElement} canvas a telemetry item with a plot
+   * @param {Number} xEnd a telemetry item with a plot
+   * @param {Number} yEnd a telemetry item with a plot
+   * @returns {Promise}
+   */
+  async function createTags({ page, canvas, xEnd, yEnd }) {
+    await canvas.hover({ trial: true });
+
+    //Alt+Shift Drag Start to select some points to tag
+    await page.keyboard.down('Alt');
+    await page.keyboard.down('Shift');
+
+    await canvas.dragTo(canvas, {
+      sourcePosition: {
+        x: 1,
+        y: 1
+      },
+      targetPosition: {
+        x: xEnd,
+        y: yEnd
+      }
+    });
+
+    //Alt Drag End
+    await page.keyboard.up('Alt');
+    await page.keyboard.up('Shift');
+
+    //Wait for canvas to stablize.
+    await canvas.hover({ trial: true });
+
+    // add some tags
+    await page.getByText('Annotations').click();
+    await page.getByRole('button', { name: /Add Tag/ }).click();
+    await page.getByPlaceholder('Type to select tag').click();
+    await page.getByText('Driving').click();
+
+    await page.getByRole('button', { name: /Add Tag/ }).click();
+    await page.getByPlaceholder('Type to select tag').click();
+    await page.getByText('Science').click();
+  }
+
+  /**
+   * Given a telemetry item (e.g., a Sine Wave Generator) with a plot, tests that the plot can be tagged.
+   * @param {import('@playwright/test').Page} page
+   * @param {import('../../../../appActions').CreatedObjectInfo} telemetryItem a telemetry item with a plot
+   * @returns {Promise}
+   */
+  async function testTelemetryItem(page, telemetryItem) {
+    // Check that telemetry item also received the tag
+    await page.goto(telemetryItem.url);
+
+    await expect(page.getByText('No tags to display for this item')).toBeVisible();
+
+    const canvas = page.locator('canvas').nth(1);
+
+    //Wait for canvas to stablize.
+    await canvas.hover({ trial: true });
+
+    // click on the tagged plot point
+    await canvas.click({
+      position: {
+        x: 325,
+        y: 377
+      }
+    });
+
+    await expect(page.getByText('Science')).toBeVisible();
+    await expect(page.getByText('Driving')).toBeHidden();
+  }
+
+  /**
+   * Given a page, tests that tags are searchable, deletable, and persist across reloads.
+   * @param {import('@playwright/test').Page} page
+   * @returns {Promise}
+   */
+  async function basicTagsTests(page) {
+    // Search for Driving
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
+
+    // Clicking elsewhere should cause annotation selection to be cleared
+    await expect(page.getByText('No tags to display for this item')).toBeVisible();
+
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('driv');
+    // click on the search result
+    await page
+      .getByRole('searchbox', { name: 'OpenMCT Search' })
+      .getByText(/Sine Wave/)
+      .first()
+      .click();
+
+    // Delete Driving
+    await page.hover('[aria-label="Tag"]:has-text("Driving")');
+    await page.locator('[aria-label="Remove tag Driving"]').click();
+
+    // Search for Science
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('sc');
+    await expect(page.locator('[aria-label="Search Result"]').nth(0)).toContainText('Science');
+    await expect(page.locator('[aria-label="Search Result"]').nth(0)).not.toContainText('Drilling');
+
+    // Search for Driving
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('driv');
+    await expect(page.getByText('No results found')).toBeVisible();
+
+    //Reload Page
+    await page.reload({ waitUntil: 'domcontentloaded' });
+    // wait for plots to load
+    await waitForPlotsToRender(page);
+
+    await page.getByText('Annotations').click();
+    await expect(page.getByText('No tags to display for this item')).toBeVisible();
+
+    const canvas = page.locator('canvas').nth(1);
+    // click on the tagged plot point
+    await canvas.click({
+      position: {
+        x: 100,
+        y: 100
+      }
+    });
+
+    await expect(page.getByText('Science')).toBeVisible();
+    await expect(page.getByText('Driving')).toBeHidden();
+  }
+
+  test.beforeEach(async ({ page }) => {
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
+  });
+
+  test('Tags work with Overlay Plots', async ({ page }) => {
+    //Test.slow decorator is currently broken. Needs to be fixed in https://github.com/nasa/openmct/issues/5374
+    test.slow();
+
+    const overlayPlot = await createDomainObjectWithDefaults(page, {
+      type: 'Overlay Plot'
+    });
+
+    const alphaSineWave = await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Alpha Sine Wave',
+      parent: overlayPlot.uuid
+    });
+
+    await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Beta Sine Wave',
+      parent: overlayPlot.uuid
+    });
+
+    await page.goto(overlayPlot.url);
+
+    let canvas = page.locator('canvas').nth(1);
+
+    // Switch to real-time mode
+    // Adding tags should pause the plot
+    await setRealTimeMode(page);
+
+    await createTags({
+      page,
+      canvas,
+      xEnd: 700,
+      yEnd: 480
+    });
+
+    await setFixedTimeMode(page);
+
+    await basicTagsTests(page);
+    await testTelemetryItem(page, alphaSineWave);
+
+    // set to real time mode
+    await setRealTimeMode(page);
+
+    // Search for Science
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
+    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('sc');
+    // click on the search result
+    await page
+      .getByRole('searchbox', { name: 'OpenMCT Search' })
+      .getByText('Alpha Sine Wave')
+      .first()
+      .click();
+    // wait for plots to load
+    await expect(page.locator('.js-series-data-loaded')).toBeVisible();
+    // expect plot to be paused
+    await expect(page.locator('[title="Resume displaying real-time data"]')).toBeVisible();
+
+    await setFixedTimeMode(page);
+  });
+
+  test('Tags work with Plot View of telemetry items', async ({ page }) => {
+    await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator'
+    });
+
+    const canvas = page.locator('canvas').nth(1);
+    await createTags({
+      page,
+      canvas,
+      xEnd: 700,
+      yEnd: 480
+    });
+    await basicTagsTests(page);
+  });
+
+  test('Tags work with Stacked Plots', async ({ page }) => {
+    const stackedPlot = await createDomainObjectWithDefaults(page, {
+      type: 'Stacked Plot'
+    });
+
+    const alphaSineWave = await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Alpha Sine Wave',
+      parent: stackedPlot.uuid
+    });
+
+    await createDomainObjectWithDefaults(page, {
+      type: 'Sine Wave Generator',
+      name: 'Beta Sine Wave',
+      parent: stackedPlot.uuid
+    });
+
+    await page.goto(stackedPlot.url);
+
+    const canvas = page.locator('canvas').nth(1);
+
+    await createTags({
+      page,
+      canvas,
+      xEnd: 700,
+      yEnd: 215
+    });
+    await basicTagsTests(page);
+    await testTelemetryItem(page, alphaSineWave);
+  });
+});
--- a/e2e/tests/functional/plugins/telemetryTable/telemetryTable.e2e.spec.js
+++ b/e2e/tests/functional/plugins/telemetryTable/telemetryTable.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -24,13 +24,15 @@ const { createDomainObjectWithDefaults } = require('../../../../appActions');
 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
+  }) => {
    test.info().annotations.push({
      type: 'issue',
      description: 'https://github.com/nasa/openmct/issues/5113'
    });

-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    const table = await createDomainObjectWithDefaults(page, { type: 'Telemetry Table' });
    await createDomainObjectWithDefaults(page, {
@@ -65,7 +67,12 @@ test.describe('Telemetry Table', () => {
    await expect(tableWrapper).not.toHaveClass(/is-paused/);

    // Get the most recent telemetry date
-        const latestTelemetryDate = await page.locator('table.c-telemetry-table__body > tbody > tr').last().locator('td').nth(1).getAttribute('title');
+    const latestTelemetryDate = await page
+      .locator('table.c-telemetry-table__body > tbody > tr')
+      .last()
+      .locator('td')
+      .nth(1)
+      .getAttribute('title');

    // Verify that it is <= our new end bound
    const latestMilliseconds = Date.parse(latestTelemetryDate);
--- a/e2e/tests/functional/plugins/timeConductor/timeConductor.e2e.spec.js
+++ b/e2e/tests/functional/plugins/timeConductor/timeConductor.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -21,12 +21,17 @@
 *****************************************************************************/

 const { test, expect } = require('../../../../pluginFixtures');
-const { setFixedTimeMode, setRealTimeMode, setStartOffset, setEndOffset } = require('../../../../appActions');
+const {
+  setFixedTimeMode,
+  setRealTimeMode,
+  setStartOffset,
+  setEndOffset
+} = require('../../../../appActions');

 test.describe('Time conductor operations', () => {
  test('validate start time does not exceeds end time', async ({ page }) => {
    // Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
    const year = new Date().getFullYear();

    let startDate = 'xxxx-01-01 01:00:00.000Z';
@@ -48,23 +53,27 @@ test.describe('Time conductor operations', () => {
    await startTimeLocator.fill(startDate.toString());

    // invalid start date
-        startDate = (year + 1) + startDate.substring(4);
+    startDate = year + 1 + startDate.substring(4);
    await startTimeLocator.fill(startDate.toString());
    await endTimeLocator.click();

-        const startDateValidityStatus = await startTimeLocator.evaluate((element) => element.checkValidity());
+    const startDateValidityStatus = await startTimeLocator.evaluate((element) =>
+      element.checkValidity()
+    );
    expect(startDateValidityStatus).not.toBeTruthy();

    // fix to valid start date
-        startDate = (year - 1) + startDate.substring(4);
+    startDate = year - 1 + startDate.substring(4);
    await startTimeLocator.fill(startDate.toString());

    // invalid end date
-        endDate = (year - 2) + endDate.substring(4);
+    endDate = year - 2 + endDate.substring(4);
    await endTimeLocator.fill(endDate.toString());
    await startTimeLocator.click();

-        const endDateValidityStatus = await endTimeLocator.evaluate((element) => element.checkValidity());
+    const endDateValidityStatus = await endTimeLocator.evaluate((element) =>
+      element.checkValidity()
+    );
    expect(endDateValidityStatus).not.toBeTruthy();
  });
 });
@@ -82,7 +91,7 @@ test.describe('Time conductor input fields real-time mode', () => {
    };

    // Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    // Switch to real-time mode
    await setRealTimeMode(page);
@@ -91,7 +100,9 @@ test.describe('Time conductor input fields real-time mode', () => {
    await setStartOffset(page, startOffset);

    // Verify time was updated on time offset button
-        await expect(page.locator('data-testid=conductor-start-offset-button')).toContainText('00:30:23');
+    await expect(page.locator('data-testid=conductor-start-offset-button')).toContainText(
+      '00:30:23'
+    );

    // Set end time offset
    await setEndOffset(page, endOffset);
@@ -104,7 +115,9 @@ test.describe('Time conductor input fields real-time mode', () => {
   * Verify that offsets and url params are preserved when switching
   * between fixed timespan and real-time mode.
   */
-    test('preserve offsets and url params when switching between fixed and real-time mode', async ({ page }) => {
+  test('preserve offsets and url params when switching between fixed and real-time mode', async ({
+    page
+  }) => {
    const startOffset = {
      mins: '30',
      secs: '23'
@@ -115,11 +128,11 @@ test.describe('Time conductor input fields real-time mode', () => {
    };

    // Convert offsets to milliseconds
-        const startDelta = (30 * 60 * 1000) + (23 * 1000);
-        const endDelta = (1 * 1000);
+    const startDelta = 30 * 60 * 1000 + 23 * 1000;
+    const endDelta = 1 * 1000;

    // Go to baseURL
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    // Switch to real-time mode
    await setRealTimeMode(page);
@@ -137,7 +150,9 @@ test.describe('Time conductor input fields real-time mode', () => {
    await setRealTimeMode(page);

    // Verify updated start time offset persists after mode switch
-        await expect(page.locator('data-testid=conductor-start-offset-button')).toContainText('00:30:23');
+    await expect(page.locator('data-testid=conductor-start-offset-button')).toContainText(
+      '00:30:23'
+    );

    // Verify updated end time offset persists after mode switch
    await expect(page.locator('data-testid=conductor-end-offset-button')).toContainText('00:00:01');
@@ -148,20 +163,29 @@ test.describe('Time conductor input fields real-time mode', () => {
    expect(page.url()).toContain(`endDelta=${endDelta}`);
  });

-    test.fixme('time conductor history in fixed time mode will track changing start and end times', async ({ page }) => {
+  test.fixme(
+    'time conductor history in fixed time mode will track changing start and end times',
+    async ({ page }) => {
      // change start time, verify it's tracked in history
      // change end time, verify it's tracked in history
-    });
+    }
+  );

-    test.fixme('time conductor history in realtime mode will track changing start and end times', async ({ page }) => {
+  test.fixme(
+    'time conductor history in realtime mode will track changing start and end times',
+    async ({ page }) => {
      // change start offset, verify it's tracked in history
      // change end offset, verify it's tracked in history
-    });
+    }
+  );

-    test.fixme('time conductor history allows you to set a historical timeframe', async ({ page }) => {
+  test.fixme(
+    'time conductor history allows you to set a historical timeframe',
+    async ({ page }) => {
      // make sure there are historical history options
      // select an option and make sure the time conductor start and end bounds are updated correctly
-    });
+    }
+  );

  test.fixme('time conductor history allows you to set a realtime offsets', async ({ page }) => {
    // make sure there are realtime history options
@@ -170,7 +194,7 @@ test.describe('Time conductor input fields real-time mode', () => {
 });

 test.describe('Time Conductor History', () => {
-    test("shows milliseconds on hover @unstable", async ({ page }) => {
+  test('shows milliseconds on hover @unstable', async ({ page }) => {
    test.info().annotations.push({
      type: 'issue',
      description: 'https://github.com/nasa/openmct/issues/4386'
@@ -178,13 +202,19 @@ test.describe('Time Conductor History', () => {
    // Navigate to Open MCT in Fixed Time Mode, UTC Time System
    // with startBound at 2022-01-01 00:00:00.000Z
    // and endBound at 2022-01-01 00:00:00.200Z
-        await page.goto('./#/browse/mine?view=grid&tc.mode=fixed&tc.startBound=1640995200000&tc.endBound=1640995200200&tc.timeSystem=utc&hideInspector=true', { waitUntil: 'networkidle' });
+    await page.goto(
+      './#/browse/mine?view=grid&tc.mode=fixed&tc.startBound=1640995200000&tc.endBound=1640995200200&tc.timeSystem=utc&hideInspector=true',
+      { waitUntil: 'networkidle' }
+    );
    await page.locator("[aria-label='Time Conductor History']").hover({ trial: true });
    await page.locator("[aria-label='Time Conductor History']").click();

    // Validate history item format
    const historyItem = page.locator('text="2022-01-01 00:00:00 + 200ms"');
    await expect(historyItem).toBeEnabled();
-        await expect(historyItem).toHaveAttribute('title', '2022-01-01 00:00:00.000 - 2022-01-01 00:00:00.200');
+    await expect(historyItem).toHaveAttribute(
+      'title',
+      '2022-01-01 00:00:00.000 - 2022-01-01 00:00:00.200'
+    );
  });
 });
--- a/e2e/tests/functional/plugins/timer/timer.e2e.spec.js
+++ b/e2e/tests/functional/plugins/timer/timer.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -21,12 +21,15 @@
 *****************************************************************************/

 const { test, expect } = require('../../../../pluginFixtures');
-const { openObjectTreeContextMenu, createDomainObjectWithDefaults } = require('../../../../appActions');
+const {
+  openObjectTreeContextMenu,
+  createDomainObjectWithDefaults
+} = require('../../../../appActions');

 test.describe('Timer', () => {
  let timer;
  test.beforeEach(async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });
    timer = await createDomainObjectWithDefaults(page, { type: 'timer' });
  });

@@ -38,21 +41,21 @@ test.describe('Timer', () => {

    const timerUrl = timer.url;

-        await test.step("From the tree context menu", async () => {
+    await test.step('From the tree context menu', async () => {
      await triggerTimerContextMenuAction(page, timerUrl, 'Start');
      await triggerTimerContextMenuAction(page, timerUrl, 'Pause');
      await triggerTimerContextMenuAction(page, timerUrl, 'Restart at 0');
      await triggerTimerContextMenuAction(page, timerUrl, 'Stop');
    });

-        await test.step("From the 3dot menu", async () => {
+    await test.step('From the 3dot menu', async () => {
      await triggerTimer3dotMenuAction(page, 'Start');
      await triggerTimer3dotMenuAction(page, 'Pause');
      await triggerTimer3dotMenuAction(page, 'Restart at 0');
      await triggerTimer3dotMenuAction(page, 'Stop');
    });

-        await test.step("From the object view", async () => {
+    await test.step('From the object view', async () => {
      await triggerTimerViewAction(page, 'Start');
      await triggerTimerViewAction(page, 'Pause');
      await triggerTimerViewAction(page, 'Restart at 0');
@@ -142,7 +145,7 @@ async function assertTimerStateAfterAction(page, action) {
  switch (action) {
    case 'Start':
    case 'Restart at 0':
-        timerStateClass = "is-started";
+      timerStateClass = 'is-started';
      break;
    case 'Stop':
      timerStateClass = 'is-stopped';
--- a/e2e/tests/functional/recentObjects.e2e.spec.js
+++ b/e2e/tests/functional/recentObjects.e2e.spec.js
@@ -22,13 +22,17 @@

 const { test, expect } = require('../../pluginFixtures.js');
 const { createDomainObjectWithDefaults } = require('../../appActions.js');
+const { waitForAnimations } = require('../../baseFixtures.js');

 test.describe('Recent Objects', () => {
+  /** @type {import('@playwright/test').Locator} */
  let recentObjectsList;
+  /** @type {import('@playwright/test').Locator} */
  let clock;
+  /** @type {import('@playwright/test').Locator} */
  let folderA;
  test.beforeEach(async ({ page }) => {
-        await page.goto('./', { waitUntil: 'networkidle' });
+    await page.goto('./', { waitUntil: 'domcontentloaded' });

    // Set Recent Objects List locator for subsequent tests
    recentObjectsList = page.getByRole('list', {
@@ -45,19 +49,21 @@ test.describe('Recent Objects', () => {
    });

    // Drag the Recent Objects panel up a bit
-        await page.locator('div:nth-child(2) > .l-pane__handle').hover();
+    await page
+      .locator('.l-pane.l-pane--vertical-handle-before', {
+        hasText: 'Recently Viewed'
+      })
+      .locator('.l-pane__handle')
+      .hover();
    await page.mouse.down();
    await page.mouse.move(0, 100);
    await page.mouse.up();
  });
-    test('Recent Objects CRUD operations', async ({ page }) => {
+  test('Navigated objects show up in recents, object renames and deletions are reflected', async ({
+    page
+  }) => {
    // Verify that both created objects appear in the list and are in the correct order
-        expect(recentObjectsList.getByRole('listitem', { name: clock.name })).toBeTruthy();
-        expect(recentObjectsList.getByRole('listitem', { name: folderA.name })).toBeTruthy();
-        expect(recentObjectsList.getByRole('listitem', { name: clock.name }).locator('a').getByText(folderA.name)).toBeTruthy();
-        expect(recentObjectsList.getByRole('listitem').nth(0).getByText(clock.name)).toBeTruthy();
-        expect(recentObjectsList.getByRole('listitem', { name: clock.name }).locator('a').getByText(folderA.name)).toBeTruthy();
-        expect(recentObjectsList.getByRole('listitem').nth(1).getByText(folderA.name)).toBeTruthy();
+    await assertInitialRecentObjectsListState();

    // Navigate to the folder by clicking on the main object name in the recent objects list item
    await page.getByRole('listitem', { name: folderA.name }).getByText(folderA.name).click();
@@ -66,22 +72,31 @@ test.describe('Recent Objects', () => {

    // Rename
    folderA.name = `${folderA.name}-NEW!`;
-        await page.locator('.l-browse-bar__object-name').fill("");
+    await page.locator('.l-browse-bar__object-name').fill('');
    await page.locator('.l-browse-bar__object-name').fill(folderA.name);
    await page.keyboard.press('Enter');

    // Verify rename has been applied in recent objects list item and objects paths
-        expect(await page.getByRole('navigation', {
-            name: `${clock.name} Breadcrumb`
-        }).locator('a').filter({
+    expect(
+      await page
+        .getByRole('navigation', {
+          name: clock.name
+        })
+        .locator('a')
+        .filter({
          hasText: folderA.name
-        }).count()).toBeGreaterThan(0);
+        })
+        .count()
+    ).toBeGreaterThan(0);
    expect(recentObjectsList.getByRole('listitem', { name: folderA.name })).toBeTruthy();

    // Delete
    await page.click('button[title="Show selected item in tree"]');
    // Delete the folder via the left tree pane treeitem context menu
-        await page.getByRole('treeitem', { name: new RegExp(folderA.name) }).locator('a').click({
+    await page
+      .getByRole('treeitem', { name: new RegExp(folderA.name) })
+      .locator('a')
+      .click({
        button: 'right'
      });
    await page.getByRole('menuitem', { name: /Remove/ }).click();
@@ -91,7 +106,10 @@ test.describe('Recent Objects', () => {
    await expect(recentObjectsList.getByRole('listitem', { name: folderA.name })).toBeHidden();
    await expect(recentObjectsList.getByRole('listitem', { name: clock.name })).toBeHidden();
  });
-    test("Clicking on an object in the path of a recent object navigates to the object", async ({ page, openmctConfig }) => {
+  test('Clicking on an object in the path of a recent object navigates to the object', async ({
+    page,
+    openmctConfig
+  }) => {
    const { myItemsFolderName } = openmctConfig;
    test.info().annotations.push({
      type: 'issue',
@@ -101,32 +119,233 @@ test.describe('Recent Objects', () => {

    // Navigate to the folder by clicking on its entry in the Clock's breadcrumb
    const waitForFolderNavigation = page.waitForURL(`**/${folderA.uuid}?*`);
-        await page.getByRole('navigation', {
-            name: `${clock.name} Breadcrumb`
-        }).locator('a').filter({
+    await page
+      .getByRole('navigation', {
+        name: clock.name
+      })
+      .locator('a')
+      .filter({
        hasText: folderA.name
-        }).click();
+      })
+      .click();

    // Verify that the hash URL updates correctly
    await waitForFolderNavigation;
-        // eslint-disable-next-line no-useless-escape
-        expect(page.url()).toMatch(new RegExp(`.*${folderA.uuid}\?.*`));
+    expect(page.url()).toMatch(new RegExp(`.*${folderA.uuid}?.*`));

    // Navigate to My Items by clicking on its entry in the Clock's breadcrumb
    const waitForMyItemsNavigation = page.waitForURL(`**/mine?*`);
-        await page.getByRole('navigation', {
-            name: `${clock.name} Breadcrumb`
-        }).locator('a').filter({
+    await page
+      .getByRole('navigation', {
+        name: clock.name
+      })
+      .locator('a')
+      .filter({
        hasText: myItemsFolderName
-        }).click();
+      })
+      .click();

    // Verify that the hash URL updates correctly
    await waitForMyItemsNavigation;
-        // eslint-disable-next-line no-useless-escape
-        expect(page.url()).toMatch(new RegExp(`.*mine\?.*`));
+    expect(page.url()).toMatch(new RegExp(`.*mine?.*`));
  });
-    test.fixme("Clicking on the 'target button' scrolls the object into view in the tree and highlights it", async ({ page }) => {
+  test("Clicking on the 'target button' scrolls the object into view in the tree and highlights it", async ({
+    page
+  }) => {
+    const clockTreeItem = page
+      .getByRole('tree', { name: 'Main Tree' })
+      .getByRole('treeitem', { name: clock.name });
+    const folderTreeItem = page.getByRole('tree', { name: 'Main Tree' }).getByRole('treeitem', {
+      name: folderA.name,
+      expanded: true
    });
-    test.fixme("Tests for context menu actions from recent objects", async ({ page }) => {
+
+    // Click the "Target" button for the Clock which is nested in a folder
+    await page.getByRole('button', { name: `Open and scroll to ${clock.name}` }).click();
+
+    // Assert that the Clock parent folder has expanded and the Clock is visible)
+    await expect(folderTreeItem.locator('.c-disclosure-triangle')).toHaveClass(/--expanded/);
+    await expect(clockTreeItem).toBeVisible();
+
+    // Assert that the Clock treeitem is highlighted
+    await expect(clockTreeItem.locator('.c-tree__item')).toHaveClass(/is-targeted-item/);
+
+    // Wait for highlight animation to end
+    await waitForAnimations(clockTreeItem.locator('.c-tree__item'));
+
+    // Assert that the Clock treeitem is no longer highlighted
+    await expect(clockTreeItem.locator('.c-tree__item')).not.toHaveClass(/is-targeted-item/);
  });
+  test('Persists on refresh', async ({ page }) => {
+    await assertInitialRecentObjectsListState();
+    await page.reload();
+    await assertInitialRecentObjectsListState();
+  });
+  test('Displays objects and aliases uniquely', async ({ page }) => {
+    const mainTree = page.getByRole('tree', { name: 'Main Tree' });
+
+    // Navigate to the clock and reveal it in the tree
+    await page.goto(clock.url);
+    await page.getByTitle('Show selected item in tree').click();
+
+    // Right click the clock and create an alias using the "link" context menu action
+    const clockTreeItem = page
+      .getByRole('tree', {
+        name: 'Main Tree'
+      })
+      .getByRole('treeitem', {
+        name: clock.name
+      });
+    await clockTreeItem.click({
+      button: 'right'
+    });
+    await page
+      .getByRole('menuitem', {
+        name: /Create Link/
+      })
+      .click();
+    await page
+      .getByRole('tree', { name: 'Create Modal Tree' })
+      .getByRole('treeitem')
+      .first()
+      .click();
+    await page.getByRole('button', { name: 'Save' }).click();
+
+    // Click the newly created object alias in the tree
+    await mainTree
+      .getByRole('treeitem', {
+        name: new RegExp(clock.name)
+      })
+      .filter({
+        has: page.locator('.is-alias')
+      })
+      .click();
+
+    // Assert that two recent objects are displayed and one of them is an alias
+    expect(await recentObjectsList.getByRole('listitem', { name: clock.name }).count()).toBe(2);
+    expect(await recentObjectsList.locator('.is-alias').count()).toBe(1);
+
+    // Assert that the alias and the original's breadcrumbs are different
+    const clockBreadcrumbs = recentObjectsList
+      .getByRole('listitem', { name: clock.name })
+      .getByRole('navigation');
+    expect(await clockBreadcrumbs.count()).toBe(2);
+    expect(await clockBreadcrumbs.nth(0).innerText()).not.toEqual(
+      await clockBreadcrumbs.nth(1).innerText()
+    );
+  });
+  test('Enforces a limit of 20 recent objects and clears the recent objects', async ({ page }) => {
+    // Creating 21 objects takes a while, so increase the timeout
+    test.slow();
+
+    // Assert that the list initially contains 3 objects (clock, folder, my items)
+    expect(await recentObjectsList.locator('.c-recentobjects-listitem').count()).toBe(3);
+
+    let lastFolder;
+    let lastClock;
+    // Create 19 more objects (3 in beforeEach() + 18 new = 21 total)
+    for (let i = 0; i < 9; i++) {
+      lastFolder = await createDomainObjectWithDefaults(page, {
+        type: 'Folder',
+        parent: lastFolder?.uuid
+      });
+      lastClock = await createDomainObjectWithDefaults(page, {
+        type: 'Clock',
+        parent: lastFolder?.uuid
+      });
+    }
+
+    // Assert that the list contains 20 objects
+    expect(await recentObjectsList.locator('.c-recentobjects-listitem').count()).toBe(20);
+
+    // Collapse the tree
+    await page.getByTitle('Collapse all tree items').click();
+    const lastFolderTreeItem = page.getByRole('tree', { name: 'Main Tree' }).getByRole('treeitem', {
+      name: lastFolder.name,
+      expanded: true
+    });
+    const lastClockTreeItem = page.getByRole('tree', { name: 'Main Tree' }).getByRole('treeitem', {
+      name: lastClock.name
+    });
+
+    // Test "Open and Scroll To" in a deeply nested tree, while we're here
+    await page.getByRole('button', { name: `Open and scroll to ${lastClock.name}` }).click();
+
+    // Assert that the Clock parent folder has expanded and the Clock is visible)
+    await expect(lastFolderTreeItem.locator('.c-disclosure-triangle')).toHaveClass(/--expanded/);
+    await expect(lastClockTreeItem).toBeVisible();
+
+    // Assert that the Clock treeitem is highlighted
+    await expect(lastClockTreeItem.locator('.c-tree__item')).toHaveClass(/is-targeted-item/);
+
+    // Wait for highlight animation to end
+    await waitForAnimations(lastClockTreeItem.locator('.c-tree__item'));
+
+    // Assert that the Clock treeitem is no longer highlighted
+    await expect(lastClockTreeItem.locator('.c-tree__item')).not.toHaveClass(/is-targeted-item/);
+
+    // Click the aria-label="Clear Recently Viewed" button
+    await page.getByRole('button', { name: 'Clear Recently Viewed' }).click();
+
+    // Click on the "OK" button in the confirmation dialog
+    await page.getByRole('button', { name: 'OK' }).click();
+
+    // Assert that the list is empty
+    expect(await recentObjectsList.locator('.c-recentobjects-listitem').count()).toBe(0);
+  });
+  test('Ensure clear recent objects button is active or inactive', async ({ page }) => {
+    // Assert that the list initially contains 3 objects (clock, folder, my items)
+    expect(await recentObjectsList.locator('.c-recentobjects-listitem').count()).toBe(3);
+
+    // Assert that the button is enabled
+    expect(await page.getByRole('button', { name: 'Clear Recently Viewed' }).isEnabled()).toBe(
+      true
+    );
+
+    // Click the aria-label="Clear Recently Viewed" button
+    await page.getByRole('button', { name: 'Clear Recently Viewed' }).click();
+
+    // Click on the "OK" button in the confirmation dialog
+    await page.getByRole('button', { name: 'OK' }).click();
+
+    // Assert that the list is empty
+    expect(await recentObjectsList.locator('.c-recentobjects-listitem').count()).toBe(0);
+
+    // Assert that the button is disabled
+    expect(await page.getByRole('button', { name: 'Clear Recently Viewed' }).isEnabled()).toBe(
+      false
+    );
+
+    // Navigate to folder object
+    await page.goto(folderA.url);
+
+    // Assert that the list contains 1 object
+    expect(await recentObjectsList.locator('.c-recentobjects-listitem').count()).toBe(1);
+
+    // Assert that the button is enabled
+    expect(await page.getByRole('button', { name: 'Clear Recently Viewed' }).isEnabled()).toBe(
+      true
+    );
+  });
+
+  function assertInitialRecentObjectsListState() {
+    return Promise.all([
+      expect(recentObjectsList.getByRole('listitem', { name: clock.name })).toBeVisible(),
+      expect(recentObjectsList.getByRole('listitem', { name: folderA.name })).toBeVisible(),
+      expect(
+        recentObjectsList
+          .getByRole('listitem', { name: clock.name })
+          .locator('a')
+          .getByText(folderA.name)
+      ).toBeVisible(),
+      expect(recentObjectsList.getByRole('listitem').nth(0).getByText(clock.name)).toBeVisible(),
+      expect(
+        recentObjectsList
+          .getByRole('listitem', { name: clock.name })
+          .locator('a')
+          .getByText(folderA.name)
+      ).toBeVisible(),
+      expect(recentObjectsList.getByRole('listitem').nth(3).getByText(folderA.name)).toBeVisible()
+    ]);
+  }
 });
--- a/e2e/tests/functional/search.e2e.spec.js
+++ b/e2e/tests/functional/search.e2e.spec.js
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2022, United States Government
+ * Open MCT, Copyright (c) 2014-2023, United States Government
 * as represented by the Administrator of the National Aeronautics and Space
 * Administration. All rights reserved.
 *
@@ -24,11 +24,22 @@
 */

 const { test, expect } = require('../../pluginFixtures');
-const { createDomainObjectWithDefaults } = require('../../appActions');
+const { createDomainObjectWithDefaults, selectInspectorTab } = require('../../appActions');
 const { v4: uuid } = require('uuid');

 test.describe('Grand Search', () => {
-    test('Can search for objects, and subsequent search dropdown behaves properly', async ({ page, openmctConfig }) => {
+  const searchResultSelector = '.c-gsearch-result__title';
+  const searchResultDropDownSelector = '.c-gsearch__results';
+
+  test.beforeEach(async ({ page }) => {
+    // Go to baseURL
+    await page.goto('./', { waitUntil: 'networkidle' });
+  });
+
+  test('Can search for objects, and subsequent search dropdown behaves properly', async ({
+    page,
+    openmctConfig
+  }) => {
    const { myItemsFolderName } = openmctConfig;

    const createdObjects = await createObjectsForSearch(page);
@@ -37,12 +48,20 @@ test.describe('Grand Search', () => {
    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').click();
    // Fill [aria-label="OpenMCT Search"] input[type="search"]
    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Cl');
-        await expect(page.locator('[aria-label="Search Result"] >> nth=0')).toContainText(`Clock A ${myItemsFolderName} Red Folder Blue Folder`);
-        await expect(page.locator('[aria-label="Search Result"] >> nth=1')).toContainText(`Clock B ${myItemsFolderName} Red Folder Blue Folder`);
-        await expect(page.locator('[aria-label="Search Result"] >> nth=2')).toContainText(`Clock C ${myItemsFolderName} Red Folder Blue Folder`);
-        await expect(page.locator('[aria-label="Search Result"] >> nth=3')).toContainText(`Clock D ${myItemsFolderName} Red Folder Blue Folder`);
+    await expect(page.locator('[aria-label="Search Result"] >> nth=0')).toContainText(
+      `Clock A ${myItemsFolderName} Red Folder Blue Folder`
+    );
+    await expect(page.locator('[aria-label="Search Result"] >> nth=1')).toContainText(
+      `Clock B ${myItemsFolderName} Red Folder Blue Folder`
+    );
+    await expect(page.locator('[aria-label="Search Result"] >> nth=2')).toContainText(
+      `Clock C ${myItemsFolderName} Red Folder Blue Folder`
+    );
+    await expect(page.locator('[aria-label="Search Result"] >> nth=3')).toContainText(
+      `Clock D ${myItemsFolderName} Red Folder Blue Folder`
+    );
    // Click the Elements pool to dismiss the search menu
-        await page.locator('.l-pane__label:has-text("Elements")').click();
+    await selectInspectorTab(page, 'Elements');
    await expect(page.locator('[aria-label="Search Result"] >> nth=0')).toBeHidden();

    await page.locator('[aria-label="OpenMCT Search"] [aria-label="Search Input"]').click();
@@ -52,10 +71,12 @@ test.describe('Grand Search', () => {
    // Click [aria-label="Close"]
    await page.locator('[aria-label="Close"]').click();
    await expect(page.locator('[aria-label="Search Result"] >> nth=0')).toBeVisible();
-        await expect(page.locator('[aria-label="Search Result"] >> nth=0')).toContainText(`Clock A ${myItemsFolderName} Red Folder Blue Folder`);
+    await expect(page.locator('[aria-label="Search Result"] >> nth=0')).toContainText(
+      `Clock A ${myItemsFolderName} Red Folder Blue Folder`
+    );

    // Click [aria-label="OpenMCT Search"] a >> nth=0
-        await page.locator('[aria-label="OpenMCT Search"] a').first().click();
+    await page.locator('[aria-label="Search Result"] >> nth=0').click();
    await expect(page.locator('[aria-label="Search Result"] >> nth=0')).toBeHidden();

    // Fill [aria-label="OpenMCT Search"] input[type="search"]
@@ -63,7 +84,10 @@ test.describe('Grand Search', () => {
    await expect(page.locator('[aria-label="Search Result"] >> nth=0')).toBeHidden();

    // Click text=Snapshot Save and Finish Editing Save and Continue Editing >> button >> nth=1
-        await page.locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button').nth(1).click();
+    await page
+      .locator('text=Snapshot Save and Finish Editing Save and Continue Editing >> button')
+      .nth(1)
+      .click();
    // Click text=Save and Finish Editing
    await page.locator('text=Save and Finish Editing').click();
    // Click [aria-label="OpenMCT Search"] [aria-label="Search Input"]
@@ -77,35 +101,40 @@ test.describe('Grand Search', () => {
    await expect(page.locator('.is-object-type-clock')).toBeVisible();

    await page.locator('[aria-label="OpenMCT Search"] [aria-label="Search Input"]').fill('Disp');
-        await expect(page.locator('[aria-label="Search Result"] >> nth=0')).toContainText(createdObjects.displayLayout.name);
+    await expect(page.locator('[aria-label="Search Result"] >> nth=0')).toContainText(
+      createdObjects.displayLayout.name
+    );
    await expect(page.locator('[aria-label="Search Result"] >> nth=0')).not.toContainText('Folder');

    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Clock C');
-        await expect(page.locator('[aria-label="Search Result"] >> nth=0')).toContainText(`Clock C ${myItemsFolderName} Red Folder Blue Folder`);
+    await expect(page.locator('[aria-label="Search Result"] >> nth=0')).toContainText(
+      `Clock C ${myItemsFolderName} Red Folder Blue Folder`
+    );

    await page.locator('[aria-label="OpenMCT Search"] input[type="search"]').fill('Cloc');
-        await expect(page.locator('[aria-label="Search Result"] >> nth=0')).toContainText(`Clock A ${myItemsFolderName} Red Folder Blue Folder`);
-        await expect(page.locator('[aria-label="Search Result"] >> nth=1')).toContainText(`Clock B ${myItemsFolderName} Red Folder Blue Folder`);
-        await expect(page.locator('[aria-label="Search Result"] >> nth=2')).toContainText(`Clock C ${myItemsFolderName} Red Folder Blue Folder`);
-        await expect(page.locator('[aria-label="Search Result"] >> nth=3')).toContainText(`Clock D ${myItemsFolderName} Red Folder Blue Folder`);
+    await expect(page.locator('[aria-label="Search Result"] >> nth=0')).toContainText(
+      `Clock A ${myItemsFolderName} Red Folder Blue Folder`
+    );
+    await expect(page.locator('[aria-label="Search Result"] >> nth=1')).toContainText(
+      `Clock B ${myItemsFolderName} Red Folder Blue Folder`
+    );
+    await expect(page.locator('[aria-label="Search Result"] >> nth=2')).toContainText(
+      `Clock C ${myItemsFolderName} Red Folder Blue Folder`
+    );
+    await expect(page.locator('[aria-label="Search Result"] >> nth=3')).toContainText(
+      `Clock D ${myItemsFolderName} Red Folder Blue Folder`
+    );
  });
-});
-
-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');
+    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);
+    const searchResults = page.locator(searchResultSelector);

    // Verify that no results are found
    expect(await searchResults.count()).toBe(0);
@@ -115,9 +144,6 @@ test.describe("Search Tests @unstable", () => {
  });

  test('Validate single object in search result @couchdb', async ({ page }) => {
-        //Go to baseURL
-        await page.goto("./", { waitUntil: "networkidle" });
-
    // Create a folder object
    const folderName = uuid();
    await createDomainObjectWithDefaults(page, {
@@ -126,7 +152,7 @@ test.describe("Search Tests @unstable", () => {
    });

    // Full search for object
-        await page.type("input[type=search]", folderName);
+    await page.type('input[type=search]', folderName);

    // Wait for search to complete
    await waitForSearchCompletion(page);
@@ -135,62 +161,84 @@ test.describe("Search Tests @unstable", () => {
    const searchResults = page.locator(searchResultSelector);

    // Verify that one result is found
+    await expect(searchResults).toBeVisible();
    expect(await searchResults.count()).toBe(1);
    await expect(searchResults).toHaveText(folderName);
  });

-    test("Validate multiple objects in search results return partial matches", async ({ page }) => {
+  test('Search results are debounced @couchdb', async ({ page }) => {
+    test.info().annotations.push({
+      type: 'issue',
+      description: 'https://github.com/nasa/openmct/issues/6179'
+    });
+    await createObjectsForSearch(page);
+
+    let networkRequests = [];
+    page.on('request', (request) => {
+      const searchRequest = request.url().endsWith('_find');
+      const fetchRequest = request.resourceType() === 'fetch';
+      if (searchRequest && fetchRequest) {
+        networkRequests.push(request);
+      }
+    });
+
+    // Full search for object
+    await page.type('input[type=search]', 'Clock', { delay: 100 });
+
+    // Wait for search to finish
+    await waitForSearchCompletion(page);
+
+    // Network requests for the composite telemetry with multiple items should be:
+    // 1.  batched request for latest telemetry using the bulk API
+    expect(networkRequests.length).toBe(1);
+
+    const searchResultDropDown = await page.locator(searchResultDropDownSelector);
+
+    await expect(searchResultDropDown).toContainText('Clock A');
+  });
+
+  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";
+    const folderName1 = 'e928a26e-e924-4ea0';
+    const folderName2 = 'e928a26e-e924-4001';

-        await createFolderObject(page, folderName);
-        await createFolderObject(page, folderName2);
+    await createDomainObjectWithDefaults(page, {
+      type: 'Folder',
+      name: folderName1
+    });
+
+    await createDomainObjectWithDefaults(page, {
+      type: 'Folder',
+      name: folderName2
+    });

    // Partial search for objects
-        await page.type("input[type=search]", 'e928a26e');
+    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);
+    const searchResultDropDown = page.locator(searchResultDropDownSelector);

    // Verify that the search result/s correctly match the search query
+    await expect(searchResultDropDown).toContainText(folderName1);
+    await expect(searchResultDropDown).toContainText(folderName2);
+
+    // Get the search results
+    const searchResults = page.locator(searchResultSelector);
+    // Verify that two results are found
    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('button:has-text("OK")').click();
-}
-
 async function waitForSearchCompletion(page) {
  // Wait loading spinner to disappear
-    await page.waitForSelector('.c-tree-and-search__loading', { state: 'detached' });
+  await page.waitForSelector('.search-finished');
 }

 /**
@@ -198,9 +246,6 @@ async function waitForSearchCompletion(page) {
 * @param {import('@playwright/test').Page} page
 */
 async function createObjectsForSearch(page) {
-    //Go to baseURL
-    await page.goto('./', { waitUntil: 'networkidle' });
-
  const redFolder = await createDomainObjectWithDefaults(page, {
    type: 'Folder',
    name: 'Red Folder'
--- a/Show More
+++ b/Show More