diff --git a/ui/app/adapters/auth-method.js b/ui/app/adapters/auth-method.js
index 6d441ae2a5ac..dc7a5e12295e 100644
--- a/ui/app/adapters/auth-method.js
+++ b/ui/app/adapters/auth-method.js
@@ -48,6 +48,7 @@ export default ApplicationAdapter.extend({
 
     return this.ajax(this.url(path), 'POST', { data }).then(() => {
       // ember data doesn't like 204s if it's not a DELETE
+      data.config.id = path; // config relationship needs an id so use path for now
       return {
         data: assign({}, data, { path: path + '/', id: path }),
       };
@@ -63,6 +64,7 @@ export default ApplicationAdapter.extend({
   },
 
   tune(path, data) {
-    return this.ajax(`${this.url(path)}tune`, 'POST', { data });
+    const url = `${this.buildURL()}/${this.pathForType()}/${encodePath(path)}tune`;
+    return this.ajax(url, 'POST', { data });
   },
 });
diff --git a/ui/app/components/auth-config-form/options.js b/ui/app/components/auth-config-form/options.js
index 31951f5b4751..a0ccfb1ea662 100644
--- a/ui/app/components/auth-config-form/options.js
+++ b/ui/app/components/auth-config-form/options.js
@@ -18,8 +18,10 @@ import { waitFor } from '@ember/test-waiters';
  */
 
 export default AuthConfigComponent.extend({
+  flashMessages: service(),
   router: service(),
   wizard: service(),
+
   saveModel: task(
     waitFor(function* () {
       let data = this.model.config.serialize();
diff --git a/ui/app/components/auth-form.js b/ui/app/components/auth-form.js
index eddbb9b27b04..9b753b2bd3fe 100644
--- a/ui/app/components/auth-form.js
+++ b/ui/app/components/auth-form.js
@@ -277,7 +277,6 @@ export default Component.extend(DEFAULTS, {
 
   delayAuthMessageReminder: task(function* () {
     if (Ember.testing) {
-      this.showLoading = true;
       yield timeout(0);
     } else {
       yield timeout(5000);
@@ -285,15 +284,9 @@ export default Component.extend(DEFAULTS, {
   }),
 
   actions: {
-    doSubmit() {
-      let passedData, e;
-      if (arguments.length > 1) {
-        [passedData, e] = arguments;
-      } else {
-        [e] = arguments;
-      }
-      if (e) {
-        e.preventDefault();
+    doSubmit(passedData, event) {
+      if (event) {
+        event.preventDefault();
       }
       let data = {};
       this.setProperties({
diff --git a/ui/app/components/configure-aws-secret.js b/ui/app/components/configure-aws-secret.js
index b9d6e9b61bc0..84f53adf2e62 100644
--- a/ui/app/components/configure-aws-secret.js
+++ b/ui/app/components/configure-aws-secret.js
@@ -31,12 +31,14 @@ import { action } from '@ember/object';
  */
 export default class ConfigureAwsSecretComponent extends Component {
   @action
-  saveRootCreds(data) {
+  saveRootCreds(data, event) {
+    event.preventDefault();
     this.args.saveAWSRoot(data);
   }
 
   @action
-  saveLease(data) {
+  saveLease(data, event) {
+    event.preventDefault();
     this.args.saveAWSLease(data);
   }
 }
diff --git a/ui/app/components/configure-ssh-secret.js b/ui/app/components/configure-ssh-secret.js
index 562dd732e358..0c8803a62c40 100644
--- a/ui/app/components/configure-ssh-secret.js
+++ b/ui/app/components/configure-ssh-secret.js
@@ -18,7 +18,8 @@ import { action } from '@ember/object';
  */
 export default class ConfigureSshSecretComponent extends Component {
   @action
-  saveConfig(data) {
-    this.args.saveConfig(data);
+  saveConfig(event) {
+    event.preventDefault();
+    this.args.saveConfig(event);
   }
 }
diff --git a/ui/app/components/diff-version-selector.js b/ui/app/components/diff-version-selector.js
index e4d9752919b9..25b8ad1f44db 100644
--- a/ui/app/components/diff-version-selector.js
+++ b/ui/app/components/diff-version-selector.js
@@ -3,7 +3,7 @@ import Component from '@glimmer/component';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { tracked } from '@glimmer/tracking';
-import { htmlSafe } from '@ember/string';
+import { htmlSafe } from '@ember/template';
 
 /**
  * @module DiffVersionSelector
diff --git a/ui/app/components/flash-message.js b/ui/app/components/flash-message.js
index 788e0a34caeb..49f026db37b2 100644
--- a/ui/app/components/flash-message.js
+++ b/ui/app/components/flash-message.js
@@ -1,15 +1,11 @@
-import { computed } from '@ember/object';
+/* eslint-disable ember/no-computed-properties-in-native-classes */
 import FlashMessage from 'ember-cli-flash/components/flash-message';
 
-export default FlashMessage.extend({
+export default class FlashMessageComponent extends FlashMessage {
   // override alertType to get Bulma specific prefix
-  //https://github.com/poteto/ember-cli-flash/blob/master/addon/components/flash-message.js#L35
-  alertType: computed('flash.type', {
-    get() {
-      const flashType = this.flash.type || '';
-      let prefix = 'is-';
-
-      return `${prefix}${flashType}`;
-    },
-  }),
-});
+  //https://github.com/poteto/ember-cli-flash/blob/master/addon/components/flash-message.js#L55
+  get alertType() {
+    const flashType = this.args.flash.type || '';
+    return `is-${flashType}`;
+  }
+}
diff --git a/ui/app/components/generate-credentials.js b/ui/app/components/generate-credentials.js
index 630c0a0ba0d9..0b197f8e8532 100644
--- a/ui/app/components/generate-credentials.js
+++ b/ui/app/components/generate-credentials.js
@@ -66,7 +66,9 @@ export default Component.extend({
   },
 
   willDestroy() {
-    this.model.unloadRecord();
+    if (!this.model.isDestroyed && !this.model.isDestroying) {
+      this.model.unloadRecord();
+    }
     this._super(...arguments);
   },
 
diff --git a/ui/app/components/kv-object-editor.js b/ui/app/components/kv-object-editor.js
index 907e2f997f3c..100aadc36e4b 100644
--- a/ui/app/components/kv-object-editor.js
+++ b/ui/app/components/kv-object-editor.js
@@ -33,12 +33,6 @@ import KVObject from 'vault/lib/kv-object';
 export default class KvObjectEditor extends Component {
   @tracked kvData;
 
-  constructor() {
-    super(...arguments);
-    this.kvData = KVObject.create({ content: [] }).fromJSON(this.args.value);
-    this.addRow();
-  }
-
   get placeholders() {
     return {
       key: this.args.keyPlaceholder || 'key',
@@ -49,6 +43,12 @@ export default class KvObjectEditor extends Component {
     return this.kvData.uniqBy('name').length !== this.kvData.get('length');
   }
 
+  // fired on did-insert from render modifier
+  @action
+  createKvData(elem, [value]) {
+    this.kvData = KVObject.create({ content: [] }).fromJSON(value);
+    this.addRow();
+  }
   @action
   addRow() {
     if (!isNone(this.kvData.findBy('name', ''))) {
diff --git a/ui/app/components/mount-backend-form.js b/ui/app/components/mount-backend-form.js
index 980e0586dbd3..b3b3a6bff3b0 100644
--- a/ui/app/components/mount-backend-form.js
+++ b/ui/app/components/mount-backend-form.js
@@ -95,7 +95,8 @@ export default class MountBackendForm extends Component {
 
   @task
   @waitFor
-  *mountBackend() {
+  *mountBackend(event) {
+    event.preventDefault();
     const mountModel = this.mountModel;
     const { type, path } = mountModel;
     // only submit form if validations pass
diff --git a/ui/app/components/oidc/provider-form.js b/ui/app/components/oidc/provider-form.js
index 404a3c25344a..2b0f4224f585 100644
--- a/ui/app/components/oidc/provider-form.js
+++ b/ui/app/components/oidc/provider-form.js
@@ -31,12 +31,6 @@ export default class OidcProviderForm extends Component {
       ? 'allow_all'
       : 'limited';
 
-  constructor() {
-    super(...arguments);
-    const { model } = this.args;
-    model.issuer = model.isNew ? '' : parseURL(model.issuer).origin;
-  }
-
   // function passed to search select
   renderInfoTooltip(selection, dropdownOptions) {
     // if a client has been deleted it will not exist in dropdownOptions (response from search select's query)
@@ -44,6 +38,12 @@ export default class OidcProviderForm extends Component {
     return !clientExists ? 'The application associated with this client_id no longer exists' : false;
   }
 
+  // fired on did-insert from render modifier
+  @action
+  setIssuer(elem, [model]) {
+    model.issuer = model.isNew ? '' : parseURL(model.issuer).origin;
+  }
+
   @action
   handleClientSelection(selection) {
     // if array then coming from search-select component, set selection as model clients
diff --git a/ui/app/components/pki/config-pki-ca.js b/ui/app/components/pki/config-pki-ca.js
index c7ae3172ab39..223b8928686a 100644
--- a/ui/app/components/pki/config-pki-ca.js
+++ b/ui/app/components/pki/config-pki-ca.js
@@ -70,7 +70,7 @@ export default Component.extend({
 
   willDestroy() {
     const ca = this.model;
-    if (ca) {
+    if (ca && !ca.isDestroyed && !ca.isDestroying) {
       ca.unloadRecord();
     }
     this._super(...arguments);
diff --git a/ui/app/components/raft-join.js b/ui/app/components/raft-join.js
index 41de3921deb3..67b7acae1f9c 100644
--- a/ui/app/components/raft-join.js
+++ b/ui/app/components/raft-join.js
@@ -24,7 +24,8 @@ export default Component.extend({
   preference: 'join',
   showJoinForm: false,
   actions: {
-    advanceFirstScreen() {
+    advanceFirstScreen(event) {
+      event.preventDefault();
       if (this.preference !== 'join') {
         this.onDismiss();
         return;
diff --git a/ui/app/components/secret-create-or-update.js b/ui/app/components/secret-create-or-update.js
index ea7ba030942f..52b86a879517 100644
--- a/ui/app/components/secret-create-or-update.js
+++ b/ui/app/components/secret-create-or-update.js
@@ -27,11 +27,9 @@ import Component from '@glimmer/component';
 import ControlGroupError from 'vault/lib/control-group-error';
 import Ember from 'ember';
 import keys from 'vault/lib/keycodes';
-
 import { action, set } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
-
 import { isBlank, isNone } from '@ember/utils';
 import { task, waitForEvent } from 'ember-concurrency';
 
@@ -52,9 +50,9 @@ export default class SecretCreateOrUpdate extends Component {
   @service store;
   @service wizard;
 
-  constructor() {
-    super(...arguments);
-    this.codemirrorString = this.args.secretData.toJSONString();
+  @action
+  setup(elem, [secretData, model, mode]) {
+    this.codemirrorString = secretData.toJSONString();
     this.validationMessages = {
       path: '',
     };
@@ -62,16 +60,16 @@ export default class SecretCreateOrUpdate extends Component {
     if (Ember.testing) {
       this.secretPaths = ['beep', 'bop', 'boop'];
     } else {
-      let adapter = this.store.adapterFor('secret-v2');
-      let type = { modelName: 'secret-v2' };
-      let query = { backend: this.args.model.backend };
+      const adapter = this.store.adapterFor('secret-v2');
+      const type = { modelName: 'secret-v2' };
+      const query = { backend: model.backend };
       adapter.query(this.store, type, query).then((result) => {
         this.secretPaths = result.data.keys;
       });
     }
     this.checkRows();
 
-    if (this.args.mode === 'edit') {
+    if (mode === 'edit') {
       this.addRow();
     }
   }
diff --git a/ui/app/components/secret-edit.js b/ui/app/components/secret-edit.js
index 65b3f29d9cc2..52c06e560b6a 100644
--- a/ui/app/components/secret-edit.js
+++ b/ui/app/components/secret-edit.js
@@ -34,18 +34,17 @@ export default class SecretEdit extends Component {
   @tracked isV2 = false;
   @tracked codemirrorString = null;
 
-  constructor() {
-    super(...arguments);
-    let secrets = this.args.model.secretData;
-    if (!secrets && this.args.model.selectedVersion) {
+  // fired on did-insert from render modifier
+  @action
+  createKvData(elem, [model]) {
+    if (!model.secretData && model.selectedVersion) {
       this.isV2 = true;
-      secrets = this.args.model.belongsTo('selectedVersion').value().secretData;
+      model.secretData = model.belongsTo('selectedVersion').value().secretData;
     }
-    const data = KVObject.create({ content: [] }).fromJSON(secrets);
-    this.secretData = data;
-    this.codemirrorString = data.toJSONString();
+    this.secretData = KVObject.create({ content: [] }).fromJSON(model.secretData);
+    this.codemirrorString = this.secretData.toJSONString();
     if (this.wizard.featureState === 'details' && this.args.mode === 'create') {
-      let engine = this.args.model.backend.includes('kv') ? 'kv' : this.args.model.backend;
+      const engine = model.backend.includes('kv') ? 'kv' : model.backend;
       this.wizard.transitionFeatureMachine('details', 'CONTINUE', engine);
     }
   }
diff --git a/ui/app/components/transform-role-edit.js b/ui/app/components/transform-role-edit.js
index ac02d1ae8a76..23d5caf505c7 100644
--- a/ui/app/components/transform-role-edit.js
+++ b/ui/app/components/transform-role-edit.js
@@ -2,6 +2,7 @@ import TransformBase, { addToList, removeFromList } from './transform-edit-base'
 import { inject as service } from '@ember/service';
 
 export default TransformBase.extend({
+  flashMessages: service(),
   store: service(),
   initialTransformations: null,
 
diff --git a/ui/app/components/transformation-edit.js b/ui/app/components/transformation-edit.js
index 9ce050a51de8..ec65ea3e88fb 100644
--- a/ui/app/components/transformation-edit.js
+++ b/ui/app/components/transformation-edit.js
@@ -2,6 +2,7 @@ import TransformBase, { addToList, removeFromList } from './transform-edit-base'
 import { inject as service } from '@ember/service';
 
 export default TransformBase.extend({
+  flashMessages: service(),
   store: service(),
   initialRoles: null,
 
diff --git a/ui/app/components/transit-key-actions.js b/ui/app/components/transit-key-actions.js
index 1fd3894923b4..42f5a9d999c9 100644
--- a/ui/app/components/transit-key-actions.js
+++ b/ui/app/components/transit-key-actions.js
@@ -216,7 +216,11 @@ export default Component.extend(TRANSIT_PARAMS, {
       this.toggleProperty('isModalActive');
     },
 
-    doSubmit(data, options = {}) {
+    doSubmit(data, options = {}, maybeEvent) {
+      const event = options.type === 'submit' ? options : maybeEvent;
+      if (event) {
+        event.preventDefault();
+      }
       const { backend, id } = this.getModelInfo();
       const action = this.selectedAction;
       const { encodedBase64, ...formData } = data || {};
diff --git a/ui/app/components/wrap-ttl.js b/ui/app/components/wrap-ttl.js
index 19b5afb74aa0..395a657c4835 100644
--- a/ui/app/components/wrap-ttl.js
+++ b/ui/app/components/wrap-ttl.js
@@ -32,8 +32,8 @@ export default Component.extend({
         label='Wrap response'
         helperTextDisabled='Will not wrap response'
         helperTextEnabled='Will wrap response with a lease of'
-        enableTTL=wrapResponse
-        initialValue=ttl
+        enableTTL=this.wrapResponse
+        initialValue=this.ttl
         onChange=(action 'changedValue')
       }}
     </div>
diff --git a/ui/app/controllers/vault/cluster.js b/ui/app/controllers/vault/cluster.js
index 8528655e82d4..cd33af43b01f 100644
--- a/ui/app/controllers/vault/cluster.js
+++ b/ui/app/controllers/vault/cluster.js
@@ -10,6 +10,7 @@ export default Controller.extend({
   router: service(),
   permissions: service(),
   namespaceService: service('namespace'),
+  flashMessages: service(),
 
   vaultVersion: service('version'),
   console: service(),
diff --git a/ui/app/controllers/vault/cluster/access/methods.js b/ui/app/controllers/vault/cluster/access/methods.js
index 222874afc85e..4ed0409331ac 100644
--- a/ui/app/controllers/vault/cluster/access/methods.js
+++ b/ui/app/controllers/vault/cluster/access/methods.js
@@ -1,7 +1,10 @@
 import Controller from '@ember/controller';
 import { task } from 'ember-concurrency';
+import { inject as service } from '@ember/service';
 
 export default Controller.extend({
+  flashMessages: service(),
+
   queryParams: {
     page: 'page',
     pageFilter: 'pageFilter',
diff --git a/ui/app/controllers/vault/cluster/auth.js b/ui/app/controllers/vault/cluster/auth.js
index 496ceaf1c8bc..76f9bb9f78a6 100644
--- a/ui/app/controllers/vault/cluster/auth.js
+++ b/ui/app/controllers/vault/cluster/auth.js
@@ -4,20 +4,18 @@ import Controller, { inject as controller } from '@ember/controller';
 import { task, timeout } from 'ember-concurrency';
 
 export default Controller.extend({
+  flashMessages: service(),
   vaultController: controller('vault'),
   clusterController: controller('vault.cluster'),
   namespaceService: service('namespace'),
   featureFlagService: service('featureFlag'),
   auth: service(),
   router: service(),
-
   queryParams: [{ authMethod: 'with', oidcProvider: 'o' }],
-
   namespaceQueryParam: alias('clusterController.namespaceQueryParam'),
   wrappedToken: alias('vaultController.wrappedToken'),
   redirectTo: alias('vaultController.redirectTo'),
   managedNamespaceRoot: alias('featureFlagService.managedNamespaceRoot'),
-
   authMethod: '',
   oidcProvider: '',
 
diff --git a/ui/app/controllers/vault/cluster/secrets/backends.js b/ui/app/controllers/vault/cluster/secrets/backends.js
index d3daf50134f7..95b173d2bcf6 100644
--- a/ui/app/controllers/vault/cluster/secrets/backends.js
+++ b/ui/app/controllers/vault/cluster/secrets/backends.js
@@ -3,9 +3,11 @@ import { computed } from '@ember/object';
 import Controller from '@ember/controller';
 import { task } from 'ember-concurrency';
 import { supportedSecretBackends } from 'vault/helpers/supported-secret-backends';
+import { inject as service } from '@ember/service';
 const LINKED_BACKENDS = supportedSecretBackends();
 
 export default Controller.extend({
+  flashMessages: service(),
   displayableBackends: filterBy('model', 'shouldIncludeInList'),
 
   supportedBackends: computed('displayableBackends', 'displayableBackends.[]', function () {
diff --git a/ui/app/controllers/vault/cluster/settings/configure-secret-backend.js b/ui/app/controllers/vault/cluster/settings/configure-secret-backend.js
index 9ce582a1d6b0..6908b07ecac5 100644
--- a/ui/app/controllers/vault/cluster/settings/configure-secret-backend.js
+++ b/ui/app/controllers/vault/cluster/settings/configure-secret-backend.js
@@ -57,7 +57,6 @@ export default Controller.extend(CONFIG_ATTRS, {
           },
         })
         .then(() => {
-          this.model.send('pushedData');
           this.reset();
           this.flashMessages.success('The backend configuration saved successfully!');
         })
diff --git a/ui/app/modifiers/code-mirror.js b/ui/app/modifiers/code-mirror.js
index f018c0974855..d1a31041079b 100644
--- a/ui/app/modifiers/code-mirror.js
+++ b/ui/app/modifiers/code-mirror.js
@@ -29,7 +29,10 @@ export default class CodeMirrorModifier extends Modifier {
 
   @action
   _onChange(editor) {
-    this.args.named.onUpdate(editor.getValue(), this._editor);
+    // avoid sending change event after initial setup when editor value is set to content
+    if (this.args.named.content !== editor.getValue()) {
+      this.args.named.onUpdate(editor.getValue(), this._editor);
+    }
   }
 
   @action
diff --git a/ui/app/serializers/auth-method.js b/ui/app/serializers/auth-method.js
index 9b2ba244ccfc..f68e50e37af0 100644
--- a/ui/app/serializers/auth-method.js
+++ b/ui/app/serializers/auth-method.js
@@ -8,7 +8,7 @@ export default ApplicationSerializer.extend(EmbeddedRecordsMixin, {
   normalize(modelClass, data) {
     // embedded records need a unique value to be stored
     // use the uuid from the auth-method as the unique id for mount-config
-    if (data.config) {
+    if (data.config && !data.config.id) {
       data.config.id = data.uuid;
     }
     return this._super(modelClass, data);
diff --git a/ui/app/templates/components/auth-form.hbs b/ui/app/templates/components/auth-form.hbs
index db216af8a376..4924ac01cfdd 100644
--- a/ui/app/templates/components/auth-form.hbs
+++ b/ui/app/templates/components/auth-form.hbs
@@ -91,7 +91,7 @@
           />
         </AuthJwt>
       {{else}}
-        <form id="auth-form" onsubmit={{action "doSubmit"}}>
+        <form id="auth-form" onsubmit={{action "doSubmit" null}}>
           {{#if (eq this.providerName "github")}}
             <div class="field">
               <label for="token" class="is-label">GitHub token</label>
diff --git a/ui/app/templates/components/kv-object-editor.hbs b/ui/app/templates/components/kv-object-editor.hbs
index aaed61599210..5f63876ad412 100644
--- a/ui/app/templates/components/kv-object-editor.hbs
+++ b/ui/app/templates/components/kv-object-editor.hbs
@@ -1,4 +1,4 @@
-<div class="field" ...attributes>
+<div class="field" ...attributes {{did-insert this.createKvData @value}}>
   <FormFieldLabel
     @label={{@label}}
     @helpText={{@helpText}}
@@ -11,59 +11,61 @@
       <AlertInline @type="danger" @message={{@validationError}} @paddingTop={{true}} />
     </div>
   {{/if}}
-  {{#each this.kvData as |row index|}}
-    <div class="columns is-variable" data-test-kv-row>
-      <div class="column is-one-quarter">
-        <Input
-          data-test-kv-key={{true}}
-          @value={{row.name}}
-          placeholder={{this.placeholders.key}}
-          {{on "change" (fn this.updateRow row index)}}
-          class="input"
-        />
-      </div>
-      <div class="column">
-        {{#if (has-block)}}
-          {{yield row this.kvData}}
-        {{else}}
-          <Textarea
-            data-test-kv-value={{index}}
-            name={{row.name}}
-            class="input {{if @validationError 'has-error-border'}}"
-            @value={{row.value}}
-            wrap="off"
-            placeholder={{this.placeholders.value}}
-            rows={{1}}
+  {{#if this.kvData}}
+    {{#each this.kvData as |row index|}}
+      <div class="columns is-variable" data-test-kv-row>
+        <div class="column is-one-quarter">
+          <Input
+            data-test-kv-key={{true}}
+            @value={{row.name}}
+            placeholder={{this.placeholders.key}}
             {{on "change" (fn this.updateRow row index)}}
-            {{on "keyup" this.handleKeyUp}}
+            class="input"
           />
-        {{/if}}
-      </div>
-      <div class="column is-narrow">
-        {{#if (eq this.kvData.length (inc index))}}
-          <button type="button" {{action "addRow"}} class="button is-outlined is-primary" data-test-kv-add-row={{true}}>
-            Add
-          </button>
-        {{else}}
-          <button
-            class="button has-text-grey is-expanded is-icon"
-            type="button"
-            {{action "deleteRow" row index}}
-            aria-label="Delete row"
-            data-test-kv-delete-row={{index}}
-          >
-            <Icon @name="trash" />
-          </button>
-        {{/if}}
+        </div>
+        <div class="column">
+          {{#if (has-block)}}
+            {{yield row this.kvData}}
+          {{else}}
+            <Textarea
+              data-test-kv-value={{index}}
+              name={{row.name}}
+              class="input {{if @validationError 'has-error-border'}}"
+              @value={{row.value}}
+              wrap="off"
+              placeholder={{this.placeholders.value}}
+              rows={{1}}
+              {{on "change" (fn this.updateRow row index)}}
+              {{on "keyup" this.handleKeyUp}}
+            />
+          {{/if}}
+        </div>
+        <div class="column is-narrow">
+          {{#if (eq this.kvData.length (inc index))}}
+            <button type="button" {{action "addRow"}} class="button is-outlined is-primary" data-test-kv-add-row={{true}}>
+              Add
+            </button>
+          {{else}}
+            <button
+              class="button has-text-grey is-expanded is-icon"
+              type="button"
+              {{action "deleteRow" row index}}
+              aria-label="Delete row"
+              data-test-kv-delete-row={{index}}
+            >
+              <Icon @name="trash" />
+            </button>
+          {{/if}}
+        </div>
       </div>
-    </div>
-  {{/each}}
-  {{#if this.hasDuplicateKeys}}
-    <AlertBanner
-      @type="warning"
-      @message="More than one key shares the same name. Please be sure to have unique key names or some data may be lost when saving."
-      @class="is-marginless"
-      data-test-duplicate-error-warnings
-    />
+    {{/each}}
+    {{#if this.hasDuplicateKeys}}
+      <AlertBanner
+        @type="warning"
+        @message="More than one key shares the same name. Please be sure to have unique key names or some data may be lost when saving."
+        @class="is-marginless"
+        data-test-duplicate-error-warnings
+      />
+    {{/if}}
   {{/if}}
 </div>
\ No newline at end of file
diff --git a/ui/app/templates/components/oidc/provider-form.hbs b/ui/app/templates/components/oidc/provider-form.hbs
index 7e9791744143..d62321d22788 100644
--- a/ui/app/templates/components/oidc/provider-form.hbs
+++ b/ui/app/templates/components/oidc/provider-form.hbs
@@ -25,7 +25,7 @@
   </p.levelLeft>
 </PageHeader>
 
-<form {{on "submit" (perform this.save)}}>
+<form {{on "submit" (perform this.save)}} {{did-insert this.setIssuer @model}}>
   <div class="box is-sideless is-fullwidth is-bottomless">
     <MessageError @errorMessage={{this.errorBanner}} class="has-top-margin-s" />
     {{! name field }}
diff --git a/ui/app/templates/components/secret-create-or-update.hbs b/ui/app/templates/components/secret-create-or-update.hbs
index b810da6acd3e..9a6b0022772c 100644
--- a/ui/app/templates/components/secret-create-or-update.hbs
+++ b/ui/app/templates/components/secret-create-or-update.hbs
@@ -3,6 +3,7 @@
     class={{if @showAdvancedMode "advanced-edit" "simple-edit"}}
     onsubmit={{action "createOrUpdateKey" @mode}}
     aria-label="secret create form"
+    {{did-insert this.setup @secretData @model @mode}}
   >
     <div class="field box is-fullwidth is-sideless is-marginless">
       <NamespaceReminder @mode="create" @noun="secret" />
@@ -153,7 +154,11 @@
 
 {{#if (eq @mode "edit")}}
   {{! no metadata option because metadata is version agnostic }}
-  <form onsubmit={{action "createOrUpdateKey" "edit"}} aria-label="secret edit form">
+  <form
+    onsubmit={{action "createOrUpdateKey" "edit"}}
+    aria-label="secret edit form"
+    {{did-insert this.setup @secretData @model @mode}}
+  >
     <div class="box is-sideless is-fullwidth is-marginless padding-top">
       <MessageError @model={{@modelForData}} @errorMessage={{this.error}} />
       {{#if (eq @canReadSecretData false)}}
diff --git a/ui/app/templates/components/secret-edit.hbs b/ui/app/templates/components/secret-edit.hbs
index e55d46fb2eb4..1f791611355a 100644
--- a/ui/app/templates/components/secret-edit.hbs
+++ b/ui/app/templates/components/secret-edit.hbs
@@ -1,81 +1,85 @@
-<PageHeader as |p|>
-  <p.top>
-    <KeyValueHeader
-      @baseKey={{@baseKey}}
-      @path="vault.cluster.secrets.backend.list"
-      @mode={{@mode}}
-      @root={{@root}}
-      @showCurrent={{true}}
-    />
-  </p.top>
-  <p.levelLeft>
-    <h1 class="title is-3">
-      {{#if (eq @mode "create")}}
-        Create secret
-      {{else if (and this.isV2 (eq @mode "edit"))}}
-        Create new version
-      {{else if (eq @mode "edit")}}
-        Edit secret
-      {{else}}
-        {{@key.id}}
-      {{/if}}
-    </h1>
-  </p.levelLeft>
-</PageHeader>
-{{! tabs for show only }}
-{{#if (eq @mode "show")}}
-  <div class="tabs-container box is-bottomless is-marginless is-fullwidth is-paddingless">
-    <nav class="tabs">
-      <ul>
-        <LinkTo @route="vault.cluster.secrets.backend.show" @model={{@key.id}} data-test-secret-tab>
-          Secret
-        </LinkTo>
-        {{! must have read access to /metadata see tab or update to update metadata}}
-        {{#if (or this.canReadSecretMetadata this.canUpdateSecretMetadata)}}
-          <LinkTo @route="vault.cluster.secrets.backend.metadata" @model={{@key.id}} data-test-secret-metadata-tab>
-            Metadata
-          </LinkTo>
+<div {{did-insert this.createKvData @model}}>
+  <PageHeader as |p|>
+    <p.top>
+      <KeyValueHeader
+        @baseKey={{@baseKey}}
+        @path="vault.cluster.secrets.backend.list"
+        @mode={{@mode}}
+        @root={{@root}}
+        @showCurrent={{true}}
+      />
+    </p.top>
+    <p.levelLeft>
+      <h1 class="title is-3">
+        {{#if (eq @mode "create")}}
+          Create secret
+        {{else if (and this.isV2 (eq @mode "edit"))}}
+          Create new version
+        {{else if (eq @mode "edit")}}
+          Edit secret
+        {{else}}
+          {{@key.id}}
         {{/if}}
-      </ul>
-    </nav>
-  </div>
-{{/if}}
+      </h1>
+    </p.levelLeft>
+  </PageHeader>
+  {{! tabs for show only }}
+  {{#if (eq @mode "show")}}
+    <div class="tabs-container box is-bottomless is-marginless is-fullwidth is-paddingless">
+      <nav class="tabs">
+        <ul>
+          <LinkTo @route="vault.cluster.secrets.backend.show" @model={{@key.id}} data-test-secret-tab>
+            Secret
+          </LinkTo>
+          {{! must have read access to /metadata see tab or update to update metadata}}
+          {{#if (or this.canReadSecretMetadata this.canUpdateSecretMetadata)}}
+            <LinkTo @route="vault.cluster.secrets.backend.metadata" @model={{@key.id}} data-test-secret-metadata-tab>
+              Metadata
+            </LinkTo>
+          {{/if}}
+        </ul>
+      </nav>
+    </div>
+  {{/if}}
 
-<SecretEditToolbar
-  @mode={{@mode}}
-  @model={{@model}}
-  @isV2={{this.isV2}}
-  @isWriteWithoutRead={{this.isWriteWithoutRead}}
-  @secretDataIsAdvanced={{this.secretDataIsAdvanced}}
-  @showAdvancedMode={{this.showAdvancedMode}}
-  @modelForData={{this.modelForData}}
-  @canUpdateSecretData={{this.canUpdateSecretData}}
-  @canReadSecretMetadata={{this.canReadSecretMetadata}}
-  @codemirrorString={{this.codemirrorString}}
-  @editActions={{hash toggleAdvanced=(action "toggleAdvanced") refresh=(action "refresh")}}
-/>
+  {{#if (not-eq this.secretData null)}}
+    <SecretEditToolbar
+      @mode={{@mode}}
+      @model={{@model}}
+      @isV2={{this.isV2}}
+      @isWriteWithoutRead={{this.isWriteWithoutRead}}
+      @secretDataIsAdvanced={{this.secretDataIsAdvanced}}
+      @showAdvancedMode={{this.showAdvancedMode}}
+      @modelForData={{this.modelForData}}
+      @canUpdateSecretData={{this.canUpdateSecretData}}
+      @canReadSecretMetadata={{this.canReadSecretMetadata}}
+      @codemirrorString={{this.codemirrorString}}
+      @editActions={{hash toggleAdvanced=(action "toggleAdvanced") refresh=(action "refresh")}}
+    />
 
-{{#if (or (eq @mode "create") (eq @mode "edit"))}}
-  <SecretCreateOrUpdate
-    @mode={{@mode}}
-    @model={{@model}}
-    @showAdvancedMode={{this.showAdvancedMode}}
-    @modelForData={{this.modelForData}}
-    @error={{this.error}}
-    @isV2={{this.isV2}}
-    @secretData={{this.secretData}}
-    @buttonDisabled={{this.buttonDisabled}}
-    @canUpdateSecretMetadata={{this.canUpdateSecretMetadata}}
-    @canReadSecretData={{this.canReadSecretData}}
-    @canReadSecretMetadata={{this.canReadSecretMetadata}}
-  />
-{{else if (eq @mode "show")}}
-  <SecretFormShow
-    @isV2={{this.isV2}}
-    @modelForData={{this.modelForData}}
-    @isWriteWithoutRead={{this.isWriteWithoutRead}}
-    @showAdvancedMode={{this.showAdvancedMode}}
-  />
-{{else}}
-  <EmptyState @title="No secret view was selected" />
-{{/if}}
\ No newline at end of file
+    {{#if (or (eq @mode "create") (eq @mode "edit"))}}
+      <SecretCreateOrUpdate
+        @mode={{@mode}}
+        @model={{@model}}
+        @showAdvancedMode={{this.showAdvancedMode}}
+        @modelForData={{this.modelForData}}
+        @error={{this.error}}
+        @isV2={{this.isV2}}
+        @secretData={{this.secretData}}
+        @buttonDisabled={{this.buttonDisabled}}
+        @canUpdateSecretMetadata={{this.canUpdateSecretMetadata}}
+        @canReadSecretData={{this.canReadSecretData}}
+        @canReadSecretMetadata={{this.canReadSecretMetadata}}
+      />
+    {{else if (eq @mode "show")}}
+      <SecretFormShow
+        @isV2={{this.isV2}}
+        @modelForData={{this.modelForData}}
+        @isWriteWithoutRead={{this.isWriteWithoutRead}}
+        @showAdvancedMode={{this.showAdvancedMode}}
+      />
+    {{else}}
+      <EmptyState @title="No secret view was selected" />
+    {{/if}}
+  {{/if}}
+</div>
\ No newline at end of file
diff --git a/ui/app/templates/components/tool-actions-form.hbs b/ui/app/templates/components/tool-actions-form.hbs
index aada57d35cc5..27781f0f38f6 100644
--- a/ui/app/templates/components/tool-actions-form.hbs
+++ b/ui/app/templates/components/tool-actions-form.hbs
@@ -7,7 +7,7 @@
       @algorithm={{this.algorithm}}
       @errors={{this.errors}}
       @format={{this.format}}
-      @input={{input}}
+      @input={{this.input}}
     />
     {{! template-lint-enable no-passed-in-event-handlers }}
   {{else if (eq this.selectedAction "random")}}
diff --git a/ui/app/templates/vault/cluster/tools/tool.hbs b/ui/app/templates/vault/cluster/tools/tool.hbs
index 68405b2e4c08..8ed3fdc77c42 100644
--- a/ui/app/templates/vault/cluster/tools/tool.hbs
+++ b/ui/app/templates/vault/cluster/tools/tool.hbs
@@ -6,7 +6,7 @@
           <LinkTo
             @route="vault.cluster.tools.tool"
             @model={{supportedAction}}
-            class="(if (eq supportedAction selectedAction) 'is-active')"
+            class={{if (eq supportedAction this.selectedAction) "is-active"}}
             data-test-tools-action-link={{supportedAction}}
           >
             {{capitalize supportedAction}}
diff --git a/ui/app/utils/field-to-attrs.js b/ui/app/utils/field-to-attrs.js
index 2b0eb5f38842..06113f8f6e60 100644
--- a/ui/app/utils/field-to-attrs.js
+++ b/ui/app/utils/field-to-attrs.js
@@ -65,12 +65,13 @@ export const expandAttributeMeta = function (modelClass, attributeNames) {
     } else {
       meta = getAttributeMeta(modelClass, field);
     }
+    const { type, options } = meta || {};
     return {
       // using field name here because it is the full path,
       // name on the attribute meta will be relative to the relationship if applicable
       name: field,
-      type: meta.type,
-      options: meta.options,
+      type,
+      options,
     };
   });
 };
diff --git a/ui/config/content-security-policy.js b/ui/config/content-security-policy.js
new file mode 100644
index 000000000000..5fadd84c8c63
--- /dev/null
+++ b/ui/config/content-security-policy.js
@@ -0,0 +1,18 @@
+module.exports = function (environment) {
+  return {
+    delivery: ['header', 'meta'],
+    enabled: environment !== 'production',
+    failTests: true,
+    policy: {
+      'default-src': ["'none'"],
+      'script-src': ["'self'"],
+      'font-src': ["'self'"],
+      'connect-src': ["'self'"],
+      'img-src': ["'self'", 'data:'],
+      'style-src': ["'unsafe-inline'", "'self'"],
+      'media-src': ["'self'"],
+      'form-action': ["'none'"],
+    },
+    reportOnly: false,
+  };
+};
diff --git a/ui/config/environment.js b/ui/config/environment.js
index 408b36c111f8..1ffd9ed1c21e 100644
--- a/ui/config/environment.js
+++ b/ui/config/environment.js
@@ -68,16 +68,6 @@ module.exports = function (environment) {
   }
   if (environment !== 'production') {
     ENV.APP.DEFAULT_PAGE_SIZE = 15;
-    ENV.contentSecurityPolicyHeader = 'Content-Security-Policy';
-    ENV.contentSecurityPolicyMeta = true;
-    ENV.contentSecurityPolicy = {
-      'connect-src': ["'self'"],
-      'img-src': ["'self'", 'data:'],
-      'font-src': ["'self'"],
-      'form-action': ["'none'"],
-      'script-src': ["'self'"],
-      'style-src': ["'unsafe-inline'", "'self'"],
-    };
   }
 
   ENV.welcomeMessage = process.env.UI_AUTH_WELCOME;
diff --git a/ui/lib/core/addon/components/autocomplete-input.hbs b/ui/lib/core/addon/components/autocomplete-input.hbs
index f808ae6a5bb0..d30f9fca13d4 100644
--- a/ui/lib/core/addon/components/autocomplete-input.hbs
+++ b/ui/lib/core/addon/components/autocomplete-input.hbs
@@ -11,7 +11,7 @@
       class="input"
       {{on "input" this.onInput}}
     />
-    <BasicDropdown @registerAPI={{fn (mut this.dropdownAPI)}} @renderInPlace={{true}} as |D|>
+    <BasicDropdown @registerAPI={{this.setDropdownAPI}} @renderInPlace={{true}} as |D|>
       <D.Content @defaultClass="autocomplete-input">
         {{#each @options as |option|}}
           <div class="autocomplete-input-option" role="button" {{on "click" (fn this.selectOption option.value)}}>
diff --git a/ui/lib/core/addon/components/autocomplete-input.js b/ui/lib/core/addon/components/autocomplete-input.js
index 695113c77355..ccd38fcbcbef 100644
--- a/ui/lib/core/addon/components/autocomplete-input.js
+++ b/ui/lib/core/addon/components/autocomplete-input.js
@@ -28,6 +28,10 @@ export default class AutocompleteInput extends Component {
     this.inputElement = element.querySelector('.input');
   }
   @action
+  setDropdownAPI(dropdownAPI) {
+    this.dropdownAPI = dropdownAPI;
+  }
+  @action
   onInput(event) {
     const { options = [], optionsTrigger } = this.args;
     if (optionsTrigger && options.length) {
diff --git a/ui/lib/core/addon/components/info-table-row.hbs b/ui/lib/core/addon/components/info-table-row.hbs
index 0ad903dfcec2..c390dc606361 100644
--- a/ui/lib/core/addon/components/info-table-row.hbs
+++ b/ui/lib/core/addon/components/info-table-row.hbs
@@ -87,7 +87,7 @@
                   @clipboardText={{@tooltipText}}
                   @success={{action (set-flash-message "Data copied!")}}
                   @tagName="div"
-                  @disabled={{not @isTooltipCopyable}}
+                  disabled={{not @isTooltipCopyable}}
                   class={{if @isTooltipCopyable "has-pointer"}}
                   data-test-tooltip-copy
                 >
diff --git a/ui/lib/core/addon/components/string-list.js b/ui/lib/core/addon/components/string-list.js
index 73b1ce59bb98..29e87030cac5 100644
--- a/ui/lib/core/addon/components/string-list.js
+++ b/ui/lib/core/addon/components/string-list.js
@@ -63,7 +63,7 @@ export default class StringList extends Component {
 
   toVal() {
     const inputs = this.inputList.filter((x) => x.value).mapBy('value');
-    if (this.format === 'string') {
+    if (this.args.type === 'string') {
       return inputs.join(',');
     }
     return inputs;
diff --git a/ui/lib/pki/addon/templates/issuers/index.hbs b/ui/lib/pki/addon/templates/issuers/index.hbs
index 332093f0cdf8..252f65a923e0 100644
--- a/ui/lib/pki/addon/templates/issuers/index.hbs
+++ b/ui/lib/pki/addon/templates/issuers/index.hbs
@@ -9,7 +9,7 @@
         <Chevron @direction="down" @isButton={{true}} />
       </D.Trigger>
       <D.Content @defaultClass="popup-menu-content">
-        <nav class="box menu">
+        <nav class="box menu" aria-label="generate options">
           <ul class="menu-list">
             <li class="action">
               <LinkTo @route="configuration.create.generate-root" {{on "click" (fn this.onLinkClick D)}}>
@@ -50,7 +50,7 @@
         <div class="level-right is-flex is-paddingless is-marginless">
           <div class="level-item">
             <PopupMenu>
-              <nav class="menu">
+              <nav class="menu" aria-label="issuer config options">
                 <ul class="menu-list">
                   <li>
                     <LinkTo @route="roles.role.details" @model={{pkiIssuer.id}}>
diff --git a/ui/mirage/identity-managers/application.js b/ui/mirage/identity-managers/application.js
index 0f1f74afb7f6..435d5bd6bb7f 100644
--- a/ui/mirage/identity-managers/application.js
+++ b/ui/mirage/identity-managers/application.js
@@ -1,3 +1,3 @@
-import IdentityManager from '../../app/utils/identity-manager';
+import IdentityManager from 'vault/utils/identity-manager';
 // to more closely match the Vault backend this will return UUIDs as identifiers for records in mirage
 export default IdentityManager;
diff --git a/ui/package.json b/ui/package.json
index 9c419f701813..34745ef6f710 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -55,7 +55,7 @@
     "@ember/legacy-built-in-components": "^0.4.1",
     "@ember/optional-features": "^2.0.0",
     "@ember/render-modifiers": "^1.0.2",
-    "@ember/test-helpers": "^2.7.0",
+    "@ember/test-helpers": "2.8.1",
     "@ember/test-waiters": "^3.0.0",
     "@glimmer/component": "^1.1.2",
     "@glimmer/tracking": "^1.1.2",
@@ -86,12 +86,12 @@
     "deepmerge": "^4.0.0",
     "doctoc": "^2.2.0",
     "ember-auto-import": "2.4.2",
-    "ember-basic-dropdown": "4.0.3",
+    "ember-basic-dropdown": "6.0.1",
     "ember-cli": "~4.4.0",
     "ember-cli-autoprefixer": "^0.8.1",
     "ember-cli-babel": "^7.26.11",
     "ember-cli-clipboard": "0.16.0",
-    "ember-cli-content-security-policy": "^1.0.0",
+    "ember-cli-content-security-policy": "2.0.3",
     "ember-cli-dependency-checker": "^3.3.1",
     "ember-cli-deprecation-workflow": "^2.1.0",
     "ember-cli-flash": "4.0.0",
@@ -117,9 +117,9 @@
     "ember-modal-dialog": "4.0.0",
     "ember-modifier": "^3.1.0",
     "ember-page-title": "^7.0.0",
-    "ember-power-select": "^5.0.3",
+    "ember-power-select": "6.0.1",
     "ember-qrcode-shim": "^0.4.0",
-    "ember-qunit": "^5.1.5",
+    "ember-qunit": "6.0.0",
     "ember-resolver": "^8.0.3",
     "ember-responsive": "5.0.0",
     "ember-router-helpers": "^0.4.0",
@@ -177,7 +177,7 @@
   "resolutions": {
     "cryptiles": "^4.1.2",
     "eslint-utils": "^1.4.1",
-    "ember-basic-dropdown": "4.0.3",
+    "ember-basic-dropdown": "6.0.1",
     "growl": "^1.10.0",
     "handlebars": "^4.3.0",
     "highlight.js": "^10.4.1",
diff --git a/ui/scripts/codemods/inject-store-service.js b/ui/scripts/codemods/inject-service.js
similarity index 56%
rename from ui/scripts/codemods/inject-store-service.js
rename to ui/scripts/codemods/inject-service.js
index 25b04eadf272..6c25c0a4952c 100644
--- a/ui/scripts/codemods/inject-store-service.js
+++ b/ui/scripts/codemods/inject-service.js
@@ -3,19 +3,24 @@ import babylonParser from './jscodeshift-babylon-parser';
 // use babylon parser with decorators-legacy plugin
 export const parser = babylonParser;
 
-// example usage
-// npx jscodeshift -t ./scripts/codemods/inject-store-service.js ./app/**/*.js
+// checks for access of specified service on this
+// injects service if not present and imports inject as service if needed
+// example usage - npx jscodeshift -t ./scripts/codemods/inject-service.js ./app/**/*.js --service=store
+// --service arg is required with name of service
 // pass -d for dry run (no files transformed)
 
-export default function transformer({ source }, api) {
+export default function transformer({ source }, api, { service }) {
+  if (!service) {
+    throw new Error('Missing service arg. Pass --service=store for example to script');
+  }
   const j = api.jscodeshift;
-  const filterForStore = (path) => {
+  const filterForService = (path) => {
     return j(path.value).find(j.MemberExpression, {
       object: {
         type: 'ThisExpression',
       },
       property: {
-        name: 'store',
+        name: service,
       },
     }).length;
   };
@@ -25,45 +30,45 @@ export default function transformer({ source }, api) {
     quote: 'single',
     trailingComma: true,
   };
-  let didInjectStore = false;
+  let didInjectService = false;
 
-  // find class bodies and filter down to ones that access this.store
-  const classesAccessingStore = j(source).find(j.ClassBody).filter(filterForStore);
+  // find class bodies and filter down to ones that access service
+  const classesAccessingService = j(source).find(j.ClassBody).filter(filterForService);
 
-  if (classesAccessingStore.length) {
+  if (classesAccessingService.length) {
     // filter down to class bodies where service is not injected
-    const missingService = classesAccessingStore.filter((path) => {
+    const missingService = classesAccessingService.filter((path) => {
       return !j(path.value)
         .find(j.ClassProperty, {
           key: {
-            name: 'store',
+            name: service,
           },
         })
         .filter((path) => {
-          // ensure store property belongs to service decorator
+          // ensure service property belongs to service decorator
           return path.value.decorators.find((path) => path.expression.name === 'service');
         }).length;
     });
 
     if (missingService.length) {
-      // inject store service
-      const storeService = j.classProperty(j.identifier('@service store'), null);
-      // adding a decorator this way will force store down to a new line and then add a new line
+      // inject service
+      const serviceInjection = j.classProperty(j.identifier(`@service ${service}`), null);
+      // adding a decorator this way will force injection down to a new line and then add a new line
       // leaving in just in case it's needed
-      // storeService.decorators = [j.decorator(j.identifier('service'))];
+      // serviceInjection.decorators = [j.decorator(j.identifier('service'))];
 
       source = missingService
         .forEach((path) => {
-          path.value.body.unshift(storeService);
+          path.value.body.unshift(serviceInjection);
         })
         .toSource();
 
-      didInjectStore = true;
+      didInjectService = true;
     }
   }
 
-  // find .extend object expressions and filter down to ones that access this.store
-  const objectsAccessingStore = j(source)
+  // find .extend object expressions and filter down to ones that access this[service]
+  const objectsAccessingService = j(source)
     .find(j.CallExpression, {
       callee: {
         type: 'MemberExpression',
@@ -72,21 +77,21 @@ export default function transformer({ source }, api) {
         },
       },
     })
-    .filter(filterForStore)
+    .filter(filterForService)
     .find(j.ObjectExpression)
     .filter((path) => {
       // filter object expressions that belong to .extend
-      // otherwise store will also be injected in actions: { } block of component for example
+      // otherwise service will also be injected in actions: { } block of component for example
       const callee = path.parent.value.callee;
       return callee && callee.property?.name === 'extend';
     });
 
-  if (objectsAccessingStore.length) {
+  if (objectsAccessingService.length) {
     // filter down to objects where service is not injected
-    const missingService = objectsAccessingStore.filter((path) => {
+    const missingService = objectsAccessingService.filter((path) => {
       return !j(path.value).find(j.ObjectProperty, {
         key: {
-          name: 'store',
+          name: service,
         },
         value: {
           callee: {
@@ -97,24 +102,24 @@ export default function transformer({ source }, api) {
     });
 
     if (missingService.length) {
-      // inject store service
-      const storeService = j.objectProperty(
-        j.identifier('store'),
+      // inject service
+      const serviceInjection = j.objectProperty(
+        j.identifier(service),
         j.callExpression(j.identifier('service'), [])
       );
 
       source = missingService
         .forEach((path) => {
-          path.value.properties.unshift(storeService);
+          path.value.properties.unshift(serviceInjection);
         })
         .toSource(recastOptions);
 
-      didInjectStore = true;
+      didInjectService = true;
     }
   }
 
-  // if store was injected here check if inject has been imported
-  if (didInjectStore) {
+  // if service was injected here check if inject has been imported
+  if (didInjectService) {
     const needsImport = !j(source).find(j.ImportSpecifier, {
       imported: {
         name: 'inject',
diff --git a/ui/tests/acceptance/auth-test.js b/ui/tests/acceptance/auth-test.js
index b9e87e02317a..9c60fbe1f08a 100644
--- a/ui/tests/acceptance/auth-test.js
+++ b/ui/tests/acceptance/auth-test.js
@@ -2,7 +2,7 @@
 import { module, test } from 'qunit';
 import { setupApplicationTest } from 'ember-qunit';
 import sinon from 'sinon';
-import { click, currentURL, visit, settled } from '@ember/test-helpers';
+import { click, currentURL, visit, settled, waitUntil, find } from '@ember/test-helpers';
 import { supportedAuthBackends } from 'vault/helpers/supported-auth-backends';
 import authForm from '../pages/components/auth-form';
 import jwtForm from '../pages/components/auth-jwt';
@@ -113,9 +113,18 @@ module('Acceptance | auth', function (hooks) {
   });
 
   test('it shows the push notification warning after submit', async function (assert) {
+    assert.expect(1);
+
+    this.server.get('/v1/auth/token/lookup-self', async () => {
+      assert.ok(
+        await waitUntil(() => find('[data-test-auth-message="push"]')),
+        'shows push notification message'
+      );
+      return [204, { 'Content-Type': 'application/json' }, JSON.stringify({})];
+    });
+
     await visit('/vault/auth');
     await component.selectMethod('token');
     await click('[data-test-auth-submit]');
-    assert.dom('[data-test-auth-message="push"]').exists('shows push notification message');
   });
 });
diff --git a/ui/tests/acceptance/enterprise-control-groups-test.js b/ui/tests/acceptance/enterprise-control-groups-test.js
index 37a33e89dd46..a5646a5c6600 100644
--- a/ui/tests/acceptance/enterprise-control-groups-test.js
+++ b/ui/tests/acceptance/enterprise-control-groups-test.js
@@ -71,7 +71,6 @@ module('Acceptance | Enterprise | control groups', function (hooks) {
   const setupControlGroup = async (context) => {
     let userpassAccessor;
     await visit('/vault/secrets');
-
     await consoleComponent.toggle();
     await settled();
     await consoleComponent.runCommands([
@@ -118,8 +117,10 @@ module('Acceptance | Enterprise | control groups', function (hooks) {
     await listPage.create();
     await editPage.createSecret(path, key, val);
   };
-
-  test('for v2 secrets it redirects you if you try to navigate to a Control Group restricted path', async function (assert) {
+  // TODO JR: This might actually be broken but I've spent too much time trying to debug so skipping for now
+  // in the application route error handler the transition object is missing the backend param for some reason
+  // this causes urlFromTransition to error in the control group service
+  skip('for v2 secrets it redirects you if you try to navigate to a Control Group restricted path', async function (assert) {
     await consoleComponent.runCommands([
       'write sys/mounts/kv-v2-mount type=kv-v2',
       'delete kv-v2-mount/metadata/foo',
diff --git a/ui/tests/acceptance/enterprise-license-banner-test.js b/ui/tests/acceptance/enterprise-license-banner-test.js
index 2c4c8de7176e..ffd0315e2b51 100644
--- a/ui/tests/acceptance/enterprise-license-banner-test.js
+++ b/ui/tests/acceptance/enterprise-license-banner-test.js
@@ -51,7 +51,7 @@ module('Acceptance | Enterprise | License banner warnings', function (hooks) {
         return [response, { 'Content-Type': 'application/json' }, JSON.stringify(healthResp)];
       });
       this.get('/v1/sys/internal/ui/feature-flags', this.passthrough);
-      // this.get('/v1/sys/health', this.passthrough);
+      this.get('/v1/sys/internal/ui/mounts', this.passthrough);
       this.get('/v1/sys/seal-status', this.passthrough);
       this.get('/v1/sys/license/features', this.passthrough);
     });
@@ -66,6 +66,7 @@ module('Acceptance | Enterprise | License banner warnings', function (hooks) {
         return [response, { 'Content-Type': 'application/json' }, JSON.stringify(healthResp)];
       });
       this.get('/v1/sys/internal/ui/feature-flags', this.passthrough);
+      this.get('/v1/sys/internal/ui/mounts', this.passthrough);
       this.get('/v1/sys/seal-status', this.passthrough);
       this.get('/v1/sys/license/features', this.passthrough);
     });
@@ -81,6 +82,7 @@ module('Acceptance | Enterprise | License banner warnings', function (hooks) {
         return [response, { 'Content-Type': 'application/json' }, JSON.stringify(healthResp)];
       });
       this.get('/v1/sys/internal/ui/feature-flags', this.passthrough);
+      this.get('/v1/sys/internal/ui/mounts', this.passthrough);
       this.get('/v1/sys/seal-status', this.passthrough);
       this.get('/v1/sys/license/features', this.passthrough);
     });
diff --git a/ui/tests/acceptance/init-test.js b/ui/tests/acceptance/init-test.js
index b18cd65e69bd..24f5fd3ce65b 100644
--- a/ui/tests/acceptance/init-test.js
+++ b/ui/tests/acceptance/init-test.js
@@ -12,7 +12,7 @@ const HEALTH_RESPONSE = {
   replication_performance_mode: 'unknown',
   replication_dr_mode: 'unknown',
   server_time_utc: 1538066726,
-  version: '0.11.0+prem',
+  version: '1.13.0-dev1',
 };
 
 const CLOUD_SEAL_RESPONSE = {
diff --git a/ui/tests/acceptance/jwt-auth-method-test.js b/ui/tests/acceptance/jwt-auth-method-test.js
index c2b218496270..008709b34632 100644
--- a/ui/tests/acceptance/jwt-auth-method-test.js
+++ b/ui/tests/acceptance/jwt-auth-method-test.js
@@ -11,6 +11,7 @@ module('Acceptance | jwt auth method', function (hooks) {
   setupMirage(hooks);
 
   hooks.beforeEach(function () {
+    localStorage.clear(); // ensure that a token isn't stored otherwise visit('/vault/auth') will redirect to secrets
     this.stub = sinon.stub();
     this.server.post(
       '/auth/:path/oidc/auth_url',
diff --git a/ui/tests/acceptance/secrets/backend/kv/secret-test.js b/ui/tests/acceptance/secrets/backend/kv/secret-test.js
index 94025612d835..d62c2472f268 100644
--- a/ui/tests/acceptance/secrets/backend/kv/secret-test.js
+++ b/ui/tests/acceptance/secrets/backend/kv/secret-test.js
@@ -173,7 +173,7 @@ module('Acceptance | secrets/secret/create, read, delete', function (hooks) {
 
   test('it can mount a KV 2 secret engine with config metadata', async function (assert) {
     const enginePath = `kv-${new Date().getTime()}`;
-    let maxVersion = 101;
+    let maxVersion = '101';
     await mountSecrets.visit();
     await click('[data-test-mount-type="kv"]');
 
diff --git a/ui/tests/acceptance/settings/mount-secret-backend-test.js b/ui/tests/acceptance/settings/mount-secret-backend-test.js
index be2452c84dec..06538cae66ca 100644
--- a/ui/tests/acceptance/settings/mount-secret-backend-test.js
+++ b/ui/tests/acceptance/settings/mount-secret-backend-test.js
@@ -23,8 +23,8 @@ module('Acceptance | settings/mount-secret-backend', function (hooks) {
     const path = `kv-${new Date().getTime()}`;
     const defaultTTLHours = 100;
     const maxTTLHours = 300;
-    const defaultTTLSeconds = defaultTTLHours * 60 * 60;
-    const maxTTLSeconds = maxTTLHours * 60 * 60;
+    const defaultTTLSeconds = (defaultTTLHours * 60 * 60).toString();
+    const maxTTLSeconds = (maxTTLHours * 60 * 60).toString();
 
     await page.visit();
 
@@ -50,7 +50,7 @@ module('Acceptance | settings/mount-secret-backend', function (hooks) {
     // always force the new mount to the top of the list
     const path = `kv-${new Date().getTime()}`;
     const maxTTLHours = 300;
-    const maxTTLSeconds = maxTTLHours * 60 * 60;
+    const maxTTLSeconds = (maxTTLHours * 60 * 60).toString();
 
     await page.visit();
 
@@ -67,7 +67,7 @@ module('Acceptance | settings/mount-secret-backend', function (hooks) {
       .maxTTLVal(maxTTLHours)
       .submit();
     await configPage.visit({ backend: path });
-    assert.strictEqual(configPage.defaultTTL, 0, 'shows the proper TTL');
+    assert.strictEqual(configPage.defaultTTL, '0', 'shows the proper TTL');
     assert.strictEqual(configPage.maxTTL, maxTTLSeconds, 'shows the proper max TTL');
   });
 
diff --git a/ui/tests/integration/components/auth-config-form/options-test.js b/ui/tests/integration/components/auth-config-form/options-test.js
index 740844f50ceb..bd40cafd70fd 100644
--- a/ui/tests/integration/components/auth-config-form/options-test.js
+++ b/ui/tests/integration/components/auth-config-form/options-test.js
@@ -44,7 +44,7 @@ module('Integration | Component | auth-config-form options', function (hooks) {
     });
     sinon.spy(model.config, 'serialize');
     this.set('model', model);
-    await render(hbs`{{auth-config-form/options model=model}}`);
+    await render(hbs`{{auth-config-form/options model=this.model}}`);
     component.save();
     return settled().then(() => {
       assert.ok(model.config.serialize.calledOnce);
diff --git a/ui/tests/integration/components/auth-form-test.js b/ui/tests/integration/components/auth-form-test.js
index 2edd21440648..451e7575862f 100644
--- a/ui/tests/integration/components/auth-form-test.js
+++ b/ui/tests/integration/components/auth-form-test.js
@@ -6,7 +6,6 @@ import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render, settled } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
-import fetch from 'fetch';
 import sinon from 'sinon';
 import Pretender from 'pretender';
 import { create } from 'ember-cli-page-object';
@@ -14,14 +13,6 @@ import authForm from '../../pages/components/auth-form';
 
 const component = create(authForm);
 
-const authService = Service.extend({
-  async authenticate() {
-    return fetch('http://localhost:2000');
-  },
-  handleError() {},
-  setLastFetch() {},
-});
-
 const workingAuthService = Service.extend({
   authenticate() {
     return resolve({});
@@ -44,32 +35,20 @@ module('Integration | Component | auth form', function (hooks) {
   setupRenderingTest(hooks);
 
   hooks.beforeEach(function () {
-    this.owner.lookup('service:csp-event').attach();
     this.owner.register('service:router', routerService);
     this.router = this.owner.lookup('service:router');
   });
 
-  hooks.afterEach(function () {
-    this.owner.lookup('service:csp-event').remove();
-  });
-
   const CSP_ERR_TEXT = `Error This is a standby Vault node but can't communicate with the active node via request forwarding. Sign in at the active node to use the Vault UI.`;
   test('it renders error on CSP violation', async function (assert) {
     assert.expect(2);
-    this.owner.unregister('service:auth');
-    this.owner.register('service:auth', authService);
-    this.auth = this.owner.lookup('service:auth');
     this.set('cluster', EmberObject.create({ standby: true }));
     this.set('selectedAuth', 'token');
-    await render(hbs`{{auth-form cluster=cluster selectedAuth=selectedAuth}}`);
+    await render(hbs`{{auth-form cluster=this.cluster selectedAuth=this.selectedAuth}}`);
     assert.false(component.errorMessagePresent, false);
-    component.login();
-    // because this is an ember-concurrency backed service,
-    // we have to manually force settling the run queue
-    later(() => cancelTimers(), 50);
-    return settled().then(() => {
-      assert.strictEqual(component.errorText, CSP_ERR_TEXT);
-    });
+    this.owner.lookup('service:csp-event').events.addObject({ violatedDirective: 'connect-src' });
+    await settled();
+    assert.strictEqual(component.errorText, CSP_ERR_TEXT);
   });
 
   test('it renders with vault style errors', async function (assert) {
@@ -84,11 +63,12 @@ module('Integration | Component | auth form', function (hooks) {
           }),
         ];
       });
+      this.get('/v1/sys/internal/ui/mounts', this.passthrough);
     });
 
     this.set('cluster', EmberObject.create({}));
     this.set('selectedAuth', 'token');
-    await render(hbs`{{auth-form cluster=cluster selectedAuth=selectedAuth}}`);
+    await render(hbs`{{auth-form cluster=this.cluster selectedAuth=this.selectedAuth}}`);
     return component.login().then(() => {
       assert.strictEqual(component.errorText, 'Error Authentication failed: Not allowed');
       server.shutdown();
@@ -101,11 +81,12 @@ module('Integration | Component | auth form', function (hooks) {
       this.get('/v1/auth/**', () => {
         return [400, { 'Content-Type': 'application/json' }];
       });
+      this.get('/v1/sys/internal/ui/mounts', this.passthrough);
     });
 
     this.set('cluster', EmberObject.create({}));
     this.set('selectedAuth', 'token');
-    await render(hbs`{{auth-form cluster=cluster selectedAuth=selectedAuth}}`);
+    await render(hbs`{{auth-form cluster=this.cluster selectedAuth=this.selectedAuth}}`);
     // ARG TODO research and see if adapter errors changed, but null used to be Bad Request
     return component.login().then(() => {
       assert.strictEqual(component.errorText, 'Error Authentication failed: null');
@@ -124,7 +105,7 @@ module('Integration | Component | auth form', function (hooks) {
         return [200, { 'Content-Type': 'application/json' }, JSON.stringify({ data: { auth: methods } })];
       });
     });
-    await render(hbs`<AuthForm @cluster={{cluster}} />`);
+    await render(hbs`<AuthForm @cluster={{this.cluster}} />`);
 
     assert.strictEqual(component.tabs.length, 0, 'renders a tab for every backend');
     server.shutdown();
@@ -146,7 +127,7 @@ module('Integration | Component | auth form', function (hooks) {
     });
 
     this.set('cluster', EmberObject.create({}));
-    await render(hbs`{{auth-form cluster=cluster }}`);
+    await render(hbs`{{auth-form cluster=this.cluster }}`);
 
     assert.strictEqual(component.tabs.length, 2, 'renders a tab for userpass and Other');
     assert.strictEqual(component.tabs.objectAt(0).name, 'foo', 'uses the path in the label');
@@ -167,7 +148,7 @@ module('Integration | Component | auth form', function (hooks) {
       });
     });
     this.set('cluster', EmberObject.create({}));
-    await render(hbs`{{auth-form cluster=cluster }}`);
+    await render(hbs`{{auth-form cluster=this.cluster }}`);
 
     assert.strictEqual(
       component.descriptionText,
@@ -195,7 +176,7 @@ module('Integration | Component | auth form', function (hooks) {
 
     this.set('cluster', EmberObject.create({}));
     this.set('selectedAuth', 'foo/');
-    await render(hbs`{{auth-form cluster=cluster selectedAuth=selectedAuth}}`);
+    await render(hbs`{{auth-form cluster=this.cluster selectedAuth=this.selectedAuth}}`);
     await component.login();
 
     await settled();
@@ -218,7 +199,7 @@ module('Integration | Component | auth form', function (hooks) {
       });
     });
     this.set('cluster', EmberObject.create({}));
-    await render(hbs`<AuthForm @cluster={{cluster}} />`);
+    await render(hbs`<AuthForm @cluster={{this.cluster}} />`);
 
     server.shutdown();
     assert.strictEqual(component.tabs.length, 0, 'renders a tab for every backend');
@@ -245,7 +226,7 @@ module('Integration | Component | auth form', function (hooks) {
     let wrappedToken = '54321';
     this.set('wrappedToken', wrappedToken);
     this.set('cluster', EmberObject.create({}));
-    await render(hbs`<AuthForm @cluster={{cluster}} @wrappedToken={{wrappedToken}} />`);
+    await render(hbs`<AuthForm @cluster={{this.cluster}} @wrappedToken={{this.wrappedToken}} />`);
     later(() => cancelTimers(), 50);
     await settled();
     assert.strictEqual(
@@ -277,7 +258,7 @@ module('Integration | Component | auth form', function (hooks) {
     });
 
     this.set('wrappedToken', '54321');
-    await render(hbs`{{auth-form cluster=cluster wrappedToken=wrappedToken}}`);
+    await render(hbs`{{auth-form cluster=this.cluster wrappedToken=this.wrappedToken}}`);
     later(() => cancelTimers(), 50);
 
     await settled();
diff --git a/ui/tests/integration/components/auth-jwt-test.js b/ui/tests/integration/components/auth-jwt-test.js
index 314af03c155b..a974250cfaae 100644
--- a/ui/tests/integration/components/auth-jwt-test.js
+++ b/ui/tests/integration/components/auth-jwt-test.js
@@ -45,16 +45,16 @@ const renderIt = async (context, path = 'jwt') => {
   context.set('selectedAuthPath', path);
   await render(hbs`
     <AuthJwt
-      @window={{window}}
-      @roleName={{roleName}}
-      @selectedAuthPath={{selectedAuthPath}}
-      @onError={{action (mut error)}}
-      @onLoading={{action (mut isLoading)}}
-      @onToken={{action (mut token)}}
-      @onNamespace={{action (mut namespace)}}
-      @onSelectedAuth={{action (mut selectedAuth)}}
-      @onSubmit={{action handler}}
-      @onRoleName={{action (mut roleName)}}
+      @window={{this.window}}
+      @roleName={{this.roleName}}
+      @selectedAuthPath={{this.selectedAuthPath}}
+      @onError={{action (mut this.error)}}
+      @onLoading={{action (mut this.isLoading)}}
+      @onToken={{action (mut this.token)}}
+      @onNamespace={{action (mut this.namespace)}}
+      @onSelectedAuth={{action (mut this.selectedAuth)}}
+      @onSubmit={{action this.handler}}
+      @onRoleName={{action (mut this.roleName)}}
     />
     `);
 };
@@ -107,7 +107,7 @@ module('Integration | Component | auth jwt', function (hooks) {
   });
 
   test('it renders the yield', async function (assert) {
-    await render(hbs`<AuthJwt @onSubmit={{action (mut submit)}}>Hello!</AuthJwt>`);
+    await render(hbs`<AuthJwt @onSubmit={{action (mut this.submit)}}>Hello!</AuthJwt>`);
     assert.strictEqual(component.yieldContent, 'Hello!', 'yields properly');
   });
 
diff --git a/ui/tests/integration/components/b64-toggle-test.js b/ui/tests/integration/components/b64-toggle-test.js
index c3acc5a446ff..b494de57a1be 100644
--- a/ui/tests/integration/components/b64-toggle-test.js
+++ b/ui/tests/integration/components/b64-toggle-test.js
@@ -13,7 +13,7 @@ module('Integration | Component | b64 toggle', function (hooks) {
 
   test('it toggles encoding on the passed string', async function (assert) {
     this.set('value', 'value');
-    await render(hbs`{{b64-toggle value=value}}`);
+    await render(hbs`{{b64-toggle value=this.value}}`);
     await click('button');
     assert.strictEqual(this.value, btoa('value'), 'encodes to base64');
     await click('button');
@@ -22,7 +22,7 @@ module('Integration | Component | b64 toggle', function (hooks) {
 
   test('it toggles encoding starting with base64', async function (assert) {
     this.set('value', btoa('value'));
-    await render(hbs`{{b64-toggle value=value initialEncoding='base64'}}`);
+    await render(hbs`{{b64-toggle value=this.value initialEncoding='base64'}}`);
     assert.ok(find('button').textContent.includes('Decode'), 'renders as on when in b64 mode');
     await click('button');
     assert.strictEqual(this.value, 'value', 'decodes from base64');
@@ -30,7 +30,7 @@ module('Integration | Component | b64 toggle', function (hooks) {
 
   test('it detects changes to value after encoding', async function (assert) {
     this.set('value', btoa('value'));
-    await render(hbs`{{b64-toggle value=value initialEncoding='base64'}}`);
+    await render(hbs`{{b64-toggle value=this.value initialEncoding='base64'}}`);
     assert.ok(find('button').textContent.includes('Decode'), 'renders as on when in b64 mode');
     this.set('value', btoa('value') + '=');
     assert.ok(find('button').textContent.includes('Encode'), 'toggles off since value has changed');
@@ -43,7 +43,7 @@ module('Integration | Component | b64 toggle', function (hooks) {
 
   test('it does not toggle when the value is empty', async function (assert) {
     this.set('value', '');
-    await render(hbs`{{b64-toggle value=value}}`);
+    await render(hbs`{{b64-toggle value=this.value}}`);
     await click('button');
     assert.ok(find('button').textContent.includes('Encode'));
   });
diff --git a/ui/tests/integration/components/box-radio-test.js b/ui/tests/integration/components/box-radio-test.js
index 7d59da393e6f..2ea8656a3e35 100644
--- a/ui/tests/integration/components/box-radio-test.js
+++ b/ui/tests/integration/components/box-radio-test.js
@@ -18,11 +18,11 @@ module('Integration | Component | box-radio', function (hooks) {
     const spy = sinon.spy();
     this.set('onRadioChange', spy);
     await render(hbs`<BoxRadio
-      @type={{type}}
-      @glyph={{type}}
-      @displayName={{displayName}}
-      @onRadioChange={{onRadioChange}}
-      @disabled={{disabled}}
+      @type={{this.type}}
+      @glyph={{this.type}}
+      @displayName={{this.displayName}}
+      @onRadioChange={{this.onRadioChange}}
+      @disabled={{this.disabled}}
     />`);
 
     assert.dom(this.element).hasText('An Option', 'shows the display name of the option');
@@ -35,11 +35,11 @@ module('Integration | Component | box-radio', function (hooks) {
     const spy = sinon.spy();
     this.set('onRadioChange', spy);
     await render(hbs`<BoxRadio
-      @type={{type}}
-      @glyph={{type}}
-      @displayName={{displayName}}
-      @onRadioChange={{onRadioChange}}
-      @disabled=true
+      @type={{this.type}}
+      @glyph={{this.type}}
+      @displayName={{this.displayName}}
+      @onRadioChange={{this.onRadioChange}}
+      @disabled={{true}}
     />`);
 
     assert.dom(this.element).hasText('An Option', 'shows the display name of the option');
diff --git a/ui/tests/integration/components/calendar-widget-test.js b/ui/tests/integration/components/calendar-widget-test.js
index a725ea294d9b..f10134c45c92 100644
--- a/ui/tests/integration/components/calendar-widget-test.js
+++ b/ui/tests/integration/components/calendar-widget-test.js
@@ -24,12 +24,12 @@ module('Integration | Component | calendar-widget', function (hooks) {
   test('it renders and can open the calendar view', async function (assert) {
     await render(hbs`
       <CalendarWidget
-        @arrayOfMonths={{arrayOfMonths}}
-        @endTimeDisplay={{concat "January " currentYear}}
-        @endTimeFromResponse={{endTimeFromResponse}}
-        @handleClientActivityQuery={{handleClientActivityQuery}}
-        @handleCurrentBillingPeriod={{handleCurrentBillingPeriod}}
-        @startTimeDisplay={{concat "February " previousYear}}
+        @arrayOfMonths={{this.arrayOfMonths}}
+        @endTimeDisplay={{concat "January " this.currentYear}}
+        @endTimeFromResponse={{this.endTimeFromResponse}}
+        @handleClientActivityQuery={{this.handleClientActivityQuery}}
+        @handleCurrentBillingPeriod={{this.handleCurrentBillingPeriod}}
+        @startTimeDisplay={{concat "February " this.previousYear}}
       />
     `);
 
@@ -40,12 +40,12 @@ module('Integration | Component | calendar-widget', function (hooks) {
   test('it does not allow a user to click to a future year but does allow a user to click to previous year', async function (assert) {
     await render(hbs`
       <CalendarWidget
-        @arrayOfMonths={{arrayOfMonths}}
-        @endTimeDisplay={{concat "March " currentYear}}
-        @endTimeFromResponse={{endTimeFromResponse}}
-        @handleClientActivityQuery={{handleClientActivityQuery}}
-        @handleCurrentBillingPeriod={{handleCurrentBillingPeriod}}
-        @startTimeDisplay={{concat "February " previousYear}}
+        @arrayOfMonths={{this.arrayOfMonths}}
+        @endTimeDisplay={{concat "March " this.currentYear}}
+        @endTimeFromResponse={{this.endTimeFromResponse}}
+        @handleClientActivityQuery={{this.handleClientActivityQuery}}
+        @handleCurrentBillingPeriod={{this.handleCurrentBillingPeriod}}
+        @startTimeDisplay={{concat "February " this.previousYear}}
       />
     `);
 
@@ -65,12 +65,12 @@ module('Integration | Component | calendar-widget', function (hooks) {
   test('it disables the current month', async function (assert) {
     await render(hbs`
       <CalendarWidget
-        @arrayOfMonths={{arrayOfMonths}}
-        @endTimeDisplay={{concat "January " currentYear}}
-        @endTimeFromResponse={{endTimeFromResponse}}
-        @handleClientActivityQuery={{handleClientActivityQuery}}
-        @handleCurrentBillingPeriod={{handleCurrentBillingPeriod}}
-        @startTimeDisplay={{concat "February " previousYear}}
+        @arrayOfMonths={{this.arrayOfMonths}}
+        @endTimeDisplay={{concat "January " this.currentYear}}
+        @endTimeFromResponse={{this.endTimeFromResponse}}
+        @handleClientActivityQuery={{this.handleClientActivityQuery}}
+        @handleCurrentBillingPeriod={{this.handleCurrentBillingPeriod}}
+        @startTimeDisplay={{concat "February " this.previousYear}}
       />
     `);
     await calendarDropdown.openCalendar();
@@ -86,12 +86,12 @@ module('Integration | Component | calendar-widget', function (hooks) {
   test('it allows you to reset the billing period', async function (assert) {
     await render(hbs`
     <CalendarWidget
-      @arrayOfMonths={{arrayOfMonths}}
-      @endTimeDisplay={{concat "January " currentYear}}
-      @endTimeFromResponse={{endTimeFromResponse}}
-      @handleClientActivityQuery={{handleClientActivityQuery}}
-      @handleCurrentBillingPeriod={{handleCurrentBillingPeriod}}
-      @startTimeDisplay={{concat "February " previousYear}}
+      @arrayOfMonths={{this.arrayOfMonths}}
+      @endTimeDisplay={{concat "January " this.currentYear}}
+      @endTimeFromResponse={{this.endTimeFromResponse}}
+      @handleClientActivityQuery={{this.handleClientActivityQuery}}
+      @handleCurrentBillingPeriod={{this.handleCurrentBillingPeriod}}
+      @startTimeDisplay={{concat "February " this.previousYear}}
     />
   `);
     await calendarDropdown.menuToggle();
@@ -102,12 +102,12 @@ module('Integration | Component | calendar-widget', function (hooks) {
   test('it passes the appropriate data to the handleCurrentBillingPeriod when a date is selected', async function (assert) {
     await render(hbs`
     <CalendarWidget
-      @arrayOfMonths={{arrayOfMonths}}
-      @endTimeDisplay={{concat "January " currentYear}}
-      @endTimeFromResponse={{endTimeFromResponse}}
-      @handleClientActivityQuery={{handleClientActivityQuery}}
-      @handleCurrentBillingPeriod={{handleCurrentBillingPeriod}}
-      @startTimeDisplay={{concat "February " previousYear}}
+      @arrayOfMonths={{this.arrayOfMonths}}
+      @endTimeDisplay={{concat "January " this.currentYear}}
+      @endTimeFromResponse={{this.endTimeFromResponse}}
+      @handleClientActivityQuery={{this.handleClientActivityQuery}}
+      @handleCurrentBillingPeriod={{this.handleCurrentBillingPeriod}}
+      @startTimeDisplay={{concat "February " this.previousYear}}
     />
   `);
     await calendarDropdown.openCalendar();
@@ -124,12 +124,12 @@ module('Integration | Component | calendar-widget', function (hooks) {
     this.set('endTimeFromResponse', [this.previousYear, 11]);
     await render(hbs`
     <CalendarWidget
-      @arrayOfMonths={{arrayOfMonths}}
-      @endTimeDisplay={{concat "December " previousYear}}
-      @endTimeFromResponse={{endTimeFromResponse}}
-      @handleClientActivityQuery={{handleClientActivityQuery}}
-      @handleCurrentBillingPeriod={{handleCurrentBillingPeriod}}
-      @startTimeDisplay={{"March 2020"}}
+      @arrayOfMonths={{this.arrayOfMonths}}
+      @endTimeDisplay={{concat "December " this.previousYear}}
+      @endTimeFromResponse={{this.endTimeFromResponse}}
+      @handleClientActivityQuery={{this.handleClientActivityQuery}}
+      @handleCurrentBillingPeriod={{this.handleCurrentBillingPeriod}}
+      @startTimeDisplay="March 2020"
     />
   `);
     await calendarDropdown.openCalendar();
diff --git a/ui/tests/integration/components/clients/attribution-test.js b/ui/tests/integration/components/clients/attribution-test.js
index 04dcd8a0f9e7..9ccbf4ed9bce 100644
--- a/ui/tests/integration/components/clients/attribution-test.js
+++ b/ui/tests/integration/components/clients/attribution-test.js
@@ -31,7 +31,7 @@ module('Integration | Component | clients/attribution', function (hooks) {
   test('it renders empty state with no data', async function (assert) {
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <Clients::Attribution @chartLegend={{chartLegend}} />
+      <Clients::Attribution @chartLegend={{this.chartLegend}} />
     `);
 
     assert.dom('[data-test-component="empty-state"]').exists();
@@ -45,12 +45,12 @@ module('Integration | Component | clients/attribution', function (hooks) {
     await render(hbs`
       <div id="modal-wormhole"></div>
       <Clients::Attribution 
-        @chartLegend={{chartLegend}}
-        @totalClientAttribution={{totalClientAttribution}} 
-        @totalUsageCounts={{totalUsageCounts}} 
-        @timestamp={{timestamp}} 
-        @selectedNamespace={{selectedNamespace}}
-        @isDateRange={{isDateRange}}
+        @chartLegend={{this.chartLegend}}
+        @totalClientAttribution={{this.totalClientAttribution}} 
+        @totalUsageCounts={{this.totalUsageCounts}} 
+        @timestamp={{this.timestamp}} 
+        @selectedNamespace={{this.selectedNamespace}}
+        @isDateRange={{this.isDateRange}}
         />
     `);
 
@@ -76,12 +76,12 @@ module('Integration | Component | clients/attribution', function (hooks) {
     await render(hbs`
       <div id="modal-wormhole"></div>
       <Clients::Attribution 
-        @chartLegend={{chartLegend}}
-        @totalClientAttribution={{totalClientAttribution}} 
-        @totalUsageCounts={{totalUsageCounts}} 
-        @timestamp={{timestamp}} 
-        @selectedNamespace={{selectedNamespace}}
-        @isDateRange={{isDateRange}}
+        @chartLegend={{this.chartLegend}}
+        @totalClientAttribution={{this.totalClientAttribution}} 
+        @totalUsageCounts={{this.totalUsageCounts}} 
+        @timestamp={{this.timestamp}} 
+        @selectedNamespace={{this.selectedNamespace}}
+        @isDateRange={{this.isDateRange}}
         />
     `);
     assert
@@ -129,12 +129,12 @@ module('Integration | Component | clients/attribution', function (hooks) {
     await render(hbs`
       <div id="modal-wormhole"></div>
       <Clients::Attribution 
-        @chartLegend={{chartLegend}}
-        @totalClientAttribution={{namespaceMountsData}} 
-        @totalUsageCounts={{totalUsageCounts}} 
-        @timestamp={{timestamp}} 
-        @selectedNamespace={{selectedNamespace}}
-        @isDateRange={{isDateRange}}
+        @chartLegend={{this.chartLegend}}
+        @totalClientAttribution={{this.namespaceMountsData}} 
+        @totalUsageCounts={{this.totalUsageCounts}} 
+        @timestamp={{this.timestamp}} 
+        @selectedNamespace={{this.selectedNamespace}}
+        @isDateRange={{this.isDateRange}}
         />
     `);
 
@@ -159,9 +159,9 @@ module('Integration | Component | clients/attribution', function (hooks) {
     await render(hbs`
       <div id="modal-wormhole"></div>
       <Clients::Attribution 
-        @chartLegend={{chartLegend}}
-        @totalClientAttribution={{namespaceMountsData}} 
-        @timestamp={{timestamp}} 
+        @chartLegend={{this.chartLegend}}
+        @totalClientAttribution={{this.namespaceMountsData}} 
+        @timestamp={{this.timestamp}} 
         @startTimeDisplay={{"January 2022"}}
         @endTimeDisplay={{"February 2022"}}
         />
diff --git a/ui/tests/integration/components/clients/config-test.js b/ui/tests/integration/components/clients/config-test.js
index 870ea422842b..845166fe1346 100644
--- a/ui/tests/integration/components/clients/config-test.js
+++ b/ui/tests/integration/components/clients/config-test.js
@@ -46,7 +46,7 @@ module('Integration | Component | client count config', function (hooks) {
   });
 
   test('it shows the table with the correct rows by default', async function (assert) {
-    await render(hbs`<Clients::Config @model={{model}} />`);
+    await render(hbs`<Clients::Config @model={{this.model}} />`);
 
     assert.dom('[data-test-pricing-metrics-config-table]').exists('Pricing metrics config table exists');
     const rows = document.querySelectorAll('.info-table-row');
@@ -64,7 +64,7 @@ module('Integration | Component | client count config', function (hooks) {
   test('TODO: it shows the config edit form when mode = edit', async function (assert) {
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <Clients::Config @model={{model}} @mode="edit" />
+      <Clients::Config @model={{this.model}} @mode="edit" />
     `);
 
     assert.dom('[data-test-pricing-metrics-config-form]').exists('Pricing metrics config form exists');
@@ -81,7 +81,7 @@ module('Integration | Component | client count config', function (hooks) {
     this.set('model', simModel);
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <Clients::Config @model={{model}} @mode="edit" />
+      <Clients::Config @model={{this.model}} @mode="edit" />
     `);
 
     await click('[data-test-edit-metrics-config-save]');
@@ -102,7 +102,7 @@ module('Integration | Component | client count config', function (hooks) {
     this.set('model', simModel);
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <Clients::Config @model={{model}} @mode="edit" />
+      <Clients::Config @model={{this.model}} @mode="edit" />
     `);
 
     await click('[data-test-edit-metrics-config-save]');
@@ -123,7 +123,7 @@ module('Integration | Component | client count config', function (hooks) {
     this.set('model', simModel);
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <Clients::Config @model={{model}} @mode="edit" />
+      <Clients::Config @model={{this.model}} @mode="edit" />
     `);
 
     await click('[data-test-edit-metrics-config-save]');
diff --git a/ui/tests/integration/components/clients/horizontal-bar-chart-test.js b/ui/tests/integration/components/clients/horizontal-bar-chart-test.js
index a094ef2a01fc..f737b5c639ad 100644
--- a/ui/tests/integration/components/clients/horizontal-bar-chart-test.js
+++ b/ui/tests/integration/components/clients/horizontal-bar-chart-test.js
@@ -24,8 +24,8 @@ module('Integration | Component | clients/horizontal-bar-chart', function (hooks
     await render(hbs`
     <Clients::HorizontalBarChart
       @dataset={{this.totalClientAttribution}}
-      @chartLegend={{chartLegend}}
-      @totalCounts={{totalCounts}}
+      @chartLegend={{this.chartLegend}}
+      @totalCounts={{this.totalCounts}}
     />`);
 
     assert.dom('[data-test-horizontal-bar-chart]').exists();
@@ -63,8 +63,8 @@ module('Integration | Component | clients/horizontal-bar-chart', function (hooks
     await render(hbs`
     <Clients::HorizontalBarChart
       @dataset={{this.totalClientAttribution}}
-      @chartLegend={{chartLegend}}
-      @totalCounts={{totalCounts}}
+      @chartLegend={{this.chartLegend}}
+      @totalCounts={{this.totalCounts}}
     />`);
 
     assert.dom('[data-test-horizontal-bar-chart]').exists();
diff --git a/ui/tests/integration/components/clients/line-chart-test.js b/ui/tests/integration/components/clients/line-chart-test.js
index 013e7633678a..ce6983d96cbe 100644
--- a/ui/tests/integration/components/clients/line-chart-test.js
+++ b/ui/tests/integration/components/clients/line-chart-test.js
@@ -33,7 +33,7 @@ module('Integration | Component | clients/line-chart', function (hooks) {
   test('it renders', async function (assert) {
     await render(hbs`
     <div class="chart-container-wide">
-      <Clients::LineChart @dataset={{dataset}} @xKey={{xKey}} @yKey={{yKey}} />
+      <Clients::LineChart @dataset={{this.dataset}} @xKey={{this.xKey}} @yKey={{this.yKey}} />
       </div>
     `);
 
@@ -79,10 +79,10 @@ module('Integration | Component | clients/line-chart', function (hooks) {
     await render(hbs`
     <div class="chart-container-wide">
       <Clients::LineChart 
-        @dataset={{dataset}} 
-        @upgradeData={{upgradeData}} 
-        @xKey={{xKey}} 
-        @yKey={{yKey}} 
+        @dataset={{this.dataset}} 
+        @upgradeData={{this.upgradeData}} 
+        @xKey={{this.xKey}} 
+        @yKey={{this.yKey}} 
       />
     </div>
     `);
@@ -137,8 +137,8 @@ module('Integration | Component | clients/line-chart', function (hooks) {
     await render(hbs`
     <div class="chart-container-wide">
       <Clients::LineChart 
-        @dataset={{dataset}} 
-        @upgradeData={{upgradeData}}
+        @dataset={{this.dataset}} 
+        @upgradeData={{this.upgradeData}}
       />
     </div>
     `);
@@ -162,10 +162,10 @@ module('Integration | Component | clients/line-chart', function (hooks) {
     await render(hbs`
     <div class="chart-container-wide">
     <Clients::LineChart 
-    @dataset={{dataset}} 
-    @upgradeData={{upgradeData}} 
-    @xKey={{xKey}} 
-    @yKey={{yKey}} 
+    @dataset={{this.dataset}} 
+    @upgradeData={{this.upgradeData}} 
+    @xKey={{this.xKey}} 
+    @yKey={{this.yKey}} 
     />
     </div>
     `);
@@ -180,10 +180,10 @@ module('Integration | Component | clients/line-chart', function (hooks) {
     await render(hbs`
     <div class="chart-container-wide">
     <Clients::LineChart 
-    @dataset={{dataset}} 
-    @upgradeData={{upgradeData}} 
-    @xKey={{xKey}} 
-    @yKey={{yKey}} 
+    @dataset={{this.dataset}} 
+    @upgradeData={{this.upgradeData}} 
+    @xKey={{this.xKey}} 
+    @yKey={{this.yKey}} 
     />
     </div>
     `);
diff --git a/ui/tests/integration/components/clients/monthly-usage-test.js b/ui/tests/integration/components/clients/monthly-usage-test.js
index e14d0183b859..ce86c4ed9829 100644
--- a/ui/tests/integration/components/clients/monthly-usage-test.js
+++ b/ui/tests/integration/components/clients/monthly-usage-test.js
@@ -1421,7 +1421,7 @@ module('Integration | Component | clients/monthly-usage', function (hooks) {
   test('it renders empty state with no data', async function (assert) {
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <Clients::MonthlyUsage @chartLegend={{chartLegend}} @timestamp={{timestamp}}/>
+      <Clients::MonthlyUsage @chartLegend={{this.chartLegend}} @timestamp={{this.timestamp}}/>
     `);
     assert.dom('[data-test-monthly-usage]').exists('monthly usage component renders');
     assert.dom('[data-test-component="empty-state"]').exists();
@@ -1444,9 +1444,9 @@ module('Integration | Component | clients/monthly-usage', function (hooks) {
     await render(hbs`
     <div id="modal-wormhole"></div>
     <Clients::MonthlyUsage 
-    @chartLegend={{chartLegend}}
-    @verticalBarChartData={{byMonthActivityData}} 
-    @timestamp={{timestamp}}
+    @chartLegend={{this.chartLegend}}
+    @verticalBarChartData={{this.byMonthActivityData}} 
+    @timestamp={{this.timestamp}}
     />
     `);
     assert.dom('[data-test-monthly-usage]').exists('monthly usage component renders');
diff --git a/ui/tests/integration/components/clients/running-total-test.js b/ui/tests/integration/components/clients/running-total-test.js
index 82fa0adb04a8..4d6f46ff67aa 100644
--- a/ui/tests/integration/components/clients/running-total-test.js
+++ b/ui/tests/integration/components/clients/running-total-test.js
@@ -1434,13 +1434,13 @@ module('Integration | Component | clients/running-total', function (hooks) {
     await render(hbs`
       <div id="modal-wormhole"></div>
       <Clients::RunningTotal
-      @chartLegend={{chartLegend}}
-      @selectedAuthMethod={{selectedAuthMethod}}
-      // @lineChartData={{byMonthActivityData}}
-      // @barChartData={{byMonthNewClients}}
-      @runningTotals={{totalUsageCounts}}
-      @upgradeData={{upgradeDuringActivity}}
-      @timestamp={{timestamp}}
+      @chartLegend={{this.chartLegend}}
+      @selectedAuthMethod={{this.selectedAuthMethod}}
+      // @lineChartData={{this.byMonthActivityData}}
+      // @barChartData={{this.byMonthNewClients}}
+      @runningTotals={{this.totalUsageCounts}}
+      @upgradeData={{this.upgradeDuringActivity}}
+      @timestamp={{this.timestamp}}
     />
     `);
 
@@ -1505,11 +1505,11 @@ module('Integration | Component | clients/running-total', function (hooks) {
     await render(hbs`
       <div id="modal-wormhole"></div>
       <Clients::RunningTotal
-      @chartLegend={{chartLegend}}
-      @selectedAuthMethod={{selectedAuthMethod}}
-      @lineChartData={{byMonthActivityData}}
-      @runningTotals={{totalUsageCounts}}
-      @timestamp={{timestamp}}
+      @chartLegend={{this.chartLegend}}
+      @selectedAuthMethod={{this.selectedAuthMethod}}
+      @lineChartData={{this.byMonthActivityData}}
+      @runningTotals={{this.totalUsageCounts}}
+      @timestamp={{this.timestamp}}
     />
     `);
 
@@ -1549,12 +1549,12 @@ module('Integration | Component | clients/running-total', function (hooks) {
     await render(hbs`
       <div id="modal-wormhole"></div>
       <Clients::RunningTotal
-      @chartLegend={{chartLegend}}
-      @selectedAuthMethod={{selectedAuthMethod}}
-      @lineChartData={{singleMonth}}
-      @barChartData={{singleMonthNew}}
-      @runningTotals={{totalUsageCounts}}
-      @timestamp={{timestamp}}
+      @chartLegend={{this.chartLegend}}
+      @selectedAuthMethod={{this.selectedAuthMethod}}
+      @lineChartData={{this.singleMonth}}
+      @barChartData={{this.singleMonthNew}}
+      @runningTotals={{this.totalUsageCounts}}
+      @timestamp={{this.timestamp}}
     />
     `);
     assert.dom('[data-test-running-total]').exists('running total component renders');
diff --git a/ui/tests/integration/components/clients/usage-stats-test.js b/ui/tests/integration/components/clients/usage-stats-test.js
index b75556e9ac17..d4471024a9d4 100644
--- a/ui/tests/integration/components/clients/usage-stats-test.js
+++ b/ui/tests/integration/components/clients/usage-stats-test.js
@@ -27,7 +27,7 @@ module('Integration | Component | clients/usage-stats', function (hooks) {
       entity_clients: 7,
       non_entity_clients: 10,
     });
-    await render(hbs`<Clients::UsageStats @totalUsageCounts={{counts}} />`);
+    await render(hbs`<Clients::UsageStats @totalUsageCounts={{this.counts}} />`);
 
     assert.dom('[data-test-stat-text]').exists({ count: 3 }, 'Renders 3 Stat texts even with no data passed');
     assert.dom('[data-test-stat-text="total-clients"]').exists('Total clients exists');
diff --git a/ui/tests/integration/components/clients/vertical-bar-chart-test.js b/ui/tests/integration/components/clients/vertical-bar-chart-test.js
index 0d2d323e4aa1..826493763534 100644
--- a/ui/tests/integration/components/clients/vertical-bar-chart-test.js
+++ b/ui/tests/integration/components/clients/vertical-bar-chart-test.js
@@ -22,8 +22,8 @@ module('Integration | Component | clients/vertical-bar-chart', function (hooks)
     await render(hbs`   
     <div class="chart-container-wide">
       <Clients::VerticalBarChart 
-        @dataset={{barChartData}} 
-        @chartLegend={{chartLegend}} 
+        @dataset={{this.barChartData}} 
+        @chartLegend={{this.chartLegend}} 
       />
     </div>
     `);
@@ -60,8 +60,8 @@ module('Integration | Component | clients/vertical-bar-chart', function (hooks)
     await render(hbs`   
     <div class="chart-container-wide">
       <Clients::VerticalBarChart 
-        @dataset={{barChartData}} 
-        @chartLegend={{chartLegend}} 
+        @dataset={{this.barChartData}} 
+        @chartLegend={{this.chartLegend}} 
       />
     </div>
     `);
diff --git a/ui/tests/integration/components/confirm-action-test.js b/ui/tests/integration/components/confirm-action-test.js
index 1f557b326920..3d24e8e5713a 100644
--- a/ui/tests/integration/components/confirm-action-test.js
+++ b/ui/tests/integration/components/confirm-action-test.js
@@ -12,7 +12,7 @@ module('Integration | Component | confirm-action', function (hooks) {
     this.set('onConfirm', confirmAction);
     await render(hbs`
       <ConfirmAction
-        @onConfirmAction={{onConfirm}}
+        @onConfirmAction={{this.onConfirm}}
         @buttonClasses="toolbar-link"
       >
         DELETE
@@ -29,7 +29,7 @@ module('Integration | Component | confirm-action', function (hooks) {
     this.set('onConfirm', confirmAction);
     await render(hbs`
       <ConfirmAction
-        @onConfirmAction={{onConfirm}}
+        @onConfirmAction={{this.onConfirm}}
         @buttonClasses="toolbar-link"
       >
         DELETE
diff --git a/ui/tests/integration/components/confirm-test.js b/ui/tests/integration/components/confirm-test.js
index 3c50dc2d6e58..3a814abb59dd 100644
--- a/ui/tests/integration/components/confirm-test.js
+++ b/ui/tests/integration/components/confirm-test.js
@@ -19,14 +19,14 @@ module('Integration | Component | Confirm', function (hooks) {
     await render(hbs`
       <Confirm as |c|>
         <c.Message
-          @id={{id}}
-          @title={{title}}
-          @triggerText={{triggerText}}
-          @message={{message}}
-          @onConfirm={{onConfirm}}
-          />
-        </Confirm>
-      `);
+          @id={{this.id}}
+          @title={{this.title}}
+          @triggerText={{this.triggerText}}
+          @message={{this.message}}
+          @onConfirm={{this.onConfirm}}
+        />
+      </Confirm>
+    `);
 
     assert.dom('.confirm-wrapper').exists();
     assert.dom('.confirm').containsText(this.triggerText);
@@ -36,14 +36,14 @@ module('Integration | Component | Confirm', function (hooks) {
     await render(hbs`
       <Confirm as |c|>
         <c.Message
-          @id={{id}}
-          @title={{title}}
-          @triggerText={{triggerText}}
-          @message={{message}}
-          @onConfirm={{onConfirm}}
-          />
-        </Confirm>
-      `);
+          @id={{this.id}}
+          @title={{this.title}}
+          @triggerText={{this.triggerText}}
+          @message={{this.message}}
+          @onConfirm={{this.onConfirm}}
+        />
+      </Confirm>
+    `);
     assert.dom('.confirm-overlay').doesNotContainText(this.message);
 
     await click('[data-test-confirm-action-trigger]');
@@ -56,14 +56,14 @@ module('Integration | Component | Confirm', function (hooks) {
     await render(hbs`
       <Confirm as |c|>
         <c.Message
-          @id={{id}}
-          @title={{title}}
-          @triggerText={{triggerText}}
-          @message={{message}}
-          @onConfirm={{onConfirm}}
-          />
-        </Confirm>
-      `);
+          @id={{this.id}}
+          @title={{this.title}}
+          @triggerText={{this.triggerText}}
+          @message={{this.message}}
+          @onConfirm={{this.onConfirm}}
+        />
+      </Confirm>
+    `);
     await click('[data-test-confirm-action-trigger]');
     await click('[data-test-confirm-button=true]');
 
@@ -74,20 +74,20 @@ module('Integration | Component | Confirm', function (hooks) {
     await render(hbs`
       <Confirm as |c|>
         <c.Message
-          @id={{id}}
-          @title={{title}}
-          @triggerText={{triggerText}}
-          @message={{message}}
-          @onConfirm={{onConfirm}}
-          />
+          @id={{this.id}}
+          @title={{this.title}}
+          @triggerText={{this.triggerText}}
+          @message={{this.message}}
+          @onConfirm={{this.onConfirm}}
+        />
         <c.Message
           @id='bar'
           @title='Wow'
           @message='Bazinga!'
-          @onConfirm={{onConfirm}}
-          />
-        </Confirm>
-      `);
+          @onConfirm={{this.onConfirm}}
+        />
+      </Confirm>
+    `);
 
     await click(`[data-test-confirm-action-trigger=${this.id}]`);
     assert.dom('.confirm-overlay').containsText(this.title);
diff --git a/ui/tests/integration/components/console/log-command-test.js b/ui/tests/integration/components/console/log-command-test.js
index a4e817bb30e5..f448dde8c4a0 100644
--- a/ui/tests/integration/components/console/log-command-test.js
+++ b/ui/tests/integration/components/console/log-command-test.js
@@ -10,7 +10,7 @@ module('Integration | Component | console/log command', function (hooks) {
     const commandText = 'list this/path';
     this.set('content', commandText);
 
-    await render(hbs`{{console/log-command content=content}}`);
+    await render(hbs`{{console/log-command content=this.content}}`);
 
     assert.dom('pre').includesText(commandText);
   });
diff --git a/ui/tests/integration/components/console/log-error-test.js b/ui/tests/integration/components/console/log-error-test.js
index 38ace01d99ae..c62dc23a9f5b 100644
--- a/ui/tests/integration/components/console/log-error-test.js
+++ b/ui/tests/integration/components/console/log-error-test.js
@@ -9,7 +9,7 @@ module('Integration | Component | console/log error', function (hooks) {
   test('it renders', async function (assert) {
     const errorText = 'Error deleting at: sys/foo. URL: v1/sys/foo Code: 404';
     this.set('content', errorText);
-    await render(hbs`{{console/log-error content=content}}`);
+    await render(hbs`{{console/log-error content=this.content}}`);
     assert.dom('pre').includesText(errorText);
   });
 });
diff --git a/ui/tests/integration/components/console/log-json-test.js b/ui/tests/integration/components/console/log-json-test.js
index 4e4c294e56e5..4d2911bf5d65 100644
--- a/ui/tests/integration/components/console/log-json-test.js
+++ b/ui/tests/integration/components/console/log-json-test.js
@@ -18,7 +18,7 @@ module('Integration | Component | console/log json', function (hooks) {
 
     this.set('content', objectContent);
 
-    await render(hbs`{{console/log-json content=content}}`);
+    await render(hbs`{{console/log-json content=this.content}}`);
     const instance = find('[data-test-component=code-mirror-modifier]').innerText;
     assert.strictEqual(instance, expectedText);
   });
diff --git a/ui/tests/integration/components/console/log-list-test.js b/ui/tests/integration/components/console/log-list-test.js
index 78a3c2354117..678019254935 100644
--- a/ui/tests/integration/components/console/log-list-test.js
+++ b/ui/tests/integration/components/console/log-list-test.js
@@ -14,7 +14,7 @@ module('Integration | Component | console/log list', function (hooks) {
 
     this.set('content', listContent);
 
-    await render(hbs`{{console/log-list content=content}}`);
+    await render(hbs`{{console/log-list content=this.content}}`);
 
     assert.dom('pre').includesText(`${expectedText}`);
   });
diff --git a/ui/tests/integration/components/console/log-object-test.js b/ui/tests/integration/components/console/log-object-test.js
index f5d7ddd6604a..b88095791f78 100644
--- a/ui/tests/integration/components/console/log-object-test.js
+++ b/ui/tests/integration/components/console/log-object-test.js
@@ -14,7 +14,7 @@ module('Integration | Component | console/log object', function (hooks) {
     const expectedText = 'Key Value one two three four seven {"five":"six"} eight [5,6]';
     this.set('content', objectContent);
 
-    await render(hbs`{{console/log-object content=content}}`);
+    await render(hbs`{{console/log-object content=this.content}}`);
     assert.dom('pre').includesText(expectedText);
   });
 });
diff --git a/ui/tests/integration/components/console/log-text-test.js b/ui/tests/integration/components/console/log-text-test.js
index 5d0ef31684ea..c860094f2a8f 100644
--- a/ui/tests/integration/components/console/log-text-test.js
+++ b/ui/tests/integration/components/console/log-text-test.js
@@ -12,7 +12,7 @@ module('Integration | Component | console/log text', function (hooks) {
     const text = 'Success! You did a thing!';
     this.set('content', text);
 
-    await render(hbs`{{console/log-text content=content}}`);
+    await render(hbs`{{console/log-text content=this.content}}`);
 
     assert.dom('pre').includesText(text);
   });
diff --git a/ui/tests/integration/components/control-group-success-test.js b/ui/tests/integration/components/control-group-success-test.js
index 6a866a21bf0a..8f82cfa179c6 100644
--- a/ui/tests/integration/components/control-group-success-test.js
+++ b/ui/tests/integration/components/control-group-success-test.js
@@ -57,7 +57,7 @@ module('Integration | Component | control group success', function (hooks) {
     };
     this.set('model', MODEL);
     this.set('response', response);
-    await render(hbs`{{control-group-success model=model controlGroupResponse=response }}`);
+    await render(hbs`{{control-group-success model=this.model controlGroupResponse=this.response }}`);
     assert.ok(component.showsNavigateMessage, 'shows unwrap message');
     await component.navigate();
     later(() => cancelTimers(), 50);
@@ -70,7 +70,7 @@ module('Integration | Component | control group success', function (hooks) {
   test('render without token', async function (assert) {
     assert.expect(2);
     this.set('model', MODEL);
-    await render(hbs`{{control-group-success model=model}}`);
+    await render(hbs`{{control-group-success model=this.model}}`);
     assert.ok(component.showsUnwrapForm, 'shows unwrap form');
     await component.token('token');
     component.unwrap();
diff --git a/ui/tests/integration/components/control-group-test.js b/ui/tests/integration/components/control-group-test.js
index 8f04d91f400e..403db84519c6 100644
--- a/ui/tests/integration/components/control-group-test.js
+++ b/ui/tests/integration/components/control-group-test.js
@@ -57,7 +57,7 @@ module('Integration | Component | control group', function (hooks) {
     let { model, authData } = setup();
     this.set('model', model);
     this.set('auth.authData', authData);
-    await render(hbs`{{control-group model=model}}`);
+    await render(hbs`{{control-group model=this.model}}`);
     assert.ok(component.showsAccessorCallout, 'shows accessor callout');
     assert.strictEqual(component.bannerPrefix, 'Locked');
     assert.strictEqual(component.bannerText, 'The path you requested is locked by a Control Group');
@@ -72,7 +72,7 @@ module('Integration | Component | control group', function (hooks) {
     this.set('model', model);
     this.set('auth.authData', authData);
     this.set('controlGroup.wrapInfo', { token: 'token' });
-    await render(hbs`{{control-group model=model}}`);
+    await render(hbs`{{control-group model=this.model}}`);
     assert.true(component.showsTokenText, 'shows token message');
     assert.strictEqual(component.token, 'token', 'shows token value');
   });
@@ -81,7 +81,7 @@ module('Integration | Component | control group', function (hooks) {
     let { model, authData } = setup({ authorizations: [{ name: 'manager 1' }, { name: 'manager 2' }] });
     this.set('model', model);
     this.set('auth.authData', authData);
-    await render(hbs`{{control-group model=model}}`);
+    await render(hbs`{{control-group model=this.model}}`);
     assert.ok(component.authorizationText, 'Already approved by manager 1, manager 2');
   });
 
@@ -89,7 +89,7 @@ module('Integration | Component | control group', function (hooks) {
     let { model, authData } = setup({ approved: true });
     this.set('model', model);
     this.set('auth.authData', authData);
-    await render(hbs`{{control-group model=model}}`);
+    await render(hbs`{{control-group model=this.model}}`);
 
     assert.strictEqual(component.bannerPrefix, 'Success!');
     assert.strictEqual(component.bannerText, 'You have been given authorization');
@@ -103,7 +103,7 @@ module('Integration | Component | control group', function (hooks) {
     this.set('model', model);
     this.set('auth.authData', authData);
     this.set('controlGroup.wrapInfo', { token: 'token' });
-    await render(hbs`{{control-group model=model}}`);
+    await render(hbs`{{control-group model=this.model}}`);
     assert.true(component.showsTokenText, 'shows token');
     assert.notOk(component.showsRefresh, 'does not shows refresh button');
     assert.ok(component.showsSuccessComponent, 'renders control group success');
@@ -114,7 +114,7 @@ module('Integration | Component | control group', function (hooks) {
 
     this.set('model', model);
     this.set('auth.authData', authData);
-    await render(hbs`{{control-group model=model}}`);
+    await render(hbs`{{control-group model=this.model}}`);
 
     assert.strictEqual(component.bannerPrefix, 'Locked');
     assert.strictEqual(
@@ -138,7 +138,7 @@ module('Integration | Component | control group', function (hooks) {
 
     this.set('model', model);
     this.set('auth.authData', authData);
-    await render(hbs`{{control-group model=model}}`);
+    await render(hbs`{{control-group model=this.model}}`);
 
     assert.strictEqual(component.bannerPrefix, 'Thanks!');
     assert.strictEqual(component.bannerText, 'You have given authorization');
@@ -153,7 +153,7 @@ module('Integration | Component | control group', function (hooks) {
 
     this.set('model', model);
     this.set('auth.authData', authData);
-    await render(hbs`{{control-group model=model}}`);
+    await render(hbs`{{control-group model=this.model}}`);
 
     assert.strictEqual(component.bannerPrefix, 'Thanks!');
     assert.strictEqual(component.bannerText, 'You have given authorization');
@@ -173,7 +173,7 @@ module('Integration | Component | control group', function (hooks) {
 
     this.set('model', model);
     this.set('auth.authData', authData);
-    await render(hbs`{{control-group model=model}}`);
+    await render(hbs`{{control-group model=this.model}}`);
     assert.strictEqual(component.bannerPrefix, 'Success!');
     assert.strictEqual(component.bannerText, 'This Control Group has been authorized');
     assert.ok(component.showsBackLink, 'back link is visible');
diff --git a/ui/tests/integration/components/database-role-setting-form-test.js b/ui/tests/integration/components/database-role-setting-form-test.js
index d2e8080a7512..fb734d5ec359 100644
--- a/ui/tests/integration/components/database-role-setting-form-test.js
+++ b/ui/tests/integration/components/database-role-setting-form-test.js
@@ -96,7 +96,7 @@ module('Integration | Component | database-role-setting-form', function (hooks)
   });
 
   test('it shows empty states when no roleType passed in', async function (assert) {
-    await render(hbs`<DatabaseRoleSettingForm @attrs={{model.attrs}} @model={{model}}/>`);
+    await render(hbs`<DatabaseRoleSettingForm @attrs={{this.model.attrs}} @model={{this.model}}/>`);
     assert.dom('[data-test-component="empty-state"]').exists({ count: 2 }, 'Two empty states exist');
   });
 
@@ -105,10 +105,10 @@ module('Integration | Component | database-role-setting-form', function (hooks)
     this.set('dbType', '');
     await render(hbs`
       <DatabaseRoleSettingForm
-        @attrs={{model.attrs}}
-        @model={{model}}
-        @roleType={{roleType}}
-        @dbType={{dbType}}
+        @attrs={{this.model.attrs}}
+        @model={{this.model}}
+        @roleType={{this.roleType}}
+        @dbType={{this.dbType}}
       />
     `);
     assert.dom('[data-test-component="empty-state"]').doesNotExist('Does not show empty states');
diff --git a/ui/tests/integration/components/date-dropdown-test.js b/ui/tests/integration/components/date-dropdown-test.js
index 58278c621160..84bc30018904 100644
--- a/ui/tests/integration/components/date-dropdown-test.js
+++ b/ui/tests/integration/components/date-dropdown-test.js
@@ -37,7 +37,7 @@ module('Integration | Component | date-dropdown', function (hooks) {
     assert.dom('[data-test-date-dropdown-submit]').hasText('Submit', 'button renders default text');
     await render(hbs`
       <div class="is-flex-align-baseline">
-        <DateDropdown @submitText={{text}}/>
+        <DateDropdown @submitText={{this.text}}/>
       </div>
     `);
     assert.dom('[data-test-date-dropdown-submit]').hasText('Save', 'button renders passed in text');
@@ -52,10 +52,10 @@ module('Integration | Component | date-dropdown', function (hooks) {
     this.set('parentAction', parentAction);
 
     await render(hbs`
-    <div class="is-flex-align-baseline">
-    <DateDropdown 
-    @handleDateSelection={{parentAction}} />
-    </div>
+      <div class="is-flex-align-baseline">
+      <DateDropdown 
+        @handleDateSelection={{this.parentAction}} />
+      </div>
     `);
 
     const monthDropdown = this.element.querySelector('[data-test-popup-menu-trigger="month"]');
diff --git a/ui/tests/integration/components/edit-form-kmip-role-test.js b/ui/tests/integration/components/edit-form-kmip-role-test.js
index 8a2c254d0192..28290e772084 100644
--- a/ui/tests/integration/components/edit-form-kmip-role-test.js
+++ b/ui/tests/integration/components/edit-form-kmip-role-test.js
@@ -7,9 +7,8 @@ import { setupRenderingTest } from 'ember-qunit';
 import { click, render, settled } from '@ember/test-helpers';
 import hbs from 'htmlbars-inline-precompile';
 import sinon from 'sinon';
-import engineResolverFor from 'ember-engines/test-support/engine-resolver-for';
+import { setupEngine } from 'ember-engines/test-support';
 import { COMPUTEDS } from 'vault/models/kmip/role';
-const resolver = engineResolverFor('kmip');
 
 const flash = Service.extend({
   success: sinon.stub(),
@@ -56,20 +55,22 @@ const createModel = (options) => {
 };
 
 module('Integration | Component | edit form kmip role', function (hooks) {
-  setupRenderingTest(hooks, { resolver });
+  setupRenderingTest(hooks);
+  setupEngine(hooks, 'kmip');
 
   hooks.beforeEach(function () {
+    this.context = { owner: this.engine }; // this.engine set by setupEngine
     run(() => {
-      this.owner.unregister('service:flash-messages');
-      this.owner.register('service:flash-messages', flash);
-      this.owner.register('service:namespace', namespace);
+      this.engine.unregister('service:flash-messages');
+      this.engine.register('service:flash-messages', flash);
+      this.engine.register('service:namespace', namespace);
     });
   });
 
   test('it renders: new model', async function (assert) {
     let model = createModel({ isNew: true });
     this.set('model', model);
-    await render(hbs`<EditFormKmipRole @model={{model}} />`);
+    await render(hbs`<EditFormKmipRole @model={{this.model}} />`, this.context);
 
     assert.dom('[data-test-input="operationAll"]').isChecked('sets operationAll');
   });
@@ -77,14 +78,14 @@ module('Integration | Component | edit form kmip role', function (hooks) {
   test('it renders: operationAll', async function (assert) {
     let model = createModel({ operationAll: true });
     this.set('model', model);
-    await render(hbs`<EditFormKmipRole @model={{model}} />`);
+    await render(hbs`<EditFormKmipRole @model={{this.model}} />`, this.context);
     assert.dom('[data-test-input="operationAll"]').isChecked('sets operationAll');
   });
 
   test('it renders: operationNone', async function (assert) {
     let model = createModel({ operationNone: true });
     this.set('model', model);
-    await render(hbs`<EditFormKmipRole @model={{model}} />`);
+    await render(hbs`<EditFormKmipRole @model={{this.model}} />`, this.context);
 
     assert.dom('[data-test-input="operationNone"]').isNotChecked('sets operationNone');
   });
@@ -92,7 +93,7 @@ module('Integration | Component | edit form kmip role', function (hooks) {
   test('it renders: choose operations', async function (assert) {
     let model = createModel({ operationGet: true });
     this.set('model', model);
-    await render(hbs`<EditFormKmipRole @model={{model}} />`);
+    await render(hbs`<EditFormKmipRole @model={{this.model}} />`, this.context);
 
     assert.dom('[data-test-input="operationNone"]').isChecked('sets operationNone');
     assert.dom('[data-test-input="operationAll"]').isNotChecked('sets operationAll');
@@ -156,7 +157,7 @@ module('Integration | Component | edit form kmip role', function (hooks) {
       let model = createModel(initialState);
       this.set('model', model);
       let clickTargets = displayClicks.split(',');
-      await render(hbs`<EditFormKmipRole @model={{model}} />`);
+      await render(hbs`<EditFormKmipRole @model={{this.model}} />`, this.context);
 
       for (let clickTarget of clickTargets) {
         await click(`label[for=${clickTarget}]`);
diff --git a/ui/tests/integration/components/edit-form-test.js b/ui/tests/integration/components/edit-form-test.js
index 4a6a42a1a7f4..d3baef4b7f3e 100644
--- a/ui/tests/integration/components/edit-form-test.js
+++ b/ui/tests/integration/components/edit-form-test.js
@@ -44,31 +44,29 @@ module('Integration | Component | edit form', function (hooks) {
   });
 
   test('it renders', async function (assert) {
-    let model = createModel();
-    this.set('model', model);
-    await render(hbs`{{edit-form model=model}}`);
+    this.set('model', createModel());
+    await render(hbs`{{edit-form model=this.model}}`);
 
     assert.ok(component.fields.length, 2);
   });
 
   test('it calls flash message fns on save', async function (assert) {
     assert.expect(4);
-    let model = createModel();
     let onSave = () => {
       return resolve();
     };
-    this.set('model', model);
+    this.set('model', createModel());
     this.set('onSave', onSave);
     let saveSpy = sinon.spy(this, 'onSave');
 
-    await render(hbs`{{edit-form model=model onSave=onSave}}`);
+    await render(hbs`{{edit-form model=this.model onSave=this.onSave}}`);
 
     component.submit();
     later(() => cancelTimers(), 50);
     return settled().then(() => {
       assert.ok(saveSpy.calledOnce, 'calls passed onSave');
       assert.strictEqual(saveSpy.getCall(0).args[0].saveType, 'save');
-      assert.deepEqual(saveSpy.getCall(0).args[0].model, model, 'passes model to onSave');
+      assert.deepEqual(saveSpy.getCall(0).args[0].model, this.model, 'passes model to onSave');
       let flash = this.owner.lookup('service:flash-messages');
       assert.strictEqual(flash.success.callCount, 1, 'calls flash message success');
     });
diff --git a/ui/tests/integration/components/form-field-test.js b/ui/tests/integration/components/form-field-test.js
index 1f25ce4c042c..6c97ab5666a3 100644
--- a/ui/tests/integration/components/form-field-test.js
+++ b/ui/tests/integration/components/form-field-test.js
@@ -35,14 +35,13 @@ module('Integration | Component | form field', function (hooks) {
     this.attr = { name: 'foo' };
     this.model = model;
     await render(hbs`<FormField @attr={{this.attr}} @model={{this.model}} />`);
-
-    assert.strictEqual(component.fields.objectAt(0).labelText, 'Foo', 'renders a label');
+    assert.strictEqual(component.fields.objectAt(0).labelText[0], 'Foo', 'renders a label');
     assert.notOk(component.hasInput, 'renders only the label');
   });
 
   test('it renders: string', async function (assert) {
     let [model, spy] = await setup.call(this, createAttr('foo', 'string', { defaultValue: 'default' }));
-    assert.strictEqual(component.fields.objectAt(0).labelText, 'Foo', 'renders a label');
+    assert.strictEqual(component.fields.objectAt(0).labelText[0], 'Foo', 'renders a label');
     assert.strictEqual(component.fields.objectAt(0).inputValue, 'default', 'renders default value');
     assert.ok(component.hasInput, 'renders input for string');
     await component.fields.objectAt(0).input('bar').change();
@@ -53,7 +52,7 @@ module('Integration | Component | form field', function (hooks) {
 
   test('it renders: boolean', async function (assert) {
     let [model, spy] = await setup.call(this, createAttr('foo', 'boolean', { defaultValue: false }));
-    assert.strictEqual(component.fields.objectAt(0).labelText, 'Foo', 'renders a label');
+    assert.strictEqual(component.fields.objectAt(0).labelText[0], 'Foo', 'renders a label');
     assert.notOk(component.fields.objectAt(0).inputChecked, 'renders default value');
     assert.ok(component.hasCheckbox, 'renders a checkbox for boolean');
     await component.fields.objectAt(0).clickLabel();
@@ -64,24 +63,24 @@ module('Integration | Component | form field', function (hooks) {
 
   test('it renders: number', async function (assert) {
     let [model, spy] = await setup.call(this, createAttr('foo', 'number', { defaultValue: 5 }));
-    assert.strictEqual(component.fields.objectAt(0).labelText, 'Foo', 'renders a label');
-    assert.strictEqual(component.fields.objectAt(0).inputValue, 5, 'renders default value');
+    assert.strictEqual(component.fields.objectAt(0).labelText[0], 'Foo', 'renders a label');
+    assert.strictEqual(component.fields.objectAt(0).inputValue, '5', 'renders default value');
     assert.ok(component.hasInput, 'renders input for number');
     await component.fields.objectAt(0).input(8).change();
 
-    assert.strictEqual(model.get('foo'), 8);
+    assert.strictEqual(model.get('foo'), '8');
     assert.ok(spy.calledWith('foo', '8'), 'onChange called with correct args');
   });
 
   test('it renders: object', async function (assert) {
     await setup.call(this, createAttr('foo', 'object'));
-    assert.strictEqual(component.fields.objectAt(0).labelText, 'Foo', 'renders a label');
+    assert.strictEqual(component.fields.objectAt(0).labelText[0], 'Foo', 'renders a label');
     assert.ok(component.hasJSONEditor, 'renders the json editor');
   });
 
   test('it renders: string as json with clear button', async function (assert) {
     await setup.call(this, createAttr('foo', 'string', { editType: 'json', allowReset: true }));
-    assert.strictEqual(component.fields.objectAt(0).labelText, 'Foo', 'renders a label');
+    assert.strictEqual(component.fields.objectAt(0).labelText[0], 'Foo', 'renders a label');
     assert.ok(component.hasJSONEditor, 'renders the json editor');
     assert.ok(component.hasJSONClearButton, 'renders button that will clear the JSON value');
   });
@@ -91,7 +90,7 @@ module('Integration | Component | form field', function (hooks) {
       this,
       createAttr('foo', 'string', { defaultValue: 'goodbye', editType: 'textarea' })
     );
-    assert.strictEqual(component.fields.objectAt(0).labelText, 'Foo', 'renders a label');
+    assert.strictEqual(component.fields.objectAt(0).labelText[0], 'Foo', 'renders a label');
     assert.ok(component.hasTextarea, 'renders a textarea');
     assert.strictEqual(component.fields.objectAt(0).textareaValue, 'goodbye', 'renders default value');
     await component.fields.objectAt(0).textarea('hello');
@@ -161,7 +160,11 @@ module('Integration | Component | form field', function (hooks) {
 
   test('it uses a passed label', async function (assert) {
     await setup.call(this, createAttr('foo', 'string', { label: 'Not Foo' }));
-    assert.strictEqual(component.fields.objectAt(0).labelText, 'Not Foo', 'renders the label from options');
+    assert.strictEqual(
+      component.fields.objectAt(0).labelText[0],
+      'Not Foo',
+      'renders the label from options'
+    );
   });
 
   test('it renders a help tooltip', async function (assert) {
diff --git a/ui/tests/integration/components/hover-copy-button-test.js b/ui/tests/integration/components/hover-copy-button-test.js
index 658d2369ed32..1d6d74690072 100644
--- a/ui/tests/integration/components/hover-copy-button-test.js
+++ b/ui/tests/integration/components/hover-copy-button-test.js
@@ -31,7 +31,7 @@ module('Integration | Component | hover copy button', function (hooks) {
       @alwaysShow={{true}}
     />
   `);
-    await render(hbs`{{hover-copy-button alwaysShow=true copyValue=copyValue}}`);
+    await render(hbs`{{hover-copy-button alwaysShow=true copyValue=this.copyValue}}`);
     assert.ok(component.buttonIsVisible);
     assert.ok(component.wrapperClass.includes('hover-copy-button-static'));
   });
diff --git a/ui/tests/integration/components/identity/item-details-test.js b/ui/tests/integration/components/identity/item-details-test.js
index ec464f1bd72d..f6cfee43dd7c 100644
--- a/ui/tests/integration/components/identity/item-details-test.js
+++ b/ui/tests/integration/components/identity/item-details-test.js
@@ -27,7 +27,7 @@ module('Integration | Component | identity/item details', function (hooks) {
     });
     sinon.spy(model, 'save');
     this.set('model', model);
-    await render(hbs`{{identity/item-details model=model}}`);
+    await render(hbs`{{identity/item-details model=this.model}}`);
     assert.dom('[data-test-disabled-warning]').exists();
     await component.enable();
 
@@ -40,7 +40,7 @@ module('Integration | Component | identity/item details', function (hooks) {
     });
 
     this.set('model', model);
-    await render(hbs`{{identity/item-details model=model}}`);
+    await render(hbs`{{identity/item-details model=this.model}}`);
     assert.dom('[data-test-disabled-warning]').exists('shows the warning banner');
     assert.dom('[data-test-enable]').doesNotExist('does not show the enable button');
   });
@@ -49,7 +49,7 @@ module('Integration | Component | identity/item details', function (hooks) {
     let model = EmberObject.create();
     this.set('model', model);
 
-    await render(hbs`{{identity/item-details model=model}}`);
+    await render(hbs`{{identity/item-details model=this.model}}`);
     assert.dom('[data-test-disabled-warning]').doesNotExist('does not show the warning banner');
   });
 });
diff --git a/ui/tests/integration/components/info-table-test.js b/ui/tests/integration/components/info-table-test.js
index b7e7fdffa448..9399d780c31e 100644
--- a/ui/tests/integration/components/info-table-test.js
+++ b/ui/tests/integration/components/info-table-test.js
@@ -5,7 +5,7 @@ import hbs from 'htmlbars-inline-precompile';
 
 const TITLE = 'My Table';
 const HEADER = 'Cool Header';
-const ITEMS = ['https://127.0.0.1:8201', 'hello', 3];
+const ITEMS = ['https://127.0.0.1:8201', 'hello', '3'];
 
 module('Integration | Component | InfoTable', function (hooks) {
   setupRenderingTest(hooks);
@@ -19,9 +19,9 @@ module('Integration | Component | InfoTable', function (hooks) {
   test('it renders', async function (assert) {
     assert.expect(6);
     await render(hbs`<InfoTable
-        @title={{title}}
-        @header={{header}}
-        @items={{items}}
+        @title={{this.title}}
+        @header={{this.header}}
+        @items={{this.items}}
       />`);
 
     assert.dom('[data-test-info-table]').exists();
diff --git a/ui/tests/integration/components/keymgmt/distribute-test.js b/ui/tests/integration/components/keymgmt/distribute-test.js
index 8198ea147e11..aa62c08869c9 100644
--- a/ui/tests/integration/components/keymgmt/distribute-test.js
+++ b/ui/tests/integration/components/keymgmt/distribute-test.js
@@ -99,7 +99,7 @@ module('Integration | Component | keymgmt/distribute', function (hooks) {
   test('it does not allow operation selection until valid key/provider combo selected', async function (assert) {
     assert.expect(6);
     await render(
-      hbs`<Keymgmt::Distribute @backend="keymgmt" @key="example-1" @providers={{providers}} @onClose={{fn (mut this.onClose)}} />`
+      hbs`<Keymgmt::Distribute @backend="keymgmt" @key="example-1" @providers={{this.providers}} @onClose={{fn (mut this.onClose)}} />`
     );
     assert.dom(SELECTORS.operationsSection).hasAttribute('disabled');
     // Select
@@ -123,7 +123,7 @@ module('Integration | Component | keymgmt/distribute', function (hooks) {
   test('it shows key type select field if new key created', async function (assert) {
     assert.expect(2);
     await render(
-      hbs`<Keymgmt::Distribute @backend="keymgmt" @providers={{providers}} @onClose={{fn (mut this.onClose)}} />`
+      hbs`<Keymgmt::Distribute @backend="keymgmt" @providers={{this.providers}} @onClose={{fn (mut this.onClose)}} />`
     );
     assert.dom(SELECTORS.keyTypeSection).doesNotExist('Key Type section is not rendered by default');
     // Add new item on search-select
@@ -157,7 +157,7 @@ module('Integration | Component | keymgmt/distribute', function (hooks) {
   test('it hides the key field if passed from the parent', async function (assert) {
     assert.expect(4);
     await render(
-      hbs`<Keymgmt::Distribute @backend="keymgmt" @providers={{providers}} @key="example-1" @onClose={{fn (mut this.onClose)}} />`
+      hbs`<Keymgmt::Distribute @backend="keymgmt" @providers={{this.providers}} @key="example-1" @onClose={{fn (mut this.onClose)}} />`
     );
     assert.dom(SELECTORS.providerInput).exists('Provider input shown');
     assert.dom(SELECTORS.keySection).doesNotExist('Key input not shown');
diff --git a/ui/tests/integration/components/keymgmt/key-edit-test.js b/ui/tests/integration/components/keymgmt/key-edit-test.js
index 0d67fffdf30c..221a39877c3c 100644
--- a/ui/tests/integration/components/keymgmt/key-edit-test.js
+++ b/ui/tests/integration/components/keymgmt/key-edit-test.js
@@ -32,7 +32,9 @@ module('Integration | Component | keymgmt/key-edit', function (hooks) {
   // TODO: Add capabilities tests
   test('it renders show view as default', async function (assert) {
     assert.expect(8);
-    await render(hbs`<Keymgmt::KeyEdit @model={{model}} @tab={{tab}} /><div id="modal-wormhole" />`);
+    await render(
+      hbs`<Keymgmt::KeyEdit @model={{this.model}} @tab={{this.tab}} /><div id="modal-wormhole" />`
+    );
     assert.dom('[data-test-secret-header]').hasText('Unicorns', 'Shows key name');
     assert.dom('[data-test-keymgmt-key-toolbar]').exists('Subnav toolbar exists');
     assert.dom('[data-test-tab="Details"]').exists('Details tab exists');
@@ -56,7 +58,9 @@ module('Integration | Component | keymgmt/key-edit', function (hooks) {
     this.set('mode', 'edit');
     this.set('model', model);
 
-    await render(hbs`<Keymgmt::KeyEdit @model={{model}} @mode={{mode}} /><div id="modal-wormhole" />`);
+    await render(
+      hbs`<Keymgmt::KeyEdit @model={{this.model}} @mode={{this.mode}} /><div id="modal-wormhole" />`
+    );
     assert.dom('[data-test-secret-header]').hasText('Edit key', 'Shows edit header');
     assert.dom('[data-test-keymgmt-key-toolbar]').doesNotExist('Subnav toolbar does not exist');
     assert.dom('[data-test-tab="Details"]').doesNotExist('Details tab does not exist');
@@ -69,7 +73,9 @@ module('Integration | Component | keymgmt/key-edit', function (hooks) {
     this.set('mode', 'create');
     this.set('model', model);
 
-    await render(hbs`<Keymgmt::KeyEdit @model={{model}} @mode={{mode}} /><div id="modal-wormhole" />`);
+    await render(
+      hbs`<Keymgmt::KeyEdit @model={{this.model}} @mode={{this.mode}} /><div id="modal-wormhole" />`
+    );
     assert.dom('[data-test-secret-header]').hasText('Create key', 'Shows edit header');
     assert.dom('[data-test-keymgmt-key-toolbar]').doesNotExist('Subnav toolbar does not exist');
     assert.dom('[data-test-tab="Details"]').doesNotExist('Details tab does not exist');
@@ -81,7 +87,9 @@ module('Integration | Component | keymgmt/key-edit', function (hooks) {
     const store = this.owner.lookup('service:store');
     this.model = store.createRecord('keymgmt/key');
     this.set('mode', 'create');
-    await render(hbs`<Keymgmt::KeyEdit @model={{model}} @mode={{mode}} /><div id="modal-wormhole" />`);
+    await render(
+      hbs`<Keymgmt::KeyEdit @model={{this.model}} @mode={{this.mode}} /><div id="modal-wormhole" />`
+    );
     assert.dom('[data-test-input="type"]').hasValue('rsa-2048', 'Has type rsa-2048 by default');
   });
 });
diff --git a/ui/tests/integration/components/known-secondaries-card-test.js b/ui/tests/integration/components/known-secondaries-card-test.js
index 0ef05df4b0e5..2dc68a8eb405 100644
--- a/ui/tests/integration/components/known-secondaries-card-test.js
+++ b/ui/tests/integration/components/known-secondaries-card-test.js
@@ -1,9 +1,8 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
-import engineResolverFor from 'ember-engines/test-support/engine-resolver-for';
+import { setupEngine } from 'ember-engines/test-support';
 import hbs from 'htmlbars-inline-precompile';
-const resolver = engineResolverFor('replication');
 
 const CLUSTER = {
   canAddSecondary: true,
@@ -19,16 +18,19 @@ const REPLICATION_ATTRS = {
 };
 
 module('Integration | Component | replication known-secondaries-card', function (hooks) {
-  setupRenderingTest(hooks, { resolver });
+  setupRenderingTest(hooks);
+  setupEngine(hooks, 'replication');
 
   hooks.beforeEach(function () {
+    this.context = { owner: this.engine }; // this.engine set by setupEngine
     this.set('cluster', CLUSTER);
     this.set('replicationAttrs', REPLICATION_ATTRS);
   });
 
   test('it renders with a table of known secondaries', async function (assert) {
     await render(
-      hbs`<KnownSecondariesCard @cluster={{this.cluster}} @replicationAttrs={{this.replicationAttrs}} />`
+      hbs`<KnownSecondariesCard @cluster={{this.cluster}} @replicationAttrs={{this.replicationAttrs}} />`,
+      this.context
     );
 
     assert
@@ -43,7 +45,8 @@ module('Integration | Component | replication known-secondaries-card', function
     };
     this.set('replicationAttrs', noSecondaries);
     await render(
-      hbs`<KnownSecondariesCard @cluster={{this.cluster}} @replicationAttrs={{this.replicationAttrs}} />`
+      hbs`<KnownSecondariesCard @cluster={{this.cluster}} @replicationAttrs={{this.replicationAttrs}} />`,
+      this.context
     );
 
     assert
@@ -56,7 +59,8 @@ module('Integration | Component | replication known-secondaries-card', function
 
   test('it renders an Add secondary link if user has capabilites', async function (assert) {
     await render(
-      hbs`<KnownSecondariesCard @cluster={{this.cluster}} @replicationAttrs={{this.replicationAttrs}} />`
+      hbs`<KnownSecondariesCard @cluster={{this.cluster}} @replicationAttrs={{this.replicationAttrs}} />`,
+      this.context
     );
 
     assert.dom('.add-secondaries').exists();
@@ -68,7 +72,8 @@ module('Integration | Component | replication known-secondaries-card', function
     };
     this.set('cluster', noCapabilities);
     await render(
-      hbs`<KnownSecondariesCard @cluster={{this.cluster}} @replicationAttrs={{this.replicationAttrs}} />`
+      hbs`<KnownSecondariesCard @cluster={{this.cluster}} @replicationAttrs={{this.replicationAttrs}} />`,
+      this.context
     );
 
     assert.dom('.add-secondaries').doesNotExist();
diff --git a/ui/tests/integration/components/known-secondaries-table-test.js b/ui/tests/integration/components/known-secondaries-table-test.js
index a715f9b3c5c8..cc5210af6bbd 100644
--- a/ui/tests/integration/components/known-secondaries-table-test.js
+++ b/ui/tests/integration/components/known-secondaries-table-test.js
@@ -2,9 +2,8 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
-import engineResolverFor from 'ember-engines/test-support/engine-resolver-for';
+import { setupEngine } from 'ember-engines/test-support';
 import hbs from 'htmlbars-inline-precompile';
-const resolver = engineResolverFor('replication');
 
 const SECONDARIES = [
   { node_id: 'secondary-1', api_address: 'https://127.0.0.1:52304', connection_status: 'connected' },
@@ -13,21 +12,23 @@ const SECONDARIES = [
 ];
 
 module('Integration | Component | replication known-secondaries-table', function (hooks) {
-  setupRenderingTest(hooks, { resolver });
+  setupRenderingTest(hooks);
+  setupEngine(hooks, 'replication');
 
   hooks.beforeEach(function () {
+    this.context = { owner: this.engine }; // this.engine set by setupEngine
     this.set('secondaries', SECONDARIES);
   });
 
   test('it renders a table of known secondaries', async function (assert) {
-    await render(hbs`<KnownSecondariesTable @secondaries={{secondaries}} />`);
+    await render(hbs`<KnownSecondariesTable @secondaries={{this.secondaries}} />`, this.context);
 
     assert.dom('[data-test-known-secondaries-table]').exists();
   });
 
   test('it shows the secondary URL and connection_status', async function (assert) {
     assert.expect(9);
-    await render(hbs`<KnownSecondariesTable @secondaries={{secondaries}} />`);
+    await render(hbs`<KnownSecondariesTable @secondaries={{this.secondaries}} />`, this.context);
 
     SECONDARIES.forEach((secondary) => {
       assert.strictEqual(
diff --git a/ui/tests/integration/components/kv-object-editor-test.js b/ui/tests/integration/components/kv-object-editor-test.js
index cecc3d7c4591..39f6f1f92d44 100644
--- a/ui/tests/integration/components/kv-object-editor-test.js
+++ b/ui/tests/integration/components/kv-object-editor-test.js
@@ -39,7 +39,7 @@ module('Integration | Component | kv-object-editor', function (hooks) {
   test('it renders passed data', async function (assert) {
     let metadata = { foo: 'bar', baz: 'bop' };
     this.set('value', metadata);
-    await render(hbs`{{kv-object-editor value=value}}`);
+    await render(hbs`{{kv-object-editor value=this.value}}`);
     assert.strictEqual(
       component.rows.length,
       Object.keys(metadata).length + 1,
@@ -63,7 +63,7 @@ module('Integration | Component | kv-object-editor', function (hooks) {
   test('it shows a warning if there are duplicate keys', async function (assert) {
     let metadata = { foo: 'bar', baz: 'bop' };
     this.set('value', metadata);
-    await render(hbs`{{kv-object-editor value=value onChange=this.spy}}`);
+    await render(hbs`{{kv-object-editor value=this.value onChange=this.spy}}`);
     await component.rows.objectAt(0).kvKey('foo');
 
     assert.ok(component.showsDuplicateError, 'duplicate keys are allowed but an error message is shown');
diff --git a/ui/tests/integration/components/license-banners-test.js b/ui/tests/integration/components/license-banners-test.js
index 6e562838a5e4..8fceba13f1e9 100644
--- a/ui/tests/integration/components/license-banners-test.js
+++ b/ui/tests/integration/components/license-banners-test.js
@@ -17,7 +17,7 @@ module('Integration | Component | license-banners', function (hooks) {
   test('it renders an error if expiry is before now', async function (assert) {
     const yesterday = subDays(new Date(), 1);
     this.set('expiry', formatRFC3339(yesterday));
-    await render(hbs`<LicenseBanners @expiry={{expiry}} />`);
+    await render(hbs`<LicenseBanners @expiry={{this.expiry}} />`);
     assert.dom('[data-test-license-banner-expired]').exists('Expired license banner renders');
     assert.dom('.message-title').hasText('License expired', 'Shows correct title on alert');
   });
@@ -25,7 +25,7 @@ module('Integration | Component | license-banners', function (hooks) {
   test('it renders a warning if expiry is within 30 days', async function (assert) {
     const nextMonth = addDays(new Date(), 30);
     this.set('expiry', formatRFC3339(nextMonth));
-    await render(hbs`<LicenseBanners @expiry={{expiry}} />`);
+    await render(hbs`<LicenseBanners @expiry={{this.expiry}} />`);
     assert.dom('[data-test-license-banner-warning]').exists('Warning license banner renders');
     assert.dom('.message-title').hasText('Vault license expiring', 'Shows correct title on alert');
   });
@@ -33,7 +33,7 @@ module('Integration | Component | license-banners', function (hooks) {
   test('it does not render a banner if expiry is outside 30 days', async function (assert) {
     const outside30 = addDays(new Date(), 32);
     this.set('expiry', formatRFC3339(outside30));
-    await render(hbs`<LicenseBanners @expiry={{expiry}} />`);
+    await render(hbs`<LicenseBanners @expiry={{this.expiry}} />`);
     assert.dom('[data-test-license-banner]').doesNotExist('License banner does not render');
   });
 });
diff --git a/ui/tests/integration/components/link-status-test.js b/ui/tests/integration/components/link-status-test.js
index 68542bb9a5f2..ca262e4a80c3 100644
--- a/ui/tests/integration/components/link-status-test.js
+++ b/ui/tests/integration/components/link-status-test.js
@@ -11,7 +11,7 @@ module('Integration | Component | link-status', function (hooks) {
 
   // this can be removed once feature is released for OSS
   hooks.beforeEach(function () {
-    this.owner.lookup('service:version').set('isEnterprise', true);
+    this.owner.lookup('service:version').set('version', '1.13.0+ent');
     this.statuses = statuses;
   });
 
@@ -25,7 +25,7 @@ module('Integration | Component | link-status', function (hooks) {
   });
 
   test('it does not render banner in oss version', async function (assert) {
-    this.owner.lookup('service:version').set('isEnterprise', false);
+    this.owner.lookup('service:version').set('version', '1.13.0');
 
     await render(hbs`
       <div id="modal-wormhole"></div>
diff --git a/ui/tests/integration/components/linkable-item-test.js b/ui/tests/integration/components/linkable-item-test.js
index 9fdbabf280b5..67e68061c72c 100644
--- a/ui/tests/integration/components/linkable-item-test.js
+++ b/ui/tests/integration/components/linkable-item-test.js
@@ -44,7 +44,7 @@ module('Integration | Component | linkable-item', function (hooks) {
     await render(hbs`
       <LinkableItem @link={{hash route="vault" model="modelId"}} as |Li|>
         <Li.content
-          @title={{title}}
+          @title="A title"
           @link={{hash route="vault" model="modelId"}}
         >
           stuff here
diff --git a/ui/tests/integration/components/masked-input-test.js b/ui/tests/integration/components/masked-input-test.js
index 091c852b042b..11f7bf521462 100644
--- a/ui/tests/integration/components/masked-input-test.js
+++ b/ui/tests/integration/components/masked-input-test.js
@@ -29,7 +29,7 @@ module('Integration | Component | masked input', function (hooks) {
 
   test('it renders obscure font when displayOnly', async function (assert) {
     this.set('value', 'value');
-    await render(hbs`{{masked-input displayOnly=true value=value}}`);
+    await render(hbs`{{masked-input displayOnly=true value=this.value}}`);
 
     assert.dom('.masked-value').hasClass('masked-font', 'loading class with correct font');
   });
@@ -54,7 +54,7 @@ module('Integration | Component | masked input', function (hooks) {
 
   test('it unmasks text when button is clicked', async function (assert) {
     this.set('value', 'value');
-    await render(hbs`{{masked-input value=value}}`);
+    await render(hbs`{{masked-input value=this.value}}`);
     await component.toggleMasked();
 
     assert.dom('.masked-value').doesNotHaveClass('masked-font');
@@ -62,7 +62,7 @@ module('Integration | Component | masked input', function (hooks) {
 
   test('it remasks text when button is clicked', async function (assert) {
     this.set('value', 'value');
-    await render(hbs`{{masked-input value=value}}`);
+    await render(hbs`{{masked-input value=this.value}}`);
 
     await component.toggleMasked();
     await component.toggleMasked();
@@ -72,7 +72,7 @@ module('Integration | Component | masked input', function (hooks) {
 
   test('it shortens all outputs when displayOnly and masked', async function (assert) {
     this.set('value', '123456789-123456789-123456789');
-    await render(hbs`{{masked-input value=value displayOnly=true}}`);
+    await render(hbs`{{masked-input value=this.value displayOnly=true}}`);
     let maskedValue = document.querySelector('.masked-value').innerText;
     assert.strictEqual(maskedValue.length, 11);
 
@@ -83,7 +83,7 @@ module('Integration | Component | masked input', function (hooks) {
 
   test('it does not unmask text on focus', async function (assert) {
     this.set('value', '123456789-123456789-123456789');
-    await render(hbs`{{masked-input value=value}}`);
+    await render(hbs`{{masked-input value=this.value}}`);
     assert.dom('.masked-value').hasClass('masked-font');
     await focus('.masked-value');
     assert.dom('.masked-value').hasClass('masked-font');
@@ -91,7 +91,7 @@ module('Integration | Component | masked input', function (hooks) {
 
   test('it does not remove value on tab', async function (assert) {
     this.set('value', 'hello');
-    await render(hbs`{{masked-input value=value}}`);
+    await render(hbs`{{masked-input value=this.value}}`);
     await triggerKeyEvent('[data-test-textarea]', 'keydown', 9);
     await component.toggleMasked();
     let unMaskedValue = document.querySelector('.masked-value').value;
diff --git a/ui/tests/integration/components/mount-accessor-select-test.js b/ui/tests/integration/components/mount-accessor-select-test.js
index c4bb45f9705b..d6a64bbaaba9 100644
--- a/ui/tests/integration/components/mount-accessor-select-test.js
+++ b/ui/tests/integration/components/mount-accessor-select-test.js
@@ -21,26 +21,26 @@ module('Integration | Component | mount-accessor-select', function (hooks) {
   });
 
   test('it renders', async function (assert) {
-    await render(hbs`<MountAccessorSelect @onChange={{onChange}}/>`);
+    await render(hbs`<MountAccessorSelect @onChange={{this.onChange}}/>`);
     assert.dom('[data-test-mount-accessor-select]').exists();
   });
 
   test('it filters token', async function (assert) {
-    await render(hbs`<MountAccessorSelect @onChange={{onChange}} @filterToken={{true}}/>`);
+    await render(hbs`<MountAccessorSelect @onChange={{this.onChange}} @filterToken={{true}}/>`);
     await click('[data-test-mount-accessor-select]');
     let options = document.querySelector('[data-test-mount-accessor-select]').options;
     assert.strictEqual(options.length, 1, 'only the auth option, no token');
   });
 
   test('it shows token', async function (assert) {
-    await render(hbs`<MountAccessorSelect @onChange={{onChange}}/>`);
+    await render(hbs`<MountAccessorSelect @onChange={{this.onChange}}/>`);
     await click('[data-test-mount-accessor-select]');
     let options = document.querySelector('[data-test-mount-accessor-select]').options;
     assert.strictEqual(options.length, 2, 'both auth and token show');
   });
 
   test('it sends value to parent onChange', async function (assert) {
-    await render(hbs`<MountAccessorSelect @onChange={{onChange}}/>`);
+    await render(hbs`<MountAccessorSelect @onChange={{this.onChange}}/>`);
     await fillIn('[data-test-mount-accessor-select]', 'auth_userpass_1234');
     assert.ok(
       this.onChange.calledWith('auth_userpass_1234'),
@@ -49,14 +49,14 @@ module('Integration | Component | mount-accessor-select', function (hooks) {
   });
 
   test('it selects the first option if no default', async function (assert) {
-    await render(hbs`<MountAccessorSelect @onChange={{onChange}} />`);
+    await render(hbs`<MountAccessorSelect @onChange={{this.onChange}} />`);
     let defaultSelection = document.querySelector('[data-test-mount-accessor-select]').options[0].innerHTML;
     // remove all non letters
     assert.strictEqual(defaultSelection.replace(/\W/g, ''), 'userpassuserpass');
   });
 
   test('it shows Select one if yes default', async function (assert) {
-    await render(hbs`<MountAccessorSelect @onChange={{onChange}} @noDefault={{true}} />`);
+    await render(hbs`<MountAccessorSelect @onChange={{this.onChange}} @noDefault={{true}} />`);
     let defaultSelection = document.querySelector('[data-test-mount-accessor-select]').options[0].innerHTML;
     // remove all non letters
     assert.strictEqual(defaultSelection.replace(/\W/g, ''), 'Selectone');
diff --git a/ui/tests/integration/components/mount-backend-form-test.js b/ui/tests/integration/components/mount-backend-form-test.js
index 8fd3a4c0e863..dfa9b208233f 100644
--- a/ui/tests/integration/components/mount-backend-form-test.js
+++ b/ui/tests/integration/components/mount-backend-form-test.js
@@ -63,7 +63,7 @@ module('Integration | Component | mount backend form', function (hooks) {
     });
     const spy = sinon.spy();
     this.set('onMountSuccess', spy);
-    await render(hbs`{{mount-backend-form onMountSuccess=onMountSuccess}}`);
+    await render(hbs`{{mount-backend-form onMountSuccess=this.onMountSuccess}}`);
 
     await component.mount('approle', 'foo');
 
diff --git a/ui/tests/integration/components/oidc-consent-block-test.js b/ui/tests/integration/components/oidc-consent-block-test.js
index 7dd74b56dd84..4fbbe4c749ce 100644
--- a/ui/tests/integration/components/oidc-consent-block-test.js
+++ b/ui/tests/integration/components/oidc-consent-block-test.js
@@ -12,7 +12,7 @@ module('Integration | Component | oidc-consent-block', function (hooks) {
   test('it renders', async function (assert) {
     this.set('redirect', redirectBase);
     await render(hbs`
-      <OidcConsentBlock @redirect={{redirect}} @code="1234" />
+      <OidcConsentBlock @redirect={{this.redirect}} @code="1234" />
     `);
 
     assert.dom('[data-test-consent-title]').hasText('Consent', 'Title is correct on initial render');
@@ -32,7 +32,7 @@ module('Integration | Component | oidc-consent-block', function (hooks) {
     this.set('redirect', redirectBase);
 
     await render(hbs`
-      <OidcConsentBlock @redirect={{redirect}} @code="1234" @testRedirect={{successSpy}} @foo="make sure this doesn't get passed" />
+      <OidcConsentBlock @redirect={{this.redirect}} @code="1234" @testRedirect={{this.successSpy}} @foo="make sure this doesn't get passed" />
     `);
 
     assert.dom('[data-test-consent-title]').hasText('Consent', 'Title is correct on initial render');
@@ -53,7 +53,7 @@ module('Integration | Component | oidc-consent-block', function (hooks) {
     this.set('redirect', redirectBase);
 
     await render(hbs`
-      <OidcConsentBlock @redirect={{redirectBase}} @code="1234" @testRedirect={{successSpy}} />
+      <OidcConsentBlock @redirect={{this.redirectBase}} @code="1234" @testRedirect={{this.successSpy}} />
     `);
 
     assert.dom('[data-test-consent-title]').hasText('Consent', 'Title is correct on initial render');
@@ -79,11 +79,11 @@ module('Integration | Component | oidc-consent-block', function (hooks) {
 
     await render(hbs`
       <OidcConsentBlock
-        @redirect={{redirect}}
-        @code={{code}}
+        @redirect={{this.redirect}}
+        @code={{this.code}}
         @state="foo"
         @foo="make sure this doesn't get passed"
-        @testRedirect={{successSpy}}
+        @testRedirect={{this.successSpy}}
       />
     `);
 
diff --git a/ui/tests/integration/components/path-filter-config-list-test.js b/ui/tests/integration/components/path-filter-config-list-test.js
index 30e9ab07d7d2..a15b17a2e316 100644
--- a/ui/tests/integration/components/path-filter-config-list-test.js
+++ b/ui/tests/integration/components/path-filter-config-list-test.js
@@ -3,7 +3,7 @@ import { setupRenderingTest } from 'ember-qunit';
 import { render, click, findAll } from '@ember/test-helpers';
 import { typeInSearch, clickTrigger } from 'ember-power-select/test-support/helpers';
 import hbs from 'htmlbars-inline-precompile';
-import engineResolverFor from 'ember-engines/test-support/engine-resolver-for';
+import { setupEngine } from 'ember-engines/test-support';
 import Service from '@ember/service';
 import sinon from 'sinon';
 import { Promise } from 'rsvp';
@@ -12,8 +12,6 @@ import ss from 'vault/tests/pages/components/search-select';
 
 const searchSelect = create(ss);
 
-const resolver = engineResolverFor('replication');
-
 const MOUNTS_RESPONSE = {
   data: {
     secret: {},
@@ -32,8 +30,11 @@ const NAMESPACE_MOUNTS_RESPONSE = {
 };
 
 module('Integration | Component | path filter config list', function (hooks) {
-  setupRenderingTest(hooks, { resolver });
+  setupRenderingTest(hooks);
+  setupEngine(hooks, 'replication');
+
   hooks.beforeEach(function () {
+    this.context = { owner: this.engine }; // this.engine set by setupEngine
     let ajaxStub = sinon.stub().usingPromise(Promise);
     ajaxStub.withArgs('/v1/sys/internal/ui/mounts', 'GET').resolves(MOUNTS_RESPONSE);
     ajaxStub
@@ -54,13 +55,13 @@ module('Integration | Component | path filter config list', function (hooks) {
         };
       },
     });
-    this.owner.register('service:namespace', namespaceServiceStub);
-    this.owner.register('service:store', storeServiceStub);
+    this.engine.register('service:namespace', namespaceServiceStub);
+    this.engine.register('service:store', storeServiceStub);
   });
 
   test('it renders', async function (assert) {
     this.set('config', { mode: null, paths: [] });
-    await render(hbs`<PathFilterConfigList @config={{config}} @paths={{paths}} />`);
+    await render(hbs`<PathFilterConfigList @config={{this.config}} @paths={{this.paths}} />`, this.context);
 
     assert.dom('[data-test-component=path-filter-config]').exists();
   });
@@ -68,7 +69,7 @@ module('Integration | Component | path filter config list', function (hooks) {
   test('it sets config.paths', async function (assert) {
     this.set('config', { mode: 'allow', paths: [] });
     this.set('paths', []);
-    await render(hbs`<PathFilterConfigList @config={{config}} @paths={{paths}} />`);
+    await render(hbs`<PathFilterConfigList @config={{this.config}} @paths={{this.paths}} />`, this.context);
 
     await clickTrigger();
     await typeInSearch('auth');
@@ -86,7 +87,7 @@ module('Integration | Component | path filter config list', function (hooks) {
 
   test('it sets config.mode', async function (assert) {
     this.set('config', { mode: 'allow', paths: [] });
-    await render(hbs`<PathFilterConfigList @config={{this.config}} />`);
+    await render(hbs`<PathFilterConfigList @config={{this.config}} />`, this.context);
     await click('#deny');
     assert.strictEqual(this.config.mode, 'deny');
     await click('#no-filtering');
@@ -95,7 +96,7 @@ module('Integration | Component | path filter config list', function (hooks) {
 
   test('it shows a warning when going from a mode to allow all', async function (assert) {
     this.set('config', { mode: 'allow', paths: [] });
-    await render(hbs`<PathFilterConfigList @config={{this.config}} />`);
+    await render(hbs`<PathFilterConfigList @config={{this.config}} />`, this.context);
     await click('#no-filtering');
     assert.dom('[data-test-remove-warning]').exists('shows removal warning');
   });
@@ -103,7 +104,7 @@ module('Integration | Component | path filter config list', function (hooks) {
   test('it fetches mounts from a namespace when namespace name is entered', async function (assert) {
     this.set('config', { mode: 'allow', paths: [] });
     this.set('paths', []);
-    await render(hbs`<PathFilterConfigList @config={{config}} @paths={{paths}} />`);
+    await render(hbs`<PathFilterConfigList @config={{this.config}} @paths={{this.paths}} />`, this.context);
 
     await clickTrigger();
     assert.strictEqual(searchSelect.options.length, 2, 'shows userpass and namespace as an option');
@@ -117,7 +118,7 @@ module('Integration | Component | path filter config list', function (hooks) {
   test('it selects mounts from different groups, and puts discarded option back within group', async function (assert) {
     this.set('config', { mode: 'allow', paths: [] });
     this.set('paths', []);
-    await render(hbs`<PathFilterConfigList @config={{config}} @paths={{paths}} />`);
+    await render(hbs`<PathFilterConfigList @config={{this.config}} @paths={{this.paths}} />`, this.context);
     await clickTrigger();
     await searchSelect.options.objectAt(1).click();
     await clickTrigger();
@@ -150,7 +151,7 @@ module('Integration | Component | path filter config list', function (hooks) {
   test('it renders previously set config.paths when editing the mount config', async function (assert) {
     this.set('config', { mode: 'allow', paths: ['auth/userpass/'] });
     this.set('paths', []);
-    await render(hbs`<PathFilterConfigList @config={{config}} @paths={{paths}} />`);
+    await render(hbs`<PathFilterConfigList @config={{this.config}} @paths={{this.paths}} />`, this.context);
     assert.strictEqual(
       searchSelect.selectedOptions.objectAt(0).text,
       'auth/userpass/',
diff --git a/ui/tests/integration/components/pgp-list-test.js b/ui/tests/integration/components/pgp-list-test.js
index 4a649c1a7019..d6af45042d7b 100644
--- a/ui/tests/integration/components/pgp-list-test.js
+++ b/ui/tests/integration/components/pgp-list-test.js
@@ -17,7 +17,7 @@ module('Integration | Component | pgp list', function (hooks) {
 
   test('it renders', async function (assert) {
     this.set('listLength', 0);
-    await render(hbs`<PgpList @listLength={{listLength}} />`);
+    await render(hbs`<PgpList @listLength={{this.listLength}} />`);
     assert.dom('[data-test-empty-text]').exists('shows the empty state');
     this.set('listLength', 1);
     assert
diff --git a/ui/tests/integration/components/pki/config-pki-ca-test.js b/ui/tests/integration/components/pki/config-pki-ca-test.js
index 858adf56b5f4..dc3fa6587aaf 100644
--- a/ui/tests/integration/components/pki/config-pki-ca-test.js
+++ b/ui/tests/integration/components/pki/config-pki-ca-test.js
@@ -51,7 +51,7 @@ module('Integration | Component | config pki ca', function (hooks) {
     const refreshFn = onRefresh || function () {};
     context.set('config', config());
     context.set('onRefresh', refreshFn);
-    await context.render(hbs`<Pki::ConfigPkiCa @onRefresh={{onRefresh}} @config={{config}} />`);
+    await context.render(hbs`<Pki::ConfigPkiCa @onRefresh={{this.onRefresh}} @config={{this.config}} />`);
   };
 
   test('it renders, no pem', async function (assert) {
@@ -72,7 +72,7 @@ module('Integration | Component | config pki ca', function (hooks) {
   test('it renders, with pem', async function (assert) {
     const c = config('pem');
     this.set('config', c);
-    await render(hbs`<Pki::ConfigPkiCa @config={{config}} />`);
+    await render(hbs`<Pki::ConfigPkiCa @config={{this.config}} />`);
     assert.notOk(component.hasTitle, 'no title in the default state');
     assert.strictEqual(component.replaceCAText, 'Add CA');
     assert.strictEqual(component.downloadLinks.length, 3, 'shows download links');
diff --git a/ui/tests/integration/components/pki/config-pki-test.js b/ui/tests/integration/components/pki/config-pki-test.js
index 24782b014a90..62cf6fd75b52 100644
--- a/ui/tests/integration/components/pki/config-pki-test.js
+++ b/ui/tests/integration/components/pki/config-pki-test.js
@@ -31,7 +31,7 @@ module('Integration | Component | config pki', function (hooks) {
   const setupAndRender = async function (context, config, section = 'tidy') {
     context.set('config', config);
     context.set('section', section);
-    await context.render(hbs`<Pki::ConfigPki @section={{section}} @config={{config}} />`);
+    await context.render(hbs`<Pki::ConfigPki @section={{this.section}} @config={{this.config}} />`);
   };
 
   test('it renders tidy section', async function (assert) {
@@ -101,7 +101,9 @@ module('Integration | Component | config pki', function (hooks) {
       })
     );
     this.set('section', section);
-    await render(hbs`<Pki::ConfigPki @section={{section}} @config={{config}} @onRefresh={{onRefresh}} />`);
+    await render(
+      hbs`<Pki::ConfigPki @section={{this.section}} @config={{this.config}} @onRefresh={{this.onRefresh}} />`
+    );
 
     component.submit();
   });
@@ -121,7 +123,9 @@ module('Integration | Component | config pki', function (hooks) {
       })
     );
     this.set('section', section);
-    await render(hbs`<Pki::ConfigPki @section={{section}} @config={{config}} @onRefresh={{onRefresh}} />`);
+    await render(
+      hbs`<Pki::ConfigPki @section={{this.section}} @config={{this.config}} @onRefresh={{this.onRefresh}} />`
+    );
     component.submit();
   });
 
diff --git a/ui/tests/integration/components/radial-progress-test.js b/ui/tests/integration/components/radial-progress-test.js
index b58b41f8aa04..9f4852aedb0f 100644
--- a/ui/tests/integration/components/radial-progress-test.js
+++ b/ui/tests/integration/components/radial-progress-test.js
@@ -20,9 +20,9 @@ module('Integration | Component | radial progress', function (hooks) {
     assert.strictEqual(component.height, '20');
     assert.strictEqual(component.width, '20');
     assert.strictEqual(component.strokeWidth, '1');
-    assert.strictEqual(component.r, 19 / 2);
-    assert.strictEqual(component.cx, 10);
-    assert.strictEqual(component.cy, 10);
+    assert.strictEqual(component.r, (19 / 2).toString());
+    assert.strictEqual(component.cx, '10');
+    assert.strictEqual(component.cy, '10');
     assert.strictEqual(Number(component.strokeDash).toFixed(2), circumference);
     assert.strictEqual(Number(component.strokeDashOffset).toFixed(3), (circumference * 0.5).toFixed(3));
   });
diff --git a/ui/tests/integration/components/raft-join-test.js b/ui/tests/integration/components/raft-join-test.js
index 37a29e8767d0..cf0ab01ad871 100644
--- a/ui/tests/integration/components/raft-join-test.js
+++ b/ui/tests/integration/components/raft-join-test.js
@@ -28,7 +28,7 @@ module('Integration | Component | raft-join', function (hooks) {
   test('it calls onDismiss when a user chooses to init', async function (assert) {
     let spy = sinon.spy();
     this.set('onDismiss', spy);
-    await render(hbs`<RaftJoin @onDismiss={{onDismiss}} />`);
+    await render(hbs`<RaftJoin @onDismiss={{this.onDismiss}} />`);
 
     await click('[data-test-join-init]');
     await click('[data-test-next]');
diff --git a/ui/tests/integration/components/readonly-form-field-test.js b/ui/tests/integration/components/readonly-form-field-test.js
index e831ed2c039a..740bac9dc091 100644
--- a/ui/tests/integration/components/readonly-form-field-test.js
+++ b/ui/tests/integration/components/readonly-form-field-test.js
@@ -22,7 +22,7 @@ module('Integration | Component | readonly-form-field', function (hooks) {
 
   test('it renders', async function (assert) {
     this.set('attr', EmberObject.create(minimumAttr));
-    await render(hbs`<ReadonlyFormField @attr={{attr}} @value="value" />`);
+    await render(hbs`<ReadonlyFormField @attr={{this.attr}} @value="value" />`);
     assert
       .dom('[data-test-readonly-label]')
       .includesText('My input', 'formats the attr name when no label provided');
@@ -32,7 +32,7 @@ module('Integration | Component | readonly-form-field', function (hooks) {
 
   test('it renders with options', async function (assert) {
     this.set('attr', customLabelAttr);
-    await render(hbs`<ReadonlyFormField @attr={{attr}} @value="another value" />`);
+    await render(hbs`<ReadonlyFormField @attr={{this.attr}} @value="another value" />`);
     assert
       .dom('[data-test-readonly-label]')
       .includesText('Custom-label', 'Uses the provided label as passed');
diff --git a/ui/tests/integration/components/regex-validator-test.js b/ui/tests/integration/components/regex-validator-test.js
index 2769097c2881..5cfe419b3e3d 100644
--- a/ui/tests/integration/components/regex-validator-test.js
+++ b/ui/tests/integration/components/regex-validator-test.js
@@ -20,10 +20,10 @@ module('Integration | Component | regex-validator', function (hooks) {
 
     await render(
       hbs`<RegexValidator
-        @onChange={{onChange}}
-        @attr={{attr}}
-        @value={{value}}
-        @labelString={{labelString}}
+        @onChange={{this.onChange}}
+        @attr={{this.attr}}
+        @value={{this.value}}
+        @labelString={{this.labelString}}
       />`
     );
     assert.dom('.regex-label label').hasText('Regex Example', 'Label is correct');
diff --git a/ui/tests/integration/components/replication-dashboard-test.js b/ui/tests/integration/components/replication-dashboard-test.js
index 6786967a0705..46c316fc8c01 100644
--- a/ui/tests/integration/components/replication-dashboard-test.js
+++ b/ui/tests/integration/components/replication-dashboard-test.js
@@ -35,9 +35,9 @@ module('Integration | Component | replication-dashboard', function (hooks) {
 
   test('it renders', async function (assert) {
     await render(hbs`<ReplicationDashboard
-      @replicationDetails={{replicationDetails}}
-      @clusterMode={{clusterMode}}
-      @isSecondary={{isSecondary}}
+      @replicationDetails={{this.replicationDetails}}
+      @clusterMode={{this.clusterMode}}
+      @isSecondary={{this.isSecondary}}
     />`);
 
     assert.dom('[data-test-replication-dashboard]').exists();
@@ -49,9 +49,9 @@ module('Integration | Component | replication-dashboard', function (hooks) {
 
   test('it updates the dashboard when the replication mode has changed', async function (assert) {
     await render(hbs`<ReplicationDashboard
-      @replicationDetails={{replicationDetails}}
-      @clusterMode={{clusterMode}}
-      @isSecondary={{isSecondary}}
+      @replicationDetails={{this.replicationDetails}}
+      @clusterMode={{this.clusterMode}}
+      @isSecondary={{this.isSecondary}}
     />`);
 
     assert.dom('[data-test-selectable-card-container="secondary"]').exists();
@@ -68,9 +68,9 @@ module('Integration | Component | replication-dashboard', function (hooks) {
     this.set('isSecondary', false);
 
     await render(hbs`<ReplicationDashboard
-      @replicationDetails={{replicationDetails}}
-      @clusterMode={{clusterMode}}
-      @isSecondary={{isSecondary}}
+      @replicationDetails={{this.replicationDetails}}
+      @clusterMode={{this.clusterMode}}
+      @isSecondary={{this.isSecondary}}
     />`);
 
     assert.dom('[data-test-selectable-card-container="primary"]').exists();
@@ -81,9 +81,9 @@ module('Integration | Component | replication-dashboard', function (hooks) {
     this.set('replicationDetails', IS_SYNCING);
 
     await render(hbs`<ReplicationDashboard
-      @replicationDetails={{replicationDetails}}
-      @clusterMode={{clusterMode}}
-      @isSecondary={{isSecondary}}
+      @replicationDetails={{this.replicationDetails}}
+      @clusterMode={{this.clusterMode}}
+      @isSecondary={{this.isSecondary}}
       @componentToRender='replication-secondary-card'
     />`);
 
@@ -97,9 +97,9 @@ module('Integration | Component | replication-dashboard', function (hooks) {
     this.set('replicationDetails', IS_REINDEXING);
 
     await render(hbs`<ReplicationDashboard
-      @replicationDetails={{replicationDetails}}
-      @clusterMode={{clusterMode}}
-      @isSecondary={{isSecondary}}
+      @replicationDetails={{this.replicationDetails}}
+      @clusterMode={{this.clusterMode}}
+      @isSecondary={{this.isSecondary}}
       @componentToRender='replication-secondary-card'
     />`);
 
@@ -140,11 +140,11 @@ module('Integration | Component | replication-dashboard', function (hooks) {
     this.set('isSecondary', false);
 
     await render(hbs`<ReplicationDashboard
-      @replicationDetails={{replicationDetails}}
-      @replicationDetailsSummary={{replicationDetailsSummary}}
-      @isSummaryDashboard={{isSummaryDashboard}}
-      @clusterMode={{clusterMode}}
-      @isSecondary={{isSecondary}}
+      @replicationDetails={{this.replicationDetails}}
+      @replicationDetailsSummary={{this.replicationDetailsSummary}}
+      @isSummaryDashboard={{this.isSummaryDashboard}}
+      @clusterMode={{this.clusterMode}}
+      @isSecondary={{this.isSecondary}}
       @componentToRender='replication-summary-card'
     />`);
 
@@ -179,11 +179,11 @@ module('Integration | Component | replication-dashboard', function (hooks) {
     this.set('isSecondary', false);
 
     await render(hbs`<ReplicationDashboard
-      @replicationDetails={{replicationDetails}}
-      @replicationDetailsSummary={{replicationDetailsSummary}}
-      @isSummaryDashboard={{isSummaryDashboard}}
-      @clusterMode={{clusterMode}}
-      @isSecondary={{isSecondary}}
+      @replicationDetails={{this.replicationDetails}}
+      @replicationDetailsSummary={{this.replicationDetailsSummary}}
+      @isSummaryDashboard={{this.isSummaryDashboard}}
+      @clusterMode={{this.clusterMode}}
+      @isSecondary={{this.isSecondary}}
       @componentToRender='replication-summary-card'
     />`);
 
diff --git a/ui/tests/integration/components/replication-header-test.js b/ui/tests/integration/components/replication-header-test.js
index fadfa78ac67f..0be86b3a282a 100644
--- a/ui/tests/integration/components/replication-header-test.js
+++ b/ui/tests/integration/components/replication-header-test.js
@@ -30,7 +30,7 @@ module('Integration | Component | replication-header', function (hooks) {
   test('it renders', async function (assert) {
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <ReplicationHeader @data={{data}} @isSecondary={{isSecondary}} @title={{title}}/>
+      <ReplicationHeader @data={{this.data}} @isSecondary={{this.isSecondary}} @title={{this.title}}/>
     `);
 
     assert.dom('[data-test-replication-header]').exists();
@@ -39,7 +39,7 @@ module('Integration | Component | replication-header', function (hooks) {
   test('it renders with mode and secondaryId when set', async function (assert) {
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <ReplicationHeader @data={{data}} @isSecondary={{isSecondary}} @title={{title}} @secondaryId={{secondaryId}}/>
+      <ReplicationHeader @data={{this.data}} @isSecondary={{this.isSecondary}} @title={{this.title}} @secondaryId={{this.secondaryId}}/>
     `);
 
     assert.dom('[data-test-secondaryId]').includesText(SECONDARY_ID, `shows the correct secondaryId value`);
@@ -54,7 +54,7 @@ module('Integration | Component | replication-header', function (hooks) {
 
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <ReplicationHeader @data={{data}} @isSecondary={{isSecondary}} @title={{title}} @secondaryId={{secondaryId}}/>
+      <ReplicationHeader @data={{this.data}} @isSecondary={{this.isSecondary}} @title={{this.title}} @secondaryId={{this.secondaryId}}/>
     `);
 
     assert.dom('[data-test-secondaryId]').doesNotExist();
@@ -64,7 +64,7 @@ module('Integration | Component | replication-header', function (hooks) {
   test('it does not show tabs when showTabs is not set', async function (assert) {
     await render(hbs`
       <div id="modal-wormhole"></div>
-      <ReplicationHeader @data={{data}} @isSecondary={{isSecondary}} @title={{title}}/>
+      <ReplicationHeader @data={{this.data}} @isSecondary={{this.isSecondary}} @title={{this.title}}/>
     `);
 
     assert.dom('[data-test-tabs]').doesNotExist();
diff --git a/ui/tests/integration/components/replication-page-test.js b/ui/tests/integration/components/replication-page-test.js
index 73f48919dadc..cb02cf723654 100644
--- a/ui/tests/integration/components/replication-page-test.js
+++ b/ui/tests/integration/components/replication-page-test.js
@@ -20,19 +20,19 @@ module('Integration | Component | replication-page', function (hooks) {
   });
 
   test('it renders', async function (assert) {
-    await render(hbs`<ReplicationPage @model={{model}} />`);
+    await render(hbs`<ReplicationPage @model={{this.model}} />`);
     assert.dom('[data-test-replication-page]').exists();
     assert.dom('[data-test-layout-loading]').doesNotExist();
   });
 
   test('it renders loader when either clusterId is unknown or mode is bootstrapping', async function (assert) {
     this.set('model.replicationAttrs.clusterId', '');
-    await render(hbs`<ReplicationPage @model={{model}} />`);
+    await render(hbs`<ReplicationPage @model={{this.model}} />`);
     assert.dom('[data-test-layout-loading]').exists();
 
     this.set('model.replicationAttrs.clusterId', '123456');
     this.set('model.replicationAttrs.mode', 'bootstrapping');
-    await render(hbs`<ReplicationPage @model={{model}} />`);
+    await render(hbs`<ReplicationPage @model={{this.model}} />`);
     assert.dom('[data-test-layout-loading]').exists();
   });
 });
diff --git a/ui/tests/integration/components/replication-primary-card-test.js b/ui/tests/integration/components/replication-primary-card-test.js
index 0ccb9a937c5d..e6d784c73b3e 100644
--- a/ui/tests/integration/components/replication-primary-card-test.js
+++ b/ui/tests/integration/components/replication-primary-card-test.js
@@ -1,13 +1,13 @@
 import { module, test } from 'qunit';
 import { setupRenderingTest } from 'ember-qunit';
 import { render } from '@ember/test-helpers';
-import engineResolverFor from 'ember-engines/test-support/engine-resolver-for';
+import { setupEngine } from 'ember-engines/test-support';
 import { CLUSTER_STATES } from 'core/helpers/cluster-states';
 import hbs from 'htmlbars-inline-precompile';
-const resolver = engineResolverFor('replication');
 
 module('Integration | Component | replication-primary-card', function (hooks) {
-  setupRenderingTest(hooks, { resolver });
+  setupRenderingTest(hooks);
+  setupEngine(hooks, 'replication');
 
   test('it renders', async function (assert) {
     const title = 'Last WAL';
@@ -18,11 +18,15 @@ module('Integration | Component | replication-primary-card', function (hooks) {
     this.set('description', description);
     this.set('metric', metric);
 
-    await render(hbs`
+    await render(
+      hbs`
       <ReplicationPrimaryCard
-        @title={{title}}
-        @description={{description}}
-        @metric='3000' />`);
+        @title={{this.title}}
+        @description={{this.description}}
+        @metric='3000'
+      />`,
+      { owner: this.engine }
+    );
 
     assert.dom('[data-test-hasError]').doesNotExist('shows no error for non-State cards');
 
@@ -36,12 +40,16 @@ module('Integration | Component | replication-primary-card', function (hooks) {
       this.set('glyph', CLUSTER_STATES[state].glyph);
       this.set('state', state);
 
-      await render(hbs`
-      <ReplicationPrimaryCard
-        @title='State'
-        @description='Updated every ten seconds.'
-        @glyph={{glyph}}
-        @metric={{state}} />`);
+      await render(
+        hbs`
+        <ReplicationPrimaryCard
+          @title='State'
+          @description='Updated every ten seconds.'
+          @glyph={{this.glyph}}
+          @metric={{this.state}}
+        />`,
+        { owner: this.engine }
+      );
 
       if (CLUSTER_STATES[state].isOk) {
         assert.dom('[data-test-hasError]').doesNotExist();
diff --git a/ui/tests/integration/components/replication-secondary-card-test.js b/ui/tests/integration/components/replication-secondary-card-test.js
index cacea6f7ba2f..4adce007bd70 100644
--- a/ui/tests/integration/components/replication-secondary-card-test.js
+++ b/ui/tests/integration/components/replication-secondary-card-test.js
@@ -27,7 +27,7 @@ module('Integration | Component | replication-secondary-card', function (hooks)
 
   test('it renders', async function (assert) {
     await render(
-      hbs`<ReplicationSecondaryCard @replicationDetails={{replicationDetails}} @title={{title}} />`
+      hbs`<ReplicationSecondaryCard @replicationDetails={{this.replicationDetails}} @title={{this.title}} />`
     );
     assert.dom('[data-test-replication-secondary-card]').exists();
     assert.dom('[data-test-state]').includesText(REPLICATION_DETAILS.state, `shows the correct state value`);
@@ -38,7 +38,7 @@ module('Integration | Component | replication-secondary-card', function (hooks)
 
   test('it renders the Primary Cluster card when title is not Status', async function (assert) {
     await render(
-      hbs`<ReplicationSecondaryCard @replicationDetails={{replicationDetails}} @title='Primary cluster'/>`
+      hbs`<ReplicationSecondaryCard @replicationDetails={{this.replicationDetails}} @title='Primary cluster'/>`
     );
 
     assert.dom('[data-test-info-table]').exists('it shows the known primary cluster details');
@@ -52,7 +52,7 @@ module('Integration | Component | replication-secondary-card', function (hooks)
   test('it does not render a link to the primary cluster UI when the primary api address or known primaries are unknown', async function (assert) {
     this.set('replicationDetails', {});
     await render(
-      hbs`<ReplicationSecondaryCard @replicationDetails={{replicationDetails}} @title='Primary cluster'/>`
+      hbs`<ReplicationSecondaryCard @replicationDetails={{this.replicationDetails}} @title='Primary cluster'/>`
     );
 
     assert.dom('[data-test-primary-link]').doesNotExist();
@@ -61,14 +61,14 @@ module('Integration | Component | replication-secondary-card', function (hooks)
   test('it renders with emptyState if no knownPrimaryClusterAddrs are set', async function (assert) {
     this.set('replicationDetails', []);
     await render(
-      hbs`<ReplicationSecondaryCard @replicationDetails={{replicationDetails}} @title='Primary cluster'/>`
+      hbs`<ReplicationSecondaryCard @replicationDetails={{this.replicationDetails}} @title='Primary cluster'/>`
     );
     assert.dom('[data-test-component="empty-state"]').exists();
   });
 
   test('it renders tooltip with check-circle-outline when state is stream-wals', async function (assert) {
     await render(
-      hbs`<ReplicationSecondaryCard @replicationDetails={{replicationDetails}} @title={{title}} />`
+      hbs`<ReplicationSecondaryCard @replicationDetails={{this.replicationDetails}} @title={{this.title}} />`
     );
     assert.dom('[data-test-glyph]').hasClass('has-text-success', `shows success icon`);
   });
@@ -81,7 +81,9 @@ module('Integration | Component | replication-secondary-card', function (hooks)
     };
 
     this.set('stateError', stateError);
-    await render(hbs`<ReplicationSecondaryCard @replicationDetails={{stateError}} @title={{title}} />`);
+    await render(
+      hbs`<ReplicationSecondaryCard @replicationDetails={{this.stateError}} @title={{this.title}} />`
+    );
     assert.dom('[data-test-error]').includesText('state', 'show correct error title');
     assert
       .dom('[data-test-inline-error-message]')
@@ -96,7 +98,9 @@ module('Integration | Component | replication-secondary-card', function (hooks)
     };
 
     this.set('connectionError', connectionError);
-    await render(hbs`<ReplicationSecondaryCard @replicationDetails={{connectionError}} @title={{title}} />`);
+    await render(
+      hbs`<ReplicationSecondaryCard @replicationDetails={{this.connectionError}} @title={{this.title}} />`
+    );
     assert.dom('[data-test-error]').includesText('connection_state', 'show correct error title');
     assert
       .dom('[data-test-inline-error-message]')
diff --git a/ui/tests/integration/components/replication-summary-card-test.js b/ui/tests/integration/components/replication-summary-card-test.js
index 154c7d8c308c..f861f118c7b8 100644
--- a/ui/tests/integration/components/replication-summary-card-test.js
+++ b/ui/tests/integration/components/replication-summary-card-test.js
@@ -27,7 +27,9 @@ module('Integration | Component | replication-summary-card', function (hooks) {
   });
 
   test('it renders', async function (assert) {
-    await render(hbs`<ReplicationSummaryCard @replicationDetails={{replicationDetails}} @title={{title}} />`);
+    await render(
+      hbs`<ReplicationSummaryCard @replicationDetails={{this.replicationDetails}} @title={{this.title}} />`
+    );
     assert.dom('[data-test-replication-summary-card]').exists();
     assert
       .dom('[data-test-lastWAL]')
@@ -41,7 +43,7 @@ module('Integration | Component | replication-summary-card', function (hooks) {
 
   test('it shows the correct lastWAL and knownSecondaries when title is Performance', async function (assert) {
     await render(
-      hbs`<ReplicationSummaryCard @replicationDetails={{replicationDetails}} @title="Performance" />`
+      hbs`<ReplicationSummaryCard @replicationDetails={{this.replicationDetails}} @title="Performance" />`
     );
     assert
       .dom('[data-test-lastWAL]')
diff --git a/ui/tests/integration/components/replication-table-rows-test.js b/ui/tests/integration/components/replication-table-rows-test.js
index 5af4392545a9..09f5511b6531 100644
--- a/ui/tests/integration/components/replication-table-rows-test.js
+++ b/ui/tests/integration/components/replication-table-rows-test.js
@@ -20,14 +20,14 @@ module('Integration | Component | replication-table-rows', function (hooks) {
 
   test('it renders', async function (assert) {
     await render(
-      hbs`<ReplicationTableRows @replicationDetails={{replicationDetails}} @clusterMode={{clusterMode}}/>`
+      hbs`<ReplicationTableRows @replicationDetails={{this.replicationDetails}} @clusterMode={{this.clusterMode}}/>`
     );
     assert.dom('[data-test-table-rows]').exists();
   });
 
   test('it renders with merkle root, mode, replication set', async function (assert) {
     await render(
-      hbs`<ReplicationTableRows @replicationDetails={{replicationDetails}} @clusterMode={{clusterMode}}/>`
+      hbs`<ReplicationTableRows @replicationDetails={{this.replicationDetails}} @clusterMode={{this.clusterMode}}/>`
     );
     assert.dom('.empty-state').doesNotExist('does not show empty state when data is found');
 
@@ -49,7 +49,7 @@ module('Integration | Component | replication-table-rows', function (hooks) {
     this.set('replicationDetails', noAttrs);
     this.set('clusterMode', clusterMode);
     await render(
-      hbs`<ReplicationTableRows @replicationDetails={{replicationDetails}} @clusterMode={{clusterMode}}/>`
+      hbs`<ReplicationTableRows @replicationDetails={{this.replicationDetails}} @clusterMode={{this.clusterMode}}/>`
     );
 
     assert.dom('[data-test-table-rows]').includesText('unknown');
diff --git a/ui/tests/integration/components/secret-edit-test.js b/ui/tests/integration/components/secret-edit-test.js
index b35259921c0c..bd2294b6168f 100644
--- a/ui/tests/integration/components/secret-edit-test.js
+++ b/ui/tests/integration/components/secret-edit-test.js
@@ -34,7 +34,7 @@ module('Integration | Component | secret edit', function (hooks) {
       },
     });
 
-    await render(hbs`{{secret-edit mode=mode model=model }}`);
+    await render(hbs`{{secret-edit mode=this.mode model=this.model }}`);
     assert.dom('[data-test-toggle-input="json"]').isDisabled();
   });
 
@@ -48,7 +48,7 @@ module('Integration | Component | secret edit', function (hooks) {
       },
     });
 
-    await render(hbs`{{secret-edit mode=mode model=model }}`);
+    await render(hbs`{{secret-edit mode=this.mode model=this.model }}`);
     assert.dom('[data-test-toggle-input="json"]').isNotDisabled();
   });
 
@@ -58,7 +58,7 @@ module('Integration | Component | secret edit', function (hooks) {
       secretData: null,
     });
 
-    await render(hbs`{{secret-edit mode=mode model=model preferAdvancedEdit=true }}`);
+    await render(hbs`{{secret-edit mode=this.mode model=this.model preferAdvancedEdit=true }}`);
 
     let instance = document.querySelector('.CodeMirror').CodeMirror;
     instance.setValue(JSON.stringify([{ foo: 'bar' }]));
@@ -76,7 +76,7 @@ module('Integration | Component | secret edit', function (hooks) {
         float: '1.234',
       },
     });
-    await render(hbs`<SecretEdit @mode={{mode}} @model={{model}} />`);
+    await render(hbs`<SecretEdit @mode={{this.mode}} @model={{this.model}} />`);
     assert.dom('[data-test-secret-save]').isNotDisabled();
   });
 
@@ -94,7 +94,7 @@ module('Integration | Component | secret edit', function (hooks) {
       canReadSecretData: true,
     });
 
-    await render(hbs`{{secret-edit mode=mode model=model preferAdvancedEdit=true }}`);
+    await render(hbs`{{secret-edit mode=this.mode model=this.model preferAdvancedEdit=true }}`);
 
     let instance = document.querySelector('.CodeMirror').CodeMirror;
     instance.setValue(JSON.stringify([{ foo: 'bar' }]));
diff --git a/ui/tests/integration/components/secret-list-header-test.js b/ui/tests/integration/components/secret-list-header-test.js
index eebeee12b2ef..7d172ec2fbdc 100644
--- a/ui/tests/integration/components/secret-list-header-test.js
+++ b/ui/tests/integration/components/secret-list-header-test.js
@@ -29,7 +29,7 @@ module('Integration | Component | secret-list-header', function (hooks) {
         assert
           .dom(selector)
           .hasText(
-            `Version ${this.model.version}`,
+            `Version ${this.model.version || 1}`,
             `Badge renders with correct version for ${type} engine type`
           );
       } else {
diff --git a/ui/tests/integration/components/select-test.js b/ui/tests/integration/components/select-test.js
index ca9235a8e75e..029746528e1c 100644
--- a/ui/tests/integration/components/select-test.js
+++ b/ui/tests/integration/components/select-test.js
@@ -17,13 +17,13 @@ module('Integration | Component | Select', function (hooks) {
   });
 
   test('it renders', async function (assert) {
-    await render(hbs`<Select @options={{options}} @label={{label}} @name={{name}}/>`);
+    await render(hbs`<Select @options={{this.options}} @label={{this.label}} @name={{this.name}}/>`);
     assert.dom('[data-test-select-label]').hasText('Boop');
     assert.dom('[data-test-select="foo"]').exists();
   });
 
   test('it renders when options is an array of strings', async function (assert) {
-    await render(hbs`<Select @options={{options}} @label={{label}} @name={{name}}/>`);
+    await render(hbs`<Select @options={{this.options}} @label={{this.label}} @name={{this.name}}/>`);
 
     assert.dom('[data-test-select="foo"]').hasValue('foo');
     assert.strictEqual(this.element.querySelector('[data-test-select="foo"]').options.length, 3);
@@ -35,7 +35,7 @@ module('Integration | Component | Select', function (hooks) {
       { value: 'cherry', label: 'Cherry' },
     ];
     this.set('options', objectOptions);
-    await render(hbs`<Select @options={{options}} @label={{label}} @name={{name}}/>`);
+    await render(hbs`<Select @options={{this.options}} @label={{this.label}} @name={{this.name}}/>`);
 
     assert.dom('[data-test-select="foo"]').hasValue('berry');
     assert.strictEqual(this.element.querySelector('[data-test-select="foo"]').options.length, 2);
@@ -57,12 +57,12 @@ module('Integration | Component | Select', function (hooks) {
     await render(
       hbs`
         <Select
-          @options={{options}}
-          @label={{label}}
-          @name={{name}}
-          @valueAttribute={{valueAttribute}}
-          @labelAttribute={{labelAttribute}}
-          @selectedValue={{selectedValue}}/>`
+          @options={{this.options}}
+          @label={{this.label}}
+          @name={{this.name}}
+          @valueAttribute={{this.valueAttribute}}
+          @labelAttribute={{this.labelAttribute}}
+          @selectedValue={{this.selectedValue}}/>`
     );
 
     assert.dom('[data-test-select="foo"]').hasValue('tues', 'sets selectedValue by default');
@@ -73,7 +73,7 @@ module('Integration | Component | Select', function (hooks) {
 
   test('it calls onChange when an item is selected', async function (assert) {
     this.set('onChange', sinon.spy());
-    await render(hbs`<Select @options={{options}} @name={{name}} @onChange={{onChange}}/>`);
+    await render(hbs`<Select @options={{this.options}} @name={{this.name}} @onChange={{this.onChange}}/>`);
     await fillIn('[data-test-select="foo"]', 'bar');
 
     assert.ok(this.onChange.calledOnce);
diff --git a/ui/tests/integration/components/selectable-card-test.js b/ui/tests/integration/components/selectable-card-test.js
index ba43551f0cbb..41810a00cb43 100644
--- a/ui/tests/integration/components/selectable-card-test.js
+++ b/ui/tests/integration/components/selectable-card-test.js
@@ -15,14 +15,14 @@ module('Integration | Component selectable-card', function (hooks) {
   });
 
   test('it shows the card total', async function (assert) {
-    await render(hbs`<SelectableCard @total={{total}} @cardTitle={{cardTitle}}/>`);
+    await render(hbs`<SelectableCard @total={{this.total}} @cardTitle={{this.cardTitle}}/>`);
     let titleNumber = this.element.querySelector('.title-number').innerText;
 
-    assert.strictEqual(titleNumber, 15);
+    assert.strictEqual(titleNumber, '15');
   });
 
   test('it returns card title, ', async function (assert) {
-    await render(hbs`<SelectableCard @total={{1}} @cardTitle={{cardTitle}}/>`);
+    await render(hbs`<SelectableCard @total={{1}} @cardTitle={{this.cardTitle}}/>`);
     let titleText = this.element.querySelector('.title').innerText;
     assert.strictEqual(titleText, 'Connections');
   });
diff --git a/ui/tests/integration/components/shamir-modal-flow-test.js b/ui/tests/integration/components/shamir-modal-flow-test.js
index a5f5d56e726b..3fa580269de4 100644
--- a/ui/tests/integration/components/shamir-modal-flow-test.js
+++ b/ui/tests/integration/components/shamir-modal-flow-test.js
@@ -24,8 +24,8 @@ module('Integration | Component | shamir-modal-flow', function (hooks) {
         @fetchOnInit=true
         @generateAction=true
         @buttonText="My CTA"
-        @onClose={{onClose}}
-        @isActive={{isActive}}
+        @onClose={{this.onClose}}
+        @isActive={{this.isActive}}
       >
         <p>Inner content goes here</p>
       </ShamirModalFlow>
@@ -47,8 +47,8 @@ module('Integration | Component | shamir-modal-flow', function (hooks) {
         @fetchOnInit=true
         @generateAction=true
         @buttonText="Crazy CTA"
-        @onClose={{onClose}}
-        @isActive={{isActive}}
+        @onClose={{this.onClose}}
+        @isActive={{this.isActive}}
       >
         <p>Inner content goes here</p>
       </ShamirModalFlow>
@@ -67,8 +67,8 @@ module('Integration | Component | shamir-modal-flow', function (hooks) {
         @fetchOnInit=true
         @generateAction=true
         @buttonText="Crazy CTA"
-        @onClose={{onClose}}
-        @isActive={{isActive}}
+        @onClose={{this.onClose}}
+        @isActive={{this.isActive}}
       >
         <p>Inner content goes here</p>
       </ShamirModalFlow>
diff --git a/ui/tests/integration/components/string-list-test.js b/ui/tests/integration/components/string-list-test.js
index d4570f908a8f..b44bec2f4e3b 100644
--- a/ui/tests/integration/components/string-list-test.js
+++ b/ui/tests/integration/components/string-list-test.js
@@ -59,21 +59,21 @@ module('Integration | Component | string list', function (hooks) {
   test('it renders inputValue from a blank array', async function (assert) {
     assert.expect(2);
     this.set('inputValue', []);
-    await render(hbs`<StringList @inputValue={{inputValue}} />`);
+    await render(hbs`<StringList @inputValue={{this.inputValue}} />`);
     assertBlank(assert);
   });
 
   test('it renders inputValue array with a single item', async function (assert) {
     assert.expect(3);
     this.set('inputValue', ['foo']);
-    await render(hbs`<StringList @inputValue={{inputValue}} />`);
+    await render(hbs`<StringList @inputValue={{this.inputValue}} />`);
     assertFoo(assert);
   });
 
   test('it renders inputValue array with a multiple items', async function (assert) {
     assert.expect(4);
     this.set('inputValue', ['foo', 'bar']);
-    await render(hbs`<StringList @inputValue={{inputValue}} />`);
+    await render(hbs`<StringList @inputValue={{this.inputValue}} />`);
     assertFooBar(assert);
   });
 
@@ -101,7 +101,7 @@ module('Integration | Component | string list', function (hooks) {
     this.set('onChange', function (val) {
       assert.deepEqual(val, ['foo', 'bar'], 'calls onChange with expected value');
     });
-    await render(hbs`<StringList @inputValue={{inputValue}} @onChange={{onChange}} />`);
+    await render(hbs`<StringList @inputValue={{this.inputValue}} @onChange={{this.onChange}} />`);
     await fillIn('[data-test-string-list-input="1"]', 'bar');
     await triggerKeyEvent('[data-test-string-list-input="1"]', 'keyup', 14);
   });
@@ -112,7 +112,9 @@ module('Integration | Component | string list', function (hooks) {
     this.set('onChange', function (val) {
       assert.strictEqual(val, 'foo,bar', 'calls onChange with expected value');
     });
-    await render(hbs`<StringList @inputValue={{inputValue}} @onChange={{onChange}}/>`);
+    await render(
+      hbs`<StringList @type="string" @inputValue={{this.inputValue}} @onChange={{this.onChange}}/>`
+    );
     await fillIn('[data-test-string-list-input="1"]', 'bar');
     await triggerKeyEvent('[data-test-string-list-input="1"]', 'keyup', 14);
   });
@@ -121,9 +123,9 @@ module('Integration | Component | string list', function (hooks) {
     assert.expect(4);
     this.set('inputValue', ['foo', 'bar']);
     this.set('onChange', function (val) {
-      assert.strictEqual(val, 'bar', 'calls onChange with expected value');
+      assert.deepEqual(val, ['bar'], 'calls onChange with expected value');
     });
-    await render(hbs`<StringList @inputValue={{inputValue}} @onChange={{onChange}} />`);
+    await render(hbs`<StringList @inputValue={{this.inputValue}} @onChange={{this.onChange}} />`);
 
     await click('[data-test-string-list-row="0"] [data-test-string-list-button="delete"]');
     assert.dom('[data-test-string-list-input]').exists({ count: 2 }, 'renders 2 inputs');
diff --git a/ui/tests/integration/components/toggle-test.js b/ui/tests/integration/components/toggle-test.js
index 32f6d25b4570..b65b557f6783 100644
--- a/ui/tests/integration/components/toggle-test.js
+++ b/ui/tests/integration/components/toggle-test.js
@@ -16,7 +16,7 @@ module('Integration | Component | toggle', function (hooks) {
     this.set('handler', sinon.spy(handler));
 
     await render(hbs`<Toggle
-      @onChange={{handler}}
+      @onChange={{this.handler}}
       @name="thing"
     />`);
 
@@ -24,7 +24,7 @@ module('Integration | Component | toggle', function (hooks) {
 
     await render(hbs`
       <Toggle
-        @onChange={{handler}}
+        @onChange={{this.handler}}
         @name="thing"
       >
         <span id="test-value" class="has-text-grey">template block text</span>
@@ -38,7 +38,7 @@ module('Integration | Component | toggle', function (hooks) {
     this.set('handler', sinon.spy(handler));
     await render(hbs`
       <Toggle
-        @onChange={{handler}}
+        @onChange={{this.handler}}
         @name="thing"
         @size="small"
       >
@@ -52,7 +52,7 @@ module('Integration | Component | toggle', function (hooks) {
     this.set('handler', sinon.spy(handler));
     await render(hbs`
     <Toggle
-      @onChange={{handler}}
+      @onChange={{this.handler}}
       @name="my toggle #_has we!rd chars"
     >
       Label
diff --git a/ui/tests/integration/components/token-expire-warning-test.js b/ui/tests/integration/components/token-expire-warning-test.js
index cc7fef37d075..b8416b24c014 100644
--- a/ui/tests/integration/components/token-expire-warning-test.js
+++ b/ui/tests/integration/components/token-expire-warning-test.js
@@ -11,7 +11,7 @@ module('Integration | Component | token-expire-warning', function (hooks) {
     const expirationDate = subMinutes(Date.now(), 30);
     this.set('expirationDate', expirationDate);
 
-    await render(hbs`<TokenExpireWarning @expirationDate={{expirationDate}}/>`);
+    await render(hbs`<TokenExpireWarning @expirationDate={{this.expirationDate}}/>`);
     await waitUntil(() => find('#modal-overlays'));
     assert.dom().includesText('Your auth token expired on');
   });
@@ -21,7 +21,7 @@ module('Integration | Component | token-expire-warning', function (hooks) {
     this.set('expirationDate', expirationDate);
 
     await render(hbs`
-      <TokenExpireWarning @expirationDate={{expirationDate}}>
+      <TokenExpireWarning @expirationDate={{this.expirationDate}}>
         <p>Do not worry, your token has not expired.</p>
       </TokenExpireWarning>
     `);
diff --git a/ui/tests/integration/components/transform-list-item-test.js b/ui/tests/integration/components/transform-list-item-test.js
index 70ab8cc9e136..a23a00137e9a 100644
--- a/ui/tests/integration/components/transform-list-item-test.js
+++ b/ui/tests/integration/components/transform-list-item-test.js
@@ -20,9 +20,9 @@ module('Integration | Component | transform-list-item', function (hooks) {
     this.set('itemType', 'role');
     this.set('item', item);
     await render(hbs`<SecretList::TransformListItem
-      @item={{item}}
-      @itemPath={{itemPath}}
-      @itemType={{itemType}}
+      @item={{this.item}}
+      @itemPath={{this.itemPath}}
+      @itemType={{this.itemType}}
     />`);
 
     assert.dom('[data-test-view-only-list-item]').exists('shows view only list item');
@@ -42,9 +42,9 @@ module('Integration | Component | transform-list-item', function (hooks) {
     this.set('itemType', 'template');
     this.set('item', item);
     await render(hbs`<SecretList::TransformListItem
-      @item={{item}}
-      @itemPath={{itemPath}}
-      @itemType={{itemType}}
+      @item={{this.item}}
+      @itemPath={{this.itemPath}}
+      @itemType={{this.itemType}}
     />`);
 
     assert.dom('[data-test-secret-link="template/foo"]').exists('shows clickable list item');
@@ -65,9 +65,9 @@ module('Integration | Component | transform-list-item', function (hooks) {
     this.set('itemType', 'alphabet');
     this.set('item', item);
     await render(hbs`<SecretList::TransformListItem
-      @item={{item}}
-      @itemPath={{itemPath}}
-      @itemType={{itemType}}
+      @item={{this.item}}
+      @itemPath={{this.itemPath}}
+      @itemType={{this.itemType}}
     />`);
 
     assert.dom('[data-test-secret-link="alphabet/foo"]').exists('shows clickable list item');
@@ -88,9 +88,9 @@ module('Integration | Component | transform-list-item', function (hooks) {
     this.set('itemType', 'template');
     this.set('item', item);
     await render(hbs`<SecretList::TransformListItem
-      @item={{item}}
-      @itemPath={{itemPath}}
-      @itemType={{itemType}}
+      @item={{this.item}}
+      @itemPath={{this.itemPath}}
+      @itemType={{this.itemType}}
     />`);
 
     assert.dom('[data-test-view-only-list-item]').exists('shows view only list item');
@@ -110,9 +110,9 @@ module('Integration | Component | transform-list-item', function (hooks) {
     this.set('itemType', 'alphabet');
     this.set('item', item);
     await render(hbs`<SecretList::TransformListItem
-      @item={{item}}
-      @itemPath={{itemPath}}
-      @itemType={{itemType}}
+      @item={{this.item}}
+      @itemPath={{this.itemPath}}
+      @itemType={{this.itemType}}
     />`);
 
     assert.dom('[data-test-view-only-list-item]').exists('shows view only list item');
diff --git a/ui/tests/integration/components/transit-key-actions-test.js b/ui/tests/integration/components/transit-key-actions-test.js
index 8283b5199ba7..ea32a0770935 100644
--- a/ui/tests/integration/components/transit-key-actions-test.js
+++ b/ui/tests/integration/components/transit-key-actions-test.js
@@ -56,14 +56,14 @@ module('Integration | Component | transit key actions', function (hooks) {
   test('it renders', async function (assert) {
     this.set('key', { backend: 'transit', supportedActions: ['encrypt'] });
     await render(hbs`
-      {{transit-key-actions selectedAction="encrypt" key=key}}
+      {{transit-key-actions selectedAction="encrypt" key=this.key}}
       <div id="modal-wormhole"></div>
     `);
     assert.dom('[data-test-transit-action="encrypt"]').exists({ count: 1 }, 'renders encrypt');
 
     this.set('key', { backend: 'transit', supportedActions: ['sign'] });
     await render(hbs`
-      {{transit-key-actions selectedAction="sign" key=key}}
+      {{transit-key-actions selectedAction="sign" key=this.key}}
       <div id="modal-wormhole"></div>`);
     assert.dom('[data-test-transit-action="sign"]').exists({ count: 1 }, 'renders sign');
   });
@@ -72,7 +72,7 @@ module('Integration | Component | transit key actions', function (hooks) {
     this.set('key', { backend: 'transit', supportsSigning: true, supportedActions: ['sign', 'verify'] });
     this.set('selectedAction', 'sign');
     await render(hbs`
-      {{transit-key-actions selectedAction=selectedAction key=key}}
+      {{transit-key-actions selectedAction=this.selectedAction key=this.key}}
       <div id="modal-wormhole"></div>
     `);
     assert
@@ -102,7 +102,7 @@ module('Integration | Component | transit key actions', function (hooks) {
   test('it renders: rotate', async function (assert) {
     this.set('key', { backend: 'transit', id: 'akey', supportedActions: ['rotate'] });
     await render(hbs`
-      {{transit-key-actions selectedAction="rotate" key=key}}
+      {{transit-key-actions selectedAction="rotate" key=this.key}}
       <div id="modal-wormhole"></div>
     `);
 
@@ -122,7 +122,7 @@ module('Integration | Component | transit key actions', function (hooks) {
     this.set('selectedAction', 'encrypt');
     this.set('storeService.keyActionReturnVal', { ciphertext: 'secret' });
     await render(hbs`
-      {{transit-key-actions selectedAction=selectedAction key=key}}
+      {{transit-key-actions selectedAction=this.selectedAction key=this.key}}
       <div id="modal-wormhole"></div>
     `);
 
@@ -174,7 +174,7 @@ module('Integration | Component | transit key actions', function (hooks) {
     this.set('key', key);
     this.set('storeService.keyActionReturnVal', { ciphertext: 'secret' });
     await render(hbs`
-      {{transit-key-actions selectedAction="encrypt" key=key}}
+      {{transit-key-actions selectedAction="encrypt" key=this.key}}
       <div id="modal-wormhole"></div>
     `);
 
@@ -205,7 +205,7 @@ module('Integration | Component | transit key actions', function (hooks) {
     this.set('key', key);
     this.set('storeService.keyActionReturnVal', { ciphertext: 'secret' });
     await render(hbs`
-      {{transit-key-actions selectedAction="encrypt" key=key}}
+      {{transit-key-actions selectedAction="encrypt" key=this.key}}
       <div id="modal-wormhole"></div>
     `);
 
@@ -237,7 +237,7 @@ module('Integration | Component | transit key actions', function (hooks) {
       validKeyVersions: [1],
     });
     await render(hbs`
-      {{transit-key-actions key=key}}
+      {{transit-key-actions key=this.key}}
       <div id="modal-wormhole"></div>
     `);
   };
@@ -317,7 +317,7 @@ module('Integration | Component | transit key actions', function (hooks) {
       validKeyVersions: [1],
     });
     await render(hbs`
-      {{transit-key-actions key=key}}
+      {{transit-key-actions key=this.key}}
       <div id="modal-wormhole"></div>
     `);
     await fillIn('#algorithm', 'sha2-384');
diff --git a/ui/tests/integration/components/ttl-form-test.js b/ui/tests/integration/components/ttl-form-test.js
index 29f131c620f6..0a5795994764 100644
--- a/ui/tests/integration/components/ttl-form-test.js
+++ b/ui/tests/integration/components/ttl-form-test.js
@@ -13,13 +13,13 @@ module('Integration | Component | ttl-form', function (hooks) {
   });
 
   test('it shows no initial time and initial unit of s when not time or unit passed in', async function (assert) {
-    await render(hbs`<TtlForm @onChange={{onChange}} />`);
+    await render(hbs`<TtlForm @onChange={{this.onChange}} />`);
     assert.dom('[data-test-ttlform-value]').hasValue('');
     assert.dom('[data-test-select="ttl-unit"]').hasValue('s');
   });
 
   test('it calls the change fn with the correct values', async function (assert) {
-    await render(hbs`<TtlForm @onChange={{onChange}} @unit="m" />`);
+    await render(hbs`<TtlForm @onChange={{this.onChange}} @unit="m" />`);
 
     assert.dom('[data-test-select="ttl-unit"]').hasValue('m', 'unit value initially shows m (minutes)');
     await fillIn('[data-test-ttlform-value]', '10');
@@ -40,7 +40,7 @@ module('Integration | Component | ttl-form', function (hooks) {
       <TtlForm
         @unit="h"
         @time="3"
-        @onChange={{onChange}}
+        @onChange={{this.onChange}}
       />
     `);
 
diff --git a/ui/tests/integration/components/ttl-picker-test.js b/ui/tests/integration/components/ttl-picker-test.js
index e2b4090bd2f8..c09dfeff8e1b 100644
--- a/ui/tests/integration/components/ttl-picker-test.js
+++ b/ui/tests/integration/components/ttl-picker-test.js
@@ -13,7 +13,7 @@ module('Integration | Component | ttl picker', function (hooks) {
   });
 
   test('it renders error on non-number input', async function (assert) {
-    await render(hbs`<TtlPicker @onChange={{onChange}} />`);
+    await render(hbs`<TtlPicker @onChange={{this.onChange}} />`);
 
     let callCount = this.changeSpy.callCount;
     await fillIn('[data-test-ttl-value]', 'foo');
@@ -24,7 +24,7 @@ module('Integration | Component | ttl picker', function (hooks) {
   });
 
   test('it shows 30s for invalid duration initialValue input', async function (assert) {
-    await render(hbs`<TtlPicker @onChange={{onChange}} @initialValue={{'invalid'}} />`);
+    await render(hbs`<TtlPicker @onChange={{this.onChange}} @initialValue="invalid" />`);
     assert.dom('[data-test-ttl-value]').hasValue('30', 'sets 30 as the default');
   });
 });
diff --git a/ui/tests/integration/components/ttl-picker2-test.js b/ui/tests/integration/components/ttl-picker2-test.js
index 63cb9548a35e..822f2ccc21ef 100644
--- a/ui/tests/integration/components/ttl-picker2-test.js
+++ b/ui/tests/integration/components/ttl-picker2-test.js
@@ -14,7 +14,7 @@ module('Integration | Component | ttl-picker2', function (hooks) {
   test('it renders time and unit inputs when TTL enabled', async function (assert) {
     await render(hbs`
       <TtlPicker2
-        @onChange={{onChange}}
+        @onChange={{this.onChange}}
         @enableTTL={{true}}
       />
     `);
@@ -25,7 +25,7 @@ module('Integration | Component | ttl-picker2', function (hooks) {
   test('it does not show time and unit inputs when TTL disabled', async function (assert) {
     await render(hbs`
       <TtlPicker2
-        @onChange={{onChange}}
+        @onChange={{this.onChange}}
         @enableTTL={{false}}
       />
     `);
@@ -39,7 +39,7 @@ module('Integration | Component | ttl-picker2', function (hooks) {
         @label="clicktest"
         @unit="m"
         @time="10"
-        @onChange={{onChange}}
+        @onChange={{this.onChange}}
         @enableTTL={{false}}
       />
     `);
@@ -62,7 +62,7 @@ module('Integration | Component | ttl-picker2', function (hooks) {
         @label="clicktest"
         @unit="s"
         @time="360"
-        @onChange={{onChange}}
+        @onChange={{this.onChange}}
         @enableTTL={{false}}
       />
     `);
@@ -97,7 +97,7 @@ module('Integration | Component | ttl-picker2', function (hooks) {
         @label="clicktest"
         @unit="s"
         @time="120"
-        @onChange={{onChange}}
+        @onChange={{this.onChange}}
         @enableTTL={{true}}
         @recalculateSeconds={{true}}
       />
@@ -117,7 +117,7 @@ module('Integration | Component | ttl-picker2', function (hooks) {
   test('it sets default value to time and unit passed', async function (assert) {
     await render(hbs`
       <TtlPicker2
-        @onChange={{onChange}}
+        @onChange={{this.onChange}}
         @initialValue="2h"
         @enableTTL={{true}}
         @time=4
@@ -133,7 +133,7 @@ module('Integration | Component | ttl-picker2', function (hooks) {
     await render(hbs`
       <TtlPicker2
         @label="inittest"
-        @onChange={{onChange}}
+        @onChange={{this.onChange}}
         @initialValue="100m"
         @initialEnabled={{false}}
       />
@@ -149,7 +149,7 @@ module('Integration | Component | ttl-picker2', function (hooks) {
     await render(hbs`
       <TtlPicker2
         @label="inittest"
-        @onChange={{onChange}}
+        @onChange={{this.onChange}}
         @initialValue="100m"
         @initialEnabled={{true}}
       />
@@ -165,7 +165,7 @@ module('Integration | Component | ttl-picker2', function (hooks) {
     await render(hbs`
       <TtlPicker2
         @label="inittest"
-        @onChange={{onChange}}
+        @onChange={{this.onChange}}
         @initialValue="100m"
         @initialEnabled="true"
       />
@@ -181,7 +181,7 @@ module('Integration | Component | ttl-picker2', function (hooks) {
         @label="clicktest"
         @unit="d"
         @time="2"
-        @onChange={{onChange}}
+        @onChange={{this.onChange}}
         @enableTTL={{false}}
       />
     `);
@@ -202,7 +202,7 @@ module('Integration | Component | ttl-picker2', function (hooks) {
     await render(hbs`
       <TtlPicker2
         @label="changeOnInitTest"
-        @onChange={{onChange}}
+        @onChange={{this.onChange}}
         @initialValue="100m"
         @initialEnabled="true"
         @changeOnInit={{true}}
@@ -224,7 +224,7 @@ module('Integration | Component | ttl-picker2', function (hooks) {
     await render(hbs`
       <TtlPicker2
         @label="convertunits"
-        @onChange={{onChange}}
+        @onChange={{this.onChange}}
         @initialValue="60000s"
         @initialEnabled="true"
       />
@@ -237,7 +237,7 @@ module('Integration | Component | ttl-picker2', function (hooks) {
     await render(hbs`
       <TtlPicker2
         @label="convertunits"
-        @onChange={{onChange}}
+        @onChange={{this.onChange}}
         @initialValue={{86400}}
         @initialEnabled="true"
       />
diff --git a/ui/tests/integration/components/upgrade-page-test.js b/ui/tests/integration/components/upgrade-page-test.js
index ffc7f468c497..f18ac55bfa0b 100644
--- a/ui/tests/integration/components/upgrade-page-test.js
+++ b/ui/tests/integration/components/upgrade-page-test.js
@@ -27,18 +27,18 @@ module('Integration | Component | upgrade page', function (hooks) {
 
   test('it renders with custom attributes', async function (assert) {
     await render(hbs`
-      {{upgrade-page title="Test Feature Title" featureName="Specific Feature Name" minimumEdition="Vault Enterprise Premium"}}
+      {{upgrade-page title="Test Feature Title" minimumEdition="Vault Enterprise Premium"}}
       <div id="modal-wormhole"></div>
     `);
 
     assert.dom('.page-header .title').hasText('Test Feature Title', 'renders custom page title');
     assert
       .dom('[data-test-empty-state-title]')
-      .hasText('Upgrade to use Specific Feature Name', 'renders custom title');
+      .hasText('Upgrade to use Test Feature Title', 'renders custom title');
     assert
       .dom('[data-test-empty-state-message]')
       .hasText(
-        'You will need Vault Enterprise Premium with Specific Feature Name included to use this feature.',
+        'You will need Vault Enterprise Premium with Test Feature Title included to use this feature.',
         'renders custom message'
       );
   });
diff --git a/ui/tests/integration/components/wrap-ttl-test.js b/ui/tests/integration/components/wrap-ttl-test.js
index 8e07d6acc61c..e58fa840fcf5 100644
--- a/ui/tests/integration/components/wrap-ttl-test.js
+++ b/ui/tests/integration/components/wrap-ttl-test.js
@@ -22,19 +22,19 @@ module('Integration | Component | wrap ttl', function (hooks) {
   });
 
   test('it renders', async function (assert) {
-    await render(hbs`{{wrap-ttl onChange=(action onChange)}}`);
+    await render(hbs`{{wrap-ttl onChange=(action this.onChange)}}`);
     assert.strictEqual(this.lastOnChangeCall, '30m', 'calls onChange with 30m default on first render');
     assert.dom('label[for="toggle-Wrapresponse"] .ttl-picker-label').hasText('Wrap response');
   });
 
   test('it nulls out value when you uncheck wrapResponse', async function (assert) {
-    await render(hbs`{{wrap-ttl onChange=(action onChange)}}`);
+    await render(hbs`{{wrap-ttl onChange=(action this.onChange)}}`);
     await click('[data-test-toggle-label="Wrap response"]');
     assert.strictEqual(this.lastOnChangeCall, null, 'calls onChange with null');
   });
 
   test('it sends value changes to onChange handler', async function (assert) {
-    await render(hbs`{{wrap-ttl onChange=(action onChange)}}`);
+    await render(hbs`{{wrap-ttl onChange=(action this.onChange)}}`);
     // for testing purposes we need to input unit first because it keeps seconds value
     await fillIn('[data-test-select="ttl-unit"]', 'h');
     assert.strictEqual(this.lastOnChangeCall, '1800s', 'calls onChange correctly on time input');
diff --git a/ui/tests/integration/helpers/date-format-test.js b/ui/tests/integration/helpers/date-format-test.js
index 4e0ecb91bb92..2f90dafe82b4 100644
--- a/ui/tests/integration/helpers/date-format-test.js
+++ b/ui/tests/integration/helpers/date-format-test.js
@@ -11,7 +11,7 @@ module('Integration | Helper | date-format', function (hooks) {
     let today = new Date();
     this.set('today', today);
 
-    await render(hbs`<p data-test-date-format>Date: {{date-format today "yyyy"}}</p>`);
+    await render(hbs`<p data-test-date-format>Date: {{date-format this.today "yyyy"}}</p>`);
     assert
       .dom('[data-test-date-format]')
       .includesText(today.getFullYear(), 'it renders the date in the year format');
@@ -21,7 +21,7 @@ module('Integration | Helper | date-format', function (hooks) {
     let today = new Date().getTime();
     this.set('today', today);
 
-    await render(hbs`<p class="date-format">{{date-format today 'hh:mm:ss'}}</p>`);
+    await render(hbs`<p class="date-format">{{date-format this.today 'hh:mm:ss'}}</p>`);
     let formattedDate = document.querySelector('.date-format').innerText;
     assert.ok(formattedDate.match(/^\d{2}:\d{2}:\d{2}$/));
   });
@@ -30,7 +30,7 @@ module('Integration | Helper | date-format', function (hooks) {
     let todayString = new Date().getFullYear().toString();
     this.set('todayString', todayString);
 
-    await render(hbs`<p data-test-date-format>Date: {{date-format todayString "yyyy"}}</p>`);
+    await render(hbs`<p data-test-date-format>Date: {{date-format this.todayString "yyyy"}}</p>`);
     assert
       .dom('[data-test-date-format]')
       .includesText(todayString, 'it renders the a date if passed in as a string');
@@ -40,7 +40,7 @@ module('Integration | Helper | date-format', function (hooks) {
     let tenDigitDate = 1621785298;
     this.set('tenDigitDate', tenDigitDate);
 
-    await render(hbs`<p data-test-date-format>Date: {{date-format tenDigitDate "MM/dd/yyyy"}}</p>`);
+    await render(hbs`<p data-test-date-format>Date: {{date-format this.tenDigitDate "MM/dd/yyyy"}}</p>`);
     assert.dom('[data-test-date-format]').includesText('05/23/2021');
   });
 
@@ -49,7 +49,7 @@ module('Integration | Helper | date-format', function (hooks) {
     this.set('formattedDate', formattedDate);
 
     await render(
-      hbs`<p data-test-date-format>Date: {{date-format formattedDate 'MMMM dd, yyyy hh:mm:ss a' isFormatted=true}}</p>`
+      hbs`<p data-test-date-format>Date: {{date-format this.formattedDate 'MMMM dd, yyyy hh:mm:ss a' isFormatted=true}}</p>`
     );
     assert.dom('[data-test-date-format]').includesText(format(formattedDate, 'MMMM dd, yyyy hh:mm:ss a'));
   });
@@ -59,7 +59,7 @@ module('Integration | Helper | date-format', function (hooks) {
     this.set('timestampDate', timestampDate);
 
     await render(
-      hbs`<p data-test-date-format>Date: {{date-format timestampDate 'MMM dd, yyyy' dateOnly=true}}</p>`
+      hbs`<p data-test-date-format>Date: {{date-format this.timestampDate 'MMM dd, yyyy' dateOnly=true}}</p>`
     );
     assert.dom('[data-test-date-format]').includesText('Date: Sep 01, 2021');
   });
diff --git a/ui/tests/integration/helpers/format-duration-test.js b/ui/tests/integration/helpers/format-duration-test.js
index e4704beb9f18..28df753b92c8 100644
--- a/ui/tests/integration/helpers/format-duration-test.js
+++ b/ui/tests/integration/helpers/format-duration-test.js
@@ -27,7 +27,7 @@ module('Integration | Helper | format-duration', function (hooks) {
 
   test('it is able to format numbers', async function (assert) {
     this.set('number', 60);
-    await render(hbs`<p data-test-format-duration>Date: {{format-duration number}}</p>`);
+    await render(hbs`<p data-test-format-duration>Date: {{format-duration this.number}}</p>`);
 
     assert
       .dom('[data-test-format-duration]')
@@ -37,14 +37,14 @@ module('Integration | Helper | format-duration', function (hooks) {
   test('it renders the input if time not found', async function (assert) {
     this.set('number', 'arg');
 
-    await render(hbs`<p data-test-format-duration>Date: {{format-duration number}}</p>`);
+    await render(hbs`<p data-test-format-duration>Date: {{format-duration this.number}}</p>`);
     assert.dom('[data-test-format-duration]').hasText('Date: arg');
   });
 
   test('it renders no value if nullable true', async function (assert) {
     this.set('number', 0);
 
-    await render(hbs`<p data-test-format-duration>Date: {{format-duration number nullable=true}}</p>`);
+    await render(hbs`<p data-test-format-duration>Date: {{format-duration this.number nullable=true}}</p>`);
     assert.dom('[data-test-format-duration]').hasText('Date:');
   });
 });
diff --git a/ui/tests/integration/helpers/is-empty-value-test.js b/ui/tests/integration/helpers/is-empty-value-test.js
index 8e258923a637..d7683ef2e011 100644
--- a/ui/tests/integration/helpers/is-empty-value-test.js
+++ b/ui/tests/integration/helpers/is-empty-value-test.js
@@ -4,7 +4,7 @@ import { render } from '@ember/test-helpers';
 import { hbs } from 'ember-cli-htmlbars';
 
 const template = hbs`
-{{#if (is-empty-value inputValue hasDefault=defaultValue)}}
+{{#if (is-empty-value this.inputValue hasDefault=this.defaultValue)}}
 Empty
 {{else}}
 Full
diff --git a/ui/tests/unit/adapters/aws-credential-test.js b/ui/tests/unit/adapters/aws-credential-test.js
index 0d87e232a37f..c2f0ecb12eec 100644
--- a/ui/tests/unit/adapters/aws-credential-test.js
+++ b/ui/tests/unit/adapters/aws-credential-test.js
@@ -78,7 +78,7 @@ module('Unit | Adapter | aws credential', function (hooks) {
         expectedMethod,
         `${description} uses the correct http verb: ${expectedMethod}`
       );
-      assert.strictEqual(requestBody, JSON.stringify(expectedRequestBody));
+      assert.strictEqual(requestBody, expectedRequestBody ? JSON.stringify(expectedRequestBody) : null);
     });
   });
 });
diff --git a/ui/tests/unit/adapters/identity/_test-cases.js b/ui/tests/unit/adapters/identity/_test-cases.js
index 58f13771ea79..2c4a6d2ebd38 100644
--- a/ui/tests/unit/adapters/identity/_test-cases.js
+++ b/ui/tests/unit/adapters/identity/_test-cases.js
@@ -23,13 +23,13 @@ export default function (modelName) {
     },
     {
       adapterMethod: 'updateRecord',
-      args: [storeMVP, { modelName }, { id: 'foo' }],
+      args: [storeMVP, { modelName }, { id: 'foo', modelName }],
       url: `/v1/${modelName}/id/foo`,
       method: 'PUT',
     },
     {
       adapterMethod: 'deleteRecord',
-      args: [storeMVP, { modelName }, { id: 'foo' }],
+      args: [storeMVP, { modelName }, { id: 'foo', modelName }],
       url: `/v1/${modelName}/id/foo`,
       method: 'DELETE',
     },
diff --git a/ui/tests/unit/adapters/identity/entity-alias-test.js b/ui/tests/unit/adapters/identity/entity-alias-test.js
index 810c15539985..e27c50fed795 100644
--- a/ui/tests/unit/adapters/identity/entity-alias-test.js
+++ b/ui/tests/unit/adapters/identity/entity-alias-test.js
@@ -14,7 +14,7 @@ module('Unit | Adapter | identity/entity-alias', function (hooks) {
     this.server.shutdown();
   });
 
-  const cases = testCases('identit/entity-alias');
+  const cases = testCases('identity/entity-alias');
 
   cases.forEach((testCase) => {
     test(`entity-alias#${testCase.adapterMethod}`, function (assert) {
diff --git a/ui/tests/unit/models/secret-engine-test.js b/ui/tests/unit/models/secret-engine-test.js
index b565f40a4763..7d07b53ced4e 100644
--- a/ui/tests/unit/models/secret-engine-test.js
+++ b/ui/tests/unit/models/secret-engine-test.js
@@ -20,7 +20,7 @@ module('Unit | Model | secret-engine', function (hooks) {
     run(() => {
       model = run(() =>
         this.owner.lookup('service:store').createRecord('secret-engine', {
-          options: { version: 2 },
+          version: 2,
           type: 'kv',
         })
       );
@@ -34,7 +34,7 @@ module('Unit | Model | secret-engine', function (hooks) {
     run(() => {
       model = run(() =>
         this.owner.lookup('service:store').createRecord('secret-engine', {
-          options: { version: 2 },
+          version: 2,
           type: 'kv',
         })
       );
diff --git a/ui/tests/unit/models/transit-key-test.js b/ui/tests/unit/models/transit-key-test.js
index 17bf45a332ef..27dd40f803c4 100644
--- a/ui/tests/unit/models/transit-key-test.js
+++ b/ui/tests/unit/models/transit-key-test.js
@@ -28,7 +28,7 @@ module('Unit | Model | transit key', function (hooks) {
     let done = assert.async();
     let model = run(() =>
       this.owner.lookup('service:store').createRecord('transit-key', {
-        keyVersions: [1, 2, 3, 4, 5],
+        keys: { 1: 123, 2: 456, 3: 789, 4: 101112, 5: 131415 },
         minDecryptionVersion: 1,
         latestVersion: 5,
       })
@@ -50,7 +50,7 @@ module('Unit | Model | transit key', function (hooks) {
     let done = assert.async();
     let model = run(() =>
       this.owner.lookup('service:store').createRecord('transit-key', {
-        keyVersions: [1, 2, 3, 4, 5],
+        keys: { 1: 123, 2: 456, 3: 789, 4: 101112, 5: 131415 },
         minDecryptionVersion: 1,
         latestVersion: 5,
       })
diff --git a/ui/tests/unit/routes/vault/cluster/redirect-test.js b/ui/tests/unit/routes/vault/cluster/redirect-test.js
index 256330a6a77c..c854e0dabf66 100644
--- a/ui/tests/unit/routes/vault/cluster/redirect-test.js
+++ b/ui/tests/unit/routes/vault/cluster/redirect-test.js
@@ -7,6 +7,8 @@ module('Unit | Route | vault/cluster/redirect', function (hooks) {
 
   hooks.beforeEach(function () {
     this.router = this.owner.lookup('service:router');
+    this.route = this.owner.lookup('route:vault/cluster/redirect');
+    this.auth = this.owner.lookup('service:auth');
     this.originalTransition = this.router.replaceWith;
     this.router.replaceWith = sinon.stub().returns({
       followRedirects: function () {
@@ -17,6 +19,13 @@ module('Unit | Route | vault/cluster/redirect', function (hooks) {
         };
       },
     });
+    this.setCurrentToken = (token) => {
+      this.auth.setCluster(token);
+      if (token) {
+        this.auth.setTokenData(token, { token: 'foo' });
+        this.auth.tokens = [token];
+      }
+    };
   });
 
   hooks.afterEach(function () {
@@ -24,18 +33,16 @@ module('Unit | Route | vault/cluster/redirect', function (hooks) {
   });
 
   test('it calls route', function (assert) {
-    let route = this.owner.lookup('route:vault/cluster/redirect');
-    assert.ok(route);
+    assert.ok(this.route);
   });
 
   test('it redirects to auth when unauthenticated', function (assert) {
-    let route = this.owner.lookup('route:vault/cluster/redirect');
-    const auth = this.owner.lookup('service:auth');
-    const originalToken = auth.currentToken;
+    const originalToken = this.auth.currentToken;
+    this.setCurrentToken(null);
 
-    auth.currentToken = null;
-
-    route.beforeModel({ to: { queryParams: { redirect_to: 'vault/cluster/tools', namespace: 'admin' } } });
+    this.route.beforeModel({
+      to: { queryParams: { redirect_to: 'vault/cluster/tools', namespace: 'admin' } },
+    });
 
     assert.true(
       this.router.replaceWith.calledWithExactly('vault.cluster.auth', {
@@ -43,32 +50,26 @@ module('Unit | Route | vault/cluster/redirect', function (hooks) {
       }),
       'transitions to auth when not authenticated'
     );
-    auth.currentToken = originalToken;
+    this.setCurrentToken(originalToken);
   });
 
   test('it redirects to cluster when authenticated without redirect param', function (assert) {
-    let route = this.owner.lookup('route:vault/cluster/redirect');
-    const auth = this.owner.lookup('service:auth');
-    const originalToken = auth.currentToken;
+    const originalToken = this.auth.currentToken;
+    this.setCurrentToken('s.xxxxxxxxx');
 
-    auth.currentToken = 's.xxxxxxxxx';
-
-    route.beforeModel({ to: { queryParams: { foo: 'bar' } } });
+    this.route.beforeModel({ to: { queryParams: { foo: 'bar' } } });
     assert.true(
       this.router.replaceWith.calledWithExactly('vault.cluster', { queryParams: { foo: 'bar' } }),
       'transitions to cluster when authenticated but no redirect param'
     );
-    auth.currentToken = originalToken;
+    this.setCurrentToken(originalToken);
   });
 
   test('it redirects to desired path when authenticated with redirect param', function (assert) {
-    let route = this.owner.lookup('route:vault/cluster/redirect');
-    const auth = this.owner.lookup('service:auth');
-    const originalToken = auth.currentToken;
-
-    auth.currentToken = 's.xxxxxxxxx';
+    const originalToken = this.auth.currentToken;
+    this.setCurrentToken('s.xxxxxxxxx');
 
-    route.beforeModel({
+    this.route.beforeModel({
       to: {
         queryParams: { redirect_to: 'vault/cluster/tools?namespace=admin', namespace: 'ns1', foo: 'bar' },
       },
@@ -78,6 +79,6 @@ module('Unit | Route | vault/cluster/redirect', function (hooks) {
       this.router.replaceWith.calledWithExactly('vault/cluster/tools?namespace=admin'),
       'transitions to redirect_to path when authenticated and removes other params'
     );
-    auth.currentToken = originalToken;
+    this.setCurrentToken(originalToken);
   });
 });
diff --git a/ui/yarn.lock b/ui/yarn.lock
index dc3d354d5058..bd5361e36961 100644
--- a/ui/yarn.lock
+++ b/ui/yarn.lock
@@ -2915,7 +2915,7 @@
     ember-cli-babel "^7.10.0"
     ember-modifier-manager-polyfill "^1.1.0"
 
-"@ember/render-modifiers@^1.0.2 || ^2.0.0", "@ember/render-modifiers@^2.0.2", "@ember/render-modifiers@^2.0.3":
+"@ember/render-modifiers@^1.0.2 || ^2.0.0", "@ember/render-modifiers@^2.0.2", "@ember/render-modifiers@^2.0.4":
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/@ember/render-modifiers/-/render-modifiers-2.0.4.tgz#0ac7af647cb736076dbfcd54ca71e090cd329d71"
   integrity sha512-Zh/fo5VUmVzYHkHVvzWVjJ1RjFUxA2jH0zCp2+DQa80Bf3DUXauiEByxU22UkN4LFT55DBFttC0xCQSJG3WTsg==
@@ -2931,7 +2931,7 @@
   dependencies:
     ember-cli-babel "^7.26.6"
 
-"@ember/test-helpers@^2.7.0":
+"@ember/test-helpers@2.8.1":
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.8.1.tgz#20f2e30d48172c2ff713e1db7fbec5352f918d4e"
   integrity sha512-jbsYwWyAdhL/pdPu7Gb3SG1gvIXY70FWMtC/Us0Kmvk82Y+5YUQ1SOC0io75qmOGYQmH7eQrd/bquEVd+4XtdQ==
@@ -3009,31 +3009,6 @@
     resolve "^1.8.1"
     semver "^7.3.2"
 
-"@embroider/macros@0.41.0", "@embroider/macros@^0.41.0":
-  version "0.41.0"
-  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.41.0.tgz#3e78b6f388d7229906abf4c75edfff8bb0208aca"
-  integrity sha512-QISzwEEfLsskZeL0jyZDs1RoQSotwBWj+4upTogNHuxQP5j/9H3IMG/3QB1gh8GEpbudATb/cS4NDYK3UBxufw==
-  dependencies:
-    "@embroider/shared-internals" "0.41.0"
-    assert-never "^1.1.0"
-    ember-cli-babel "^7.23.0"
-    lodash "^4.17.10"
-    resolve "^1.8.1"
-    semver "^7.3.2"
-
-"@embroider/macros@0.47.2":
-  version "0.47.2"
-  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.47.2.tgz#23cbe92cac3c24747f054e1eea2a22538bf7ebd0"
-  integrity sha512-ViNWluJCeM5OPlM3rs8kdOz3RV5rpfXX5D2rDnc/q86xRS0xf4NFEjYRV7W6fBcD0b3v5jSHDTwrjq9Kee4rHg==
-  dependencies:
-    "@embroider/shared-internals" "0.47.2"
-    assert-never "^1.2.1"
-    ember-cli-babel "^7.26.6"
-    find-up "^5.0.0"
-    lodash "^4.17.21"
-    resolve "^1.20.0"
-    semver "^7.3.2"
-
 "@embroider/macros@1.5.0", "@embroider/macros@^1.0.0":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.5.0.tgz#8c67666359e7814d91cdeac2fd96c896080473b3"
@@ -3062,6 +3037,32 @@
     resolve "^1.20.0"
     semver "^7.3.2"
 
+"@embroider/macros@^0.41.0":
+  version "0.41.0"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-0.41.0.tgz#3e78b6f388d7229906abf4c75edfff8bb0208aca"
+  integrity sha512-QISzwEEfLsskZeL0jyZDs1RoQSotwBWj+4upTogNHuxQP5j/9H3IMG/3QB1gh8GEpbudATb/cS4NDYK3UBxufw==
+  dependencies:
+    "@embroider/shared-internals" "0.41.0"
+    assert-never "^1.1.0"
+    ember-cli-babel "^7.23.0"
+    lodash "^4.17.10"
+    resolve "^1.8.1"
+    semver "^7.3.2"
+
+"@embroider/macros@^0.50.0 || ^1.0.0", "@embroider/macros@^1.2.0", "@embroider/macros@^1.9.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.9.0.tgz#0df2a56fdd93f11fddea450b6ca83cc2119b5008"
+  integrity sha512-12ElrRT+mX3aSixGHjHnfsnyoH1hw5nM+P+Ax0ITZdp6TaAvWZ8dENnVHltdnv4ssHiX0EsVEXmqbIIdMN4nLA==
+  dependencies:
+    "@embroider/shared-internals" "1.8.3"
+    assert-never "^1.2.1"
+    babel-import-util "^1.1.0"
+    ember-cli-babel "^7.26.6"
+    find-up "^5.0.0"
+    lodash "^4.17.21"
+    resolve "^1.20.0"
+    semver "^7.3.2"
+
 "@embroider/shared-internals@0.41.0":
   version "0.41.0"
   resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.41.0.tgz#2553f026d4f48ea1fd11235501feb63bf49fa306"
@@ -3075,19 +3076,6 @@
     semver "^7.3.2"
     typescript-memoize "^1.0.0-alpha.3"
 
-"@embroider/shared-internals@0.47.2":
-  version "0.47.2"
-  resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-0.47.2.tgz#24e9fa0dd9c529d5c996ee1325729ea08d1fa19f"
-  integrity sha512-SxdZYjAE0fiM5zGDz+12euWIsQZ1tsfR1k+NKmiWMyLhA5T3pNgbR2/Djvx/cVIxOtEavGGSllYbzRKBtV4xMg==
-  dependencies:
-    babel-import-util "^0.2.0"
-    ember-rfc176-data "^0.3.17"
-    fs-extra "^9.1.0"
-    lodash "^4.17.21"
-    resolve-package-path "^4.0.1"
-    semver "^7.3.5"
-    typescript-memoize "^1.0.1"
-
 "@embroider/shared-internals@1.5.0", "@embroider/shared-internals@^1.0.0":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-1.5.0.tgz#d3883f13571be36fcdbc59c65c785db7b6d8186e"
@@ -3115,21 +3103,12 @@
     semver "^7.3.5"
     typescript-memoize "^1.0.1"
 
-"@embroider/util@^0.39.1 || ^0.40.0 || ^0.41.0":
-  version "0.41.0"
-  resolved "https://registry.yarnpkg.com/@embroider/util/-/util-0.41.0.tgz#5324cb4742aa4ed8d613c4f88a466f73e4e6acc1"
-  integrity sha512-ytA3J/YfQh7FEUEBwz3ezTqQNm/S5et5rZw3INBIy4Ak4x0NXV/VXLjyL8mv3txL8fGknZTBdXEhDsHUKIq8SQ==
-  dependencies:
-    "@embroider/macros" "0.41.0"
-    broccoli-funnel "^3.0.5"
-    ember-cli-babel "^7.23.1"
-
-"@embroider/util@^0.47.2":
-  version "0.47.2"
-  resolved "https://registry.yarnpkg.com/@embroider/util/-/util-0.47.2.tgz#d06497b4b84c07ed9c7b628293bb019c533f4556"
-  integrity sha512-g9OqnFJPktGu9NS0Ug3Pxz1JE3jeDceeVE4IrlxDrVmBXMA/GrBvpwjolWgl6jh97cMJyExdz62jIvPHV4256Q==
+"@embroider/util@^0.39.1 || ^0.40.0 || ^0.41.0 || ^1.0.0", "@embroider/util@^1.2.0":
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/@embroider/util/-/util-1.9.0.tgz#331c46bdf106c44cb1dd6baaa9030d322c13cfca"
+  integrity sha512-9I63iJK6N01OHJafmS/BX0msUkTlmhFMIEmDl/SRNACVi0nS6QfNyTgTTeji1P/DALf6eobg/9t/N4VhS9G9QA==
   dependencies:
-    "@embroider/macros" "0.47.2"
+    "@embroider/macros" "^1.9.0"
     broccoli-funnel "^3.0.5"
     ember-cli-babel "^7.23.1"
 
@@ -8612,22 +8591,24 @@ ember-auto-import@^1.2.19:
     walk-sync "^0.3.3"
     webpack "^4.43.0"
 
-ember-basic-dropdown@4.0.3, "ember-basic-dropdown@^3.1.0 || ^4.0.2":
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-4.0.3.tgz#69eed0f4ccb3fcc72bd8379c151504602949ac12"
-  integrity sha512-WND4LLGS6a3x6j7ZZVs6jmv22xm0HeMELgW4cTDhnNE7L9zJY/kxgAaqSAg19EJ81GzOHI+Ub+SqJ5QjSDtXaA==
+ember-basic-dropdown@6.0.1, ember-basic-dropdown@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ember-basic-dropdown/-/ember-basic-dropdown-6.0.1.tgz#9844b8b263033c916e193fb15b91517a00192db0"
+  integrity sha512-8cmqHvho7fToAv2pauzLd3y9fUVtMu0+eBwsevjiuTdWUPLvkIvn745NbT5aempVmxfMq0oQLhjzK8VUd4gxaw==
   dependencies:
-    "@ember/render-modifiers" "^2.0.3"
-    "@embroider/macros" "^1.0.0"
-    "@embroider/util" "^1.0.0"
+    "@ember/render-modifiers" "^2.0.4"
+    "@embroider/macros" "^1.2.0"
+    "@embroider/util" "^1.2.0"
     "@glimmer/component" "^1.0.4"
     "@glimmer/tracking" "^1.0.4"
-    ember-cli-babel "^7.26.6"
-    ember-cli-htmlbars "^6.0.0"
+    ember-cli-babel "^7.26.11"
+    ember-cli-htmlbars "^6.0.1"
     ember-cli-typescript "^4.2.1"
-    ember-element-helper "^0.5.5"
+    ember-element-helper "^0.6.0"
+    ember-get-config "^1.0.2 || ^2.0.0"
     ember-maybe-in-element "^2.0.3"
-    ember-style-modifier "^0.7.0"
+    ember-modifier "^3.2.7"
+    ember-style-modifier "^0.8.0"
     ember-truth-helpers "^2.1.0 || ^3.0.0"
 
 ember-cache-primitive-polyfill@^1.0.1:
@@ -8682,7 +8663,7 @@ ember-cli-babel@^6.6.0:
     ember-cli-version-checker "^2.1.2"
     semver "^5.5.0"
 
-ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.17.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.0, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.0, ember-cli-babel@^7.26.1, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.5, ember-cli-babel@^7.26.6, ember-cli-babel@^7.26.8, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3:
+ember-cli-babel@^7.0.0, ember-cli-babel@^7.1.2, ember-cli-babel@^7.1.3, ember-cli-babel@^7.10.0, ember-cli-babel@^7.13.0, ember-cli-babel@^7.13.2, ember-cli-babel@^7.18.0, ember-cli-babel@^7.19.0, ember-cli-babel@^7.20.0, ember-cli-babel@^7.21.0, ember-cli-babel@^7.22.1, ember-cli-babel@^7.23.0, ember-cli-babel@^7.23.1, ember-cli-babel@^7.26.0, ember-cli-babel@^7.26.1, ember-cli-babel@^7.26.11, ember-cli-babel@^7.26.3, ember-cli-babel@^7.26.4, ember-cli-babel@^7.26.5, ember-cli-babel@^7.26.6, ember-cli-babel@^7.26.8, ember-cli-babel@^7.5.0, ember-cli-babel@^7.7.3:
   version "7.26.11"
   resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-7.26.11.tgz#50da0fe4dcd99aada499843940fec75076249a9f"
   integrity sha512-JJYeYjiz/JTn34q7F5DSOjkkZqy8qwFOOxXfE6pe9yEJqWGu4qErKxlz8I22JoVEQ/aBUO+OcKTpmctvykM9YA==
@@ -8729,13 +8710,16 @@ ember-cli-clipboard@0.16.0:
     ember-cli-babel "^7.26.6"
     ember-cli-htmlbars "^5.7.1"
 
-ember-cli-content-security-policy@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ember-cli-content-security-policy/-/ember-cli-content-security-policy-1.1.1.tgz#7d91a695319d8f99c317f3a594fba77bbfedf6c7"
-  integrity sha512-QgGAFt1nmsb0qF2YXI5iSM7jJVb09R2hrfX7uR+kkXMb5VyNQXdo2ZlX/DuIbePQVY4q9THpRh8Yf0UHJNbvDQ==
+ember-cli-content-security-policy@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/ember-cli-content-security-policy/-/ember-cli-content-security-policy-2.0.3.tgz#833eca6be4d625f8b1b85cf5bad62544b535b483"
+  integrity sha512-tSGRbR2XiOjHk7oEH7LVF1y5S643rUEjl3mujI6EYPkrQbHaV0WdLyIWJkLvuP1KGnjBfvnLCyiKDFu6z2PjVg==
   dependencies:
     body-parser "^1.17.0"
-    chalk "^2.0.0"
+    chalk "^4.1.1"
+    debug "^4.3.1"
+    ember-cli-babel "^7.26.3"
+    ember-cli-version-checker "^5.0.2"
 
 ember-cli-dependency-checker@^3.3.1:
   version "3.3.1"
@@ -8795,7 +8779,7 @@ ember-cli-htmlbars@^4.3.1:
     strip-bom "^4.0.0"
     walk-sync "^2.0.2"
 
-ember-cli-htmlbars@^5.1.0, ember-cli-htmlbars@^5.2.0, ember-cli-htmlbars@^5.3.2:
+ember-cli-htmlbars@^5.2.0, ember-cli-htmlbars@^5.3.2:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-5.7.2.tgz#e0cd2fb3c20d85fe4c3e228e6f0590ee1c645ba8"
   integrity sha512-Uj6R+3TtBV5RZoJY14oZn/sNPnc+UgmC8nb5rI4P3fR/gYoyTFIZSXiIM7zl++IpMoIrocxOrgt+mhonKphgGg==
@@ -8860,6 +8844,26 @@ ember-cli-htmlbars@^6.0.0, ember-cli-htmlbars@^6.0.1:
     strip-bom "^4.0.0"
     walk-sync "^2.2.0"
 
+ember-cli-htmlbars@^6.1.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.1.1.tgz#f5b588572a5d18ad087560122b8dabc90145173d"
+  integrity sha512-DKf2rjzIVw9zWCuFsBGJScrgf5Mz7dSg08Cq+FWFYIxnpssINUbNUoB0NHWnUJK4QqCvaExOyOmjm0kO455CPg==
+  dependencies:
+    "@ember/edition-utils" "^1.2.0"
+    babel-plugin-ember-template-compilation "^1.0.0"
+    babel-plugin-htmlbars-inline-precompile "^5.3.0"
+    broccoli-debug "^0.6.5"
+    broccoli-persistent-filter "^3.1.2"
+    broccoli-plugin "^4.0.3"
+    ember-cli-version-checker "^5.1.2"
+    fs-tree-diff "^2.0.1"
+    hash-for-dep "^1.5.1"
+    heimdalljs-logger "^0.1.10"
+    js-string-escape "^1.0.1"
+    semver "^7.3.4"
+    silent-error "^1.1.1"
+    walk-sync "^2.2.0"
+
 ember-cli-inject-live-reload@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ember-cli-inject-live-reload/-/ember-cli-inject-live-reload-2.1.0.tgz#ef63c733c133024d5726405a3c247fa12e88a385"
@@ -9131,7 +9135,7 @@ ember-cli-version-checker@^4.1.0:
     semver "^6.3.0"
     silent-error "^1.1.1"
 
-ember-cli-version-checker@^5.1.1, ember-cli-version-checker@^5.1.2:
+ember-cli-version-checker@^5.0.2, ember-cli-version-checker@^5.1.1, ember-cli-version-checker@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-5.1.2.tgz#649c7b6404902e3b3d69c396e054cea964911ab0"
   integrity sha512-rk7GY+FmLn/2e22HsZs0Ycrz8HQ1W3Fv+2TFOuEFW9optnDXDgkntPBIl6gact/LHsfBM5RKbM3dHsIIeLgl0Q==
@@ -9372,14 +9376,14 @@ ember-destroyable-polyfill@^2.0.2, ember-destroyable-polyfill@^2.0.3:
     ember-cli-version-checker "^5.1.1"
     ember-compatibility-helpers "^1.2.1"
 
-ember-element-helper@^0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/ember-element-helper/-/ember-element-helper-0.5.5.tgz#4a9ecb4dce57ee7f5ceb868a53c7b498c729f056"
-  integrity sha512-Tu3hsI+/mjHBUvw62Qi+YDZtKkn59V66CjwbgfNTZZ7aHf4gFm1ow4zJ4WLnpnie8p9FvOmIUxwl5HvgPJIcFA==
+ember-element-helper@^0.6.0:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/ember-element-helper/-/ember-element-helper-0.6.1.tgz#a6fbc5be5f875b5c864ae61bf5c5f81d6de6d936"
+  integrity sha512-YiOdAMlzYul4ulkIoNp8z7iHDfbT1fbut/9xGFRfxDwU/FmF8HtAUB2f1veu/w50HTeZNopa1OV2PCloZ76XlQ==
   dependencies:
-    "@embroider/util" "^0.39.1 || ^0.40.0 || ^0.41.0"
-    ember-cli-babel "^7.17.2"
-    ember-cli-htmlbars "^5.1.0"
+    "@embroider/util" "^0.39.1 || ^0.40.0 || ^0.41.0 || ^1.0.0"
+    ember-cli-babel "^7.26.11"
+    ember-cli-htmlbars "^6.0.1"
 
 ember-engines@0.8.23:
   version "0.8.23"
@@ -9439,6 +9443,14 @@ ember-fetch@^8.1.1:
     ember-cli-babel "^7.26.6"
     ember-cli-htmlbars "^5.7.1"
 
+"ember-get-config@^1.0.2 || ^2.0.0":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ember-get-config/-/ember-get-config-2.1.1.tgz#bede76c25d95dbefab8d30064abf7aa00bc19235"
+  integrity sha512-uNmv1cPG/4qsac8oIf5txJ2FZ8p88LEpG4P3dNcjsJS98Y8hd0GPMFwVqpnzI78Lz7VYRGQWY4jnE4qm5R3j4g==
+  dependencies:
+    "@embroider/macros" "^0.50.0 || ^1.0.0"
+    ember-cli-babel "^7.26.6"
+
 ember-in-element-polyfill@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ember-in-element-polyfill/-/ember-in-element-polyfill-1.0.1.tgz#143504445bb4301656a2eaad42644d684f5164dd"
@@ -9496,26 +9508,26 @@ ember-modifier-manager-polyfill@^1.1.0, ember-modifier-manager-polyfill@^1.2.0:
     ember-cli-version-checker "^2.1.2"
     ember-compatibility-helpers "^1.2.0"
 
-ember-modifier@^3.0.0:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-3.2.7.tgz#f2d35b7c867cbfc549e1acd8d8903c5ecd02ea4b"
-  integrity sha512-ezcPQhH8jUfcJQbbHji4/ZG/h0yyj1jRDknfYue/ypQS8fM8LrGcCMo0rjDZLzL1Vd11InjNs3BD7BdxFlzGoA==
+ember-modifier@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-3.1.0.tgz#ba5b0941302accd787ed3dcfc8d20400b77ffc41"
+  integrity sha512-G5Lj9jVFsD2sVJcRNQfaGKG1p81wT4LGfClBhCuB4TgwP1NGJKdqI+Q8BW2MptONxQt/71UjjUH0YK7Gm9eahg==
   dependencies:
     ember-cli-babel "^7.26.6"
     ember-cli-normalize-entity-name "^1.0.0"
     ember-cli-string-utils "^1.1.0"
-    ember-cli-typescript "^5.0.0"
+    ember-cli-typescript "^4.2.1"
     ember-compatibility-helpers "^1.2.5"
 
-ember-modifier@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-3.1.0.tgz#ba5b0941302accd787ed3dcfc8d20400b77ffc41"
-  integrity sha512-G5Lj9jVFsD2sVJcRNQfaGKG1p81wT4LGfClBhCuB4TgwP1NGJKdqI+Q8BW2MptONxQt/71UjjUH0YK7Gm9eahg==
+ember-modifier@^3.2.7:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/ember-modifier/-/ember-modifier-3.2.7.tgz#f2d35b7c867cbfc549e1acd8d8903c5ecd02ea4b"
+  integrity sha512-ezcPQhH8jUfcJQbbHji4/ZG/h0yyj1jRDknfYue/ypQS8fM8LrGcCMo0rjDZLzL1Vd11InjNs3BD7BdxFlzGoA==
   dependencies:
     ember-cli-babel "^7.26.6"
     ember-cli-normalize-entity-name "^1.0.0"
     ember-cli-string-utils "^1.1.0"
-    ember-cli-typescript "^4.2.1"
+    ember-cli-typescript "^5.0.0"
     ember-compatibility-helpers "^1.2.5"
 
 ember-native-dom-helpers@^0.7.0:
@@ -9533,23 +9545,23 @@ ember-page-title@^7.0.0:
   dependencies:
     ember-cli-babel "^7.26.6"
 
-ember-power-select@^5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/ember-power-select/-/ember-power-select-5.0.3.tgz#615da0742a222a8c090590dd2cbb2db3a6147ac5"
-  integrity sha512-V72DxohhuPdsF6Rcxu1cVL2faHSk83RdTCkxeDT71NeQQNpHKbslhc0c+MMU52wm0mzch+oWmti/2McpL/vIvQ==
+ember-power-select@6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ember-power-select/-/ember-power-select-6.0.1.tgz#0f0c7bdda83adc59363fb1009c34786d783fff95"
+  integrity sha512-YslsjEUzdHhFfUP7IlklQuKt6rFG/VS38JLCjTYiCcBKrl76pxky/PoGMx3V+Ukh5mI77mGfA7BSKpKv8MAQAw==
   dependencies:
-    "@embroider/util" "^0.47.2"
-    "@glimmer/component" "^1.0.4"
-    "@glimmer/tracking" "^1.0.4"
+    "@embroider/util" "^1.0.0"
+    "@glimmer/component" "^1.1.2"
+    "@glimmer/tracking" "^1.1.2"
     ember-assign-helper "^0.4.0"
-    ember-basic-dropdown "^3.1.0 || ^4.0.2"
-    ember-cli-babel "^7.26.0"
-    ember-cli-htmlbars "^6.0.0"
+    ember-basic-dropdown "^6.0.0"
+    ember-cli-babel "^7.26.11"
+    ember-cli-htmlbars "^6.1.0"
     ember-cli-typescript "^4.2.0"
     ember-concurrency ">=1.0.0 <3"
     ember-concurrency-decorators "^2.0.0"
     ember-text-measurer "^0.6.0"
-    ember-truth-helpers "^2.1.0 || ^3.0.0"
+    ember-truth-helpers "^3.0.0"
 
 ember-qrcode-shim@^0.4.0:
   version "0.4.0"
@@ -9558,20 +9570,20 @@ ember-qrcode-shim@^0.4.0:
   dependencies:
     ember-cli-babel "^7.1.2"
 
-ember-qunit@^5.1.5:
-  version "5.1.5"
-  resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-5.1.5.tgz#24a7850f052be24189ff597dfc31b923e684c444"
-  integrity sha512-2cFA4oMygh43RtVcMaBrr086Tpdhgbn3fVZ2awLkzF/rnSN0D0PSRpd7hAD7OdBPerC/ZYRwzVyGXLoW/Zes4A==
+ember-qunit@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-6.0.0.tgz#cea4766c297a25d58a3e886ccd4eb726167ea47c"
+  integrity sha512-idNWh9Ap2HN9e3Xozh5Jrciu5tDhn0okM/bgwDjdks3dwuMhEox45iiRTx469FWQ9+ixjZ40AsXsRTDkfCmvmw==
   dependencies:
     broccoli-funnel "^3.0.8"
     broccoli-merge-trees "^3.0.2"
     common-tags "^1.8.0"
-    ember-auto-import "^1.11.3"
+    ember-auto-import "^2.4.2"
     ember-cli-babel "^7.26.6"
     ember-cli-test-loader "^3.0.0"
-    resolve-package-path "^3.1.0"
+    resolve-package-path "^4.0.3"
     silent-error "^1.1.1"
-    validate-peer-dependencies "^1.2.0"
+    validate-peer-dependencies "^2.1.0"
 
 ember-resolver@^8.0.3:
   version "8.0.3"
@@ -9678,13 +9690,13 @@ ember-source@~4.4.0:
     semver "^7.3.4"
     silent-error "^1.1.1"
 
-ember-style-modifier@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/ember-style-modifier/-/ember-style-modifier-0.7.0.tgz#85b3dfd7e4bc2bd546df595f2dab4fb141cf7d87"
-  integrity sha512-iDzffiwJcb9j6gu3g8CxzZOTvRZ0BmLMEFl+uyqjiaj72VVND9+HbLyQRw1/ewPAtinhSktxxTTdwU/JO+stLw==
+ember-style-modifier@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/ember-style-modifier/-/ember-style-modifier-0.8.0.tgz#ef46b3f288e63e3d850418ea8dc6f7b12edde721"
+  integrity sha512-I7M+oZ+poYYOP7n521rYv7kkYZbxotL8VbtHYxLQ3tasRZYQJ21qfu3vVjydSjwyE3w7EZRgKngBoMhKSAEZnw==
   dependencies:
     ember-cli-babel "^7.26.6"
-    ember-modifier "^3.0.0"
+    ember-modifier "^3.2.7"
 
 ember-svg-jar@^2.1.0:
   version "2.3.3"
@@ -9786,6 +9798,13 @@ ember-truth-helpers@3.0.0, "ember-truth-helpers@^2.1.0 || ^3.0.0":
   dependencies:
     ember-cli-babel "^7.22.1"
 
+ember-truth-helpers@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/ember-truth-helpers/-/ember-truth-helpers-3.1.1.tgz#434715926d72bcc63b8a115dec09745fda4474dc"
+  integrity sha512-FHwJAx77aA5q27EhdaaiBFuy9No+8yaWNT5A7zs0sIFCmf14GbcLn69vJEp6mW7vkITezizGAWhw7gL0Wbk7DA==
+  dependencies:
+    ember-cli-babel "^7.22.1"
+
 ember-wormhole@0.6.0, ember-wormhole@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/ember-wormhole/-/ember-wormhole-0.6.0.tgz#1f9143aa05c0f0abdf14a97ff22520ebaf85eca0"
@@ -15915,7 +15934,7 @@ resolve-package-path@^3.1.0:
     path-root "^0.1.1"
     resolve "^1.17.0"
 
-resolve-package-path@^4.0.1, resolve-package-path@^4.0.3:
+resolve-package-path@^4.0.0, resolve-package-path@^4.0.1, resolve-package-path@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-4.0.3.tgz#31dab6897236ea6613c72b83658d88898a9040aa"
   integrity sha512-SRpNAPW4kewOaNUt8VPqhJ0UMxawMwzJD8V7m1cJfdSTK9ieZwS6K7Dabsm4bmLFM96Z5Y/UznrpG5kt1im8yA==
@@ -17932,12 +17951,12 @@ validate-npm-package-name@^3.0.0:
   dependencies:
     builtins "^1.0.3"
 
-validate-peer-dependencies@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/validate-peer-dependencies/-/validate-peer-dependencies-1.2.0.tgz#22aab93c514f4fda457d36c80685e8b1160d2036"
-  integrity sha512-nd2HUpKc6RWblPZQ2GDuI65sxJ2n/UqZwSBVtj64xlWjMx0m7ZB2m9b2JS3v1f+n9VWH/dd1CMhkHfP6pIdckA==
+validate-peer-dependencies@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/validate-peer-dependencies/-/validate-peer-dependencies-2.1.0.tgz#1ad8218b1b168aeb500165f9de2a3f53269ece56"
+  integrity sha512-x+M+mp16g4N+jDQJO6a+AKnMHAViov9mRzYfgMYR6Bq+UTwewf8aTQsP+e1QH0oZrADqP7fuI/bEbl3CzRFhOQ==
   dependencies:
-    resolve-package-path "^3.1.0"
+    resolve-package-path "^4.0.0"
     semver "^7.3.2"
 
 vary@^1, vary@~1.1.2: