diff --git a/docs-app/package.json b/docs-app/package.json
index 5117261b..76d20d08 100644
--- a/docs-app/package.json
+++ b/docs-app/package.json
@@ -102,7 +102,7 @@
     "ember-template-lint": "^5.8.0",
     "eslint": "^8.32.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-ember": "^11.4.3",
+    "eslint-plugin-ember": "^11.8.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-qunit": "^7.3.1",
diff --git a/docs-app/tests/acceptance/button-test.gts b/docs-app/tests/acceptance/button-test.gts
index 4acc3e9d..393d307b 100644
--- a/docs-app/tests/acceptance/button-test.gts
+++ b/docs-app/tests/acceptance/button-test.gts
@@ -1,16 +1,13 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
+import { currentURL, visit } from '@ember/test-helpers';
 import { module, test } from 'qunit';
-import { visit, currentURL } from '@ember/test-helpers';
 import { setupApplicationTest } from 'ember-qunit';
 
 module('Acceptance | Button', function (hooks) {
   setupApplicationTest(hooks);
 
   test('visiting the button page', async function (assert) {
-
-    await visit('/docs/components/button')
+    await visit('/docs/components/button');
     assert.strictEqual(currentURL(), '/docs/components/button');
   });
-
 });
diff --git a/packages/ember-toucan-core/package.json b/packages/ember-toucan-core/package.json
index 76ff1b10..b49bbb29 100644
--- a/packages/ember-toucan-core/package.json
+++ b/packages/ember-toucan-core/package.json
@@ -88,7 +88,7 @@
     "ember-template-lint": "^5.8.0",
     "eslint": "^8.32.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-ember": "^11.4.3",
+    "eslint-plugin-ember": "^11.8.0",
     "eslint-plugin-n": "^16.0.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
diff --git a/packages/ember-toucan-form/package.json b/packages/ember-toucan-form/package.json
index bb19412a..8bd64058 100644
--- a/packages/ember-toucan-form/package.json
+++ b/packages/ember-toucan-form/package.json
@@ -93,7 +93,7 @@
     "ember-template-lint": "^5.8.0",
     "eslint": "^8.32.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-ember": "^11.4.3",
+    "eslint-plugin-ember": "^11.8.0",
     "eslint-plugin-n": "^16.0.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d5b7e1ed..93a0784b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -121,7 +121,7 @@ importers:
         version: 4.0.2
       '@nullvoxpopuli/eslint-configs':
         specifier: ^3.0.4
-        version: 3.1.1(@babel/core@7.20.12)(@babel/eslint-parser@7.19.1)(eslint-config-prettier@8.6.0)(eslint-plugin-ember@11.4.6)(eslint-plugin-qunit@7.3.4)(eslint@8.33.0)(prettier@2.8.3)
+        version: 3.1.1(@babel/core@7.20.12)(@babel/eslint-parser@7.19.1)(eslint-config-prettier@8.6.0)(eslint-plugin-ember@11.8.0)(eslint-plugin-qunit@7.3.4)(eslint@8.33.0)(prettier@2.8.3)
       '@tailwindcss/typography':
         specifier: ^0.5.7
         version: 0.5.9(tailwindcss@3.2.4)
@@ -291,8 +291,8 @@ importers:
         specifier: ^8.5.0
         version: 8.6.0(eslint@8.33.0)
       eslint-plugin-ember:
-        specifier: ^11.4.3
-        version: 11.4.6(eslint@8.33.0)
+        specifier: ^11.8.0
+        version: 11.8.0(eslint@8.33.0)
       eslint-plugin-node:
         specifier: ^11.1.0
         version: 11.1.0(eslint@8.33.0)
@@ -424,7 +424,7 @@ importers:
         version: 1.0.2
       '@nullvoxpopuli/eslint-configs':
         specifier: ^3.0.4
-        version: 3.1.1(@babel/core@7.20.12)(@babel/eslint-parser@7.19.1)(@typescript-eslint/eslint-plugin@5.50.0)(@typescript-eslint/parser@5.50.0)(eslint-config-prettier@8.6.0)(eslint-plugin-ember@11.4.6)(eslint@8.33.0)(prettier@2.8.3)
+        version: 3.1.1(@babel/core@7.20.12)(@babel/eslint-parser@7.19.1)(@typescript-eslint/eslint-plugin@5.50.0)(@typescript-eslint/parser@5.50.0)(eslint-config-prettier@8.6.0)(eslint-plugin-ember@11.8.0)(eslint@8.33.0)(prettier@2.8.3)
       '@tsconfig/ember':
         specifier: ^2.0.0
         version: 2.0.0
@@ -507,8 +507,8 @@ importers:
         specifier: ^8.3.0
         version: 8.6.0(eslint@8.33.0)
       eslint-plugin-ember:
-        specifier: ^11.4.3
-        version: 11.4.6(eslint@8.33.0)
+        specifier: ^11.8.0
+        version: 11.8.0(eslint@8.33.0)
       eslint-plugin-n:
         specifier: ^16.0.0
         version: 16.0.0(eslint@8.33.0)
@@ -608,7 +608,7 @@ importers:
         version: 1.0.2
       '@nullvoxpopuli/eslint-configs':
         specifier: ^3.0.4
-        version: 3.1.1(@babel/core@7.21.4)(@babel/eslint-parser@7.19.1)(@typescript-eslint/eslint-plugin@5.50.0)(@typescript-eslint/parser@5.50.0)(eslint-config-prettier@8.6.0)(eslint-plugin-ember@11.4.6)(eslint@8.33.0)(prettier@2.8.3)
+        version: 3.1.1(@babel/core@7.21.4)(@babel/eslint-parser@7.19.1)(@typescript-eslint/eslint-plugin@5.50.0)(@typescript-eslint/parser@5.50.0)(eslint-config-prettier@8.6.0)(eslint-plugin-ember@11.8.0)(eslint@8.33.0)(prettier@2.8.3)
       '@tsconfig/ember':
         specifier: ^2.0.0
         version: 2.0.0
@@ -697,8 +697,8 @@ importers:
         specifier: ^8.3.0
         version: 8.6.0(eslint@8.33.0)
       eslint-plugin-ember:
-        specifier: ^11.4.3
-        version: 11.4.6(eslint@8.33.0)
+        specifier: ^11.8.0
+        version: 11.8.0(eslint@8.33.0)
       eslint-plugin-n:
         specifier: ^16.0.0
         version: 16.0.0(eslint@8.33.0)
@@ -794,7 +794,7 @@ importers:
         version: 1.0.2
       '@nullvoxpopuli/eslint-configs':
         specifier: ^3.0.4
-        version: 3.1.1(@babel/core@7.20.12)(@babel/eslint-parser@7.19.1)(@typescript-eslint/eslint-plugin@5.50.0)(@typescript-eslint/parser@5.50.0)(eslint-config-prettier@8.6.0)(eslint-plugin-ember@11.4.6)(eslint-plugin-qunit@7.3.4)(eslint@8.33.0)(prettier@2.8.3)
+        version: 3.1.1(@babel/core@7.20.12)(@babel/eslint-parser@7.19.1)(@typescript-eslint/eslint-plugin@5.50.0)(@typescript-eslint/parser@5.50.0)(eslint-config-prettier@8.6.0)(eslint-plugin-ember@11.8.0)(eslint-plugin-qunit@7.3.4)(eslint@8.33.0)(prettier@2.8.3)
       '@tsconfig/ember':
         specifier: ^2.0.0
         version: 2.0.0
@@ -955,8 +955,8 @@ importers:
         specifier: ^8.5.0
         version: 8.6.0(eslint@8.33.0)
       eslint-plugin-ember:
-        specifier: ^11.4.3
-        version: 11.4.6(eslint@8.33.0)
+        specifier: ^11.8.0
+        version: 11.8.0(eslint@8.33.0)
       eslint-plugin-n:
         specifier: ^16.0.0
         version: 16.0.0(eslint@8.33.0)
@@ -4150,12 +4150,6 @@ packages:
       '@glimmer/env': 0.1.7
     dev: true
 
-  /@glimmer/interfaces@0.84.2:
-    resolution: {integrity: sha512-tMZxQpOddUVmHEOuripkNqVR7ba0K4doiYnFd4WyswqoHPlxqpBujbIamQ+bWCWEF0U4yxsXKa31ekS/JHkiBQ==}
-    dependencies:
-      '@simple-dom/interface': 1.4.0
-    dev: true
-
   /@glimmer/interfaces@0.84.3:
     resolution: {integrity: sha512-dk32ykoNojt0mvEaIW6Vli5MGTbQo58uy3Epj7ahCgTHmWOKuw/0G83f2UmFprRwFx689YTXG38I/vbpltEjzg==}
     dependencies:
@@ -4172,15 +4166,6 @@ packages:
       '@glimmer/validator': 0.84.3
     dev: true
 
-  /@glimmer/syntax@0.84.2:
-    resolution: {integrity: sha512-SPBd1tpIR9XeaXsXsMRCnKz63eLnIZ0d5G9QC4zIBFBC3pQdtG0F5kWeuRVCdfTIFuR+5WBMfk5jvg+3gbQhjg==}
-    dependencies:
-      '@glimmer/interfaces': 0.84.2
-      '@glimmer/util': 0.84.2
-      '@handlebars/parser': 2.0.0
-      simple-html-tokenizer: 0.5.11
-    dev: true
-
   /@glimmer/syntax@0.84.3:
     resolution: {integrity: sha512-ioVbTic6ZisLxqTgRBL2PCjYZTFIwobifCustrozRU2xGDiYvVIL0vt25h2c1ioDsX59UgVlDkIK4YTAQQSd2A==}
     dependencies:
@@ -4199,14 +4184,6 @@ packages:
   /@glimmer/util@0.44.0:
     resolution: {integrity: sha512-duAsm30uVK9jSysElCbLyU6QQYO2X9iLDLBIBUcCqck9qN1o3tK2qWiHbGK5d6g8E2AJ4H88UrfElkyaJlGrwg==}
 
-  /@glimmer/util@0.84.2:
-    resolution: {integrity: sha512-VbhzE2s4rmU+qJF3gGBTL1IDjq+/G2Th51XErS8MQVMCmE4CU2pdwSzec8PyOowqCGUOrVIWuMzEI6VoPM4L4w==}
-    dependencies:
-      '@glimmer/env': 0.1.7
-      '@glimmer/interfaces': 0.84.2
-      '@simple-dom/interface': 1.4.0
-    dev: true
-
   /@glimmer/util@0.84.3:
     resolution: {integrity: sha512-qFkh6s16ZSRuu2rfz3T4Wp0fylFj3HBsONGXQcrAdZjdUaIS6v3pNj6mecJ71qRgcym9Hbaq/7/fefIwECUiKw==}
     dependencies:
@@ -4531,7 +4508,7 @@ packages:
       '@nodelib/fs.scandir': 2.1.5
       fastq: 1.15.0
 
-  /@nullvoxpopuli/eslint-configs@3.1.1(@babel/core@7.20.12)(@babel/eslint-parser@7.19.1)(@typescript-eslint/eslint-plugin@5.50.0)(@typescript-eslint/parser@5.50.0)(eslint-config-prettier@8.6.0)(eslint-plugin-ember@11.4.6)(eslint-plugin-qunit@7.3.4)(eslint@8.33.0)(prettier@2.8.3):
+  /@nullvoxpopuli/eslint-configs@3.1.1(@babel/core@7.20.12)(@babel/eslint-parser@7.19.1)(@typescript-eslint/eslint-plugin@5.50.0)(@typescript-eslint/parser@5.50.0)(eslint-config-prettier@8.6.0)(eslint-plugin-ember@11.8.0)(eslint-plugin-qunit@7.3.4)(eslint@8.33.0)(prettier@2.8.3):
     resolution: {integrity: sha512-7ERkp5DJCC/5RryMD27Kc6NWJsT19rZab5MuaeDEXND6fGiNSnVkjh/b38Qh7U3VGzG8YRZ5VMa9BnhWO29BoA==}
     engines: {node: '>= v16.0.0'}
     peerDependencies:
@@ -4567,7 +4544,7 @@ packages:
       eslint: 8.33.0
       eslint-import-resolver-typescript: 3.5.3(eslint-plugin-import@2.27.5)(eslint@8.33.0)
       eslint-plugin-decorator-position: 5.0.2(@babel/eslint-parser@7.19.1)(eslint@8.33.0)
-      eslint-plugin-ember: 11.4.6(eslint@8.33.0)
+      eslint-plugin-ember: 11.8.0(eslint@8.33.0)
       eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.50.0)(eslint-import-resolver-typescript@3.5.3)(eslint@8.33.0)
       eslint-plugin-json: 3.1.0
       eslint-plugin-n: 15.6.1(eslint@8.33.0)
@@ -4582,7 +4559,7 @@ packages:
       - supports-color
     dev: true
 
-  /@nullvoxpopuli/eslint-configs@3.1.1(@babel/core@7.20.12)(@babel/eslint-parser@7.19.1)(@typescript-eslint/eslint-plugin@5.50.0)(@typescript-eslint/parser@5.50.0)(eslint-config-prettier@8.6.0)(eslint-plugin-ember@11.4.6)(eslint@8.33.0)(prettier@2.8.3):
+  /@nullvoxpopuli/eslint-configs@3.1.1(@babel/core@7.20.12)(@babel/eslint-parser@7.19.1)(@typescript-eslint/eslint-plugin@5.50.0)(@typescript-eslint/parser@5.50.0)(eslint-config-prettier@8.6.0)(eslint-plugin-ember@11.8.0)(eslint@8.33.0)(prettier@2.8.3):
     resolution: {integrity: sha512-7ERkp5DJCC/5RryMD27Kc6NWJsT19rZab5MuaeDEXND6fGiNSnVkjh/b38Qh7U3VGzG8YRZ5VMa9BnhWO29BoA==}
     engines: {node: '>= v16.0.0'}
     peerDependencies:
@@ -4618,7 +4595,7 @@ packages:
       eslint: 8.33.0
       eslint-import-resolver-typescript: 3.5.3(eslint-plugin-import@2.27.5)(eslint@8.33.0)
       eslint-plugin-decorator-position: 5.0.2(@babel/eslint-parser@7.19.1)(eslint@8.33.0)
