diff --git a/src/async-generators/yield-spread-obj.case b/src/async-generators/yield-spread-obj.case
index f7d14c022ab..2f8c6490963 100644
--- a/src/async-generators/yield-spread-obj.case
+++ b/src/async-generators/yield-spread-obj.case
@@ -11,8 +11,6 @@ info: |
     (...)
     ...AssignmentExpression[In, ?Yield]
 features: [object-spread]
-includes:
-  - compareArray.js
 flags: [async]
 ---*/
 
diff --git a/src/dynamic-import/ns-extensible.case b/src/dynamic-import/ns-extensible.case
index b54a0c88d62..155f235a592 100644
--- a/src/dynamic-import/ns-extensible.case
+++ b/src/dynamic-import/ns-extensible.case
@@ -3,7 +3,6 @@
 /*---
 desc: Module namespace objects are not extensible.
 template: namespace
-includes: [propertyHelper.js]
 ---*/
 
 //- import
diff --git a/src/generators/yield-spread-obj.case b/src/generators/yield-spread-obj.case
index ccddbcfc22e..6c06ada929b 100644
--- a/src/generators/yield-spread-obj.case
+++ b/src/generators/yield-spread-obj.case
@@ -11,8 +11,6 @@ info: |
     (...)
     ...AssignmentExpression[In, ?Yield]
 features: [object-spread]
-includes:
-  - compareArray.js
 ---*/
 
 //- body
diff --git a/test/built-ins/Array/prototype/includes/values-are-not-cached.js b/test/built-ins/Array/prototype/includes/values-are-not-cached.js
index 6e557dfd6ad..a44f374f0ca 100644
--- a/test/built-ins/Array/prototype/includes/values-are-not-cached.js
+++ b/test/built-ins/Array/prototype/includes/values-are-not-cached.js
@@ -11,7 +11,6 @@ info: |
   7. Repeat, while k < len
     a. Let elementK be the result of ? Get(O, ! ToString(k)).
   ...
