diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index e2efdfce5..367a8de25 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1807,7 +1807,7 @@ importers:
         version: /ember-data@5.3.0(@babel/core@7.24.7)(@ember/string@3.1.1)(ember-source@3.28.12)
       ember-data-beta:
         specifier: npm:ember-data@beta
-        version: /ember-data@5.4.0-beta.11(@ember/string@3.1.1)(@ember/test-waiters@3.1.0)(ember-source@3.28.12)(qunit@2.21.0)
+        version: /ember-data@5.4.0-beta.11(@ember/string@3.1.1)(@ember/test-helpers@2.9.4)(@ember/test-waiters@3.1.0)(ember-source@3.28.12)(qunit@2.21.0)
       ember-data-latest:
         specifier: npm:ember-data@5.3.0
         version: /ember-data@5.3.0(@babel/core@7.24.7)(@ember/string@3.1.1)(ember-source@3.28.12)
@@ -1822,7 +1822,7 @@ importers:
         version: 4.1.0(ember-source@3.28.12)
       ember-qunit-7:
         specifier: npm:ember-qunit@^7.0.0
-        version: /ember-qunit@7.0.0(ember-source@3.28.12)(qunit@2.21.0)(webpack@5.92.0)
+        version: /ember-qunit@7.0.0(@ember/test-helpers@2.9.4)(ember-source@3.28.12)(qunit@2.21.0)(webpack@5.92.0)
       ember-source:
         specifier: ~3.28.11
         version: 3.28.12(@babel/core@7.24.7)
@@ -1850,6 +1850,9 @@ importers:
       ember-source-latest:
         specifier: npm:ember-source@latest
         version: /ember-source@5.9.0(@babel/core@7.24.7)(webpack@5.92.0)
+      ember-test-helpers-2:
+        specifier: npm:@ember/test-helpers@^2.0.0
+        version: /@ember/test-helpers@2.9.4(@babel/core@7.24.7)(ember-source@3.28.12)
       ember-truth-helpers:
         specifier: ^3.0.0
         version: 3.1.1
@@ -2409,7 +2412,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-annotate-as-pure': 7.24.7
       regexpu-core: 5.3.2
       semver: 6.3.1
@@ -2650,7 +2653,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-environment-visitor': 7.24.7
       '@babel/helper-plugin-utils': 7.24.7
 
@@ -2660,7 +2663,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@7.24.7(@babel/core@7.24.7):
@@ -2696,7 +2699,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-environment-visitor': 7.24.7
       '@babel/helper-plugin-utils': 7.24.7
 
@@ -2745,7 +2748,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
 
   /@babel/plugin-proposal-private-property-in-object@7.21.11(@babel/core@7.24.7):
     resolution: {integrity: sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==}
@@ -2767,7 +2770,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-syntax-bigint@7.8.3(@babel/core@7.24.7):
@@ -2784,7 +2787,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-syntax-class-static-block@7.14.5(@babel/core@7.24.7):
@@ -2793,7 +2796,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-syntax-decorators@7.24.7(@babel/core@7.24.7):
@@ -2818,7 +2821,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-syntax-import-assertions@7.24.7(@babel/core@7.24.7):
@@ -2827,7 +2830,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-syntax-import-attributes@7.24.7(@babel/core@7.24.7):
@@ -2836,7 +2839,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.24.7):
@@ -2844,7 +2847,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-syntax-json-strings@7.8.3(@babel/core@7.24.7):
@@ -2852,7 +2855,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-syntax-jsx@7.24.7(@babel/core@7.24.7):
@@ -2870,7 +2873,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-syntax-nullish-coalescing-operator@7.8.3(@babel/core@7.24.7):
@@ -2878,7 +2881,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-syntax-numeric-separator@7.10.4(@babel/core@7.24.7):
@@ -2886,7 +2889,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-syntax-object-rest-spread@7.8.3(@babel/core@7.24.7):
@@ -2894,7 +2897,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-syntax-optional-catch-binding@7.8.3(@babel/core@7.24.7):
@@ -2902,7 +2905,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-syntax-optional-chaining@7.8.3(@babel/core@7.24.7):
@@ -2919,7 +2922,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-syntax-top-level-await@7.14.5(@babel/core@7.24.7):
@@ -2928,7 +2931,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-syntax-typescript@7.24.7(@babel/core@7.24.7):
@@ -2946,7 +2949,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-create-regexp-features-plugin': 7.24.7(@babel/core@7.24.7)
       '@babel/helper-plugin-utils': 7.24.7
 
@@ -2956,7 +2959,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-transform-async-generator-functions@7.24.7(@babel/core@7.24.7):
@@ -3021,7 +3024,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-transform-block-scoping@7.24.7(@babel/core@7.24.7):
@@ -3128,7 +3131,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
       '@babel/template': 7.24.7
 