-      eslint-plugin-ember: 11.4.6(eslint@8.33.0)
+      eslint-plugin-ember: 11.8.0(eslint@8.33.0)
       eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.50.0)(eslint-import-resolver-typescript@3.5.3)(eslint@8.33.0)
       eslint-plugin-json: 3.1.0
       eslint-plugin-n: 15.6.1(eslint@8.33.0)
@@ -4632,7 +4609,7 @@ packages:
       - supports-color
     dev: true
 
-  /@nullvoxpopuli/eslint-configs@3.1.1(@babel/core@7.20.12)(@babel/eslint-parser@7.19.1)(eslint-config-prettier@8.6.0)(eslint-plugin-ember@11.4.6)(eslint-plugin-qunit@7.3.4)(eslint@8.33.0)(prettier@2.8.3):
+  /@nullvoxpopuli/eslint-configs@3.1.1(@babel/core@7.20.12)(@babel/eslint-parser@7.19.1)(eslint-config-prettier@8.6.0)(eslint-plugin-ember@11.8.0)(eslint-plugin-qunit@7.3.4)(eslint@8.33.0)(prettier@2.8.3):
     resolution: {integrity: sha512-7ERkp5DJCC/5RryMD27Kc6NWJsT19rZab5MuaeDEXND6fGiNSnVkjh/b38Qh7U3VGzG8YRZ5VMa9BnhWO29BoA==}
     engines: {node: '>= v16.0.0'}
     peerDependencies:
@@ -4666,7 +4643,7 @@ packages:
       eslint: 8.33.0
       eslint-import-resolver-typescript: 3.5.3(eslint-plugin-import@2.27.5)(eslint@8.33.0)
       eslint-plugin-decorator-position: 5.0.2(@babel/eslint-parser@7.19.1)(eslint@8.33.0)
-      eslint-plugin-ember: 11.4.6(eslint@8.33.0)
+      eslint-plugin-ember: 11.8.0(eslint@8.33.0)
       eslint-plugin-import: 2.27.5(eslint-import-resolver-typescript@3.5.3)(eslint@8.33.0)
       eslint-plugin-json: 3.1.0
       eslint-plugin-n: 15.6.1(eslint@8.33.0)
@@ -4681,7 +4658,7 @@ packages:
       - supports-color
     dev: true
 
-  /@nullvoxpopuli/eslint-configs@3.1.1(@babel/core@7.21.4)(@babel/eslint-parser@7.19.1)(@typescript-eslint/eslint-plugin@5.50.0)(@typescript-eslint/parser@5.50.0)(eslint-config-prettier@8.6.0)(eslint-plugin-ember@11.4.6)(eslint@8.33.0)(prettier@2.8.3):
+  /@nullvoxpopuli/eslint-configs@3.1.1(@babel/core@7.21.4)(@babel/eslint-parser@7.19.1)(@typescript-eslint/eslint-plugin@5.50.0)(@typescript-eslint/parser@5.50.0)(eslint-config-prettier@8.6.0)(eslint-plugin-ember@11.8.0)(eslint@8.33.0)(prettier@2.8.3):
     resolution: {integrity: sha512-7ERkp5DJCC/5RryMD27Kc6NWJsT19rZab5MuaeDEXND6fGiNSnVkjh/b38Qh7U3VGzG8YRZ5VMa9BnhWO29BoA==}
     engines: {node: '>= v16.0.0'}
     peerDependencies:
@@ -4717,7 +4694,7 @@ packages:
       eslint: 8.33.0
       eslint-import-resolver-typescript: 3.5.3(eslint-plugin-import@2.27.5)(eslint@8.33.0)
       eslint-plugin-decorator-position: 5.0.2(@babel/eslint-parser@7.19.1)(eslint@8.33.0)
-      eslint-plugin-ember: 11.4.6(eslint@8.33.0)
+      eslint-plugin-ember: 11.8.0(eslint@8.33.0)
       eslint-plugin-import: 2.27.5(@typescript-eslint/parser@5.50.0)(eslint-import-resolver-typescript@3.5.3)(eslint@8.33.0)
       eslint-plugin-json: 3.1.0
       eslint-plugin-n: 15.6.1(eslint@8.33.0)
@@ -10357,23 +10334,23 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-plugin-ember@11.4.6(eslint@8.33.0):
-    resolution: {integrity: sha512-ak+gDkZrOQUjpLYiDWJA1D2jWJy0MYTf409Ki6du06+vYNifuMJIFpJhH9oKsD1FPU1sQylzhHcOeiHfbQTWmA==}
+  /eslint-plugin-ember@11.8.0(eslint@8.33.0):
+    resolution: {integrity: sha512-oZ6My7LlbyhNCguHuyBnajGbpU5+raQ5zkaF9Vqe8EkWf3Ji2uJZH7BxzMMcR4gAuyx5qTUZRXVs42km1nTzVg==}
     engines: {node: 14.* || 16.* || >= 18}
     peerDependencies:
       eslint: '>= 7'
     dependencies:
       '@ember-data/rfc395-data': 0.0.4