-includes: [compareArray.js]
 ---*/
 
 function getCleanObj() {
diff --git a/test/built-ins/ArrayIteratorPrototype/next/detach-typedarray-in-progress.js b/test/built-ins/ArrayIteratorPrototype/next/detach-typedarray-in-progress.js
index 7f14762b089..bab001a1625 100644
--- a/test/built-ins/ArrayIteratorPrototype/next/detach-typedarray-in-progress.js
+++ b/test/built-ins/ArrayIteratorPrototype/next/detach-typedarray-in-progress.js
@@ -18,7 +18,7 @@ testWithTypedArrayConstructors(TA => {
   var i = 0;
   assert.throws(TypeError, () => {
     for (let key of typedArray.keys()) {
-      $262.detachArrayBuffer(typedArray.buffer);
+      $DETACHBUFFER(typedArray.buffer);
       i++;
     }
   });
diff --git a/test/built-ins/AsyncGeneratorPrototype/return/return-promise.js b/test/built-ins/AsyncGeneratorPrototype/return/return-promise.js
index 07dff9f6524..5579e5090fb 100644
--- a/test/built-ins/AsyncGeneratorPrototype/return/return-promise.js
+++ b/test/built-ins/AsyncGeneratorPrototype/return/return-promise.js
@@ -18,7 +18,6 @@ info: |
   ...
   9. Return promiseCapability.[[Promise]].
 
-includes: [propertyHelper.js]
 features: [async-iteration]
 ---*/
 
diff --git a/test/built-ins/Atomics/notify/count-from-nans.js b/test/built-ins/Atomics/notify/count-from-nans.js
index 7006f3166d9..a986dc7f342 100644
--- a/test/built-ins/Atomics/notify/count-from-nans.js
+++ b/test/built-ins/Atomics/notify/count-from-nans.js
@@ -20,7 +20,7 @@ info: |
   2. If number is NaN, return +0.
   ...
 
-includes: [nans.js, atomicsHelper.js]
+includes: [nans.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
diff --git a/test/built-ins/Atomics/notify/non-shared-bufferdatate-non-shared-int-views.js b/test/built-ins/Atomics/notify/non-shared-bufferdatate-non-shared-int-views.js
index 088aa7bb5c0..982dc8d6d07 100644
--- a/test/built-ins/Atomics/notify/non-shared-bufferdatate-non-shared-int-views.js
+++ b/test/built-ins/Atomics/notify/non-shared-bufferdatate-non-shared-int-views.js
@@ -5,7 +5,6 @@
 esid: sec-atomics.notify
 description: >
   Test Atomics.notify on non-shared integer TypedArrays
-includes: [testTypedArray.js]
 features: [ArrayBuffer, Atomics, TypedArray]
 ---*/
 
diff --git a/test/built-ins/Atomics/notify/non-shared-int-views.js b/test/built-ins/Atomics/notify/non-shared-int-views.js
index b2acf372979..ae22d77be55 100644
--- a/test/built-ins/Atomics/notify/non-shared-int-views.js
+++ b/test/built-ins/Atomics/notify/non-shared-int-views.js
@@ -5,7 +5,6 @@
 esid: sec-atomics.notify
 description: >
   Test Atomics.notify on non-shared integer TypedArrays
-includes: [testTypedArray.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
diff --git a/test/built-ins/Atomics/wait/negative-index-throws.js b/test/built-ins/Atomics/wait/negative-index-throws.js
index 0c2ecffcf58..62dc993ed10 100644
--- a/test/built-ins/Atomics/wait/negative-index-throws.js
+++ b/test/built-ins/Atomics/wait/negative-index-throws.js
@@ -14,7 +14,6 @@ info: |
         ...
         2.b If integerIndex < 0, throw a RangeError exception
 
-includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, TypedArray]
 ---*/
 
diff --git a/test/built-ins/Atomics/wait/object-for-timeout.js b/test/built-ins/Atomics/wait/object-for-timeout.js
index dea53d77c44..acc78f5f882 100644
--- a/test/built-ins/Atomics/wait/object-for-timeout.js
+++ b/test/built-ins/Atomics/wait/object-for-timeout.js
@@ -15,7 +15,6 @@ info: |
       Let primValue be ? ToPrimitive(argument, hint Number).
       Return ? ToNumber(primValue).
 
-includes: [atomicsHelper.js]
 features: [Atomics, SharedArrayBuffer, Symbol, Symbol.toPrimitive, TypedArray]
 flags: [CanBlockIsTrue]
 ---*/
diff --git a/test/built-ins/Date/parse/time-value-maximum-range.js b/test/built-ins/Date/parse/time-value-maximum-range.js
index 725239a102a..e9003604973 100644
--- a/test/built-ins/Date/parse/time-value-maximum-range.js
+++ b/test/built-ins/Date/parse/time-value-maximum-range.js
@@ -18,7 +18,6 @@ info: |
   smaller: exactly -100,000,000 days to 100,000,000 days measured relative to
   midnight at the beginning of 01 January, 1970 UTC. This gives a range of
   8,640,000,000,000,000 milliseconds to either side of 01 January, 1970 UTC.
-includes: [propertyHelper.js]
 ---*/
 
 const minDateStr = "-271821-04-20T00:00:00.000Z";
diff --git a/test/built-ins/Date/parse/zero.js b/test/built-ins/Date/parse/zero.js
index a898d47b69a..3bee3fb5881 100644
--- a/test/built-ins/Date/parse/zero.js
+++ b/test/built-ins/Date/parse/zero.js
@@ -18,7 +18,6 @@ info: |
   Date.parse(x.toString())
   Date.parse(x.toUTCString())
   Date.parse(x.toISOString())
-includes: [propertyHelper.js]
 ---*/
 
 const zero = new Date(0);
diff --git a/test/built-ins/FinalizationGroup/prototype/cleanupSome/iterator-holdings-multiple-values.js b/test/built-ins/FinalizationGroup/prototype/cleanupSome/iterator-holdings-multiple-values.js
index 55ede9cba3a..479d7d622a5 100644
--- a/test/built-ins/FinalizationGroup/prototype/cleanupSome/iterator-holdings-multiple-values.js
+++ b/test/built-ins/FinalizationGroup/prototype/cleanupSome/iterator-holdings-multiple-values.js
@@ -29,7 +29,7 @@ info: |
     c. Return CreateIterResultObject(cell.[[Holdings]], false).
   9. Otherwise, return CreateIterResultObject(undefined, true).
 features: [FinalizationGroup, Symbol, host-gc-required]
-includes: [compareArray.js, async-gc.js]
+includes: [async-gc.js]
 flags: [async, non-deterministic]
 ---*/
 
diff --git a/test/built-ins/Function/prototype/toString/built-in-function-object.js b/test/built-ins/Function/prototype/toString/built-in-function-object.js
index a87201a7e40..854ca45c9ae 100644
--- a/test/built-ins/Function/prototype/toString/built-in-function-object.js
+++ b/test/built-ins/Function/prototype/toString/built-in-function-object.js
@@ -13,7 +13,7 @@ info: |
   NativeFunction:
     function IdentifierName_opt ( FormalParameters ) { [ native code ] }
 
-includes: [fnGlobalObject.js, nativeFunctionMatcher.js, wellKnownIntrinsicObjects.js]
+includes: [nativeFunctionMatcher.js, wellKnownIntrinsicObjects.js]
 features: [arrow-function]
 ---*/
 
diff --git a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-28.js b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-28.js
index 5e6dff816a2..ec6f4a58764 100644
--- a/test/built-ins/Object/defineProperties/15.2.3.7-6-a-28.js
+++ b/test/built-ins/Object/defineProperties/15.2.3.7-6-a-28.js
@@ -18,9 +18,7 @@ Object.defineProperties(obj, {
   }
 });
 
-if (isWritable(obj, "prop")) {
-  $ERROR('Expected obj["prop"] not to be writable.');
-}
+verifyNotWritable(obj, "prop");
 
 if (!obj.hasOwnProperty("prop")) {
   $ERROR('Expected obj.hasOwnProperty("prop") to be true, actually ' + obj.hasOwnProperty("prop"));
diff --git a/test/built-ins/Promise/allSettled/resolve-non-thenable.js b/test/built-ins/Promise/allSettled/resolve-non-thenable.js
index 8dae32d8ccb..b52bfc0dfad 100644
--- a/test/built-ins/Promise/allSettled/resolve-non-thenable.js
+++ b/test/built-ins/Promise/allSettled/resolve-non-thenable.js
@@ -10,7 +10,7 @@ info: |
     a. Let valuesArray be ! CreateArrayFromList(values).
     b. Return ? Call(promiseCapability.[[Resolve]], undefined, « valuesArray »).
 flags: [async]
-includes: [compareArray.js, promiseHelper.js]
+includes: [promiseHelper.js]
 features: [Promise.allSettled]
 ---*/
 
diff --git a/test/built-ins/RegExp/match-indices/indices-array-element.js b/test/built-ins/RegExp/match-indices/indices-array-element.js
index 68fa8fce206..0c14ac791e8 100644
--- a/test/built-ins/RegExp/match-indices/indices-array-element.js
+++ b/test/built-ins/RegExp/match-indices/indices-array-element.js
@@ -3,7 +3,6 @@
 
 /*---
 description: A matching element of indices is an Array with exactly two number properties.
-includes: [compareArray.js]
 esid: sec-getmatchindicesarray
 features: [regexp-match-indices]
 info: |
diff --git a/test/built-ins/String/prototype/matchAll/regexp-is-undefined-or-null-invokes-matchAll.js b/test/built-ins/String/prototype/matchAll/regexp-is-undefined-or-null-invokes-matchAll.js
index adb37052464..ea79dc08d46 100644
--- a/test/built-ins/String/prototype/matchAll/regexp-is-undefined-or-null-invokes-matchAll.js
+++ b/test/built-ins/String/prototype/matchAll/regexp-is-undefined-or-null-invokes-matchAll.js
@@ -12,7 +12,6 @@ info: |
     4. Let rx be ? RegExpCreate(R, "g").
     5. Return ? Invoke(rx, @@matchAll, « S »).
 features: [String.prototype.matchAll]
-includes: [compareArray.js, compareIterator.js, regExpUtils.js]
 ---*/
 
 var callCount = 0;
diff --git a/test/built-ins/String/prototype/matchAll/regexp-prototype-has-no-matchAll.js b/test/built-ins/String/prototype/matchAll/regexp-prototype-has-no-matchAll.js
index d7c2b2f5751..f73f3a6338c 100644
--- a/test/built-ins/String/prototype/matchAll/regexp-prototype-has-no-matchAll.js
+++ b/test/built-ins/String/prototype/matchAll/regexp-prototype-has-no-matchAll.js
@@ -15,7 +15,6 @@ info: |
     5. Return ? Invoke(rx, @@matchAll, « S »).
 
 features: [Symbol.matchAll, String.prototype.matchAll]
-includes: [compareArray.js, compareIterator.js, regExpUtils.js]
 ---*/
 
 assert.sameValue(typeof String.prototype.matchAll, "function");
diff --git a/test/built-ins/Symbol/prototype/description/description-symboldescriptivestring.js b/test/built-ins/Symbol/prototype/description/description-symboldescriptivestring.js
index 0bf5e639931..b786cbfb379 100644
--- a/test/built-ins/Symbol/prototype/description/description-symboldescriptivestring.js
+++ b/test/built-ins/Symbol/prototype/description/description-symboldescriptivestring.js
@@ -14,7 +14,6 @@ info: |
   Assert: Type(desc) is String.
   Return the string-concatenation of "Symbol(", desc, and ")".
 
-includes: [propertyHelper.js]
 features: [Symbol.prototype.description]
 ---*/
 
diff --git a/test/built-ins/TypedArray/prototype/map/BigInt/callbackfn-no-interaction-over-non-integer-properties.js b/test/built-ins/TypedArray/prototype/map/BigInt/callbackfn-no-interaction-over-non-integer-properties.js
index e8bf86d04fb..cc9bf1acadd 100644
--- a/test/built-ins/TypedArray/prototype/map/BigInt/callbackfn-no-interaction-over-non-integer-properties.js
+++ b/test/built-ins/TypedArray/prototype/map/BigInt/callbackfn-no-interaction-over-non-integer-properties.js
@@ -14,7 +14,7 @@ info: |
     b. Let kValue be ? Get(O, Pk).
     c. Let mappedValue be ? Call(callbackfn, T, « kValue, k, O »).
   ...
-includes: [testBigIntTypedArray.js, compareArray.js]
+includes: [testBigIntTypedArray.js]
 features: [BigInt, Symbol, TypedArray]
 ---*/
 
diff --git a/test/built-ins/TypedArray/prototype/map/callbackfn-no-interaction-over-non-integer-properties.js b/test/built-ins/TypedArray/prototype/map/callbackfn-no-interaction-over-non-integer-properties.js
index e097d50ce2e..96495d98272 100644
--- a/test/built-ins/TypedArray/prototype/map/callbackfn-no-interaction-over-non-integer-properties.js
+++ b/test/built-ins/TypedArray/prototype/map/callbackfn-no-interaction-over-non-integer-properties.js
@@ -14,7 +14,7 @@ info: |
     b. Let kValue be ? Get(O, Pk).
     c. Let mappedValue be ? Call(callbackfn, T, « kValue, k, O »).
   ...
-includes: [testTypedArray.js, compareArray.js]
+includes: [testTypedArray.js]
 features: [Symbol, TypedArray]
 ---*/
 
diff --git a/test/built-ins/TypedArray/prototype/set/BigInt/bigint-tobigint64.js b/test/built-ins/TypedArray/prototype/set/BigInt/bigint-tobigint64.js
index bee2bd50031..d80a2b54b59 100644
--- a/test/built-ins/TypedArray/prototype/set/BigInt/bigint-tobigint64.js
+++ b/test/built-ins/TypedArray/prototype/set/BigInt/bigint-tobigint64.js
@@ -49,7 +49,6 @@ info: |
     2. Let int64bit be n modulo 2^64.
     3. If int64bit ≥ 2^63, return int64bit - 2^64; otherwise return int64bit.
 
-includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
diff --git a/test/built-ins/TypedArray/prototype/set/BigInt/bigint-tobiguint64.js b/test/built-ins/TypedArray/prototype/set/BigInt/bigint-tobiguint64.js
index 2cba6d2c939..7001b52b2ff 100644
--- a/test/built-ins/TypedArray/prototype/set/BigInt/bigint-tobiguint64.js
+++ b/test/built-ins/TypedArray/prototype/set/BigInt/bigint-tobiguint64.js
@@ -49,7 +49,6 @@ info: |
     2. Let int64bit be n modulo 2^64.
     3. Return int64bit.
 
-includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
diff --git a/test/built-ins/TypedArray/prototype/slice/BigInt/results-with-empty-length.js b/test/built-ins/TypedArray/prototype/slice/BigInt/results-with-empty-length.js
index 901805a843c..d89433f37e8 100644
--- a/test/built-ins/TypedArray/prototype/slice/BigInt/results-with-empty-length.js
+++ b/test/built-ins/TypedArray/prototype/slice/BigInt/results-with-empty-length.js
@@ -3,7 +3,7 @@
 /*---
 esid: sec-%typedarray%.prototype.slice
 description: slice may return a new empty instance
-includes: [testBigIntTypedArray.js, compareArray.js]
+includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
diff --git a/test/built-ins/TypedArray/prototype/slice/BigInt/results-with-same-length.js b/test/built-ins/TypedArray/prototype/slice/BigInt/results-with-same-length.js
index c351ef0867e..ef8de0f3196 100644
--- a/test/built-ins/TypedArray/prototype/slice/BigInt/results-with-same-length.js
+++ b/test/built-ins/TypedArray/prototype/slice/BigInt/results-with-same-length.js
@@ -3,7 +3,7 @@
 /*---
 esid: sec-%typedarray%.prototype.slice
 description: slice may return a new instance with the same length
-includes: [testBigIntTypedArray.js, compareArray.js]
+includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
diff --git a/test/built-ins/TypedArray/prototype/slice/results-with-empty-length.js b/test/built-ins/TypedArray/prototype/slice/results-with-empty-length.js
index 7cd44b9c60b..99e3b109b81 100644
--- a/test/built-ins/TypedArray/prototype/slice/results-with-empty-length.js
+++ b/test/built-ins/TypedArray/prototype/slice/results-with-empty-length.js
@@ -3,7 +3,7 @@
 /*---
 esid: sec-%typedarray%.prototype.slice
 description: slice may return a new empty instance
-includes: [testTypedArray.js, compareArray.js]
+includes: [testTypedArray.js]
 features: [TypedArray]
 ---*/
 
diff --git a/test/built-ins/TypedArray/prototype/slice/results-with-same-length.js b/test/built-ins/TypedArray/prototype/slice/results-with-same-length.js
index d89cbbdf513..39252ed54a0 100644
--- a/test/built-ins/TypedArray/prototype/slice/results-with-same-length.js
+++ b/test/built-ins/TypedArray/prototype/slice/results-with-same-length.js
@@ -3,7 +3,7 @@
 /*---
 esid: sec-%typedarray%.prototype.slice
 description: slice may return a new instance with the same length
-includes: [testTypedArray.js, compareArray.js]
+includes: [testTypedArray.js]
 features: [TypedArray]
 ---*/
 
diff --git a/test/built-ins/TypedArray/prototype/sort/sorted-values-nan.js b/test/built-ins/TypedArray/prototype/sort/sorted-values-nan.js
index 4e9909d4388..917c3135a51 100644
--- a/test/built-ins/TypedArray/prototype/sort/sorted-values-nan.js
+++ b/test/built-ins/TypedArray/prototype/sort/sorted-values-nan.js
@@ -13,7 +13,7 @@ info: |
 
   NOTE: Because NaN always compares greater than any other value, NaN property
   values always sort to the end of the result when comparefn is not provided.
-includes: [testTypedArray.js, compareArray.js]
+includes: [testTypedArray.js]
 features: [TypedArray]
 ---*/
 
diff --git a/test/built-ins/TypedArray/prototype/subarray/BigInt/results-with-empty-length.js b/test/built-ins/TypedArray/prototype/subarray/BigInt/results-with-empty-length.js
index 310d1bc6ddb..5ff6768ec50 100644
--- a/test/built-ins/TypedArray/prototype/subarray/BigInt/results-with-empty-length.js
+++ b/test/built-ins/TypedArray/prototype/subarray/BigInt/results-with-empty-length.js
@@ -8,7 +8,7 @@ info: |
 
   ...
   17. Return ? TypedArraySpeciesCreate(O, argumentsList).
-includes: [testBigIntTypedArray.js, compareArray.js]
+includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
diff --git a/test/built-ins/TypedArray/prototype/subarray/BigInt/results-with-same-length.js b/test/built-ins/TypedArray/prototype/subarray/BigInt/results-with-same-length.js
index 79e579374bb..d54310d5260 100644
--- a/test/built-ins/TypedArray/prototype/subarray/BigInt/results-with-same-length.js
+++ b/test/built-ins/TypedArray/prototype/subarray/BigInt/results-with-same-length.js
@@ -8,7 +8,7 @@ info: |
 
   ...
   17. Return ? TypedArraySpeciesCreate(O, argumentsList).
-includes: [testBigIntTypedArray.js, compareArray.js]
+includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
diff --git a/test/built-ins/TypedArray/prototype/subarray/results-with-empty-length.js b/test/built-ins/TypedArray/prototype/subarray/results-with-empty-length.js
index 0660a11125d..9e04230690d 100644
--- a/test/built-ins/TypedArray/prototype/subarray/results-with-empty-length.js
+++ b/test/built-ins/TypedArray/prototype/subarray/results-with-empty-length.js
@@ -8,7 +8,7 @@ info: |
 
   ...
   17. Return ? TypedArraySpeciesCreate(O, argumentsList).
-includes: [testTypedArray.js, compareArray.js]
+includes: [testTypedArray.js]
 features: [TypedArray]
 ---*/
 
diff --git a/test/built-ins/TypedArray/prototype/subarray/results-with-same-length.js b/test/built-ins/TypedArray/prototype/subarray/results-with-same-length.js
index 947e957223e..c51cbcc023c 100644
--- a/test/built-ins/TypedArray/prototype/subarray/results-with-same-length.js
+++ b/test/built-ins/TypedArray/prototype/subarray/results-with-same-length.js
@@ -8,7 +8,7 @@ info: |
 
   ...
   17. Return ? TypedArraySpeciesCreate(O, argumentsList).
-includes: [testTypedArray.js, compareArray.js]
+includes: [testTypedArray.js]
 features: [TypedArray]
 ---*/
 
diff --git a/test/built-ins/TypedArrayConstructors/ctors-bigint/object-arg/bigint-tobigint64.js b/test/built-ins/TypedArrayConstructors/ctors-bigint/object-arg/bigint-tobigint64.js
index 501df4ec921..dd3bdcc44fd 100644
--- a/test/built-ins/TypedArrayConstructors/ctors-bigint/object-arg/bigint-tobigint64.js
+++ b/test/built-ins/TypedArrayConstructors/ctors-bigint/object-arg/bigint-tobigint64.js
@@ -59,7 +59,6 @@ info: |
     2. Let int64bit be n modulo 2^64.
     3. If int64bit ≥ 2^63, return int64bit - 2^64; otherwise return int64bit.
 
-includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
diff --git a/test/built-ins/TypedArrayConstructors/ctors-bigint/object-arg/bigint-tobiguint64.js b/test/built-ins/TypedArrayConstructors/ctors-bigint/object-arg/bigint-tobiguint64.js
index 9f87a9be284..ded74af07a9 100644
--- a/test/built-ins/TypedArrayConstructors/ctors-bigint/object-arg/bigint-tobiguint64.js
+++ b/test/built-ins/TypedArrayConstructors/ctors-bigint/object-arg/bigint-tobiguint64.js
@@ -59,7 +59,6 @@ info: |
     2. Let int64bit be n modulo 2^64.
     3. Return int64bit.
 
-includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
diff --git a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/tonumber-value-detached-buffer.js b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/tonumber-value-detached-buffer.js
index d8f720d0452..9c8a191e9f7 100644
--- a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/tonumber-value-detached-buffer.js
+++ b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/BigInt/tonumber-value-detached-buffer.js
@@ -36,7 +36,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
     {
       value: {
         valueOf: function() {
-          $262.detachArrayBuffer(ta.buffer);
+          $DETACHBUFFER(ta.buffer);
           return 42n;
         }
       }
diff --git a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/tonumber-value-detached-buffer.js b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/tonumber-value-detached-buffer.js
index d1975ee639d..1940e5cde37 100644
--- a/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/tonumber-value-detached-buffer.js
+++ b/test/built-ins/TypedArrayConstructors/internals/DefineOwnProperty/tonumber-value-detached-buffer.js
@@ -36,7 +36,7 @@ testWithTypedArrayConstructors(function(TA) {
     {
       value: {
         valueOf: function() {
-          $262.detachArrayBuffer(ta.buffer);
+          $DETACHBUFFER(ta.buffer);
           return 42;
         }
       }
diff --git a/test/built-ins/TypedArrayConstructors/internals/HasProperty/BigInt/abrupt-from-ordinary-has-parent-hasproperty.js b/test/built-ins/TypedArrayConstructors/internals/HasProperty/BigInt/abrupt-from-ordinary-has-parent-hasproperty.js
index 5c788c69a65..b334a3888de 100644
--- a/test/built-ins/TypedArrayConstructors/internals/HasProperty/BigInt/abrupt-from-ordinary-has-parent-hasproperty.js
+++ b/test/built-ins/TypedArrayConstructors/internals/HasProperty/BigInt/abrupt-from-ordinary-has-parent-hasproperty.js
@@ -23,7 +23,7 @@ info: |
   5. If parent is not null, then
     a. Return ? parent.[[HasProperty]](P).
   6. Return false.
-includes: [testBigIntTypedArray.js, detachArrayBuffer.js]
+includes: [testBigIntTypedArray.js]
 features: [BigInt, Reflect, Proxy, TypedArray]
 ---*/
 
diff --git a/test/built-ins/TypedArrayConstructors/internals/HasProperty/abrupt-from-ordinary-has-parent-hasproperty.js b/test/built-ins/TypedArrayConstructors/internals/HasProperty/abrupt-from-ordinary-has-parent-hasproperty.js
index 1c235fa815a..c54b4cf20b1 100644
--- a/test/built-ins/TypedArrayConstructors/internals/HasProperty/abrupt-from-ordinary-has-parent-hasproperty.js
+++ b/test/built-ins/TypedArrayConstructors/internals/HasProperty/abrupt-from-ordinary-has-parent-hasproperty.js
@@ -23,7 +23,7 @@ info: |
   5. If parent is not null, then
     a. Return ? parent.[[HasProperty]](P).
   6. Return false.
-includes: [testTypedArray.js, detachArrayBuffer.js]
+includes: [testTypedArray.js]
 features: [Reflect, Proxy, TypedArray]
 ---*/
 
diff --git a/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/bigint-tobigint64.js b/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/bigint-tobigint64.js
index 66404af879d..353b9c76df4 100644
--- a/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/bigint-tobigint64.js
+++ b/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/bigint-tobigint64.js
@@ -65,7 +65,6 @@ info: |
     2. Let int64bit be n modulo 2^64.
     3. If int64bit ≥ 2^63, return int64bit - 2^64; otherwise return int64bit.
 
-includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
diff --git a/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/bigint-tobiguint64.js b/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/bigint-tobiguint64.js
index cf76e47fd9e..40cbc409087 100644
--- a/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/bigint-tobiguint64.js
+++ b/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/bigint-tobiguint64.js
@@ -65,7 +65,6 @@ info: |
     2. Let int64bit be n modulo 2^64.
     3. Return int64bit.
 
-includes: [testBigIntTypedArray.js]
 features: [BigInt, TypedArray]
 ---*/
 
diff --git a/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/tonumber-value-detached-buffer.js b/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/tonumber-value-detached-buffer.js
index 5794dfbc483..dabfe0cc541 100644
--- a/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/tonumber-value-detached-buffer.js
+++ b/test/built-ins/TypedArrayConstructors/internals/Set/BigInt/tonumber-value-detached-buffer.js
@@ -32,7 +32,7 @@ testWithBigIntTypedArrayConstructors(function(TA) {
   assert.throws(TypeError, function() {
     Reflect.set(ta, 0, {
       valueOf: function() {
-        $262.detachArrayBuffer(ta.buffer);
+        $DETACHBUFFER(ta.buffer);
         return 42n;
       }
     });
diff --git a/test/built-ins/TypedArrayConstructors/internals/Set/tonumber-value-detached-buffer.js b/test/built-ins/TypedArrayConstructors/internals/Set/tonumber-value-detached-buffer.js
index 86a4b867b8f..7560b3105e5 100644
--- a/test/built-ins/TypedArrayConstructors/internals/Set/tonumber-value-detached-buffer.js
+++ b/test/built-ins/TypedArrayConstructors/internals/Set/tonumber-value-detached-buffer.js
@@ -32,7 +32,7 @@ testWithTypedArrayConstructors(function(TA) {
   assert.throws(TypeError, function() {
     Reflect.set(ta, 0, {
       valueOf: function() {
-        $262.detachArrayBuffer(ta.buffer);
+        $DETACHBUFFER(ta.buffer);
         return 42;
       }
     });
diff --git a/test/built-ins/WeakMap/iterable.js b/test/built-ins/WeakMap/iterable.js
index 2954ebef150..41032ebb53c 100644
--- a/test/built-ins/WeakMap/iterable.js
+++ b/test/built-ins/WeakMap/iterable.js
@@ -11,7 +11,6 @@ info: |
   9. Repeat
     k. Let status be Call(adder, map, «k.[[value]], v.[[value]]»).
     l. If status is an abrupt completion, return IteratorClose(iter, status).
-includes: [compareArray.js]
 ---*/
 
 var first = {};
diff --git a/test/built-ins/WeakSet/iterable.js b/test/built-ins/WeakSet/iterable.js
index e232678cd2c..3de9b3a11c2 100644
--- a/test/built-ins/WeakSet/iterable.js
+++ b/test/built-ins/WeakSet/iterable.js
@@ -11,7 +11,6 @@ info: |
   9. Repeat
     f. Let status be Call(adder, set, «nextValue»).
     g. If status is an abrupt completion, return IteratorClose(iter, status).
-includes: [compareArray.js]
 ---*/
 
 var first = {};
diff --git a/test/intl402/DateTimeFormat/numbering-system-calendar-options.js b/test/intl402/DateTimeFormat/numbering-system-calendar-options.js
index ac309110957..c278dcb52e8 100644
--- a/test/intl402/DateTimeFormat/numbering-system-calendar-options.js
+++ b/test/intl402/DateTimeFormat/numbering-system-calendar-options.js
@@ -7,7 +7,6 @@ description: >
     Tests that the options numberingSystem and calendar can be  set through
     either the locale or the options.
 author: Norbert Lindenberg, Daniel Ehrenberg
-includes: [testIntl.js]
 ---*/
 
 let defaultLocale = new Intl.DateTimeFormat().resolvedOptions().locale;
diff --git a/test/intl402/Intl/getCanonicalLocales/error-cases.js b/test/intl402/Intl/getCanonicalLocales/error-cases.js
index 046d6d425d6..5af5fe16e0c 100644
--- a/test/intl402/Intl/getCanonicalLocales/error-cases.js
+++ b/test/intl402/Intl/getCanonicalLocales/error-cases.js
@@ -8,7 +8,6 @@ info: |
   8.2.1 Intl.getCanonicalLocales (locales)
   1. Let ll be ? CanonicalizeLocaleList(locales).
   2. Return CreateArrayFromList(ll).
-includes: [compareArray.js]
 features: [Symbol]
 ---*/
 
diff --git a/test/intl402/ListFormat/constructor/constructor/locales-valid.js b/test/intl402/ListFormat/constructor/constructor/locales-valid.js
index 2320b3744f2..97f840a7ee5 100644
--- a/test/intl402/ListFormat/constructor/constructor/locales-valid.js
+++ b/test/intl402/ListFormat/constructor/constructor/locales-valid.js
@@ -7,7 +7,6 @@ description: Checks various cases for the locales argument to the ListFormat con
 info: |
     InitializeListFormat (listFormat, locales, options)
     1. Let _requestedLocales_ be ? CanonicalizeLocaleList(_locales_).
-includes: [testIntl.js]
 features: [Intl.ListFormat]
 ---*/
 
diff --git a/test/intl402/NumberFormat/numbering-system-options.js b/test/intl402/NumberFormat/numbering-system-options.js
index 40af32deed5..e1ecf45a390 100644
--- a/test/intl402/NumberFormat/numbering-system-options.js
+++ b/test/intl402/NumberFormat/numbering-system-options.js
@@ -7,7 +7,6 @@ description: >
     Tests that the options numberingSystem and calendar can be  set through
     either the locale or the options.
 author: Norbert Lindenberg, Daniel Ehrenberg
-includes: [testIntl.js]
 ---*/
 
 let defaultLocale = new Intl.NumberFormat().resolvedOptions().locale;
diff --git a/test/intl402/PluralRules/prototype/resolvedOptions/pluralCategories.js b/test/intl402/PluralRules/prototype/resolvedOptions/pluralCategories.js
index 30dc4728dc8..9481dc97877 100644
--- a/test/intl402/PluralRules/prototype/resolvedOptions/pluralCategories.js
+++ b/test/intl402/PluralRules/prototype/resolvedOptions/pluralCategories.js
@@ -6,7 +6,7 @@ esid: sec-Intl.PluralRules.prototype.resolvedOptions
 description: >
     Tests that Intl.PluralRules.prototype.resolvedOptions creates a new array
     for the pluralCategories property on every call.
-includes: [testIntl.js, propertyHelper.js, compareArray.js]
+includes: [propertyHelper.js, compareArray.js]
 ---*/
 
 const allowedValues = ["zero", "one", "two", "few", "many", "other"];
diff --git a/test/intl402/RelativeTimeFormat/constructor/constructor/locales-valid.js b/test/intl402/RelativeTimeFormat/constructor/constructor/locales-valid.js
index b5045fd7d06..175ebb0042e 100644
--- a/test/intl402/RelativeTimeFormat/constructor/constructor/locales-valid.js
+++ b/test/intl402/RelativeTimeFormat/constructor/constructor/locales-valid.js
@@ -7,7 +7,6 @@ description: Checks various cases for the locales argument to the RelativeTimeFo
 info: |
     InitializeRelativeTimeFormat (relativeTimeFormat, locales, options)
     3. Let _requestedLocales_ be ? CanonicalizeLocaleList(_locales_).
-includes: [testIntl.js]
 features: [Intl.RelativeTimeFormat]
 ---*/
 
diff --git a/test/intl402/Segmenter/constructor/constructor/locales-valid.js b/test/intl402/Segmenter/constructor/constructor/locales-valid.js
index 2c8885a1435..2361c6e37fa 100644
--- a/test/intl402/Segmenter/constructor/constructor/locales-valid.js
+++ b/test/intl402/Segmenter/constructor/constructor/locales-valid.js
@@ -8,7 +8,6 @@ info: |
     Intl.Segmenter ([ locales [ , options ]])
 
     3. Let _requestedLocales_ be ? CanonicalizeLocaleList(_locales_).
-includes: [testIntl.js]
 features: [Intl.Segmenter]
 ---*/
 
diff --git a/test/language/expressions/async-generator/named-yield-spread-obj.js b/test/language/expressions/async-generator/named-yield-spread-obj.js
index a673d06bbaa..852d220e218 100644
--- a/test/language/expressions/async-generator/named-yield-spread-obj.js
+++ b/test/language/expressions/async-generator/named-yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Named async generator
 esid: prod-AsyncGeneratorExpression
 features: [object-spread, async-iteration]
 flags: [generated, async]
-includes: [compareArray.js]
 info: |
     Async Generator Function Definitions
 
diff --git a/test/language/expressions/async-generator/yield-spread-obj.js b/test/language/expressions/async-generator/yield-spread-obj.js
index 717158f88dd..27e9c39b849 100644
--- a/test/language/expressions/async-generator/yield-spread-obj.js
+++ b/test/language/expressions/async-generator/yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Unnamed async generato
 esid: prod-AsyncGeneratorExpression
 features: [object-spread, async-iteration]
 flags: [generated, async]
-includes: [compareArray.js]
 info: |
     Async Generator Function Definitions
 
diff --git a/test/language/expressions/class/async-gen-method-static/yield-spread-obj.js b/test/language/expressions/class/async-gen-method-static/yield-spread-obj.js
index 9fb44181c02..7e4e7527eb9 100644
--- a/test/language/expressions/class/async-gen-method-static/yield-spread-obj.js
+++ b/test/language/expressions/class/async-gen-method-static/yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Static async generator
 esid: prod-AsyncGeneratorMethod
 features: [object-spread, async-iteration]
 flags: [generated, async]
-includes: [compareArray.js]
 info: |
     ClassElement :
       static MethodDefinition
diff --git a/test/language/expressions/class/async-gen-method/yield-spread-obj.js b/test/language/expressions/class/async-gen-method/yield-spread-obj.js
index 08d3385f8b6..64cdfc74c6b 100644
--- a/test/language/expressions/class/async-gen-method/yield-spread-obj.js
+++ b/test/language/expressions/class/async-gen-method/yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Async generator method
 esid: prod-AsyncGeneratorMethod
 features: [object-spread, async-iteration]
 flags: [generated, async]
-includes: [compareArray.js]
 info: |
     ClassElement :
       MethodDefinition
diff --git a/test/language/expressions/class/elements/async-gen-private-method-static/yield-spread-obj.js b/test/language/expressions/class/elements/async-gen-private-method-static/yield-spread-obj.js
index b288a280286..de3e240e4ba 100644
--- a/test/language/expressions/class/elements/async-gen-private-method-static/yield-spread-obj.js
+++ b/test/language/expressions/class/elements/async-gen-private-method-static/yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Static async generator
 esid: prod-AsyncGeneratorPrivateMethod
 features: [object-spread, async-iteration, class-static-methods-private]
 flags: [generated, async]
-includes: [compareArray.js]
 info: |
     ClassElement :
       static PrivateMethodDefinition
diff --git a/test/language/expressions/class/elements/async-gen-private-method/yield-spread-obj.js b/test/language/expressions/class/elements/async-gen-private-method/yield-spread-obj.js
index 0a66df31dc5..5f980b98d92 100644
--- a/test/language/expressions/class/elements/async-gen-private-method/yield-spread-obj.js
+++ b/test/language/expressions/class/elements/async-gen-private-method/yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Async generator method
 esid: prod-AsyncGeneratorPrivateMethod
 features: [object-spread, async-iteration, class-methods-private]
 flags: [generated, async]
-includes: [compareArray.js]
 info: |
     ClassElement :
       PrivateMethodDefinition
diff --git a/test/language/expressions/class/elements/fields-multiple-definitions-static-private-methods-proxy.js b/test/language/expressions/class/elements/fields-multiple-definitions-static-private-methods-proxy.js
index 5a46f0832c8..7fe3de974e5 100644
--- a/test/language/expressions/class/elements/fields-multiple-definitions-static-private-methods-proxy.js
+++ b/test/language/expressions/class/elements/fields-multiple-definitions-static-private-methods-proxy.js
@@ -5,7 +5,6 @@
 description: Static private methods not accessible via default Proxy handler
 esid: prod-FieldDefinition
 features: [class, class-static-methods-private]
-includes: [propertyHelper.js]
 info: |
     ClassElement :
       ...
diff --git a/test/language/expressions/class/elements/gen-private-method-static/yield-spread-obj.js b/test/language/expressions/class/elements/gen-private-method-static/yield-spread-obj.js
index b42b7f64c8c..b12831bcd19 100644
--- a/test/language/expressions/class/elements/gen-private-method-static/yield-spread-obj.js
+++ b/test/language/expressions/class/elements/gen-private-method-static/yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Static generator priva
 esid: prod-GeneratorPrivateMethod
 features: [object-spread, generators, class-static-methods-private]
 flags: [generated]
-includes: [compareArray.js]
 info: |
     ClassElement :
       static PrivateMethodDefinition
diff --git a/test/language/expressions/class/elements/gen-private-method/yield-spread-obj.js b/test/language/expressions/class/elements/gen-private-method/yield-spread-obj.js
index c0bd525a32d..5d72f5b2381 100644
--- a/test/language/expressions/class/elements/gen-private-method/yield-spread-obj.js
+++ b/test/language/expressions/class/elements/gen-private-method/yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Generator private meth
 esid: prod-GeneratorPrivateMethod
 features: [object-spread, generators, class-methods-private]
 flags: [generated]
-includes: [compareArray.js]
 info: |
     ClassElement :
       PrivateMethodDefinition
diff --git a/test/language/expressions/class/gen-method-static/yield-spread-obj.js b/test/language/expressions/class/gen-method-static/yield-spread-obj.js
index ac57da24840..31049d38f09 100644
--- a/test/language/expressions/class/gen-method-static/yield-spread-obj.js
+++ b/test/language/expressions/class/gen-method-static/yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Static generator metho
 esid: prod-GeneratorMethod
 features: [object-spread, generators]
 flags: [generated]
-includes: [compareArray.js]
 info: |
     ClassElement :
       static MethodDefinition
diff --git a/test/language/expressions/class/gen-method/yield-spread-obj.js b/test/language/expressions/class/gen-method/yield-spread-obj.js
index 930e7dd7cae..bb60bfe8194 100644
--- a/test/language/expressions/class/gen-method/yield-spread-obj.js
+++ b/test/language/expressions/class/gen-method/yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Generator method as a
 esid: prod-GeneratorMethod
 features: [object-spread, generators]
 flags: [generated]
-includes: [compareArray.js]
 info: |
     ClassElement :
       MethodDefinition
diff --git a/test/language/expressions/dynamic-import/namespace/await-ns-extensible.js b/test/language/expressions/dynamic-import/namespace/await-ns-extensible.js
index e35aa7418fa..c69bccf9bf9 100644
--- a/test/language/expressions/dynamic-import/namespace/await-ns-extensible.js
+++ b/test/language/expressions/dynamic-import/namespace/await-ns-extensible.js
@@ -6,7 +6,6 @@ description: Module namespace objects are not extensible. (value from await reso
 esid: sec-finishdynamicimport
 features: [dynamic-import]
 flags: [generated, async]
-includes: [propertyHelper.js]
 info: |
     Runtime Semantics: FinishDynamicImport ( referencingScriptOrModule, specifier, promiseCapability, completion )
 
diff --git a/test/language/expressions/dynamic-import/namespace/promise-then-ns-extensible.js b/test/language/expressions/dynamic-import/namespace/promise-then-ns-extensible.js
index 28a628d2117..0163081f449 100644
--- a/test/language/expressions/dynamic-import/namespace/promise-then-ns-extensible.js
+++ b/test/language/expressions/dynamic-import/namespace/promise-then-ns-extensible.js
@@ -6,7 +6,6 @@ description: Module namespace objects are not extensible. (value from promise th
 esid: sec-finishdynamicimport
 features: [dynamic-import]
 flags: [generated, async]
-includes: [propertyHelper.js]
 info: |
     Runtime Semantics: FinishDynamicImport ( referencingScriptOrModule, specifier, promiseCapability, completion )
 
diff --git a/test/language/expressions/generators/named-yield-spread-obj.js b/test/language/expressions/generators/named-yield-spread-obj.js
index f2c0afeffec..b6bdd2556e2 100644
--- a/test/language/expressions/generators/named-yield-spread-obj.js
+++ b/test/language/expressions/generators/named-yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Named generator expres
 esid: prod-GeneratorExpression
 features: [object-spread, generators]
 flags: [generated]
-includes: [compareArray.js]
 info: |
     14.4 Generator Function Definitions
 
diff --git a/test/language/expressions/generators/yield-spread-obj.js b/test/language/expressions/generators/yield-spread-obj.js
index ed2a057a98d..5c5d4fa24a6 100644
--- a/test/language/expressions/generators/yield-spread-obj.js
+++ b/test/language/expressions/generators/yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Unnamed generator expr
 esid: prod-GeneratorExpression
 features: [object-spread, generators]
 flags: [generated]
-includes: [compareArray.js]
 info: |
     14.4 Generator Function Definitions
 
diff --git a/test/language/expressions/object/method-definition/async-gen-yield-spread-obj.js b/test/language/expressions/object/method-definition/async-gen-yield-spread-obj.js
index a8de4d64746..0de4664e897 100644
--- a/test/language/expressions/object/method-definition/async-gen-yield-spread-obj.js
+++ b/test/language/expressions/object/method-definition/async-gen-yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Async generator method
 esid: prod-AsyncGeneratorMethod
 features: [object-spread, async-iteration]
 flags: [generated, async]
-includes: [compareArray.js]
 info: |
     Async Generator Function Definitions
 
diff --git a/test/language/expressions/object/method-definition/gen-yield-spread-obj.js b/test/language/expressions/object/method-definition/gen-yield-spread-obj.js
index 4670c8c5daa..063b7ea06ff 100644
--- a/test/language/expressions/object/method-definition/gen-yield-spread-obj.js
+++ b/test/language/expressions/object/method-definition/gen-yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Generator method)
 esid: prod-GeneratorMethod
 features: [object-spread, generators]
 flags: [generated]
-includes: [compareArray.js]
 info: |
     14.4 Generator Function Definitions
 
diff --git a/test/language/statements/async-generator/yield-spread-obj.js b/test/language/statements/async-generator/yield-spread-obj.js
index 956b69d8d96..a5ebe904b88 100644
--- a/test/language/statements/async-generator/yield-spread-obj.js
+++ b/test/language/statements/async-generator/yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Async generator Functi
 esid: prod-AsyncGeneratorDeclaration
 features: [object-spread, async-iteration]
 flags: [generated, async]
-includes: [compareArray.js]
 info: |
     Async Generator Function Definitions
 
diff --git a/test/language/statements/class/async-gen-method-static/yield-spread-obj.js b/test/language/statements/class/async-gen-method-static/yield-spread-obj.js
index 90598785dea..0c94ae56841 100644
--- a/test/language/statements/class/async-gen-method-static/yield-spread-obj.js
+++ b/test/language/statements/class/async-gen-method-static/yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Static async generator
 esid: prod-AsyncGeneratorMethod
 features: [object-spread, async-iteration]
 flags: [generated, async]
-includes: [compareArray.js]
 info: |
     ClassElement :
       static MethodDefinition
diff --git a/test/language/statements/class/async-gen-method/yield-spread-obj.js b/test/language/statements/class/async-gen-method/yield-spread-obj.js
index 01c03f7737c..ecec5883d45 100644
--- a/test/language/statements/class/async-gen-method/yield-spread-obj.js
+++ b/test/language/statements/class/async-gen-method/yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Async Generator method
 esid: prod-AsyncGeneratorMethod
 features: [object-spread, async-iteration]
 flags: [generated, async]
-includes: [compareArray.js]
 info: |
     ClassElement :
       MethodDefinition
diff --git a/test/language/statements/class/elements/async-gen-private-method-static/yield-spread-obj.js b/test/language/statements/class/elements/async-gen-private-method-static/yield-spread-obj.js
index d1b3e0cde0a..29674609952 100644
--- a/test/language/statements/class/elements/async-gen-private-method-static/yield-spread-obj.js
+++ b/test/language/statements/class/elements/async-gen-private-method-static/yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Static async generator
 esid: prod-AsyncGeneratorPrivateMethod
 features: [object-spread, async-iteration, class-static-methods-private]
 flags: [generated, async]
-includes: [compareArray.js]
 info: |
     ClassElement :
       static PrivateMethodDefinition
diff --git a/test/language/statements/class/elements/async-gen-private-method/yield-spread-obj.js b/test/language/statements/class/elements/async-gen-private-method/yield-spread-obj.js
index 124b85a011f..132c051bf4c 100644
--- a/test/language/statements/class/elements/async-gen-private-method/yield-spread-obj.js
+++ b/test/language/statements/class/elements/async-gen-private-method/yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Async Generator method
 esid: prod-AsyncGeneratorPrivateMethod
 features: [object-spread, async-iteration, class-methods-private]
 flags: [generated, async]
-includes: [compareArray.js]
 info: |
     ClassElement :
       PrivateMethodDefinition
diff --git a/test/language/statements/class/elements/class-field-on-frozen-objects.js b/test/language/statements/class/elements/class-field-on-frozen-objects.js
index 424eb35db5e..2545ed8199e 100644
--- a/test/language/statements/class/elements/class-field-on-frozen-objects.js
+++ b/test/language/statements/class/elements/class-field-on-frozen-objects.js
@@ -13,7 +13,6 @@ info: |
       a. Assert: IsPropertyKey(fieldName) is true.
       b. Perform ? CreateDataPropertyOrThrow(receiver, fieldName, initValue).
     10. Return.
-includes: [compareArray.js]
 features: [class, class-fields-public]
 flags: [onlyStrict]
 ---*/
diff --git a/test/language/statements/class/elements/fields-computed-name-propname-constructor.js b/test/language/statements/class/elements/fields-computed-name-propname-constructor.js
index 6ea84326e73..a12e017a79a 100644
--- a/test/language/statements/class/elements/fields-computed-name-propname-constructor.js
+++ b/test/language/statements/class/elements/fields-computed-name-propname-constructor.js
@@ -39,7 +39,6 @@ info: |
     3. Let newDesc be the PropertyDescriptor { [[Value]]: V, [[Writable]]: true, [[Enumerable]]: true,
       [[Configurable]]: true }.
     4. Return ? O.[[DefineOwnProperty]](P, newDesc).
-includes: [propertyHelper.js]
 ---*/
 
 var x = "constructor";
diff --git a/test/language/statements/class/elements/gen-private-method-static/yield-spread-obj.js b/test/language/statements/class/elements/gen-private-method-static/yield-spread-obj.js
index 7ca80d67d4a..e62db2acbf6 100644
--- a/test/language/statements/class/elements/gen-private-method-static/yield-spread-obj.js
+++ b/test/language/statements/class/elements/gen-private-method-static/yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Static generator priva
 esid: prod-GeneratorPrivateMethod
 features: [object-spread, generators, class-static-methods-private]
 flags: [generated]
-includes: [compareArray.js]
 info: |
     ClassElement :
       static PrivateMethodDefinition
diff --git a/test/language/statements/class/elements/gen-private-method/yield-spread-obj.js b/test/language/statements/class/elements/gen-private-method/yield-spread-obj.js
index 93e1824cebb..beb712855a0 100644
--- a/test/language/statements/class/elements/gen-private-method/yield-spread-obj.js
+++ b/test/language/statements/class/elements/gen-private-method/yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Generator private meth
 esid: prod-GeneratorPrivateMethod
 features: [object-spread, generators, class-methods-private]
 flags: [generated]
-includes: [compareArray.js]
 info: |
     ClassElement :
       PrivateMethodDefinition
diff --git a/test/language/statements/class/elements/private-class-field-on-frozen-objects.js b/test/language/statements/class/elements/private-class-field-on-frozen-objects.js
index 5eb8431e641..9517976c10c 100644
--- a/test/language/statements/class/elements/private-class-field-on-frozen-objects.js
+++ b/test/language/statements/class/elements/private-class-field-on-frozen-objects.js
@@ -13,7 +13,6 @@ info: |
       a. Assert: IsPropertyKey(fieldName) is true.
       b. Perform ? CreateDataPropertyOrThrow(receiver, fieldName, initValue).
     10. Return.
-includes: [compareArray.js]
 features: [class, class-fields-private, class-fields-public]
 flags: [onlyStrict]
 ---*/
diff --git a/test/language/statements/class/elements/public-class-field-initialization-is-visible-to-proxy.js b/test/language/statements/class/elements/public-class-field-initialization-is-visible-to-proxy.js
index 4728ff5bceb..760a5b232ff 100644
--- a/test/language/statements/class/elements/public-class-field-initialization-is-visible-to-proxy.js
+++ b/test/language/statements/class/elements/public-class-field-initialization-is-visible-to-proxy.js
@@ -13,7 +13,6 @@ info: |
       a. Assert: IsPropertyKey(fieldName) is true.
       b. Perform ? CreateDataPropertyOrThrow(receiver, fieldName, initValue).
     10. Return.
-includes: [propertyHelper.js]
 features: [class, class-fields-public]
 ---*/
 
diff --git a/test/language/statements/class/gen-method-static/yield-spread-obj.js b/test/language/statements/class/gen-method-static/yield-spread-obj.js
index 69c2878e946..e6584eddbaf 100644
--- a/test/language/statements/class/gen-method-static/yield-spread-obj.js
+++ b/test/language/statements/class/gen-method-static/yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Static generator metho
 esid: prod-GeneratorMethod
 features: [object-spread, generators]
 flags: [generated]
-includes: [compareArray.js]
 info: |
     ClassElement :
       static MethodDefinition
diff --git a/test/language/statements/class/gen-method/yield-spread-obj.js b/test/language/statements/class/gen-method/yield-spread-obj.js
index 39700e699f3..df6c1e96add 100644
--- a/test/language/statements/class/gen-method/yield-spread-obj.js
+++ b/test/language/statements/class/gen-method/yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Generator method as a
 esid: prod-GeneratorMethod
 features: [object-spread, generators]
 flags: [generated]
-includes: [compareArray.js]
 info: |
     ClassElement :
       MethodDefinition
diff --git a/test/language/statements/generators/yield-spread-obj.js b/test/language/statements/generators/yield-spread-obj.js
index 4750b55decf..240b03676d6 100644
--- a/test/language/statements/generators/yield-spread-obj.js
+++ b/test/language/statements/generators/yield-spread-obj.js
@@ -6,7 +6,6 @@ description: Use yield value in a object spread position (Generator Function dec
 esid: prod-GeneratorDeclaration
 features: [object-spread, generators]
 flags: [generated]
-includes: [compareArray.js]
 info: |
     14.4 Generator Function Definitions