@@ -3138,7 +3141,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-transform-dotall-regex@7.24.7(@babel/core@7.24.7):
@@ -3147,7 +3150,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-create-regexp-features-plugin': 7.24.7(@babel/core@7.24.7)
       '@babel/helper-plugin-utils': 7.24.7
 
@@ -3157,7 +3160,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-transform-dynamic-import@7.24.7(@babel/core@7.24.7):
@@ -3166,7 +3169,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
       '@babel/plugin-syntax-dynamic-import': 7.8.3(@babel/core@7.24.7)
 
@@ -3201,7 +3204,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
       '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.24.7)
 
@@ -3236,7 +3239,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-compilation-targets': 7.24.7
       '@babel/helper-function-name': 7.24.7
       '@babel/helper-plugin-utils': 7.24.7
@@ -3247,7 +3250,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
       '@babel/plugin-syntax-json-strings': 7.8.3(@babel/core@7.24.7)
 
@@ -3257,7 +3260,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-transform-logical-assignment-operators@7.24.7(@babel/core@7.24.7):
@@ -3266,7 +3269,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
       '@babel/plugin-syntax-logical-assignment-operators': 7.10.4(@babel/core@7.24.7)
 
@@ -3276,7 +3279,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-transform-modules-amd@7.24.7(@babel/core@7.24.7):
@@ -3391,7 +3394,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-create-regexp-features-plugin': 7.24.7(@babel/core@7.24.7)
       '@babel/helper-plugin-utils': 7.24.7
 
@@ -3401,7 +3404,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-transform-nullish-coalescing-operator@7.24.7(@babel/core@7.24.7):
@@ -3410,7 +3413,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
       '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3(@babel/core@7.24.7)
 
@@ -3420,7 +3423,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
       '@babel/plugin-syntax-numeric-separator': 7.10.4(@babel/core@7.24.7)
 
@@ -3439,7 +3442,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-compilation-targets': 7.24.7
       '@babel/helper-plugin-utils': 7.24.7
       '@babel/plugin-syntax-object-rest-spread': 7.8.3(@babel/core@7.24.7)
@@ -3476,7 +3479,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
       '@babel/plugin-syntax-optional-catch-binding': 7.8.3(@babel/core@7.24.7)
 
@@ -3576,7 +3579,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-transform-regenerator@7.24.7(@babel/core@7.24.7):
@@ -3585,7 +3588,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
       regenerator-transform: 0.15.2
 
@@ -3595,7 +3598,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-transform-runtime@7.24.7(@babel/core@7.24.7):
@@ -3620,7 +3623,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-transform-spread@7.24.7(@babel/core@7.24.7):
@@ -3654,7 +3657,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-transform-template-literals@7.24.7(@babel/core@7.24.7):
@@ -3663,7 +3666,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-transform-typeof-symbol@7.24.7(@babel/core@7.24.7):
@@ -3672,7 +3675,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-transform-typescript@7.24.7(@babel/core@7.24.7):
@@ -3717,7 +3720,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
 
   /@babel/plugin-transform-unicode-property-regex@7.24.7(@babel/core@7.24.7):
@@ -3726,7 +3729,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-create-regexp-features-plugin': 7.24.7(@babel/core@7.24.7)
       '@babel/helper-plugin-utils': 7.24.7
 
@@ -3736,7 +3739,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-create-regexp-features-plugin': 7.24.7(@babel/core@7.24.7)
       '@babel/helper-plugin-utils': 7.24.7
 
@@ -3746,7 +3749,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-create-regexp-features-plugin': 7.24.7(@babel/core@7.24.7)
       '@babel/helper-plugin-utils': 7.24.7
 
@@ -3945,7 +3948,7 @@ packages:
     peerDependencies:
       '@babel/core': ^7.0.0-0 || ^8.0.0-0 <8.0.0
     dependencies:
-      '@babel/core': 7.24.7
+      '@babel/core': 7.24.7(supports-color@8.1.1)
       '@babel/helper-plugin-utils': 7.24.7
       '@babel/types': 7.24.7
       esutils: 2.0.3