-      '@glimmer/syntax': 0.84.2
+      '@glimmer/syntax': 0.84.3
       css-tree: 2.3.1
       ember-rfc176-data: 0.3.18
-      ember-template-imports: 3.4.1
+      ember-template-imports: 3.4.2
       eslint: 8.33.0
       eslint-utils: 3.0.0(eslint@8.33.0)
       estraverse: 5.3.0
       lodash.camelcase: 4.3.0
       lodash.kebabcase: 4.1.1
-      magic-string: 0.27.0
+      magic-string: 0.30.0
       requireindex: 1.2.0
       snake-case: 3.0.4
     transitivePeerDependencies:
@@ -13217,6 +13194,13 @@ packages:
       '@jridgewell/sourcemap-codec': 1.4.14
     dev: true
 
+  /magic-string@0.30.0:
+    resolution: {integrity: sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.4.14
+    dev: true
+
   /make-dir@3.1.0:
     resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==}
     engines: {node: '>=8'}
diff --git a/test-app/package.json b/test-app/package.json
index ce852a05..2c8ec99f 100644
--- a/test-app/package.json
+++ b/test-app/package.json
@@ -97,7 +97,7 @@
     "ember-try": "^2.0.0",
     "eslint": "^8.32.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-ember": "^11.4.3",
+    "eslint-plugin-ember": "^11.8.0",
     "eslint-plugin-n": "^16.0.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^4.2.1",
diff --git a/test-app/tests/integration/components/checkbox-field-test.gts b/test-app/tests/integration/components/checkbox-field-test.gts
index b1c8a64a..564dee3e 100644
--- a/test-app/tests/integration/components/checkbox-field-test.gts
+++ b/test-app/tests/integration/components/checkbox-field-test.gts
@@ -1,5 +1,4 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
 
 import { click, find, render, setupOnerror } from '@ember/test-helpers';
 import { module, test } from 'qunit';