@@ -5468,6 +5471,28 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
+  /@ember/test-helpers@2.9.4(@babel/core@7.24.7)(ember-source@3.28.12):
+    resolution: {integrity: sha512-z+Qs1NYWyIVDmrY6WdmOS5mdG1lJ5CFfzh6dRhLfs9lq45deDaDrVNcaCYhnNeJZTvUBK2XR2SvPcZm0RloXdA==}
+    engines: {node: 10.* || 12.* || 14.* || 15.* || >= 16.*}
+    peerDependencies:
+      ember-source: '>=3.8.0'
+    dependencies:
+      '@ember/test-waiters': 3.1.0
+      '@embroider/macros': 1.16.3(@glint/template@1.4.0)
+      '@embroider/util': 1.13.1(ember-source@3.28.12)
+      broccoli-debug: 0.6.5
+      broccoli-funnel: 3.0.8
+      ember-cli-babel: 7.26.11
+      ember-cli-htmlbars: 6.3.0
+      ember-destroyable-polyfill: 2.0.3(@babel/core@7.24.7)
+      ember-source: 3.28.12(@babel/core@7.24.7)
+    transitivePeerDependencies:
+      - '@babel/core'
+      - '@glint/environment-ember-loose'
+      - '@glint/template'
+      - supports-color
+    dev: true
+
   /@ember/test-helpers@3.3.0(@glint/template@1.4.0)(ember-source@4.6.0)(webpack@5.92.0):
     resolution: {integrity: sha512-HEI28wtjnQuEj9+DstHUEEKPtqPAEVN9AAVr4EifVCd3DyEDy0m6hFT4qbap1WxAIktLja2QXGJg50lVWzZc5g==}
     engines: {node: 16.* || >= 18}
@@ -15089,7 +15114,7 @@ packages:
       - webpack-cli
     dev: true
 
-  /ember-data@5.4.0-beta.11(@ember/string@3.1.1)(@ember/test-waiters@3.1.0)(ember-source@3.28.12)(qunit@2.21.0):
+  /ember-data@5.4.0-beta.11(@ember/string@3.1.1)(@ember/test-helpers@2.9.4)(@ember/test-waiters@3.1.0)(ember-source@3.28.12)(qunit@2.21.0):
     resolution: {integrity: sha512-WrMx1ApTNhA8UPGP4250Q61gF4AzOOVwPsUVtyGsxgmXq4Pi9SwsTDpXewRqidMQu9MzCR43zTDcMkvynGwV1Q==}
     engines: {node: '>= 18.20.3'}
     peerDependencies:
@@ -15116,6 +15141,7 @@ packages:
       '@ember-data/store': 5.4.0-beta.11(@ember-data/request-utils@5.4.0-beta.11)(@ember-data/request@5.4.0-beta.11)(@ember-data/tracking@5.4.0-beta.11)(@warp-drive/core-types@0.0.0-beta.11)
       '@ember-data/tracking': 5.4.0-beta.11(@warp-drive/core-types@0.0.0-beta.11)(ember-source@3.28.12)
       '@ember/edition-utils': 1.2.0
+      '@ember/test-helpers': 2.9.4(@babel/core@7.24.7)(ember-source@3.28.12)
       '@ember/test-waiters': 3.1.0
       '@embroider/macros': 1.16.3(@glint/template@1.4.0)
       '@warp-drive/build-config': 0.0.0-beta.6
@@ -15519,7 +15545,7 @@ packages:
       - webpack
     dev: true
 
-  /ember-qunit@7.0.0(@ember/test-helpers@3.3.0)(ember-source@4.6.0)(qunit@2.21.0)(webpack@5.92.0):
+  /ember-qunit@7.0.0(@ember/test-helpers@2.9.4)(ember-source@3.28.12)(qunit@2.21.0)(webpack@5.92.0):
     resolution: {integrity: sha512-KhrndHYEXsHnXvmsGyJLJQ6VCudXaRs5dzPZBsdttZJIhsB6PmYAvq2Q+mh3GRDT/59T/sRDrB3FD3/lATS8aA==}
     engines: {node: 16.* || >= 18}
     peerDependencies:
@@ -15527,14 +15553,14 @@ packages:
       ember-source: '>=4.0.0'
       qunit: ^2.13.0
     dependencies:
-      '@ember/test-helpers': 3.3.0(@glint/template@1.4.0)(ember-source@4.6.0)(webpack@5.92.0)
+      '@ember/test-helpers': 2.9.4(@babel/core@7.24.7)(ember-source@3.28.12)
       broccoli-funnel: 3.0.8
       broccoli-merge-trees: 3.0.2
       common-tags: 1.8.2
       ember-auto-import: 2.7.3(@glint/template@1.4.0)(webpack@5.92.0)
       ember-cli-babel: 7.26.11
       ember-cli-test-loader: 3.1.0
-      ember-source: 4.6.0(@babel/core@7.24.7)(@glint/template@1.4.0)(webpack@5.92.0)
+      ember-source: 3.28.12(@babel/core@7.24.7)
       qunit: 2.21.0
       resolve-package-path: 4.0.3
       silent-error: 1.1.1
@@ -15545,7 +15571,7 @@ packages:
       - webpack
     dev: true
 