@@ -73,6 +72,7 @@ module('Integration | Component | Fields | CheckboxField', function (hooks) {
     assert.dom(error).hasAttribute('id');
 
     let errorId = error?.getAttribute('id') || '';
+
     assert.ok(errorId, 'Expected errorId to be truthy');
 
     // For the checkbox-field component, the only aria-describedby
@@ -81,6 +81,7 @@ module('Integration | Component | Fields | CheckboxField', function (hooks) {
     // wrapping <label> element
     let describedby =
       find('[data-checkbox]')?.getAttribute('aria-describedby') || '';
+
     assert.ok(
       describedby.includes(errorId),
       'Expected errorId to be included in the aria-describedby'
@@ -99,6 +100,7 @@ module('Integration | Component | Fields | CheckboxField', function (hooks) {
     </template>);
 
     let labelFor = find('[data-control] > label')?.getAttribute('for') || '';
+
     assert.ok(labelFor, 'Expected the id attribute of the label to be truthy');
 
     assert
diff --git a/test-app/tests/integration/components/checkbox-group-field-test.gts b/test-app/tests/integration/components/checkbox-group-field-test.gts
index 84a65b80..d65534fc 100644
--- a/test-app/tests/integration/components/checkbox-group-field-test.gts
+++ b/test-app/tests/integration/components/checkbox-group-field-test.gts
@@ -1,5 +1,4 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
 
 import { click, render, setupOnerror } from '@ember/test-helpers';
 import { module, test } from 'qunit';
diff --git a/test-app/tests/integration/components/checkbox-test.gts b/test-app/tests/integration/components/checkbox-test.gts
index 36c38717..d3b0dbbf 100644
--- a/test-app/tests/integration/components/checkbox-test.gts
+++ b/test-app/tests/integration/components/checkbox-test.gts
@@ -1,6 +1,4 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
-
 import { click, render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
diff --git a/test-app/tests/integration/components/field-test.gts b/test-app/tests/integration/components/field-test.gts
index 4069dfc2..20cc2b81 100644
--- a/test-app/tests/integration/components/field-test.gts
+++ b/test-app/tests/integration/components/field-test.gts
@@ -1,6 +1,4 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
-
 import { findAll, render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
@@ -65,6 +63,7 @@ module('Integration | Component | Field', function (hooks) {
     assert.dom(label).hasText('label', 'Expected to have label text "label"');
 
     const children = findAll('[data-test-field] > div');
+
     assert.strictEqual(
       children.length,
       2,
diff --git a/test-app/tests/integration/components/file-input-field-test.gts b/test-app/tests/integration/components/file-input-field-test.gts
index 9a0e405e..979c1a51 100644
--- a/test-app/tests/integration/components/file-input-field-test.gts
+++ b/test-app/tests/integration/components/file-input-field-test.gts
@@ -1,7 +1,6 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
-import { find, render, setupOnerror, triggerEvent } from '@ember/test-helpers';
 import { tracked } from '@glimmer/tracking';
+import { find, render, setupOnerror, triggerEvent } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
 import FileInputField from '@crowdstrike/ember-toucan-core/components/form/fields/file-input';
@@ -129,6 +128,7 @@ module('Integration | Component | Fields | FileInput', function (hooks) {
     assert.dom(error).hasAttribute('id');
 
     let errorId = error?.getAttribute('id') ?? '';
+
     assert.ok(errorId, 'Expected errorId to be truthy');
 
     // For the file input field component, the only aria-describedby
@@ -137,6 +137,7 @@ module('Integration | Component | Fields | FileInput', function (hooks) {
     // wrapping <label> element
     let describedby =
       find('[data-file-input-field]')?.getAttribute('aria-describedby') ?? '';
+
     assert.ok(
       describedby.includes(errorId),
       'Expected errorId to be included in the aria-describedby'
@@ -161,6 +162,7 @@ module('Integration | Component | Fields | FileInput', function (hooks) {
     </template>);
 
     let labelFor = find('label')?.getAttribute('for') ?? '';
+
     assert.ok(labelFor, 'Expected the id attribute of the label to be truthy');
 
     assert
@@ -336,10 +338,12 @@ module('Integration | Component | Fields | FileInput', function (hooks) {
     }
 
     let ctx = new Context();
+
     ctx.triggerText = 'Browse Files';
 
     const realOnChange = (files: File[]) => {
       ctx.currentFiles = files;
+
       if (ctx.currentFiles.length > 0) {
         ctx.triggerText = 'Replace files';
       }
diff --git a/test-app/tests/integration/components/file-input-test.gts b/test-app/tests/integration/components/file-input-test.gts
index febac5a7..236fd940 100644
--- a/test-app/tests/integration/components/file-input-test.gts
+++ b/test-app/tests/integration/components/file-input-test.gts
@@ -1,5 +1,4 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
 import { render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
diff --git a/test-app/tests/integration/components/form/file-input/delete-button-test.gts b/test-app/tests/integration/components/form/file-input/delete-button-test.gts
index 564595a7..4b1da8b1 100644
--- a/test-app/tests/integration/components/form/file-input/delete-button-test.gts
+++ b/test-app/tests/integration/components/form/file-input/delete-button-test.gts
@@ -1,5 +1,4 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
 import { render, triggerEvent } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
diff --git a/test-app/tests/integration/components/form/file-input/list-item-test.gts b/test-app/tests/integration/components/form/file-input/list-item-test.gts
index 9062886f..5b098ca9 100644
--- a/test-app/tests/integration/components/form/file-input/list-item-test.gts
+++ b/test-app/tests/integration/components/form/file-input/list-item-test.gts
@@ -1,5 +1,4 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
 import { render, triggerEvent } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
diff --git a/test-app/tests/integration/components/form/file-input/list-test.gts b/test-app/tests/integration/components/form/file-input/list-test.gts
index 95262e43..6aefbc84 100644
--- a/test-app/tests/integration/components/form/file-input/list-test.gts
+++ b/test-app/tests/integration/components/form/file-input/list-test.gts
@@ -1,5 +1,4 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
 import { render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
diff --git a/test-app/tests/integration/components/input-field-test.gts b/test-app/tests/integration/components/input-field-test.gts
index 0047a1c1..7bc73862 100644
--- a/test-app/tests/integration/components/input-field-test.gts
+++ b/test-app/tests/integration/components/input-field-test.gts
@@ -1,10 +1,8 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
 import { fillIn, find, render, setupOnerror } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
 import InputField from '@crowdstrike/ember-toucan-core/components/form/fields/input';
-
 import { setupRenderingTest } from 'test-app/tests/helpers';
 
 module('Integration | Component | Fields | Input', function (hooks) {
@@ -116,6 +114,7 @@ module('Integration | Component | Fields | Input', function (hooks) {
       .dom(hint)
       .hasText('Hint text visible here', 'Expected to have hint text "error"');
     assert.dom(hint).hasAttribute('id');
+
     const hintId = find(hint)?.getAttribute('id') || '';
     const describedby = find(input)?.getAttribute('aria-describedby') || '';
 
@@ -149,9 +148,11 @@ module('Integration | Component | Fields | Input', function (hooks) {
     </template>);
 
     const errorId = find('[data-error]')?.getAttribute('id') || '';
+
     assert.ok(errorId, 'Expected errorId to be truthy');
 
     const hintId = find('[data-hint]')?.getAttribute('id') || '';
+
     assert.ok(hintId, 'Expected hintId to be truthy');
 
     assert
diff --git a/test-app/tests/integration/components/input-test.gts b/test-app/tests/integration/components/input-test.gts
index 4e173678..0356a26e 100644
--- a/test-app/tests/integration/components/input-test.gts
+++ b/test-app/tests/integration/components/input-test.gts
@@ -1,6 +1,4 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
-
 import { fillIn, render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
diff --git a/test-app/tests/integration/components/radio-field-test.gts b/test-app/tests/integration/components/radio-field-test.gts
index 6a09bd3a..e7b8a986 100644
--- a/test-app/tests/integration/components/radio-field-test.gts
+++ b/test-app/tests/integration/components/radio-field-test.gts
@@ -1,6 +1,4 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
-
 import { click, find, render, setupOnerror } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
@@ -66,6 +64,7 @@ module('Integration | Component | Fields | Radio', function (hooks) {
     </template>);
 
     let labelFor = find('[data-control] > label')?.getAttribute('for') || '';
+
     assert.ok(labelFor, 'Expected the id attribute of the label to be truthy');
 
     assert
diff --git a/test-app/tests/integration/components/radio-group-field-test.gts b/test-app/tests/integration/components/radio-group-field-test.gts
index ba789424..67004434 100644
--- a/test-app/tests/integration/components/radio-group-field-test.gts
+++ b/test-app/tests/integration/components/radio-group-field-test.gts
@@ -1,6 +1,4 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
-
 import { click, render, setupOnerror } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
diff --git a/test-app/tests/integration/components/radio-test.gts b/test-app/tests/integration/components/radio-test.gts
index 74b28bbe..e4599e34 100644
--- a/test-app/tests/integration/components/radio-test.gts
+++ b/test-app/tests/integration/components/radio-test.gts
@@ -1,6 +1,4 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
-
 import { click, render, setupOnerror } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
diff --git a/test-app/tests/integration/components/textarea-field-test.gts b/test-app/tests/integration/components/textarea-field-test.gts
index 36a5a88e..348d5ef4 100644
--- a/test-app/tests/integration/components/textarea-field-test.gts
+++ b/test-app/tests/integration/components/textarea-field-test.gts
@@ -1,7 +1,5 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
-
-import { find, fillIn, render, setupOnerror } from '@ember/test-helpers';
+import { fillIn, find, render, setupOnerror } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
 import TextareaField from '@crowdstrike/ember-toucan-core/components/form/fields/textarea';
@@ -45,10 +43,12 @@ module('Integration | Component | Fields | Textarea', function (hooks) {
     assert.dom(hint).hasAttribute('id');
 
     let hintId = hint?.getAttribute('id') || '';
+
     assert.ok(hintId, 'Expected hintId to be truthy');
 
     let describedby =
       find('[data-textarea]')?.getAttribute('aria-describedby') || '';
+
     assert.ok(
       describedby.includes(hintId),
       'Expected hintId to be included in the aria-describedby'
@@ -78,10 +78,12 @@ module('Integration | Component | Fields | Textarea', function (hooks) {
     assert.dom(error).hasAttribute('id');
 
     let errorId = error?.getAttribute('id') || '';
+
     assert.ok(errorId, 'Expected errorId to be truthy');
 
     let describedby =
       find('[data-textarea]')?.getAttribute('aria-describedby') || '';
+
     assert.ok(
       describedby.includes(errorId),
       'Expected errorId to be included in the aria-describedby'
@@ -105,9 +107,11 @@ module('Integration | Component | Fields | Textarea', function (hooks) {
     </template>);
 
     let errorId = find('[data-error]')?.getAttribute('id') || '';
+
     assert.ok(errorId, 'Expected errorId to be truthy');
 
     let hintId = find('[data-hint]')?.getAttribute('id') || '';
+
     assert.ok(hintId, 'Expected hintId to be truthy');
 
     assert
@@ -223,7 +227,7 @@ module('Integration | Component | Fields | Textarea', function (hooks) {
     </template>);
   });
 
-  test('it renders a `<:secondary>` block that tracks the textarea value length', async function(assert) {
+  test('it renders a `<:secondary>` block that tracks the textarea value length', async function (assert) {
     await render(<template>
       <TextareaField @label="Label" @value="Hello" data-textarea>
         <:secondary as |secondary|>
@@ -237,6 +241,5 @@ module('Integration | Component | Fields | Textarea', function (hooks) {
     await fillIn('[data-textarea]', 'Hello Hello');
 
     assert.dom('[data-character]').hasText('11 / 255');
-
   });
 });
diff --git a/test-app/tests/integration/components/textarea-test.gts b/test-app/tests/integration/components/textarea-test.gts
index e1c12e8c..869c08b9 100644
--- a/test-app/tests/integration/components/textarea-test.gts
+++ b/test-app/tests/integration/components/textarea-test.gts
@@ -1,6 +1,4 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
-
 import { fillIn, render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
 
diff --git a/test-app/tests/integration/components/toucan-form/form-checkbox-group-test.gts b/test-app/tests/integration/components/toucan-form/form-checkbox-group-test.gts
index 9825141d..906f01e3 100644
--- a/test-app/tests/integration/components/toucan-form/form-checkbox-group-test.gts
+++ b/test-app/tests/integration/components/toucan-form/form-checkbox-group-test.gts
@@ -1,10 +1,9 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
 import { render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
-import { setupRenderingTest } from 'test-app/tests/helpers';
 
 import ToucanForm from '@crowdstrike/ember-toucan-form/components/toucan-form';
+import { setupRenderingTest } from 'test-app/tests/helpers';
 
 interface TestData {
   checkboxes?: Array<string>;
diff --git a/test-app/tests/integration/components/toucan-form/form-checkbox-test.gts b/test-app/tests/integration/components/toucan-form/form-checkbox-test.gts
index acf11e98..04165669 100644
--- a/test-app/tests/integration/components/toucan-form/form-checkbox-test.gts
+++ b/test-app/tests/integration/components/toucan-form/form-checkbox-test.gts
@@ -1,10 +1,9 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
 import { render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
-import { setupRenderingTest } from 'test-app/tests/helpers';
 
 import ToucanForm from '@crowdstrike/ember-toucan-form/components/toucan-form';
+import { setupRenderingTest } from 'test-app/tests/helpers';
 
 interface TestData {
   checked?: boolean;
diff --git a/test-app/tests/integration/components/toucan-form/form-input-test.gts b/test-app/tests/integration/components/toucan-form/form-input-test.gts
index 31ba4d52..45b0104f 100644
--- a/test-app/tests/integration/components/toucan-form/form-input-test.gts
+++ b/test-app/tests/integration/components/toucan-form/form-input-test.gts
@@ -1,10 +1,9 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
 import { render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
-import { setupRenderingTest } from 'test-app/tests/helpers';
 
 import ToucanForm from '@crowdstrike/ember-toucan-form/components/toucan-form';
+import { setupRenderingTest } from 'test-app/tests/helpers';
 
 interface TestData {
   text?: string;
diff --git a/test-app/tests/integration/components/toucan-form/form-radio-group-test.gts b/test-app/tests/integration/components/toucan-form/form-radio-group-test.gts
index 8af89194..9058f4e6 100644
--- a/test-app/tests/integration/components/toucan-form/form-radio-group-test.gts
+++ b/test-app/tests/integration/components/toucan-form/form-radio-group-test.gts
@@ -1,10 +1,9 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
 import { render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
-import { setupRenderingTest } from 'test-app/tests/helpers';
 
 import ToucanForm from '@crowdstrike/ember-toucan-form/components/toucan-form';
+import { setupRenderingTest } from 'test-app/tests/helpers';
 
 interface TestData {
   radio?: string;
diff --git a/test-app/tests/integration/components/toucan-form/form-textarea-test.gts b/test-app/tests/integration/components/toucan-form/form-textarea-test.gts
index b8e50ea9..cbb88a56 100644
--- a/test-app/tests/integration/components/toucan-form/form-textarea-test.gts
+++ b/test-app/tests/integration/components/toucan-form/form-textarea-test.gts
@@ -1,10 +1,9 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
 import { render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
-import { setupRenderingTest } from 'test-app/tests/helpers';
 
 import ToucanForm from '@crowdstrike/ember-toucan-form/components/toucan-form';
+import { setupRenderingTest } from 'test-app/tests/helpers';
 
 interface TestData {
   text?: string;
diff --git a/test-app/tests/integration/components/toucan-form/toucan-form-test.gts b/test-app/tests/integration/components/toucan-form/toucan-form-test.gts
index 111b1772..137adea0 100644
--- a/test-app/tests/integration/components/toucan-form/toucan-form-test.gts
+++ b/test-app/tests/integration/components/toucan-form/toucan-form-test.gts
@@ -1,10 +1,9 @@
 /* eslint-disable no-undef -- Until https://github.com/ember-cli/eslint-plugin-ember/issues/1747 is resolved... */
-/* eslint-disable simple-import-sort/imports,padding-line-between-statements,decorator-position/decorator-position -- Can't fix these manually, without --fix working in .gts */
 import { click, fillIn, render } from '@ember/test-helpers';
 import { module, test } from 'qunit';
-import { setupRenderingTest } from 'test-app/tests/helpers';
 
 import ToucanForm from '@crowdstrike/ember-toucan-form/components/toucan-form';
+import { setupRenderingTest } from 'test-app/tests/helpers';
 
 import type { ErrorRecord } from 'ember-headless-form';