-  /ember-qunit@7.0.0(@ember/test-helpers@3.3.0)(ember-source@5.8.0)(qunit@2.21.0):
+  /ember-qunit@7.0.0(@ember/test-helpers@3.3.0)(ember-source@4.6.0)(qunit@2.21.0)(webpack@5.92.0):
     resolution: {integrity: sha512-KhrndHYEXsHnXvmsGyJLJQ6VCudXaRs5dzPZBsdttZJIhsB6PmYAvq2Q+mh3GRDT/59T/sRDrB3FD3/lATS8aA==}
     engines: {node: 16.* || >= 18}
     peerDependencies:
@@ -15553,14 +15579,14 @@ packages:
       ember-source: '>=4.0.0'
       qunit: ^2.13.0
     dependencies:
-      '@ember/test-helpers': 3.3.0(ember-source@5.8.0)
+      '@ember/test-helpers': 3.3.0(@glint/template@1.4.0)(ember-source@4.6.0)(webpack@5.92.0)
       broccoli-funnel: 3.0.8
       broccoli-merge-trees: 3.0.2
       common-tags: 1.8.2
-      ember-auto-import: 2.7.3
+      ember-auto-import: 2.7.3(@glint/template@1.4.0)(webpack@5.92.0)
       ember-cli-babel: 7.26.11
       ember-cli-test-loader: 3.1.0
-      ember-source: 5.8.0(patch_hash=qsivfx5huurlb5tuvochap65l4)(@babel/core@7.24.7)
+      ember-source: 4.6.0(@babel/core@7.24.7)(@glint/template@1.4.0)(webpack@5.92.0)
       qunit: 2.21.0
       resolve-package-path: 4.0.3
       silent-error: 1.1.1
@@ -15571,7 +15597,7 @@ packages:
       - webpack
     dev: true
 
-  /ember-qunit@7.0.0(ember-source@3.28.12)(qunit@2.21.0)(webpack@5.92.0):
+  /ember-qunit@7.0.0(@ember/test-helpers@3.3.0)(ember-source@5.8.0)(qunit@2.21.0):
     resolution: {integrity: sha512-KhrndHYEXsHnXvmsGyJLJQ6VCudXaRs5dzPZBsdttZJIhsB6PmYAvq2Q+mh3GRDT/59T/sRDrB3FD3/lATS8aA==}
     engines: {node: 16.* || >= 18}
     peerDependencies:
@@ -15579,13 +15605,14 @@ packages:
       ember-source: '>=4.0.0'
       qunit: ^2.13.0
     dependencies:
+      '@ember/test-helpers': 3.3.0(ember-source@5.8.0)
       broccoli-funnel: 3.0.8
       broccoli-merge-trees: 3.0.2
       common-tags: 1.8.2
-      ember-auto-import: 2.7.3(@glint/template@1.4.0)(webpack@5.92.0)
+      ember-auto-import: 2.7.3
       ember-cli-babel: 7.26.11
       ember-cli-test-loader: 3.1.0
-      ember-source: 3.28.12(@babel/core@7.24.7)
+      ember-source: 5.8.0(patch_hash=qsivfx5huurlb5tuvochap65l4)(@babel/core@7.24.7)
       qunit: 2.21.0
       resolve-package-path: 4.0.3
       silent-error: 1.1.1
diff --git a/tests/scenarios/package.json b/tests/scenarios/package.json
index 47cc552c2..aa7e19f96 100644
--- a/tests/scenarios/package.json
+++ b/tests/scenarios/package.json
@@ -94,6 +94,7 @@
     "ember-source-canary": "https://s3.amazonaws.com/builds.emberjs.com/canary/shas/370cf34f9e86df17b880f11fef35a5a0f24ff38a.tgz",
     "ember-source-latest": "npm:ember-source@latest",
     "ember-truth-helpers": "^3.0.0",
+    "ember-test-helpers-2": "npm:@ember/test-helpers@^2.0.0",
     "execa": "^5.1.1",
     "node-fetch": "2.7.0",
     "popper.js": "^1.16.1",
diff --git a/tests/scenarios/scenarios.ts b/tests/scenarios/scenarios.ts
index d738ab9b6..78445b4f4 100644
--- a/tests/scenarios/scenarios.ts
+++ b/tests/scenarios/scenarios.ts
@@ -5,6 +5,7 @@ export async function lts_3_28(project: Project) {
   project.linkDevDependency('ember-source', { baseDir: __dirname, resolveName: 'ember-source' });
   project.linkDevDependency('ember-cli', { baseDir: __dirname, resolveName: 'ember-cli' });
   project.linkDevDependency('ember-data', { baseDir: __dirname, resolveName: 'ember-data-latest' });
+  project.linkDevDependency('@ember/test-helpers', { baseDir: __dirname, resolveName: 'ember-test-helpers-2' });
 }
 
 async function lts_4_4(project: Project) {